frontend: support seeking the filelist with letter keys

[pcsx_rearmed.git] / frontend / common / menu.c

diff --git a/frontend/common/menu.c b/frontend/common/menu.c
index 97e365d..3acab62 100644 (file)
--- a/frontend/common/menu.c
+++ b/frontend/common/menu.c
@@ -216,6 +216,13 @@ static int parse_hex_color(char *buff)
        return -1;\r
 }\r
 \r
+static char tolower_simple(char c)\r
+{\r
+       if ('A' <= c && c <= 'Z')\r
+               c = c - 'A' + 'a';\r
+       return c;\r
+}\r
+\r
 void menu_init(void)\r
 {\r
        int i, c, l;\r
@@ -619,7 +626,7 @@ static int me_loop_d(menu_entry *menu, int *menu_sel, void (*draw_prep)(void), v
 \r
        /* make sure action buttons are not pressed on entering menu */\r
        me_draw(menu, sel, NULL);\r
-       while (in_menu_wait_any(50) & (PBTN_MOK|PBTN_MBACK|PBTN_MENU));\r
+       while (in_menu_wait_any(NULL, 50) & (PBTN_MOK|PBTN_MBACK|PBTN_MENU));\r
 \r
        for (;;)\r
        {\r
@@ -628,7 +635,7 @@ static int me_loop_d(menu_entry *menu, int *menu_sel, void (*draw_prep)(void), v
 \r
                me_draw(menu, sel, draw_more);\r
                inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|\r
-                                       PBTN_MOK|PBTN_MBACK|PBTN_MENU|PBTN_L|PBTN_R, 70);\r
+                       PBTN_MOK|PBTN_MBACK|PBTN_MENU|PBTN_L|PBTN_R, NULL, 70);\r
                if (inp & (PBTN_MENU|PBTN_MBACK))\r
                        break;\r
 \r
@@ -749,8 +756,8 @@ static void do_delete(const char *fpath, const char *fname)
        text_out16(mid - me_mfont_w * len / 2, 12 * me_mfont_h, tmp);\r
        menu_draw_end();\r
 \r
-       while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MA2));\r
-       inp = in_menu_wait(PBTN_MA3|PBTN_MBACK, 100);\r
+       while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MA2));\r
+       inp = in_menu_wait(PBTN_MA3|PBTN_MBACK, NULL, 100);\r
        if (inp & PBTN_MA3)\r
                remove(fpath);\r
 }\r
@@ -824,11 +831,28 @@ static int scandir_filter(const struct dirent *ent)
        return 1;\r
 }\r
 \r
+static int dirent_seek_char(struct dirent **namelist, int len, int sel, char c)\r
+{\r
+       int i;\r
+\r
+       sel++;\r
+       for (i = sel + 1; i != sel; i++) {\r
+               if (i >= len)\r
+                       i = 1;\r
+\r
+               if (tolower_simple(namelist[i]->d_name[0]) == c)\r
+                       break;\r
+       }\r
+\r
+       return i - 1;\r
+}\r
+\r
 static char *menu_loop_romsel(char *curr_path, int len)\r
 {\r
        struct dirent **namelist;\r
        int n, inp, sel = 0;\r
        char *ret = NULL, *fname = NULL;\r
+       char cinp;\r
 \r
 rescan:\r
        // is this a dir or a full path?\r
@@ -858,10 +882,12 @@ rescan:
        }\r
 \r
        // try to find sel\r
+       // note: we don't show '.' so sel is namelist index - 1\r
        if (fname != NULL) {\r
                int i;\r
                for (i = 1; i < n; i++) {\r
-                       if (strcmp(namelist[i]->d_name, fname) == 0) {\r
+                       char *dname = namelist[i]->d_name;\r
+                       if (dname[0] == fname[0] && strcmp(dname, fname) == 0) {\r
                                sel = i - 1;\r
                                break;\r
                        }\r
@@ -870,20 +896,21 @@ rescan:
 \r
        /* make sure action buttons are not pressed on entering menu */\r
        draw_dirlist(curr_path, namelist, n, sel);\r
-       while (in_menu_wait_any(50) & (PBTN_MOK|PBTN_MBACK|PBTN_MENU))\r
+       while (in_menu_wait_any(NULL, 50) & (PBTN_MOK|PBTN_MBACK|PBTN_MENU))\r
                ;\r
 \r
        for (;;)\r
        {\r
                draw_dirlist(curr_path, namelist, n, sel);\r
                inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|\r
-                       PBTN_L|PBTN_R|PBTN_MA2|PBTN_MOK|PBTN_MBACK|PBTN_MENU, 33);\r
+                       PBTN_L|PBTN_R|PBTN_MA2|PBTN_MOK|PBTN_MBACK|PBTN_MENU|PBTN_CHAR, &cinp, 33);\r
                if (inp & PBTN_UP  )  { sel--;   if (sel < 0)   sel = n-2; }\r
                if (inp & PBTN_DOWN)  { sel++;   if (sel > n-2) sel = 0; }\r
                if (inp & PBTN_LEFT)  { sel-=10; if (sel < 0)   sel = 0; }\r
                if (inp & PBTN_L)     { sel-=24; if (sel < 0)   sel = 0; }\r
                if (inp & PBTN_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; }\r
                if (inp & PBTN_R)     { sel+=24; if (sel > n-2) sel = n-2; }\r
+               if (inp & PBTN_CHAR)  sel = dirent_seek_char(namelist, n, sel, cinp);\r
                if ((inp & PBTN_MOK) || (inp & (PBTN_MENU|PBTN_MA2)) == (PBTN_MENU|PBTN_MA2))\r
                {\r
                        again:\r
@@ -1052,7 +1079,7 @@ static int menu_loop_savestate(int is_loading)
        for (;;)\r
        {\r
                draw_savestate_menu(menu_sel, is_loading);\r
-               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_MOK|PBTN_MBACK, 100);\r
+               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_MOK|PBTN_MBACK, NULL, 100);\r
                if (inp & PBTN_UP) {\r
                        do {\r
                                menu_sel--;\r
@@ -1242,7 +1269,8 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
        for (;;)\r
        {\r
                draw_key_config(opts, opt_cnt, player_idx, sel, dev_id, dev_count, 0);\r
-               mkey = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MBACK|PBTN_MOK|PBTN_MA2, 100);\r
+               mkey = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT\r
+                               |PBTN_MBACK|PBTN_MOK|PBTN_MA2, NULL, 100);\r
                switch (mkey) {\r
                        case PBTN_UP:   sel--; if (sel < 0) sel = menu_sel_max; continue;\r
                        case PBTN_DOWN: sel++; if (sel > menu_sel_max) sel = 0; continue;\r
@@ -1267,7 +1295,7 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
                        case PBTN_MOK:\r
                                if (sel >= opt_cnt)\r
                                        return;\r
-                               while (in_menu_wait_any(30) & PBTN_MOK)\r
+                               while (in_menu_wait_any(NULL, 30) & PBTN_MOK)\r
                                        ;\r
                                break;\r
                        case PBTN_MA2:\r
@@ -1280,7 +1308,7 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
 \r
                /* wait for some up event */\r
                for (is_down = 1; is_down; )\r
-                       kc = in_update_keycode(&bind_dev_id, &is_down, -1);\r
+                       kc = in_update_keycode(&bind_dev_id, &is_down, NULL, -1);\r
 \r
                i = count_bound_keys(bind_dev_id, opts[sel].mask << mask_shift, bindtype);\r
                unbind = (i > 0);\r