improve file browser, rework filtering

diff --git a/menu.c b/menu.c
index 1b429c8..3796f45 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -30,7 +30,6 @@ char menu_error_msg[64] = { 0, };
 void *g_menuscreen_ptr;\r
 void *g_menubg_src_ptr;\r
 void *g_menubg_ptr;\r
-static char rom_fname_reload[256];\r
 \r
 #if !MSCREEN_SIZE_FIXED\r
 int g_menuscreen_w;\r
@@ -50,6 +49,7 @@ static const int me_mfont_w = 8, me_mfont_h = 10;
 static const int me_sfont_w = 6, me_sfont_h = 10;\r
 #endif\r
 \r
+static int g_menu_filter_off;\r
 static int g_border_style;\r
 static int border_left, border_right, border_top, border_bottom;\r
 \r
@@ -854,10 +854,12 @@ static void do_delete(const char *fpath, const char *fname)
 \r
 // -------------- ROM selector --------------\r
 \r
-static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)\r
+static void draw_dirlist(char *curdir, struct dirent **namelist,\r
+       int n, int sel, int show_help)\r
 {\r
        int max_cnt, start, i, x, pos;\r
        void *darken_ptr;\r
+       char buff[64];\r
 \r
        max_cnt = g_menuscreen_h / me_sfont_h;\r
        start = max_cnt / 2 - sel;\r
@@ -887,6 +889,22 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
                }\r
        }\r
        smalltext_out16(5, max_cnt/2 * me_sfont_h, ">", 0xffff);\r
+\r
+       if (show_help) {\r
+               darken_ptr = (short *)g_menuscreen_ptr\r
+                       + g_menuscreen_w * (g_menuscreen_h - me_sfont_h * 5 / 2);\r
+               menu_darken_bg(darken_ptr, darken_ptr,\r
+                       g_menuscreen_w * (me_sfont_h * 5 / 2), 1);\r
+\r
+               snprintf(buff, sizeof(buff), "%s - select, %s - back",\r
+                       in_get_key_name(-1, -PBTN_MOK), in_get_key_name(-1, -PBTN_MBACK));\r
+               smalltext_out16(x, g_menuscreen_h - me_sfont_h * 2 - 2, buff, 0xe78c);\r
+               snprintf(buff, sizeof(buff), g_menu_filter_off ?\r
+                        "%s - hide unknown files" : "%s - show all files",\r
+                       in_get_key_name(-1, -PBTN_MA3));\r
+               smalltext_out16(x, g_menuscreen_h - me_sfont_h * 1 - 2, buff, 0xe78c);\r
+       }\r
+\r
        menu_draw_end();\r
 }\r
 \r
@@ -906,19 +924,25 @@ static int scandir_cmp(const void *p1, const void *p2)
 \r
 static int scandir_filter(const struct dirent *ent)\r
 {\r
-       const char *p;\r
+       const char *ext;\r
        int i;\r
 \r
-       if (ent == NULL || ent->d_name == NULL) return 0;\r
-       if (strlen(ent->d_name) < 5) return 1;\r
+       if (ent == NULL || ent->d_name == NULL)\r
+               return 0;\r
+\r
+       if (ent->d_type == DT_DIR)\r
+               return 1;\r
 \r
-       p = ent->d_name + strlen(ent->d_name) - 4;\r
+       ext = strrchr(ent->d_name, '.');\r
+       if (ext == NULL)\r
+               return 0;\r
 \r
+       ext++;\r
        for (i = 0; i < array_size(filter_exts); i++)\r
-               if (strcmp(p, filter_exts[i]) == 0)\r
-                       return 0;\r
+               if (strcasecmp(ext, filter_exts[i]) == 0)\r
+                       return 1;\r
 \r
-       return 1;\r
+       return 0;\r
 }\r
 \r
 static int dirent_seek_char(struct dirent **namelist, int len, int sel, char c)\r
@@ -937,24 +961,46 @@ static int dirent_seek_char(struct dirent **namelist, int len, int sel, char c)
        return i - 1;\r
 }\r
 \r
