X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmenu.c;h=0b8264ef11dc29bf1e92104f0ff54e2a7a761916;hb=59d0f042a1bf325213ca8da779d89bb969881952;hp=9ffbd40c567ae9e0aa03c8bf6c9bbcf234ce7321;hpb=0805b5b4783b6b711da83c4704c01c5b615adcca;p=libpicofe.git

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 9ffbd40..0b8264e 100644
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -15,9 +15,12 @@
 #include "menu.h"
 #include "fonts.h"
 #include "usbjoy.h"
+#include "asmutils.h"
 #include "version.h"
 
-#include "Pico/PicoInt.h"
+#include <Pico/PicoInt.h>
+#include <Pico/Patch.h>
+#include <zlib/zlib.h>
 
 #ifndef _DIRENT_HAVE_D_TYPE
 #error "need d_type for file browser
@@ -168,14 +171,16 @@ static int inp_prevjoy = 0;
 static unsigned long wait_for_input(unsigned long interesting)
 {
 	unsigned long ret;
-	static int repeats = 0, wait = 300*1000;
+	static int repeats = 0, wait = 50*1000;
 	int release = 0, i;
 
-	if (repeats == 5 || repeats == 15 || repeats == 30) wait /= 2;
+	if (repeats == 2 || repeats == 4) wait /= 2;
+	if (repeats == 6) wait = 15 * 1000;
 
 	for (i = 0; i < 6 && inp_prev == gp2x_joystick_read(1); i++) {
-		if(i == 0) repeats++;
-		usleep(wait/6);
+		if (i == 0) repeats++;
+		if (wait >= 30*1000) usleep(wait); // usleep sleeps for ~30ms minimum
+		else spend_cycles(wait * currentConfig.CPUclock);
 	}
 
 	while ( !((ret = gp2x_joystick_read(1)) & interesting) ) {
@@ -185,7 +190,7 @@ static unsigned long wait_for_input(unsigned long interesting)
 
 	if (release || ret != inp_prev) {
 		repeats = 0;
-		wait = 300*1000;
+		wait = 50*1000;
 	}
 	inp_prev = ret;
 	inp_prevjoy = 0;
@@ -284,6 +289,28 @@ static int scandir_cmp(const void *p1, const void *p2)
 	return alphasort(d1, d2);
 }
 
+static char *filter_exts[] = {
+	".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds",	"bcfg", ".txt", ".htm", "html",
+	".jpg", ".gpe", ".cue"
+};
+
+static int scandir_filter(const struct dirent *ent)
+{
+	const char *p;
+	int i;
+
+	if (ent == NULL || ent->d_name == NULL) return 0;
+	if (strlen(ent->d_name) < 5) return 1;
+
+	p = ent->d_name + strlen(ent->d_name) - 4;
+
+	for (i = 0; i < sizeof(filter_exts)/sizeof(filter_exts[0]); i++)
+	{
+		if (strcmp(p, filter_exts[i]) == 0) return 0;
+	}
+
+	return 1;
+}
 
 static char *romsel_loop(char *curr_path)
 {
@@ -303,10 +330,10 @@ static char *romsel_loop(char *curr_path)
 		fname = p+1;
 	}
 
-	n = scandir(curr_path, &namelist, 0, scandir_cmp);
+	n = scandir(curr_path, &namelist, scandir_filter, scandir_cmp);
 	if (n < 0) {
 		// try root
-		n = scandir(curr_path, &namelist, 0, scandir_cmp);
+		n = scandir("/", &namelist, scandir_filter, scandir_cmp);
 		if (n < 0) {
 			// oops, we failed
 			printf("dir: "); printf(curr_path); printf("\n");
@@ -332,8 +359,10 @@ static char *romsel_loop(char *curr_path)
 		inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_L|GP2X_R|GP2X_B|GP2X_X);
 		if(inp & GP2X_UP  )  { sel--;   if (sel < 0)   sel = n-2; }
 		if(inp & GP2X_DOWN)  { sel++;   if (sel > n-2) sel = 0; }
-		if(inp &(GP2X_LEFT|GP2X_L))  { sel-=10; if (sel < 0)   sel = 0; }
-		if(inp &(GP2X_RIGHT|GP2X_R)) { sel+=10; if (sel > n-2) sel = n-2; }
+		if(inp & GP2X_LEFT)  { sel-=10; if (sel < 0)   sel = 0; }
+		if(inp & GP2X_L)     { sel-=24; if (sel < 0)   sel = 0; }
+		if(inp & GP2X_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; }
+		if(inp & GP2X_R)     { sel+=24; if (sel > n-2) sel = n-2; }
 		if(inp & GP2X_B)     { // enter dir/select
 			again:
 			if (namelist[sel+1]->d_type == DT_REG) {
@@ -390,6 +419,218 @@ 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)
+{
+	int start, i, pos;
+
+	start = 12 - sel;
+
+	gp2x_pd_clone_buffer2();
+
+	for (i = 0; i < PicoPatchCount; i++) {
+		pos = start + i;
+		if (pos < 0)  continue;
+		if (pos > 23) break;
+		gp2x_smalltext8_lim(14,     pos*10, PicoPatches[i].active ? "ON " : "OFF", 3);
+		gp2x_smalltext8_lim(14+6*4, pos*10, PicoPatches[i].name, 53-6);
+	}
+	pos = start + i;
+	if (pos < 24) gp2x_smalltext8_lim(14, pos*10, "done", 4);
+
+	gp2x_text_out8(5, 120, ">");
+	gp2x_video_flip2();
+}
+
+
+static void patches_menu_loop(void)
+{
+	int menu_sel = 0;
+	unsigned long inp = 0;
+
+	for(;;)
+	{
+		draw_patchlist(menu_sel);
+		inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_L|GP2X_R|GP2X_B|GP2X_X);
+		if(inp & GP2X_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = PicoPatchCount; }
+		if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > PicoPatchCount) menu_sel = 0; }
+		if(inp &(GP2X_LEFT|GP2X_L))  { menu_sel-=10; if (menu_sel < 0) menu_sel = 0; }
+		if(inp &(GP2X_RIGHT|GP2X_R)) { menu_sel+=10; if (menu_sel > PicoPatchCount) menu_sel = PicoPatchCount; }
+		if(inp & GP2X_B) { // action
+			if (menu_sel < PicoPatchCount)
+				PicoPatches[menu_sel].active = !PicoPatches[menu_sel].active;
+			else 	return;
+		}
+		if(inp & GP2X_X) return;
+	}
+
+}
+
+// ------------ savestate loader ------------
+
+static void menu_prepare_bg(void);
+
+static int state_slot_flags = 0;
+
+static void state_check_slots(void)
+{
+	int slot;
+
+	state_slot_flags = 0;
+
+	for (slot = 0; slot < 10; slot++)
+	{
+		if (emu_check_save_file(slot))
+		{
+			state_slot_flags |= 1 << slot;
+		}
+	}
+}
+
+static void draw_savestate_bg(int slot)
+{
+	struct PicoVideo tmp_pv;
+	unsigned short tmp_cram[0x40];
+	unsigned short tmp_vsram[0x40];
+	void *tmp_vram, *file;
+	char *fname;
+
+	fname = emu_GetSaveFName(1, 0, slot);
+	if (!fname) return;
+
+	tmp_vram = malloc(sizeof(Pico.vram));
+	if (tmp_vram == NULL) return;
+
+	memcpy(tmp_vram, Pico.vram, sizeof(Pico.vram));
+	memcpy(tmp_cram, Pico.cram, sizeof(Pico.cram));
+	memcpy(tmp_vsram, Pico.vsram, sizeof(Pico.vsram));
+	memcpy(&tmp_pv, &Pico.video, sizeof(Pico.video));
+
+	if (strcmp(fname + strlen(fname) - 3, ".gz") == 0) {
+		file = gzopen(fname, "rb");
+		emu_set_save_cbs(1);
+	} else {
+		file = fopen(fname, "rb");
+		emu_set_save_cbs(0);
+	}
+
+	if (file) {
+		if (PicoMCD & 1) {
+			PicoCdLoadStateGfx(file);
+		} else {
+			areaSeek(file, 0x10020, SEEK_SET);  // skip header and RAM in state file
+			areaRead(Pico.vram, 1, sizeof(Pico.vram), file);
+			areaSeek(file, 0x2000, SEEK_CUR);
+			areaRead(Pico.cram, 1, sizeof(Pico.cram), file);
+			areaRead(Pico.vsram, 1, sizeof(Pico.vsram), file);
+			areaSeek(file, 0x221a0, SEEK_SET);
+			areaRead(&Pico.video, 1, sizeof(Pico.video), file);
+		}
+		areaClose(file);
+	}
+
+	emu_forced_frame();
+	gp2x_memcpy_buffers((1<<2), gp2x_screen, 0, 320*240*2);
+	menu_prepare_bg();
+
+	memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));
+	memcpy(Pico.cram, tmp_cram, sizeof(Pico.cram));
+	memcpy(Pico.vsram, tmp_vsram, sizeof(Pico.vsram));
+	memcpy(&Pico.video, &tmp_pv,  sizeof(Pico.video));
+	free(tmp_vram);
+}
+
+static void draw_savestate_menu(int menu_sel, int is_loading)
+{
+	int tl_x = 25, tl_y = 60, y, i;
+
+	if (state_slot_flags & (1 << menu_sel))
+		draw_savestate_bg(menu_sel);
+	gp2x_pd_clone_buffer2();
+
+	gp2x_text_out8(tl_x, 30, is_loading ? "Load state" : "Save state");
+
+	/* draw all 10 slots */
+	y = tl_y;
+	for (i = 0; i < 10; i++, y+=10)
+	{
+		gp2x_text_out8(tl_x, y, "SLOT %i (%s)", i, (state_slot_flags & (1 << i)) ? "USED" : "free");
+	}
+	gp2x_text_out8(tl_x, y, "back");
+
+	// draw cursor
+	gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");
+
+	gp2x_video_flip2();
+}
+
+static int savestate_menu_loop(int is_loading)
+{
+	static int menu_sel = 10;
+	int menu_sel_max = 10;
+	unsigned long inp = 0;
+
+	state_check_slots();
+
+	for(;;)
+	{
+		draw_savestate_menu(menu_sel, is_loading);
+		inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X);
+		if(inp & GP2X_UP  ) {
+			do {
+				menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max;
+			} while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading);
+		}
+		if(inp & GP2X_DOWN) {
+			do {
+				menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0;
+			} while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading);
+		}
+		if(inp & GP2X_B) { // save/load
+			if (menu_sel < 10) {
+				state_slot = menu_sel;
+				if (emu_SaveLoadGame(is_loading, 0)) {
+					strcpy(menuErrorMsg, is_loading ? "Load failed" : "Save failed");
+					return 1;
+				}
+				return 0;
+			} else	return 1;
+		}
+		if(inp & GP2X_X) return 1;
+	}
+}
+
 // -------------- key config --------------
 
 static char *usb_joy_key_name(int joy, int num)
