X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Fmenu.c;h=c9fc188a92eb533e3a4bd4dd77ec06bcd7df3c3e;hb=d2f29611d1379a249c8f3f955ed16a336f9290cd;hp=4393ed5172f617a954ce710fe78e1e95f89a4209;hpb=35cbf2ec89d87204288d4d40ad46bf77361e5cfe;p=libpicofe.git

diff --git a/common/menu.c b/common/menu.c
index 4393ed5..c9fc188 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -23,8 +23,9 @@
 #include <pico/patch.h>
 
 static char static_buff[64];
-static char menu_error_msg[64] = { 0, };
 static int  menu_error_time = 0;
+char menu_error_msg[64] = { 0, };
+void *g_menubg_ptr;
 
 #ifndef UIQ3
 
@@ -276,7 +277,8 @@ void menu_init(void)
 		lprintf("found skin.txt\n");
 		while (!feof(f))
 		{
-			fgets(buff, sizeof(buff), f);
+			if (fgets(buff, sizeof(buff), f) == NULL)
+				break;
 			if (buff[0] == '#'  || buff[0] == '/')  continue; // comment
 			if (buff[0] == '\r' || buff[0] == '\n') continue; // empty line
 			if (strncmp(buff, "text_color=", 11) == 0)
@@ -299,6 +301,49 @@ void menu_init(void)
 }
 
 
+static void menu_darken_bg(void *dst, void *src, int pixels, int darker)
+{
+	unsigned int *dest = dst;
+	unsigned int *sorc = src;
+	pixels /= 2;
+	if (darker)
+	{
+		while (pixels--)
+		{
+			unsigned int p = *sorc++;
+			*dest++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);
+		}
+	}
+	else
+	{
+		while (pixels--)
+		{
+			unsigned int p = *sorc++;
+			*dest++ = (p&0xf79ef79e)>>1;
+		}
+	}
+}
+
+static void menu_enter(int is_rom_loaded)
+{
+	if (is_rom_loaded)
+	{
+		// darken the active framebuffer
+		menu_darken_bg(g_menubg_ptr, g_screen_ptr, g_screen_width * g_screen_height, 1);
+	}
+	else
+	{
+		char buff[256];
+
+		// should really only happen once, on startup..
+		emu_make_path(buff, "skin/background.png", sizeof(buff));
+		if (readpng(g_menubg_ptr, buff, READPNG_BG) < 0)
+			memset(g_menubg_ptr, 0, g_screen_width * g_screen_height * 2);
+	}
+
+	plat_video_menu_enter(is_rom_loaded);
+}
+
 static int me_id2offset(const menu_entry *ent, menu_id id)
 {
 	int i;
@@ -663,7 +708,7 @@ static void do_delete(const char *fpath, const char *fname)
 	plat_video_menu_begin();
 
 	if (!rom_loaded)
-		menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0);
+		menu_darken_bg(g_screen_ptr, g_screen_ptr, g_screen_width * g_screen_height, 0);
 
 	len = strlen(fname);
 	if (len > g_screen_width/6)
@@ -711,6 +756,7 @@ static unsigned short file2color(const char *fname)
 static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
 {
 	int max_cnt, start, i, x, pos;
+	void *darken_ptr;
 
 	max_cnt = g_screen_height / me_sfont_h;
 	start = max_cnt / 2 - sel;
@@ -721,7 +767,8 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
 //	if (!rom_loaded)
 //		menu_darken_bg(gp2x_screen, 320*240, 0);
 
-	menu_darken_bg((short *)g_screen_ptr + g_screen_width * max_cnt/2 * 10, g_screen_width * 8, 0);
+	darken_ptr = (short *)g_screen_ptr + g_screen_width * max_cnt/2 * 10;
+	menu_darken_bg(darken_ptr, darken_ptr, g_screen_width * 8, 0);
 
 	x = 5 + me_mfont_w + 1;
 	if (start - 2 >= 0)
@@ -744,10 +791,15 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
 
 static int scandir_cmp(const void *p1, const void *p2)
 {
-	struct dirent **d1 = (struct dirent **)p1, **d2 = (struct dirent **)p2;
-	if ((*d1)->d_type == (*d2)->d_type) return alphasort(d1, d2);
-	if ((*d1)->d_type == DT_DIR) return -1; // put before
-	if ((*d2)->d_type == DT_DIR) return  1;
+	const struct dirent **d1 = (const struct dirent **)p1;
+	const struct dirent **d2 = (const struct dirent **)p2;
+	if ((*d1)->d_type == (*d2)->d_type)
+		return alphasort(d1, d2);
+	if ((*d1)->d_type == DT_DIR)
+		return -1; // put before
+	if ((*d2)->d_type == DT_DIR)
+		return  1;
+
 	return alphasort(d1, d2);
 }
 
@@ -789,13 +841,16 @@ rescan:
 		fname = p+1;
 	}
 
