improved autorepeat behavior in menus

[libpicofe.git] / gp2x / menu.c

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 919fdb9..db4c9fa 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -46,16 +46,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 = 50*1000;\r
+       static int repeats = 0, wait = 20;\r
        int release = 0, i;\r
 \r
-       if (repeats == 2 || repeats == 4) wait /= 2;\r
-       if (repeats == 6) wait = 15 * 1000;\r
+       if      (repeats == 2) wait = 3;\r
+       else if (repeats == 4) wait = 2;\r
+       else if (repeats == 6) wait = 1;\r
 \r
-       for (i = 0; i < 6 && inp_prev == gp2x_joystick_read(1); i++) {\r
+       for (i = 0; i < wait && inp_prev == gp2x_joystick_read(1); i++) {\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
+               usleep(30000);\r
        }\r
 \r
        while ( !((ret = gp2x_joystick_read(1)) & interesting) ) {\r
@@ -65,8 +65,10 @@ static unsigned long wait_for_input(unsigned long interesting)
 \r
        if (release || ret != inp_prev) {\r
                repeats = 0;\r
-               wait = 50*1000;\r
+               wait = 20;\r
        }\r
+       if (wait > 6 && (ret&(GP2X_UP|GP2X_LEFT|GP2X_DOWN|GP2X_RIGHT)))\r
+               wait = 6;\r
        inp_prev = ret;\r
        inp_prevjoy = 0;\r
 \r
@@ -200,7 +202,7 @@ void menu_romload_end(void)
 static unsigned short file2color(const char *fname)\r
 {\r
        const char *ext = fname + strlen(fname) - 3;\r
-       static const char *rom_exts[]   = { "zip", "bin", "smd", "gen", "iso", "cso" };\r
+       static const char *rom_exts[]   = { "zip", "bin", "smd", "gen", "iso", "cso", "cue" };\r
        static const char *other_exts[] = { "gmv", "pat" };\r
        int i;\r
 \r
@@ -256,7 +258,7 @@ static int scandir_cmp(const void *p1, const void *p2)
 \r
 static char *filter_exts[] = {\r
        ".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html",\r
-       ".jpg", ".gpe", ".cue"\r
+       ".jpg", ".gpe"\r
 };\r
 \r
 static int scandir_filter(const struct dirent *ent)\r
@@ -751,7 +753,7 @@ static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_
                x = 40;\r
        }\r
 \r
-       menu_draw_selection(x - 16, tl_y + sel*10, (player_idx >= 0) ? 66 : 130);\r
+       menu_draw_selection(x - 16, tl_y + sel*10, (player_idx >= 0) ? 66 : 140);\r
 \r
        y = tl_y;\r
        for (i = 0; i < opt_cnt; i++, y+=10)\r
@@ -857,21 +859,25 @@ static void draw_kc_sel(int menu_sel)
 }\r
 \r
 \r
-// player2_flag, ?, ?, ?, ?, ?, ?, menu\r
+// player2_flag, reserved, ?, ?,\r
+// ?, ?, fast forward, menu\r
 // "NEXT SAVE SLOT", "PREV SAVE SLOT", "SWITCH RENDERER", "SAVE STATE",\r
 // "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"\r
 me_bind_action emuctrl_actions[] =\r
 {\r
-       { "Load State     ", 1<<28 },\r
-       { "Save State     ", 1<<27 },\r
-       { "Prev Save Slot ", 1<<25 },\r
-       { "Next Save Slot ", 1<<24 },\r
-       { "Switch Renderer", 1<<26 },\r
-       { "Volume Down    ", 1<<30 },\r
-       { "Volume Up      ", 1<<29 },\r
-       { "Fast forward   ", 1<<22 },\r
-       { "Enter Menu     ", 1<<23 },\r
-       { NULL,              0     }\r
+       { "Load State       ", 1<<28 },\r
+       { "Save State       ", 1<<27 },\r
+       { "Prev Save Slot   ", 1<<25 },\r
+       { "Next Save Slot   ", 1<<24 },\r
+       { "Switch Renderer  ", 1<<26 },\r
+       { "Volume Down      ", 1<<30 },\r
+       { "Volume Up        ", 1<<29 },\r
+       { "Fast forward     ", 1<<22 },\r
+       { "Enter Menu       ", 1<<23 },\r
+       { "Pico Next page   ", 1<<21 },\r
+       { "Pico Prev page   ", 1<<20 },\r
+       { "Pico Switch input", 1<<19 },\r
+       { NULL,                0     }\r
 };\r
 \r
 static void kc_sel_loop(void)\r
@@ -1541,6 +1547,7 @@ static void menu_loop_root(void)
                                        if (rom_loaded) {\r
                                                if(savestate_menu_loop(1))\r
                                                        continue;\r
+                                               while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000);\r
                                                engineState = PGS_Running;\r
                                                return;\r
                                        }\r
@@ -1548,6 +1555,7 @@ static void menu_loop_root(void)
                                case MA_MAIN_RESET_GAME:\r
                                        if (rom_loaded) {\r
                                                emu_ResetGame();\r
+                                               while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000);\r
                                                engineState = PGS_Running;\r
                                                return;\r
                                        }\r
@@ -1724,10 +1732,11 @@ int menu_loop_tray(void)
                                case 0: // select image\r
                                        selfname = romsel_loop(curr_path);\r
                                        if (selfname) {\r
-                                               int ret = -1, cd_type;\r
+                                               int ret = -1;\r
+                                               cd_img_type cd_type;\r
                                                cd_type = emu_cdCheck(NULL);\r
-                                               if (cd_type > 0)\r
-                                                       ret = Insert_CD(romFileName, cd_type == 2);\r
+                                               if (cd_type != CIT_NOT_CD)\r
+                                                       ret = Insert_CD(romFileName, cd_type);\r
                                                if (ret != 0) {\r
                                                        sprintf(menuErrorMsg, "Load failed, invalid CD image?");\r
                                                        printf("%s\n", menuErrorMsg);\r