@@ -546,6 +787,10 @@ static void kc_sel_loop(void)
 static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_jp)
 {
 	int tl_x = 25, tl_y = 60, y;
+	char ra_buff[16];
+
+	if (PicoCDBuffers > 1) sprintf(ra_buff, "%5iK", PicoCDBuffers * 2);
+	else strcpy(ra_buff, "     OFF");
 
 	y = tl_y;
 	//memset(gp2x_screen, 0, 320*240);
@@ -554,9 +799,13 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
 	gp2x_text_out8(tl_x, y,       "USA BIOS:     %s", b_us); // 0
 	gp2x_text_out8(tl_x, (y+=10), "EUR BIOS:     %s", b_eu); // 1
 	gp2x_text_out8(tl_x, (y+=10), "JAP BIOS:     %s", b_jp); // 2
-	gp2x_text_out8(tl_x, (y+=10), "CD LEDs                    %s", (currentConfig.EmuOpt &0x400)?"ON":"OFF"); // 3
-	gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s)    %s", (currentConfig.PicoOpt&0x800)?"ON":"OFF"); // 4
-	gp2x_text_out8(tl_x, (y+=10), "PCM audio                  %s", (currentConfig.PicoOpt&0x400)?"ON":"OFF"); // 5
+	gp2x_text_out8(tl_x, (y+=10), "CD LEDs                    %s", (currentConfig.EmuOpt &0x0400)?"ON":"OFF"); // 3
+	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), "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
@@ -572,7 +821,8 @@ 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 = 6;
+	static int menu_sel = 0;
+	int menu_sel_max = 10;
 	unsigned long inp = 0;
 	char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p;
 
