notaz.gp2x.de / libpicofe.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
work on 'vblank on line start' problem, var changes, mask defines
[libpicofe.git] / gp2x / menu.c
diff --git a/gp2x/menu.c b/gp2x/menu.c
index 5039cab..432a41a 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -124,6 +124,8 @@ static unsigned long wait_for_input_usbjoy(unsigned long interesting, int *joy)
        // handle only 1 event at a time\r
        for (i = 1; i != 0; i <<= 1)\r
                if (ret & i) { ret &= i; break; }\r
+       // ... but allow select\r
+       ret |= inp_prev & GP2X_SELECT;\r
 \r
        return ret;\r
 }\r
@@ -275,6 +277,31 @@ static int scandir_filter(const struct dirent *ent)
        return 1;\r
 }\r
 \r
+static void do_delete(const char *fpath, const char *fname)\r
+{\r
+       int len, inp;\r
+\r
+       gp2x_pd_clone_buffer2();\r
+\r
+       if (!rom_loaded)\r
+               menu_darken_bg(gp2x_screen, 320*240, 0);\r
+\r
+       len = strlen(fname);\r
+       if (len > 320/6) len = 320/6;\r
+\r
+       text_out16(320/2 - 15*8/2,  80, "About to delete");\r
+       smalltext_out16_lim(320/2 - len*6/2, 95, fname, 0xbdff, len);\r
+       text_out16(320/2 - 13*8/2, 110, "Are you sure?");\r
+       text_out16(320/2 - 25*8/2, 120, "(Y - confirm, X - cancel)");\r
+       menu_flip();\r
+\r
+\r
+       while (gp2x_joystick_read(1) & (GP2X_A|GP2X_SELECT)) usleep(50*1000);\r
+       inp = wait_for_input(GP2X_Y|GP2X_X);\r
+       if (inp & GP2X_Y)\r
+               remove(fpath);\r
+}\r
+\r
 static char *romsel_loop(char *curr_path)\r
 {\r
        struct dirent **namelist;\r
@@ -283,6 +310,7 @@ static char *romsel_loop(char *curr_path)
        unsigned long inp = 0;\r
        char *ret = NULL, *fname = NULL;\r
 \r
+rescan:\r
        // is this a dir or a full path?\r
        if ((dir = opendir(curr_path))) {\r
                closedir(dir);\r
@@ -319,24 +347,39 @@ static char *romsel_loop(char *curr_path)
        for (;;)\r
        {\r
                draw_dirlist(curr_path, namelist, n, sel);\r
-               inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_L|GP2X_R|GP2X_B|GP2X_X);\r
+               inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_L|GP2X_R|GP2X_A|GP2X_B|GP2X_X|GP2X_SELECT);\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)  { 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
+               if ((inp & GP2X_B) || (inp & (GP2X_SELECT|GP2X_A)) == (GP2X_SELECT|GP2X_A)) // enter dir/select || delete\r
+               {\r
                        again:\r
-                       if (namelist[sel+1]->d_type == DT_REG) {\r
+                       if (namelist[sel+1]->d_type == DT_REG)\r
+                       {\r
                                strcpy(romFileName, curr_path);\r
                                strcat(romFileName, "/");\r
                                strcat(romFileName, namelist[sel+1]->d_name);\r
-                               ret = romFileName;\r
-                               break;\r
-                       } else if (namelist[sel+1]->d_type == DT_DIR) {\r
-                               int newlen = strlen(curr_path) + strlen(namelist[sel+1]->d_name) + 2;\r
-                               char *p, *newdir = malloc(newlen);\r
+                               if (inp & GP2X_B) { // return sel\r
+                                       ret = romFileName;\r
+                                       break;\r
+                               }\r
+                               do_delete(romFileName, 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
+                       {\r
+                               int newlen;\r
+                               char *p, *newdir;\r
+                               if (!(inp & GP2X_B)) continue;\r
+                               newlen = strlen(curr_path) + strlen(namelist[sel+1]->d_name) + 2;\r
+                               newdir = malloc(newlen);\r
                                if (strcmp(namelist[sel+1]->d_name, "..") == 0) {\r
                                        char *start = curr_path;\r
                                        p = start + strlen(start) - 1;\r
@@ -354,7 +397,9 @@ static char *romsel_loop(char *curr_path)
                                ret = romsel_loop(newdir);\r
                                free(newdir);\r
                                break;\r
-                       } else {\r
+                       }\r
+                       else\r
+                       {\r
                                // unknown file type, happens on NTFS mounts. Try to guess.\r
                                FILE *tstf; int tmp;\r
                                strcpy(romFileName, curr_path);\r
@@ -375,7 +420,7 @@ static char *romsel_loop(char *curr_path)
        }\r
 \r
        if (n > 0) {\r
-               while(n--) free(namelist[n]);\r
+               while (n--) free(namelist[n]);\r
                free(namelist);\r
        }\r
 \r
@@ -508,7 +553,7 @@ static void draw_savestate_bg(int slot)
        }\r
 \r
        if (file) {\r
-               if (PicoMCD & 1) {\r
+               if (PicoAHW & PAHW_MCD) {\r
                        PicoCdLoadStateGfx(file);\r
                } else {\r
                        areaSeek(file, 0x10020, SEEK_SET);  // skip header and RAM in state file\r
@@ -737,7 +782,8 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
                draw_key_config(opts, opt_cnt, player_idx, sel);\r
                inp = wait_for_input_usbjoy(CONFIGURABLE_KEYS, &joy);\r
                // printf("got %08lX from joy %i\n", inp, joy);\r
-               if (joy == 0) {\r
+               if (joy == 0)\r
+               {\r
                        if (!(inp & GP2X_SELECT)) {\r
                                prev_select = 0;\r
                                if(inp & GP2X_UP  ) { sel--; if (sel < 0) sel = menu_sel_max; continue; }\r
@@ -832,7 +878,7 @@ static void kc_sel_loop(void)
 {\r
        int menu_sel = 3, menu_sel_max = 3;\r
        unsigned long inp = 0;\r
-       int is_6button = PicoOpt & 0x020;\r
+       int is_6button = PicoOpt & POPT_6BTN_PAD;\r
 \r
        while (1)\r
        {\r
@@ -1016,6 +1062,7 @@ menu_entry opt2_entries[] =
        { "Emulate Z80",               MB_ONOFF, MA_OPT2_ENABLE_Z80,    &PicoOpt, 0x00004, 0, 0, 1, 1 },\r
        { "Emulate YM2612 (FM)",       MB_ONOFF, MA_OPT2_ENABLE_YM2612, &PicoOpt, 0x00001, 0, 0, 1, 1 },\r
        { "Emulate SN76496 (PSG)",     MB_ONOFF, MA_OPT2_ENABLE_SN76496,&PicoOpt, 0x00002, 0, 0, 1, 1 },\r
+       { "Disable sprite limit",      MB_ONOFF, MA_OPT2_NO_SPRITE_LIM, &PicoOpt, 0x40000, 0, 0, 1, 1 },\r
        { "gzip savestates",           MB_ONOFF, MA_OPT2_GZIP_STATES,   &currentConfig.EmuOpt, 0x0008, 0, 0, 1, 1 },\r
        { "Don't save last used ROM",  MB_ONOFF, MA_OPT2_NO_LAST_ROM,   &currentConfig.EmuOpt, 0x0020, 0, 0, 1, 1 },\r
        { "needs restart:",            MB_NONE,  MA_NONE,               NULL, 0, 0, 0, 1, 0 },\r
@@ -1127,7 +1174,7 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
        switch (entry->id)\r
        {\r
                case MA_OPT_RENDERER:\r
-                       if (PicoOpt&0x10)\r
+                       if (PicoOpt & POPT_ALT_RENDERER)\r
                                str = " 8bit fast";\r
                        else if (currentConfig.EmuOpt&0x80)\r
                                str = "16bit accurate";\r
@@ -1151,7 +1198,7 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
                        text_out16(x, y, "Frameskip                  %s", str24);\r
                        break;\r
                case MA_OPT_SOUND_QUALITY:\r
-                       str = (PicoOpt&0x08)?"stereo":"mono";\r
+                       str = (PicoOpt & POPT_EN_STEREO) ? "stereo" : "mono";\r
                        text_out16(x, y, "Sound Quality:     %5iHz %s", PsndRate, str);\r
                        break;\r
                case MA_OPT_REGION:\r
@@ -1241,7 +1288,7 @@ static void menu_options_save(void)
                // force setting possibly changed..\r
                Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;\r
        }\r
-       if (!(PicoOpt & 0x20)) {\r
+       if (!(PicoOpt & POPT_6BTN_PAD)) {\r
                // unbind XYZ MODE, just in case\r
                unbind_action(0xf00, -1, -1);\r
        }\r
PicoDrive's frontend in a lib