X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fmenu.c;h=3386a9598c1ea6c18069c0876f00ff6086ac60a9;hb=0af33fe0ef24a3e3b65217ad0d7aa2db03d16fc1;hp=ce3f72f76da089a99405ed0fe2b2d90d7e0bddbc;hpb=4696954094ca11200b8b08e8a9bfb231cf21fb86;p=picodrive.git

diff --git a/platform/gp2x/menu.c b/platform/gp2x/menu.c
index ce3f72f..3386a95 100644
--- a/platform/gp2x/menu.c
+++ b/platform/gp2x/menu.c
@@ -419,6 +419,36 @@ static char *romsel_loop(char *curr_path)
 	return ret;
 }
 
+// ------------ debug menu ------------
+
+char *debugString(void);
+
+static void draw_debug(void)
+{
+	char *p, *str = debugString();
+	int len, line;
+
+	gp2x_pd_clone_buffer2();
+
+	p = str;
+	for (line = 0; line < 24; line++)
+	{
+		while (*p && *p != '\n') p++;
+		len = p - str;
+		if (len > 55) len = 55;
+		gp2x_smalltext8_lim(1, line*10, str, len);
+		if (*p == 0) break;
+		p++; str = p;
+	}
+	gp2x_video_flip2();
+}
+
+static void debug_menu_loop(void)
+{
+	draw_debug();
+	wait_for_input(GP2X_B|GP2X_X);
+}
+
 // ------------ patch/gg menu ------------
 
 static void draw_patchlist(int sel)
@@ -444,7 +474,7 @@ static void draw_patchlist(int sel)
 }
 
 
-void patches_menu_loop(void)
+static void patches_menu_loop(void)
 {
 	int menu_sel = 0;
 	unsigned long inp = 0;
@@ -772,8 +802,9 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
 	gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s)    %s", (currentConfig.PicoOpt&0x0800)?"ON":"OFF"); // 4
 	gp2x_text_out8(tl_x, (y+=10), "PCM audio                  %s", (currentConfig.PicoOpt&0x0400)?"ON":"OFF"); // 5
 	gp2x_text_out8(tl_x, (y+=10), "ReadAhead buffer      %s", ra_buff); // 6
-	gp2x_text_out8(tl_x, (y+=10), "Scale/Rot. fx (slow)       %s", (currentConfig.PicoOpt&0x1000)?"ON":"OFF"); // 7
-	gp2x_text_out8(tl_x, (y+=10), "Better sync (slow)         %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 8
+	gp2x_text_out8(tl_x, (y+=10), "SaveRAM cart               %s", (currentConfig.PicoOpt&0x8000)?"ON":"OFF"); // 7
+	gp2x_text_out8(tl_x, (y+=10), "Scale/Rot. fx (slow)       %s", (currentConfig.PicoOpt&0x1000)?"ON":"OFF"); // 8
+	gp2x_text_out8(tl_x, (y+=10), "Better sync (slow)         %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 9
 	gp2x_text_out8(tl_x, (y+=10), "Done");
 
 	// draw cursor
@@ -789,7 +820,7 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
 
 static void cd_menu_loop_options(void)
 {
-	int menu_sel = 0, menu_sel_max = 9;
+	int menu_sel = 0, menu_sel_max = 10;
 	unsigned long inp = 0;
 	char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p;
 
@@ -829,9 +860,10 @@ static void cd_menu_loop_options(void)
 						if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M
 					}
 					break;
-				case  7: currentConfig.PicoOpt^=0x1000; break;
-				case  8: currentConfig.PicoOpt^=0x2000; break;
-				case  9: return;
+				case  7: currentConfig.PicoOpt^=0x8000; break;
+				case  8: currentConfig.PicoOpt^=0x1000; break;
+				case  9: currentConfig.PicoOpt^=0x2000; break;
+				case 10: return;
 			}
 		}
 		if(inp & (GP2X_X|GP2X_A)) return;
@@ -996,7 +1028,7 @@ static void draw_menu_options(int menu_sel)
 	gp2x_text_out8(tl_x, (y+=10), "Sound Quality:     %5iHz %s",   currentConfig.PsndRate, monostereo);
 	gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound  %s", (currentConfig.PicoOpt&0x200)?"ON":"OFF"); // 8
 	gp2x_text_out8(tl_x, (y+=10), "6 button pad               %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 9
-	gp2x_text_out8(tl_x, (y+=10), "Genesis Region:      %s",       region_name(currentConfig.PicoRegion));
+	gp2x_text_out8(tl_x, (y+=10), "Region:              %s",       region_name(currentConfig.PicoRegion));
 	gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates   %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 11
 	gp2x_text_out8(tl_x, (y+=10), "Confirm savestate          %s", strssconfirm); // 12
 	gp2x_text_out8(tl_x, (y+=10), "Save slot                  %i", state_slot); // 13
@@ -1237,7 +1269,8 @@ static void draw_menu_root(int menu_sel)
 
 static void menu_loop_root(void)
 {
-	int ret, menu_sel = 4, menu_sel_max = 8, menu_sel_min = 4;
+	static int menu_sel = 4;
+	int ret, menu_sel_max = 8, menu_sel_min = 4;
 	unsigned long inp = 0;
 	char curr_path[PATH_MAX], *selfname;
 	FILE *tstf;
@@ -1252,7 +1285,7 @@ static void menu_loop_root(void)
 		getcwd(curr_path, PATH_MAX);
 	}
 
-	if (rom_data) menu_sel = menu_sel_min = 0;
+	if (rom_data) menu_sel_min = 0;
 	if (PicoPatches) menu_sel_max = 9;
 
 	/* make sure action buttons are not pressed on entering menu */
@@ -1262,9 +1295,10 @@ static void menu_loop_root(void)
 	for (;;)
 	{
 		draw_menu_root(menu_sel);
-		inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT);
+		inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT|GP2X_L|GP2X_R);
 		if(inp & GP2X_UP  )  { menu_sel--; if (menu_sel < menu_sel_min) menu_sel = menu_sel_max; }
 		if(inp & GP2X_DOWN)  { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = menu_sel_min; }
+		if((inp & (GP2X_L|GP2X_R)) == (GP2X_L|GP2X_R)) debug_menu_loop();
 		if(inp &(GP2X_SELECT|GP2X_X)){
 			if (rom_data) {
 				while (gp2x_joystick_read(1) & (GP2X_SELECT|GP2X_X)) usleep(50*1000); // wait until select is released