@@ -599,10 +849,23 @@ static void cd_menu_loop_options(void)
 		if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
 		if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options
 			switch (menu_sel) {
-				case  3: currentConfig.EmuOpt ^=0x400; break;
-				case  4: currentConfig.PicoOpt^=0x800; break;
-				case  5: currentConfig.PicoOpt^=0x400; break;
-				case  6: return;
+				case  3: currentConfig.EmuOpt ^=0x0400; break;
+				case  4: currentConfig.PicoOpt^=0x0800; break;
+				case  5: currentConfig.PicoOpt^=0x0400; break;
+				case  6:
+					if (inp & GP2X_LEFT) {
+						PicoCDBuffers >>= 1;
+						if (PicoCDBuffers < 64) PicoCDBuffers = 0;
+					} else {
+						if (PicoCDBuffers < 64) PicoCDBuffers = 64;
+						else PicoCDBuffers <<= 1;
+						if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M
+					}
+					break;
+				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;
@@ -636,23 +899,24 @@ static void cd_menu_loop_options(void)
 
 static void draw_amenu_options(int menu_sel)
 {
-	int tl_x = 25, tl_y = 60, y;
+	int tl_x = 25, tl_y = 50, y;
 	char *mms = mmuhack_status ? "active)  " : "inactive)";
 
 	y = tl_y;
 	//memset(gp2x_screen, 0, 320*240);
 	gp2x_pd_clone_buffer2();
 
-	gp2x_text_out8(tl_x, y,       "Scale 32 column mode       %s", (currentConfig.PicoOpt&0x100)?"ON":"OFF"); // 0
-	gp2x_text_out8(tl_x, (y+=10), "Gamma correction           %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 1
-	gp2x_text_out8(tl_x, (y+=10), "Emulate Z80                %s", (currentConfig.PicoOpt&0x004)?"ON":"OFF"); // 2
-	gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM)        %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 3
-	gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG)      %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 4
-	gp2x_text_out8(tl_x, (y+=10), "gzip savestates            %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 5
-	gp2x_text_out8(tl_x, (y+=10), "Don't save config on exit  %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 6
+	gp2x_text_out8(tl_x, y,       "Gamma correction           %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 0
+	gp2x_text_out8(tl_x, (y+=10), "A_SN's gamma curve         %s", (currentConfig.EmuOpt &0x1000)?"ON":"OFF");
+	gp2x_text_out8(tl_x, (y+=10), "Perfecf vsync              %s", (currentConfig.EmuOpt &0x2000)?"ON":"OFF");
+	gp2x_text_out8(tl_x, (y+=10), "Emulate Z80                %s", (currentConfig.PicoOpt&0x0004)?"ON":"OFF");
+	gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM)        %s", (currentConfig.PicoOpt&0x0001)?"ON":"OFF");
+	gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG)      %s", (currentConfig.PicoOpt&0x0002)?"ON":"OFF"); // 5
+	gp2x_text_out8(tl_x, (y+=10), "gzip savestates            %s", (currentConfig.EmuOpt &0x0008)?"ON":"OFF");
+	gp2x_text_out8(tl_x, (y+=10), "Don't save last used ROM   %s", (currentConfig.EmuOpt &0x0020)?"ON":"OFF");
 	gp2x_text_out8(tl_x, (y+=10), "needs restart:");
-	gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings      %s", (currentConfig.EmuOpt &0x100)?"ON":"OFF"); // 8
-	gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s",   mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 9
+	gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings      %s", (currentConfig.EmuOpt &0x0100)?"ON":"OFF");
+	gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s",   mms, (currentConfig.EmuOpt &0x0010)?"ON":"OFF"); // 10
 	gp2x_text_out8(tl_x, (y+=10), "Done");
 
 	// draw cursor
@@ -663,7 +927,8 @@ static void draw_amenu_options(int menu_sel)
 
 static void amenu_loop_options(void)
 {
-	int menu_sel = 0, menu_sel_max = 10;
+	static int menu_sel = 0;
+	int menu_sel_max = 11;
 	unsigned long inp = 0;
 
 	for(;;)
@@ -674,21 +939,22 @@ static void amenu_loop_options(void)
 		if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
 		if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options
 			switch (menu_sel) {
-				case  0: currentConfig.PicoOpt^=0x100; break;
-				case  2: currentConfig.PicoOpt^=0x004; break;
-				case  3: currentConfig.PicoOpt^=0x001; break;
-				case  4: currentConfig.PicoOpt^=0x002; break;
-				case  5: currentConfig.EmuOpt ^=0x008; break;
-				case  6: currentConfig.EmuOpt ^=0x020; break;
-				case  8: currentConfig.EmuOpt ^=0x100; break;
-				case  9: currentConfig.EmuOpt ^=0x010; break;
-				case 10: return;
+				case  1: currentConfig.EmuOpt ^=0x1000; break;
+				case  2: currentConfig.EmuOpt ^=0x2000; break;
+				case  3: currentConfig.PicoOpt^=0x0004; break;
+				case  4: currentConfig.PicoOpt^=0x0001; break;
+				case  5: currentConfig.PicoOpt^=0x0002; break;
+				case  6: currentConfig.EmuOpt ^=0x0008; break;
+				case  7: currentConfig.EmuOpt ^=0x0020; break;
+				case  9: currentConfig.EmuOpt ^=0x0100; break;
+				case 10: currentConfig.EmuOpt ^=0x0010; break;
+				case 11: return;
 			}
 		}
 		if(inp & (GP2X_X|GP2X_A)) return;
 		if(inp & (GP2X_LEFT|GP2X_RIGHT)) { // multi choise
 			switch (menu_sel) {
-				case 1:
+				case 0:
 					while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {
 						currentConfig.gamma += (inp & GP2X_LEFT) ? -1 : 1;
 						if (currentConfig.gamma <   1) currentConfig.gamma =   1;
@@ -728,8 +994,8 @@ static const char *region_name(unsigned int code)
 
 static void draw_menu_options(int menu_sel)
 {
-	int tl_x = 25, tl_y = 40, y;
-	char monostereo[8], strframeskip[8], *strrend;
+	int tl_x = 25, tl_y = 32, y;
+	char monostereo[8], strframeskip[8], *strrend, *strscaling, *strssconfirm;
 
 	strcpy(monostereo, (currentConfig.PicoOpt&0x08)?"stereo":"mono");
 	if (currentConfig.Frameskip < 0)
@@ -742,27 +1008,40 @@ static void draw_menu_options(int menu_sel)
 	} else {
 		strrend = " 8bit accurate";
 	}
+	switch (currentConfig.scaling) {
+		default: strscaling = "            OFF";   break;
+		case 1:  strscaling = "hw horizontal";     break;
+		case 2:  strscaling = "hw horiz. + vert."; break;
+		case 3:  strscaling = "sw horizontal";     break;
+	}
+	switch ((currentConfig.EmuOpt >> 9) & 5) {
+		default: strssconfirm = "OFF";    break;
+		case 1:  strssconfirm = "writes"; break;
+		case 4:  strssconfirm = "loads";  break;
+		case 5:  strssconfirm = "both";   break;
+	}
 
 	y = tl_y;
 	//memset(gp2x_screen, 0, 320*240);
 	gp2x_pd_clone_buffer2();
 
 	gp2x_text_out8(tl_x, y,       "Renderer:            %s", strrend); // 0
-	gp2x_text_out8(tl_x, (y+=10), "Accurate timing (slower)   %s", (currentConfig.PicoOpt&0x040)?"ON":"OFF"); // 1
-	gp2x_text_out8(tl_x, (y+=10), "Accurate sprites (slower)  %s", (currentConfig.PicoOpt&0x080)?"ON":"OFF"); // 2
-	gp2x_text_out8(tl_x, (y+=10), "Show FPS                   %s", (currentConfig.EmuOpt &0x002)?"ON":"OFF"); // 3
+	gp2x_text_out8(tl_x, (y+=10), "Scaling:       %s", strscaling);    // 1
+	gp2x_text_out8(tl_x, (y+=10), "Accurate timing (slower)   %s", (currentConfig.PicoOpt&0x040)?"ON":"OFF"); // 2
+	gp2x_text_out8(tl_x, (y+=10), "Accurate sprites (slower)  %s", (currentConfig.PicoOpt&0x080)?"ON":"OFF"); // 3
+	gp2x_text_out8(tl_x, (y+=10), "Show FPS                   %s", (currentConfig.EmuOpt &0x002)?"ON":"OFF"); // 4
 	gp2x_text_out8(tl_x, (y+=10), "Frameskip                  %s", strframeskip);
-	gp2x_text_out8(tl_x, (y+=10), "Enable sound               %s", (currentConfig.EmuOpt &0x004)?"ON":"OFF"); // 5
+	gp2x_text_out8(tl_x, (y+=10), "Enable sound               %s", (currentConfig.EmuOpt &0x004)?"ON":"OFF"); // 6
 	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"); // 7
-	gp2x_text_out8(tl_x, (y+=10), "6 button pad               %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 8
-	gp2x_text_out8(tl_x, (y+=10), "Genesis Region:      %s",       region_name(currentConfig.PicoRegion));
-	gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates   %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 10
-	gp2x_text_out8(tl_x, (y+=10), "Confirm save overwrites    %s", (currentConfig.EmuOpt &0x200)?"ON":"OFF"); // 11
-	gp2x_text_out8(tl_x, (y+=10), "Save slot                  %i", state_slot); // 12
+	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), "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
 	gp2x_text_out8(tl_x, (y+=10), "GP2X CPU clocks            %iMhz", currentConfig.CPUclock);
 	gp2x_text_out8(tl_x, (y+=10), "[Sega/Mega CD options]");
-	gp2x_text_out8(tl_x, (y+=10), "[advanced options]");		// 15
+	gp2x_text_out8(tl_x, (y+=10), "[advanced options]");		// 16
 	gp2x_text_out8(tl_x, (y+=10), "Save cfg as default");
 	if (rom_data)
 		gp2x_text_out8(tl_x, (y+=10), "Save cfg for current game only");
@@ -821,11 +1100,13 @@ static void menu_options_save(void)
 	} else {
 		actionNames[8] = actionNames[9] = actionNames[10] = actionNames[11] = 0;
 	}
+	scaling_update();
 }
 
 static int menu_loop_options(void)
 {
-	int menu_sel = 0, menu_sel_max = 16;
+	static int menu_sel = 0;
+	int menu_sel_max = 17;
 	unsigned long inp = 0;
 
 	if (rom_data) menu_sel_max++;
@@ -841,25 +1122,24 @@ static int menu_loop_options(void)
 		if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
 		if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options
 			switch (menu_sel) {
-				case  1: currentConfig.PicoOpt^=0x040; break;
-				case  2: currentConfig.PicoOpt^=0x080; break;
-				case  3: currentConfig.EmuOpt ^=0x002; break;
-				case  5: currentConfig.EmuOpt ^=0x004; break;
-				case  7: currentConfig.PicoOpt^=0x200; break;
-				case  8: currentConfig.PicoOpt^=0x020; break;
-				case 10: currentConfig.EmuOpt ^=0x001; break;
-				case 11: currentConfig.EmuOpt ^=0x200; break;
-				case 14: cd_menu_loop_options();
+				case  2: currentConfig.PicoOpt^=0x040; break;
+				case  3: currentConfig.PicoOpt^=0x080; break;
+				case  4: currentConfig.EmuOpt ^=0x002; break;
+				case  6: currentConfig.EmuOpt ^=0x004; break;
+				case  8: currentConfig.PicoOpt^=0x200; break;
+				case  9: currentConfig.PicoOpt^=0x020; break;
+				case 11: currentConfig.EmuOpt ^=0x001; break;
+				case 15: cd_menu_loop_options();
 					if (engineState == PGS_ReloadRom)
 						return 0; // test BIOS
 					break;
-				case 15: amenu_loop_options();    break;
-				case 16: // done (update and write)
+				case 16: amenu_loop_options();    break;
+				case 17: // done (update and write)
 					menu_options_save();
 					if (emu_WriteConfig(0)) strcpy(menuErrorMsg, "config saved");
 					else strcpy(menuErrorMsg, "failed to write config");
 					return 1;
-				case 17: // done (update and write for current game)
+				case 18: // done (update and write for current game)
 					menu_options_save();
 					if (emu_WriteConfig(1)) strcpy(menuErrorMsg, "config saved");
 					else strcpy(menuErrorMsg, "failed to write config");
@@ -883,28 +1163,42 @@ static int menu_loop_options(void)
 						else if (  currentConfig.EmuOpt &0x80) currentConfig.EmuOpt &= ~0x80;
 					}
 					break;
-				case  4:
+				case  1:
+					currentConfig.scaling += (inp & GP2X_LEFT) ? -1 : 1;
+					if (currentConfig.scaling < 0) currentConfig.scaling = 0;
+					if (currentConfig.scaling > 3) currentConfig.scaling = 3;
+					break;
+				case  5:
 					currentConfig.Frameskip += (inp & GP2X_LEFT) ? -1 : 1;
 					if (currentConfig.Frameskip < 0)  currentConfig.Frameskip = -1;
 					if (currentConfig.Frameskip > 32) currentConfig.Frameskip = 32;
 					break;
-				case  6:
+				case  7:
 					if ((inp & GP2X_RIGHT) && currentConfig.PsndRate == 44100 && !(currentConfig.PicoOpt&0x08)) {
 						currentConfig.PsndRate = 8000;  currentConfig.PicoOpt|= 0x08;
 					} else if ((inp & GP2X_LEFT) && currentConfig.PsndRate == 8000 && (currentConfig.PicoOpt&0x08)) {
 						currentConfig.PsndRate = 44100; currentConfig.PicoOpt&=~0x08;
 					} else currentConfig.PsndRate = sndrate_prevnext(currentConfig.PsndRate, inp & GP2X_RIGHT);
 					break;
-				case  9:
+				case 10:
 					region_prevnext(inp & GP2X_RIGHT);
 					break;
-				case 12:
+				case 12: {
+					int n = ((currentConfig.EmuOpt>>9)&1) | ((currentConfig.EmuOpt>>10)&2);
+					n += (inp & GP2X_LEFT) ? -1 : 1;
+					if (n < 0) n = 0; else if (n > 3) n = 3;
+					n |= n << 1; n &= ~2;
+					currentConfig.EmuOpt &= ~0xa00;
+					currentConfig.EmuOpt |= n << 9;
+					break;
+				}
+				case 13:
 					if (inp & GP2X_RIGHT) {
 						state_slot++; if (state_slot > 9) state_slot = 0;
 					} else {state_slot--; if (state_slot < 0) state_slot = 9;
 					}
 					break;
-				case 13:
+				case 14:
 					while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {
 						currentConfig.CPUclock += (inp & GP2X_LEFT) ? -1 : 1;
 						if (currentConfig.CPUclock < 1) currentConfig.CPUclock = 1;
@@ -970,6 +1264,8 @@ static void draw_menu_root(int menu_sel)
 	gp2x_text_out8(tl_x, (y+=10), "Configure controls");
 	gp2x_text_out8(tl_x, (y+=10), "Credits");
 	gp2x_text_out8(tl_x, (y+=10), "Exit");
+	if (PicoPatches)
+		gp2x_text_out8(tl_x, (y+=10), "Patches / GameGenie");
 
 	// draw cursor
 	gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");
@@ -981,7 +1277,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;
@@ -996,14 +1293,20 @@ 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;
 
-	for(;;)
+	/* make sure action buttons are not pressed on entering menu */
+	draw_menu_root(menu_sel);
+	while (gp2x_joystick_read(1) & (GP2X_B|GP2X_X|GP2X_SELECT)) usleep(50*1000);
+
+	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
@@ -1014,24 +1317,24 @@ static void menu_loop_root(void)
 		if(inp & GP2X_B   )  {
 			switch (menu_sel) {
 				case 0: // resume game
-					if (rom_data) { engineState = PGS_Running; return; }
+					if (rom_data) {
+						while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000);
+						engineState = PGS_Running;
+						return;
+					}
 					break;
 				case 1: // save state
 					if (rom_data) {
-						if(emu_SaveLoadGame(0, 0)) {
-							strcpy(menuErrorMsg, "save failed");
+						if(savestate_menu_loop(0))
 							continue;
-						}
 						engineState = PGS_Running;
 						return;
 					}
 					break;
 				case 2: // load state
 					if (rom_data) {
-						if(emu_SaveLoadGame(1, 0)) {
-							strcpy(menuErrorMsg, "load failed");
+						if(savestate_menu_loop(1))
 							continue;
-						}
 						engineState = PGS_Running;
 						return;
 					}
@@ -1067,6 +1370,14 @@ static void menu_loop_root(void)
 				case 8: // exit
 					engineState = PGS_Quit;
 					return;
+				case 9: // patches/gg
+					if (rom_data && PicoPatches) {
+						patches_menu_loop();
+						PicoPatchApply();
+						strcpy(menuErrorMsg, "Patches applied");
+						continue;
+					}
+					break;
 			}
 		}
 		menuErrorMsg[0] = 0; // clear error msg
@@ -1074,21 +1385,29 @@ static void menu_loop_root(void)
 }
 
 
-static void menu_gfx_prepare(void)
+static void menu_prepare_bg(void)
 {
 	extern int localPal[0x100];
-	int i;
+	int c, i;
 
 	// don't clear old palette just for fun (but make it dark)
-	for (i = 0x100-1; i >= 0; i--)
-		localPal[i] = (localPal[i] >> 2) & 0x003f3f3f;
+	for (i = 0x100-1; i >= 0; i--) {
+		c = localPal[i];
+		localPal[i] = ((c >> 1) & 0x007f7f7f) - ((c >> 3) & 0x001f1f1f);
+	}
 	localPal[0xe0] = 0x00000000; // reserved pixels for OSD
 	localPal[0xf0] = 0x00ffffff;
 
+	gp2x_video_setpalette(localPal, 0x100);
+}
+
+static void menu_gfx_prepare(void)
+{
+	menu_prepare_bg();
+
 	// switch to 8bpp
 	gp2x_video_changemode2(8);
-	gp2x_video_RGB_setscaling(320, 240);
-	gp2x_video_setpalette(localPal, 0x100);
+	gp2x_video_RGB_setscaling(0, 320, 240);
 	gp2x_video_flip2();
 }
 
@@ -1101,3 +1420,85 @@ void menu_loop(void)
 
 	menuErrorMsg[0] = 0;
 }
+
+
+// --------- CD tray close menu ----------
+
+static void draw_menu_tray(int menu_sel)
+{
+	int tl_x = 70, tl_y = 90, y;
+	memset(gp2x_screen, 0xe0, 320*240);
+
+	gp2x_text_out8(tl_x, 20, "The unit is about to");
+	gp2x_text_out8(tl_x, 30, "close the CD tray.");
+
+	y = tl_y;
+	gp2x_text_out8(tl_x, y,       "Load new CD image");
+	gp2x_text_out8(tl_x, (y+=10), "Insert nothing");
+
+	// draw cursor
+	gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");
+	// error
+	if (menuErrorMsg[0]) gp2x_text_out8(5, 226, menuErrorMsg);
+	gp2x_video_flip2();
+}
+
+
+int menu_loop_tray(void)
+{
+	int menu_sel = 0, menu_sel_max = 1;
+	unsigned long inp = 0;
+	char curr_path[PATH_MAX], *selfname;
+	FILE *tstf;
+
+	gp2x_memset_all_buffers(0, 0xe0, 320*240);
+	menu_gfx_prepare();
+
+	if ( (tstf = fopen(currentConfig.lastRomFile, "rb")) )
+	{
+		fclose(tstf);
+		strcpy(curr_path, currentConfig.lastRomFile);
+	}
+	else
+	{
+		getcwd(curr_path, PATH_MAX);
+	}
+
+	/* make sure action buttons are not pressed on entering menu */
+	draw_menu_tray(menu_sel);
+	while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000);
+
+	for (;;)
+	{
+		draw_menu_tray(menu_sel);
+		inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B);
+		if(inp & GP2X_UP  )  { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }
+		if(inp & GP2X_DOWN)  { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
+		if(inp & GP2X_B   )  {
+			switch (menu_sel) {
+				case 0: // select image
+					selfname = romsel_loop(curr_path);
+					if (selfname) {
+						int ret = -1, cd_type;
+						cd_type = emu_cd_check(NULL);
+						if (cd_type > 0)
+							ret = Insert_CD(romFileName, cd_type == 2);
+						if (ret != 0) {
+							sprintf(menuErrorMsg, "Load failed, invalid CD image?");
+							printf("%s\n", menuErrorMsg);
+							continue;
+						}
+						engineState = PGS_RestartRun;
+						return 1;
+					}
+					break;
+				case 1: // insert nothing
+					engineState = PGS_RestartRun;
+					return 0;
+			}
+		}
+		menuErrorMsg[0] = 0; // clear error msg
+	}
+}
+
+