improved autorepeat behavior in menus

[libpicofe.git] / gp2x / menu.c

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 4b3201e..db4c9fa 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -46,7 +46,7 @@ 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 = 6;\r
+       static int repeats = 0, wait = 20;\r
        int release = 0, i;\r
 \r
        if      (repeats == 2) wait = 3;\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 = 6;\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
@@ -1545,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
@@ -1552,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