usbjoy fix, refresh rate lib
[libpicofe.git] / gp2x / menu.c
index 5cab760..2275279 100644 (file)
@@ -15,6 +15,7 @@
 #include "menu.h"\r
 #include "fonts.h"\r
 #include "usbjoy.h"\r
+#include "asmutils.h"\r
 #include "version.h"\r
 \r
 #include <Pico/PicoInt.h>\r
@@ -170,14 +171,16 @@ static int inp_prevjoy = 0;
 static unsigned long wait_for_input(unsigned long interesting)\r
 {\r
        unsigned long ret;\r
-       static int repeats = 0, wait = 300*1000;\r
+       static int repeats = 0, wait = 50*1000;\r
        int release = 0, i;\r
 \r
-       if (repeats == 5 || repeats == 15 || repeats == 30) wait /= 2;\r
+       if (repeats == 2 || repeats == 4) wait /= 2;\r
+       if (repeats == 6) wait = 15 * 1000;\r
 \r
        for (i = 0; i < 6 && inp_prev == gp2x_joystick_read(1); i++) {\r
-               if(i == 0) repeats++;\r
-               usleep(wait/6);\r
+               if (i == 0) repeats++;\r
+               if (wait >= 30*1000) usleep(wait); // usleep sleeps for ~30ms minimum\r
+               else spend_cycles(wait * currentConfig.CPUclock);\r
        }\r
 \r
        while ( !((ret = gp2x_joystick_read(1)) & interesting) ) {\r
@@ -187,7 +190,7 @@ static unsigned long wait_for_input(unsigned long interesting)
 \r
        if (release || ret != inp_prev) {\r
                repeats = 0;\r
-               wait = 300*1000;\r
+               wait = 50*1000;\r
        }\r
        inp_prev = ret;\r
        inp_prevjoy = 0;\r
@@ -286,6 +289,28 @@ static int scandir_cmp(const void *p1, const void *p2)
        return alphasort(d1, d2);\r
 }\r
 \r
+static char *filter_exts[] = {\r
+       ".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html",\r
+       ".jpg", ".gpe", ".cue"\r
+};\r
+\r
+static int scandir_filter(const struct dirent *ent)\r
+{\r
+       const char *p;\r
+       int i;\r
+\r
+       if (ent == NULL || ent->d_name == NULL) return 0;\r
+       if (strlen(ent->d_name) < 5) return 1;\r
+\r
+       p = ent->d_name + strlen(ent->d_name) - 4;\r
+\r
+       for (i = 0; i < sizeof(filter_exts)/sizeof(filter_exts[0]); i++)\r
+       {\r
+               if (strcmp(p, filter_exts[i]) == 0) return 0;\r
+       }\r
+\r
+       return 1;\r
+}\r
 \r
 static char *romsel_loop(char *curr_path)\r
 {\r
@@ -305,10 +330,10 @@ static char *romsel_loop(char *curr_path)
                fname = p+1;\r
        }\r
 \r
-       n = scandir(curr_path, &namelist, 0, scandir_cmp);\r
+       n = scandir(curr_path, &namelist, scandir_filter, scandir_cmp);\r
        if (n < 0) {\r
                // try root\r
-               n = scandir(curr_path, &namelist, 0, scandir_cmp);\r
+               n = scandir("/", &namelist, scandir_filter, scandir_cmp);\r
                if (n < 0) {\r
                        // oops, we failed\r
                        printf("dir: "); printf(curr_path); printf("\n");\r
@@ -334,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);\r
                if(inp & GP2X_UP  )  { sel--;   if (sel < 0)   sel = n-2; }\r
                if(inp & GP2X_DOWN)  { sel++;   if (sel > n-2) sel = 0; }\r
-               if(inp &(GP2X_LEFT|GP2X_L))  { sel-=10; if (sel < 0)   sel = 0; }\r
-               if(inp &(GP2X_RIGHT|GP2X_R)) { sel+=10; if (sel > n-2) sel = n-2; }\r
+               if(inp & GP2X_LEFT)  { sel-=10; if (sel < 0)   sel = 0; }\r
+               if(inp & GP2X_L)     { sel-=24; if (sel < 0)   sel = 0; }\r
+               if(inp & GP2X_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; }\r
+               if(inp & GP2X_R)     { sel+=24; if (sel > n-2) sel = n-2; }\r
                if(inp & GP2X_B)     { // enter dir/select\r
                        again:\r
                        if (namelist[sel+1]->d_type == DT_REG) {\r
@@ -744,8 +771,10 @@ 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), "CD LEDs                    %s", (currentConfig.EmuOpt &0x0400)?"ON":"OFF"); // 3\r
        gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s)    %s", (currentConfig.PicoOpt&0x0800)?"ON":"OFF"); // 4\r
        gp2x_text_out8(tl_x, (y+=10), "PCM audio                  %s", (currentConfig.PicoOpt&0x0400)?"ON":"OFF"); // 5\r
-       gp2x_text_out8(tl_x, (y+=10), "Better sync (slow)         %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 6\r
-       gp2x_text_out8(tl_x, (y+=10), "ReadAhead buffer      %s", ra_buff); // 7\r
+       gp2x_text_out8(tl_x, (y+=10), "ReadAhead buffer      %s", ra_buff); // 6\r
+       gp2x_text_out8(tl_x, (y+=10), "SaveRAM cart               %s", (currentConfig.PicoOpt&0x8000)?"ON":"OFF"); // 7\r
+       gp2x_text_out8(tl_x, (y+=10), "Scale/Rot. fx (slow)       %s", (currentConfig.PicoOpt&0x1000)?"ON":"OFF"); // 8\r
+       gp2x_text_out8(tl_x, (y+=10), "Better sync (slow)         %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 9\r
        gp2x_text_out8(tl_x, (y+=10), "Done");\r
 \r
        // draw cursor\r
@@ -761,7 +790,7 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
 \r
 static void cd_menu_loop_options(void)\r
 {\r
-       int menu_sel = 0, menu_sel_max = 8;\r
+       int menu_sel = 0, menu_sel_max = 10;\r
        unsigned long inp = 0;\r
        char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p;\r
 \r
@@ -791,18 +820,20 @@ static void cd_menu_loop_options(void)
                                case  3: currentConfig.EmuOpt ^=0x0400; break;\r
                                case  4: currentConfig.PicoOpt^=0x0800; break;\r
                                case  5: currentConfig.PicoOpt^=0x0400; break;\r
-                               case  6: currentConfig.PicoOpt^=0x2000; break;\r
-                               case  7:\r
+                               case  6:\r
                                        if (inp & GP2X_LEFT) {\r
                                                PicoCDBuffers >>= 1;\r
                                                if (PicoCDBuffers < 64) PicoCDBuffers = 0;\r
                                        } else {\r
                                                if (PicoCDBuffers < 64) PicoCDBuffers = 64;\r
                                                else PicoCDBuffers <<= 1;\r
-                                               if (PicoCDBuffers > 4096) PicoCDBuffers = 4096;\r
+                                               if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M\r
                                        }\r
                                        break;\r
-                               case  8: return;\r
+                               case  7: currentConfig.PicoOpt^=0x8000; break;\r
+                               case  8: currentConfig.PicoOpt^=0x1000; break;\r
+                               case  9: currentConfig.PicoOpt^=0x2000; break;\r
+                               case 10: return;\r
                        }\r
                }\r
                if(inp & (GP2X_X|GP2X_A)) return;\r
@@ -843,16 +874,15 @@ static void draw_amenu_options(int menu_sel)
        //memset(gp2x_screen, 0, 320*240);\r
        gp2x_pd_clone_buffer2();\r
 \r
-       gp2x_text_out8(tl_x, y,       "Scale 32 column mode       %s", (currentConfig.PicoOpt&0x100)?"ON":"OFF"); // 0\r
-       gp2x_text_out8(tl_x, (y+=10), "Gamma correction           %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 1\r
-       gp2x_text_out8(tl_x, (y+=10), "Emulate Z80                %s", (currentConfig.PicoOpt&0x004)?"ON":"OFF"); // 2\r
-       gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM)        %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 3\r
-       gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG)      %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 4\r
-       gp2x_text_out8(tl_x, (y+=10), "gzip savestates            %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 5\r
-       gp2x_text_out8(tl_x, (y+=10), "Don't save config on exit  %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 6\r
+       gp2x_text_out8(tl_x, y,       "Gamma correction           %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 0\r
+       gp2x_text_out8(tl_x, (y+=10), "Emulate Z80                %s", (currentConfig.PicoOpt&0x004)?"ON":"OFF"); // 1\r
+       gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM)        %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 2\r
+       gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG)      %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 3\r
+       gp2x_text_out8(tl_x, (y+=10), "gzip savestates            %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 4\r
+       gp2x_text_out8(tl_x, (y+=10), "Don't save last used ROM   %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 5\r
        gp2x_text_out8(tl_x, (y+=10), "needs restart:");\r
-       gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings      %s", (currentConfig.EmuOpt &0x100)?"ON":"OFF"); // 8\r
-       gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s",   mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 9\r
+       gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings      %s", (currentConfig.EmuOpt &0x100)?"ON":"OFF"); // 7\r
+       gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s",   mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 8\r
        gp2x_text_out8(tl_x, (y+=10), "Done");\r
 \r
        // draw cursor\r
@@ -863,7 +893,7 @@ static void draw_amenu_options(int menu_sel)
 \r
 static void amenu_loop_options(void)\r
 {\r
-       int menu_sel = 0, menu_sel_max = 10;\r
+       int menu_sel = 0, menu_sel_max = 9;\r
        unsigned long inp = 0;\r
 \r
        for(;;)\r
@@ -874,21 +904,20 @@ static void amenu_loop_options(void)
                if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
                if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options\r
                        switch (menu_sel) {\r
-                               case  0: currentConfig.PicoOpt^=0x100; break;\r
-                               case  2: currentConfig.PicoOpt^=0x004; break;\r
-                               case  3: currentConfig.PicoOpt^=0x001; break;\r
-                               case  4: currentConfig.PicoOpt^=0x002; break;\r
-                               case  5: currentConfig.EmuOpt ^=0x008; break;\r
-                               case  6: currentConfig.EmuOpt ^=0x020; break;\r
-                               case  8: currentConfig.EmuOpt ^=0x100; break;\r
-                               case  9: currentConfig.EmuOpt ^=0x010; break;\r
-                               case 10: return;\r
+                               case  1: currentConfig.PicoOpt^=0x004; break;\r
+                               case  2: currentConfig.PicoOpt^=0x001; break;\r
+                               case  3: currentConfig.PicoOpt^=0x002; break;\r
+                               case  4: currentConfig.EmuOpt ^=0x008; break;\r
+                               case  5: currentConfig.EmuOpt ^=0x020; break;\r
+                               case  7: currentConfig.EmuOpt ^=0x100; break;\r
+                               case  8: currentConfig.EmuOpt ^=0x010; break;\r
+                               case  9: return;\r
                        }\r
                }\r
                if(inp & (GP2X_X|GP2X_A)) return;\r
                if(inp & (GP2X_LEFT|GP2X_RIGHT)) { // multi choise\r
                        switch (menu_sel) {\r
-                               case 1:\r
+                               case 0:\r
                                        while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {\r
                                                currentConfig.gamma += (inp & GP2X_LEFT) ? -1 : 1;\r
                                                if (currentConfig.gamma <   1) currentConfig.gamma =   1;\r
@@ -928,8 +957,8 @@ static const char *region_name(unsigned int code)
 \r
 static void draw_menu_options(int menu_sel)\r
 {\r
-       int tl_x = 25, tl_y = 40, y;\r
-       char monostereo[8], strframeskip[8], *strrend;\r
+       int tl_x = 25, tl_y = 32, y;\r
+       char monostereo[8], strframeskip[8], *strrend, *strscaling, *strssconfirm;\r
 \r
        strcpy(monostereo, (currentConfig.PicoOpt&0x08)?"stereo":"mono");\r
        if (currentConfig.Frameskip < 0)\r
@@ -942,27 +971,40 @@ static void draw_menu_options(int menu_sel)
        } else {\r
                strrend = " 8bit accurate";\r
        }\r
+       switch (currentConfig.scaling) {\r
+               default: strscaling = "            OFF";   break;\r
+               case 1:  strscaling = "hw horizontal";     break;\r
+               case 2:  strscaling = "hw horiz. + vert."; break;\r
+               case 3:  strscaling = "sw horizontal";     break;\r
+       }\r
+       switch ((currentConfig.EmuOpt >> 9) & 5) {\r
+               default: strssconfirm = "OFF";    break;\r
+               case 1:  strssconfirm = "writes"; break;\r
+               case 4:  strssconfirm = "loads";  break;\r
+               case 5:  strssconfirm = "both";   break;\r
+       }\r
 \r
        y = tl_y;\r
        //memset(gp2x_screen, 0, 320*240);\r
        gp2x_pd_clone_buffer2();\r
 \r
        gp2x_text_out8(tl_x, y,       "Renderer:            %s", strrend); // 0\r
-       gp2x_text_out8(tl_x, (y+=10), "Accurate timing (slower)   %s", (currentConfig.PicoOpt&0x040)?"ON":"OFF"); // 1\r
-       gp2x_text_out8(tl_x, (y+=10), "Accurate sprites (slower)  %s", (currentConfig.PicoOpt&0x080)?"ON":"OFF"); // 2\r
-       gp2x_text_out8(tl_x, (y+=10), "Show FPS                   %s", (currentConfig.EmuOpt &0x002)?"ON":"OFF"); // 3\r
+       gp2x_text_out8(tl_x, (y+=10), "Scaling:       %s", strscaling);    // 1\r
+       gp2x_text_out8(tl_x, (y+=10), "Accurate timing (slower)   %s", (currentConfig.PicoOpt&0x040)?"ON":"OFF"); // 2\r
+       gp2x_text_out8(tl_x, (y+=10), "Accurate sprites (slower)  %s", (currentConfig.PicoOpt&0x080)?"ON":"OFF"); // 3\r
+       gp2x_text_out8(tl_x, (y+=10), "Show FPS                   %s", (currentConfig.EmuOpt &0x002)?"ON":"OFF"); // 4\r
        gp2x_text_out8(tl_x, (y+=10), "Frameskip                  %s", strframeskip);\r
-       gp2x_text_out8(tl_x, (y+=10), "Enable sound               %s", (currentConfig.EmuOpt &0x004)?"ON":"OFF"); // 5\r
+       gp2x_text_out8(tl_x, (y+=10), "Enable sound               %s", (currentConfig.EmuOpt &0x004)?"ON":"OFF"); // 6\r
        gp2x_text_out8(tl_x, (y+=10), "Sound Quality:     %5iHz %s",   currentConfig.PsndRate, monostereo);\r
-       gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound  %s", (currentConfig.PicoOpt&0x200)?"ON":"OFF"); // 7\r
-       gp2x_text_out8(tl_x, (y+=10), "6 button pad               %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 8\r
-       gp2x_text_out8(tl_x, (y+=10), "Genesis Region:      %s",       region_name(currentConfig.PicoRegion));\r
-       gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates   %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 10\r
-       gp2x_text_out8(tl_x, (y+=10), "Confirm save overwrites    %s", (currentConfig.EmuOpt &0x200)?"ON":"OFF"); // 11\r
-       gp2x_text_out8(tl_x, (y+=10), "Save slot                  %i", state_slot); // 12\r
+       gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound  %s", (currentConfig.PicoOpt&0x200)?"ON":"OFF"); // 8\r
+       gp2x_text_out8(tl_x, (y+=10), "6 button pad               %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 9\r
+       gp2x_text_out8(tl_x, (y+=10), "Region:              %s",       region_name(currentConfig.PicoRegion));\r
+       gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates   %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 11\r
+       gp2x_text_out8(tl_x, (y+=10), "Confirm savestate          %s", strssconfirm); // 12\r
+       gp2x_text_out8(tl_x, (y+=10), "Save slot                  %i", state_slot); // 13\r
        gp2x_text_out8(tl_x, (y+=10), "GP2X CPU clocks            %iMhz", currentConfig.CPUclock);\r
        gp2x_text_out8(tl_x, (y+=10), "[Sega/Mega CD options]");\r
-       gp2x_text_out8(tl_x, (y+=10), "[advanced options]");            // 15\r
+       gp2x_text_out8(tl_x, (y+=10), "[advanced options]");            // 16\r
        gp2x_text_out8(tl_x, (y+=10), "Save cfg as default");\r
        if (rom_data)\r
                gp2x_text_out8(tl_x, (y+=10), "Save cfg for current game only");\r
@@ -1021,11 +1063,12 @@ static void menu_options_save(void)
        } else {\r
                actionNames[8] = actionNames[9] = actionNames[10] = actionNames[11] = 0;\r
        }\r
+       scaling_update();\r
 }\r
 \r
 static int menu_loop_options(void)\r
 {\r
-       int menu_sel = 0, menu_sel_max = 16;\r
+       int menu_sel = 0, menu_sel_max = 17;\r
        unsigned long inp = 0;\r
 \r
        if (rom_data) menu_sel_max++;\r
@@ -1041,25 +1084,24 @@ static int menu_loop_options(void)
                if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
                if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options\r
                        switch (menu_sel) {\r
-                               case  1: currentConfig.PicoOpt^=0x040; break;\r
-                               case  2: currentConfig.PicoOpt^=0x080; break;\r
-                               case  3: currentConfig.EmuOpt ^=0x002; break;\r
-                               case  5: currentConfig.EmuOpt ^=0x004; break;\r
-                               case  7: currentConfig.PicoOpt^=0x200; break;\r
-                               case  8: currentConfig.PicoOpt^=0x020; break;\r
-                               case 10: currentConfig.EmuOpt ^=0x001; break;\r
-                               case 11: currentConfig.EmuOpt ^=0x200; break;\r
-                               case 14: cd_menu_loop_options();\r
+                               case  2: currentConfig.PicoOpt^=0x040; break;\r
+                               case  3: currentConfig.PicoOpt^=0x080; break;\r
+                               case  4: currentConfig.EmuOpt ^=0x002; break;\r
+                               case  6: currentConfig.EmuOpt ^=0x004; break;\r
+                               case  8: currentConfig.PicoOpt^=0x200; break;\r
+                               case  9: currentConfig.PicoOpt^=0x020; break;\r
+                               case 11: currentConfig.EmuOpt ^=0x001; break;\r
+                               case 15: cd_menu_loop_options();\r
                                        if (engineState == PGS_ReloadRom)\r
                                                return 0; // test BIOS\r
                                        break;\r
-                               case 15: amenu_loop_options();    break;\r
-                               case 16: // done (update and write)\r
+                               case 16: amenu_loop_options();    break;\r
+                               case 17: // done (update and write)\r
                                        menu_options_save();\r
                                        if (emu_WriteConfig(0)) strcpy(menuErrorMsg, "config saved");\r
                                        else strcpy(menuErrorMsg, "failed to write config");\r
                                        return 1;\r
-                               case 17: // done (update and write for current game)\r
+                               case 18: // done (update and write for current game)\r
                                        menu_options_save();\r
                                        if (emu_WriteConfig(1)) strcpy(menuErrorMsg, "config saved");\r
                                        else strcpy(menuErrorMsg, "failed to write config");\r
@@ -1083,28 +1125,42 @@ static int menu_loop_options(void)
                                                else if (  currentConfig.EmuOpt &0x80) currentConfig.EmuOpt &= ~0x80;\r
                                        }\r
                                        break;\r
-                               case  4:\r
+                               case  1:\r
+                                       currentConfig.scaling += (inp & GP2X_LEFT) ? -1 : 1;\r
+                                       if (currentConfig.scaling < 0) currentConfig.scaling = 0;\r
+                                       if (currentConfig.scaling > 3) currentConfig.scaling = 3;\r
+                                       break;\r
+                               case  5:\r
                                        currentConfig.Frameskip += (inp & GP2X_LEFT) ? -1 : 1;\r
                                        if (currentConfig.Frameskip < 0)  currentConfig.Frameskip = -1;\r
                                        if (currentConfig.Frameskip > 32) currentConfig.Frameskip = 32;\r
                                        break;\r
-                               case  6:\r
+                               case  7:\r
                                        if ((inp & GP2X_RIGHT) && currentConfig.PsndRate == 44100 && !(currentConfig.PicoOpt&0x08)) {\r
                                                currentConfig.PsndRate = 8000;  currentConfig.PicoOpt|= 0x08;\r
                                        } else if ((inp & GP2X_LEFT) && currentConfig.PsndRate == 8000 && (currentConfig.PicoOpt&0x08)) {\r
                                                currentConfig.PsndRate = 44100; currentConfig.PicoOpt&=~0x08;\r
                                        } else currentConfig.PsndRate = sndrate_prevnext(currentConfig.PsndRate, inp & GP2X_RIGHT);\r
                                        break;\r
-                               case  9:\r
+                               case 10:\r
                                        region_prevnext(inp & GP2X_RIGHT);\r
                                        break;\r
-                               case 12:\r
+                               case 12: {\r
+                                       int n = ((currentConfig.EmuOpt>>9)&1) | ((currentConfig.EmuOpt>>10)&2);\r
+                                       n += (inp & GP2X_LEFT) ? -1 : 1;\r
+                                       if (n < 0) n = 0; else if (n > 3) n = 3;\r
+                                       n |= n << 1; n &= ~2;\r
+                                       currentConfig.EmuOpt &= ~0xa00;\r
+                                       currentConfig.EmuOpt |= n << 9;\r
+                                       break;\r
+                               }\r
+                               case 13:\r
                                        if (inp & GP2X_RIGHT) {\r
                                                state_slot++; if (state_slot > 9) state_slot = 0;\r
                                        } else {state_slot--; if (state_slot < 0) state_slot = 9;\r
                                        }\r
                                        break;\r
-                               case 13:\r
+                               case 14:\r
                                        while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {\r
                                                currentConfig.CPUclock += (inp & GP2X_LEFT) ? -1 : 1;\r
                                                if (currentConfig.CPUclock < 1) currentConfig.CPUclock = 1;\r
@@ -1201,7 +1257,11 @@ static void menu_loop_root(void)
        if (rom_data) menu_sel = menu_sel_min = 0;\r
        if (PicoPatches) menu_sel_max = 9;\r
 \r
-       for(;;)\r
+       /* make sure action buttons are not pressed on entering menu */\r
+       draw_menu_root(menu_sel);\r
+       while (gp2x_joystick_read(1) & (GP2X_B|GP2X_X|GP2X_SELECT)) usleep(50*1000);\r
+\r
+       for (;;)\r
        {\r
                draw_menu_root(menu_sel);\r
                inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT);\r
@@ -1217,7 +1277,11 @@ static void menu_loop_root(void)
                if(inp & GP2X_B   )  {\r
                        switch (menu_sel) {\r
                                case 0: // resume game\r
-                                       if (rom_data) { engineState = PGS_Running; return; }\r
+                                       if (rom_data) {\r
+                                               while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000);\r
+                                               engineState = PGS_Running;\r
+                                               return;\r
+                                       }\r
                                        break;\r
                                case 1: // save state\r
                                        if (rom_data) {\r
@@ -1303,7 +1367,7 @@ static void menu_gfx_prepare(void)
 \r
        // switch to 8bpp\r
        gp2x_video_changemode2(8);\r
-       gp2x_video_RGB_setscaling(320, 240);\r
+       gp2x_video_RGB_setscaling(0, 320, 240);\r
        gp2x_video_flip2();\r
 }\r
 \r
@@ -1316,3 +1380,85 @@ void menu_loop(void)
 \r
        menuErrorMsg[0] = 0;\r
 }\r
+\r
+\r
+// --------- CD tray close menu ----------\r
+\r
+static void draw_menu_tray(int menu_sel)\r
+{\r
+       int tl_x = 70, tl_y = 90, y;\r
+       memset(gp2x_screen, 0xe0, 320*240);\r
+\r
+       gp2x_text_out8(tl_x, 20, "The unit is about to");\r
+       gp2x_text_out8(tl_x, 30, "close the CD tray.");\r
+\r
+       y = tl_y;\r
+       gp2x_text_out8(tl_x, y,       "Load new CD image");\r
+       gp2x_text_out8(tl_x, (y+=10), "Insert nothing");\r
+\r
+       // draw cursor\r
+       gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");\r
+       // error\r
+       if (menuErrorMsg[0]) gp2x_text_out8(5, 226, menuErrorMsg);\r
+       gp2x_video_flip2();\r
+}\r
+\r
+\r
+int menu_loop_tray(void)\r
+{\r
+       int menu_sel = 0, menu_sel_max = 1;\r
+       unsigned long inp = 0;\r
+       char curr_path[PATH_MAX], *selfname;\r
+       FILE *tstf;\r
+\r
+       gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
+       menu_gfx_prepare();\r
+\r
+       if ( (tstf = fopen(currentConfig.lastRomFile, "rb")) )\r
+       {\r
+               fclose(tstf);\r
+               strcpy(curr_path, currentConfig.lastRomFile);\r
+       }\r
+       else\r
+       {\r
+               getcwd(curr_path, PATH_MAX);\r
+       }\r
+\r
+       /* make sure action buttons are not pressed on entering menu */\r
+       draw_menu_tray(menu_sel);\r
+       while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000);\r
+\r
+       for (;;)\r
+       {\r
+               draw_menu_tray(menu_sel);\r
+               inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B);\r
+               if(inp & GP2X_UP  )  { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
+               if(inp & GP2X_DOWN)  { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
+               if(inp & GP2X_B   )  {\r
+                       switch (menu_sel) {\r
+                               case 0: // select image\r
+                                       selfname = romsel_loop(curr_path);\r
+                                       if (selfname) {\r
+                                               int ret = -1, cd_type;\r
+                                               cd_type = emu_cd_check(NULL);\r
+                                               if (cd_type > 0)\r
+                                                       ret = Insert_CD(romFileName, cd_type == 2);\r
+                                               if (ret != 0) {\r
+                                                       sprintf(menuErrorMsg, "Load failed, invalid CD image?");\r
+                                                       printf("%s\n", menuErrorMsg);\r
+                                                       continue;\r
+                                               }\r
+                                               engineState = PGS_RestartRun;\r
+                                               return 1;\r
+                                       }\r
+                                       break;\r
+                               case 1: // insert nothing\r
+                                       engineState = PGS_RestartRun;\r
+                                       return 0;\r
+                       }\r
+               }\r
+               menuErrorMsg[0] = 0; // clear error msg\r
+       }\r
+}\r
+\r
+\r