-	n = scandir(curr_path, &namelist, scandir_filter, scandir_cmp);
+	n = scandir(curr_path, &namelist, scandir_filter, (void *)scandir_cmp);
 	if (n < 0) {
+		char *t;
 		lprintf("menu_loop_romsel failed, dir: %s\n", curr_path);
 
 		// try root
-		getcwd(curr_path, len);
-		n = scandir(curr_path, &namelist, scandir_filter, scandir_cmp);
+		t = getcwd(curr_path, len);
+		if (t == NULL)
+			plat_get_root_dir(curr_path, len);
+		n = scandir(curr_path, &namelist, scandir_filter, (void *)scandir_cmp);
 		if (n < 0) {
 			// oops, we failed
 			lprintf("menu_loop_romsel failed, dir: %s\n", curr_path);
@@ -993,7 +1048,7 @@ static void draw_savestate_bg(int slot)
 
 	/* do a frame and fetch menu bg */
 	pemu_forced_frame(POPT_EN_SOFTSCALE);
-	plat_video_menu_enter(1);
+	menu_enter(1);
 
 	memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));
 	memcpy(Pico.cram, tmp_cram, sizeof(Pico.cram));
@@ -1424,6 +1479,21 @@ static int menu_loop_cd_options(menu_id id, int keys)
 	return 0;
 }
 
+// ------------ 32X options menu ------------
+
+static menu_entry e_menu_32x_options[] =
+{
+	mee_onoff("32X enabled",          MA_32XOPT_ENABLE_32X,   PicoOpt, POPT_EN_32X),
+	mee_onoff("PWM sound",            MA_32XOPT_PWM,          PicoOpt, POPT_EN_PWM),
+};
+
+static int menu_loop_32x_options(menu_id id, int keys)
+{
+	static int sel = 0;
+	me_loop(e_menu_32x_options, &sel, NULL);
+	return 0;
+}
+
 // ------------ adv options menu ------------
 
 static menu_entry e_menu_adv_options[] =
@@ -1672,6 +1742,7 @@ static menu_entry e_menu_options[] =
 	mee_range     (cpu_clk_name,               MA_OPT_CPU_CLOCKS,    currentConfig.CPUclock, 20, 900),
 	mee_handler   ("[Display options]",        menu_loop_gfx_options),
 	mee_handler   ("[Sega/Mega CD options]",   menu_loop_cd_options),
+	mee_handler   ("[32X options]",            menu_loop_32x_options),
 	mee_handler   ("[Advanced options]",       menu_loop_adv_options),
 	mee_handler_mkname_id(MA_OPT_SAVECFG, mh_saveloadcfg, mgn_savecfg),
 	mee_handler_id("Save cfg for current game only", MA_OPT_SAVECFG_GAME, mh_saveloadcfg),
@@ -1784,7 +1855,7 @@ static void debug_menu_loop(void)
 			case 1: draw_frame_debug(); break;
 			case 2: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);
 				pemu_forced_frame(0);
-				menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0);
+				menu_darken_bg(g_screen_ptr, g_screen_ptr, g_screen_width * g_screen_height, 0);
 				PDebugShowSpriteStats((unsigned short *)g_screen_ptr + (g_screen_height/2 - 240/2)*g_screen_width +
 					g_screen_width/2 - 320/2, g_screen_width); break;
 			case 3: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);
@@ -1944,7 +2015,7 @@ void menu_loop(void)
 	me_enable(e_menu_main, MA_MAIN_RESET_GAME,  rom_loaded);
 	me_enable(e_menu_main, MA_MAIN_PATCHES, PicoPatches != NULL);
 
-	plat_video_menu_enter(rom_loaded);
+	menu_enter(rom_loaded);
 	in_set_blocking(1);
 	me_loop(e_menu_main, &sel, menu_main_plat_draw);
 
@@ -1992,7 +2063,7 @@ int menu_loop_tray(void)
 {
 	int ret = 1, sel = 0;
 
-	plat_video_menu_enter(rom_loaded);
+	menu_enter(rom_loaded);
 
 	in_set_blocking(1);
 	me_loop(e_menu_tray, &sel, NULL);
@@ -2043,29 +2114,6 @@ void menu_plat_setup(int is_wiz)
 	e_menu_gfx_options[i].need_to_save = 0;
 }
 
-/* TODO: rename */
-void menu_darken_bg(void *dst, int pixels, int darker)
-{
-	unsigned int *screen = dst;
-	pixels /= 2;
-	if (darker)
-	{
-		while (pixels--)
-		{
-			unsigned int p = *screen;
-			*screen++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);
-		}
-	}
-	else
-	{
-		while (pixels--)
-		{
-			unsigned int p = *screen;
-			*screen++ = (p&0xf79ef79e)>>1;
-		}
-	}
-}
-
 /* hidden options for config engine only */
 static menu_entry e_menu_hidden[] =
 {
@@ -2079,6 +2127,7 @@ static menu_entry *e_menu_table[] =
 	e_menu_gfx_options,
 	e_menu_adv_options,
 	e_menu_cd_options,
+	e_menu_32x_options,
 	e_menu_keyconfig,
 	e_menu_hidden,
 };