-static char *menu_loop_romsel(char *curr_path, int len)\r
+static char *menu_loop_romsel(char *curr_path, int len,\r
+       int (*extra_filter)(struct dirent **namelist, int count,\r
+                           const char *basedir))\r
 {\r
-       struct dirent **namelist;\r
-       int n, inp, sel = 0;\r
-       char *ret = NULL, *fname = NULL;\r
+       static char rom_fname_reload[256]; // used for return\r
+       char sel_fname[256];\r
+       int (*filter)(const struct dirent *);\r
+       struct dirent **namelist = NULL;\r
+       int n = 0, inp = 0, sel = 0, show_help = 0;\r
+       char *curr_path_restore = NULL;\r
+       char *ret = NULL;\r
        char cinp;\r
 \r
-rescan:\r
+       sel_fname[0] = 0;\r
+\r
        // is this a dir or a full path?\r
        if (!plat_is_dir(curr_path)) {\r
                char *p = curr_path + strlen(curr_path) - 1;\r
                for (; p > curr_path && *p != '/'; p--)\r
                        ;\r
                *p = 0;\r
-               fname = p+1;\r
+               curr_path_restore = p;\r
+               snprintf(sel_fname, sizeof(sel_fname), "%s", p + 1);\r
+\r
+               show_help = 2;\r
+       }\r
+\r
+rescan:\r
+       if (namelist != NULL) {\r
+               while (n-- > 0)\r
+                       free(namelist[n]);\r
+               free(namelist);\r
+               namelist = NULL;\r
        }\r
 \r
-       n = scandir(curr_path, &namelist, scandir_filter, (void *)scandir_cmp);\r
+       filter = NULL;\r
+       if (!g_menu_filter_off)\r
+               filter = scandir_filter;\r
+\r
+       n = scandir(curr_path, &namelist, filter, (void *)scandir_cmp);\r
        if (n < 0) {\r
                char *t;\r
                lprintf("menu_loop_romsel failed, dir: %s\n", curr_path);\r
@@ -963,7 +1009,7 @@ rescan:
                t = getcwd(curr_path, len);\r
                if (t == NULL)\r
                        plat_get_root_dir(curr_path, len);\r
-               n = scandir(curr_path, &namelist, scandir_filter, (void *)scandir_cmp);\r
+               n = scandir(curr_path, &namelist, filter, (void *)scandir_cmp);\r
                if (n < 0) {\r
                        // oops, we failed\r
                        lprintf("menu_loop_romsel failed, dir: %s\n", curr_path);\r
@@ -971,13 +1017,17 @@ rescan:
                }\r
        }\r
 \r
-       // try to find sel\r
+       if (!g_menu_filter_off && extra_filter != NULL)\r
+               n = extra_filter(namelist, n, curr_path);\r
+\r
+       // try to find selected file\r
        // note: we don't show '.' so sel is namelist index - 1\r
-       if (fname != NULL) {\r
+       sel = 0;\r
+       if (sel_fname[0] != 0) {\r
                int i;\r
                for (i = 1; i < n; i++) {\r
                        char *dname = namelist[i]->d_name;\r
-                       if (dname[0] == fname[0] && strcmp(dname, fname) == 0) {\r
+                       if (dname[0] == sel_fname[0] && strcmp(dname, sel_fname) == 0) {\r
                                sel = i - 1;\r
                                break;\r
                        }\r
@@ -985,15 +1035,16 @@ rescan:
        }\r
 \r
        /* make sure action buttons are not pressed on entering menu */\r
-       draw_dirlist(curr_path, namelist, n, sel);\r
+       draw_dirlist(curr_path, namelist, n, sel, show_help);\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|PBTN_CHAR, &cinp, 33);\r
+               draw_dirlist(curr_path, namelist, n, sel, show_help);\r
+               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT\r
+                       | PBTN_L|PBTN_R|PBTN_MA2|PBTN_MA3|PBTN_MOK|PBTN_MBACK\r
+                       | 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
@@ -1001,23 +1052,24 @@ rescan:
                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_MA3)   {\r
+                       g_menu_filter_off = !g_menu_filter_off;\r
+                       snprintf(sel_fname, sizeof(sel_fname), "%s",\r
+                               namelist[sel+1]->d_name);\r
+                       goto rescan;\r
+               }\r
                if ((inp & PBTN_MOK) || (inp & (PBTN_MENU|PBTN_MA2)) == (PBTN_MENU|PBTN_MA2))\r
                {\r
                        again:\r
                        if (namelist[sel+1]->d_type == DT_REG)\r
                        {\r
-                               strcpy(rom_fname_reload, curr_path);\r
-                               strcat(rom_fname_reload, "/");\r
-                               strcat(rom_fname_reload, namelist[sel+1]->d_name);\r
+                               snprintf(rom_fname_reload, sizeof(rom_fname_reload),\r
+                                       "%s/%s", curr_path, namelist[sel+1]->d_name);\r
                                if (inp & PBTN_MOK) { // return sel\r
                                        ret = rom_fname_reload;\r
                                        break;\r
                                }\r
                                do_delete(rom_fname_reload, namelist[sel+1]->d_name);\r
-                               if (n > 0) {\r
-                                       while (n--) free(namelist[n]);\r
-                                       free(namelist);\r
-                               }\r
                                goto rescan;\r
                        }\r
                        else if (namelist[sel+1]->d_type == DT_DIR)\r
@@ -1044,7 +1096,7 @@ rescan:
                                        strcat(newdir, "/");\r
                                        strcat(newdir, namelist[sel+1]->d_name);\r
                                }\r
-                               ret = menu_loop_romsel(newdir, newlen);\r
+                               ret = menu_loop_romsel(newdir, newlen, extra_filter);\r
                                free(newdir);\r
                                break;\r
                        }\r
@@ -1052,9 +1104,8 @@ rescan:
                        {\r
                                // unknown file type, happens on NTFS mounts. Try to guess.\r
                                FILE *tstf; int tmp;\r
-                               strcpy(rom_fname_reload, curr_path);\r
-                               strcat(rom_fname_reload, "/");\r
-                               strcat(rom_fname_reload, namelist[sel+1]->d_name);\r
+                               snprintf(rom_fname_reload, sizeof(rom_fname_reload),\r
+                                       "%s/%s", curr_path, namelist[sel+1]->d_name);\r
                                tstf = fopen(rom_fname_reload, "rb");\r
                                if (tstf != NULL)\r
                                {\r
@@ -1068,19 +1119,20 @@ rescan:
                }\r
                if (inp & PBTN_MBACK)\r
                        break;\r
+\r
+               if (show_help > 0)\r
+                       show_help--;\r
        }\r
 \r
        if (n > 0) {\r
-               while (n--) free(namelist[n]);\r
+               while (n-- > 0)\r
+                       free(namelist[n]);\r
                free(namelist);\r
        }\r
 \r
        // restore curr_path\r
-       if (fname != NULL) {\r
-               n = strlen(curr_path);\r
-               if (curr_path + n + 1 == fname)\r
-                       curr_path[n] = '/';\r
-       }\r
+       if (curr_path_restore != NULL)\r
+               *curr_path_restore = '/';\r
 \r
        return ret;\r
 }\r