X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmenu.c;h=22752796564b93c9f423fdbbfdcc50f0b78ad057;hb=576fc637929cdfc92884e2e92c6c22e002cfb000;hp=aa3019f6704e400e90555e32e8fa48fd5c1832cd;hpb=5f9922e6c2c69cb940e70f1d108aac2c3d0b01d7;p=libpicofe.git diff --git a/gp2x/menu.c b/gp2x/menu.c index aa3019f..2275279 100644 --- a/gp2x/menu.c +++ b/gp2x/menu.c @@ -15,6 +15,7 @@ #include "menu.h" #include "fonts.h" #include "usbjoy.h" +#include "asmutils.h" #include "version.h" #include @@ -170,14 +171,16 @@ static int inp_prevjoy = 0; static unsigned long wait_for_input(unsigned long interesting) { unsigned long ret; - static int repeats = 0, wait = 300*1000; + static int repeats = 0, wait = 50*1000; int release = 0, i; - if (repeats == 5 || repeats == 15 || repeats == 30) wait /= 2; + if (repeats == 2 || repeats == 4) wait /= 2; + if (repeats == 6) wait = 15 * 1000; for (i = 0; i < 6 && inp_prev == gp2x_joystick_read(1); i++) { - if(i == 0) repeats++; - usleep(wait/6); + if (i == 0) repeats++; + if (wait >= 30*1000) usleep(wait); // usleep sleeps for ~30ms minimum + else spend_cycles(wait * currentConfig.CPUclock); } while ( !((ret = gp2x_joystick_read(1)) & interesting) ) { @@ -187,7 +190,7 @@ static unsigned long wait_for_input(unsigned long interesting) if (release || ret != inp_prev) { repeats = 0; - wait = 300*1000; + wait = 50*1000; } inp_prev = ret; inp_prevjoy = 0; @@ -286,6 +289,28 @@ static int scandir_cmp(const void *p1, const void *p2) return alphasort(d1, d2); } +static char *filter_exts[] = { + ".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html", + ".jpg", ".gpe", ".cue" +}; + +static int scandir_filter(const struct dirent *ent) +{ + const char *p; + int i; + + if (ent == NULL || ent->d_name == NULL) return 0; + if (strlen(ent->d_name) < 5) return 1; + + p = ent->d_name + strlen(ent->d_name) - 4; + + for (i = 0; i < sizeof(filter_exts)/sizeof(filter_exts[0]); i++) + { + if (strcmp(p, filter_exts[i]) == 0) return 0; + } + + return 1; +} static char *romsel_loop(char *curr_path) { @@ -305,10 +330,10 @@ static char *romsel_loop(char *curr_path) fname = p+1; } - n = scandir(curr_path, &namelist, 0, scandir_cmp); + n = scandir(curr_path, &namelist, scandir_filter, scandir_cmp); if (n < 0) { // try root - n = scandir(curr_path, &namelist, 0, scandir_cmp); + n = scandir("/", &namelist, scandir_filter, scandir_cmp); if (n < 0) { // oops, we failed printf("dir: "); printf(curr_path); printf("\n"); @@ -334,8 +359,10 @@ static char *romsel_loop(char *curr_path) inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_L|GP2X_R|GP2X_B|GP2X_X); if(inp & GP2X_UP ) { sel--; if (sel < 0) sel = n-2; } if(inp & GP2X_DOWN) { sel++; if (sel > n-2) sel = 0; } - if(inp &(GP2X_LEFT|GP2X_L)) { sel-=10; if (sel < 0) sel = 0; } - if(inp &(GP2X_RIGHT|GP2X_R)) { sel+=10; if (sel > n-2) sel = n-2; } + if(inp & GP2X_LEFT) { sel-=10; if (sel < 0) sel = 0; } + if(inp & GP2X_L) { sel-=24; if (sel < 0) sel = 0; } + if(inp & GP2X_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; } + if(inp & GP2X_R) { sel+=24; if (sel > n-2) sel = n-2; } if(inp & GP2X_B) { // enter dir/select again: if (namelist[sel+1]->d_type == DT_REG) { @@ -744,8 +771,10 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j gp2x_text_out8(tl_x, (y+=10), "CD LEDs %s", (currentConfig.EmuOpt &0x0400)?"ON":"OFF"); // 3 gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s) %s", (currentConfig.PicoOpt&0x0800)?"ON":"OFF"); // 4 gp2x_text_out8(tl_x, (y+=10), "PCM audio %s", (currentConfig.PicoOpt&0x0400)?"ON":"OFF"); // 5 - gp2x_text_out8(tl_x, (y+=10), "Better sync (very slow) %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 6 - gp2x_text_out8(tl_x, (y+=10), "ReadAhead buffer %s", ra_buff); // 7 + gp2x_text_out8(tl_x, (y+=10), "ReadAhead buffer %s", ra_buff); // 6 + gp2x_text_out8(tl_x, (y+=10), "SaveRAM cart %s", (currentConfig.PicoOpt&0x8000)?"ON":"OFF"); // 7 + gp2x_text_out8(tl_x, (y+=10), "Scale/Rot. fx (slow) %s", (currentConfig.PicoOpt&0x1000)?"ON":"OFF"); // 8 + gp2x_text_out8(tl_x, (y+=10), "Better sync (slow) %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 9 gp2x_text_out8(tl_x, (y+=10), "Done"); // draw cursor @@ -761,7 +790,7 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j static void cd_menu_loop_options(void) { - int menu_sel = 0, menu_sel_max = 8; + int menu_sel = 0, menu_sel_max = 10; unsigned long inp = 0; char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p; @@ -791,18 +820,20 @@ static void cd_menu_loop_options(void) case 3: currentConfig.EmuOpt ^=0x0400; break; case 4: currentConfig.PicoOpt^=0x0800; break; case 5: currentConfig.PicoOpt^=0x0400; break; - case 6: currentConfig.PicoOpt^=0x2000; break; - case 7: + case 6: if (inp & GP2X_LEFT) { PicoCDBuffers >>= 1; if (PicoCDBuffers < 64) PicoCDBuffers = 0; } else { if (PicoCDBuffers < 64) PicoCDBuffers = 64; else PicoCDBuffers <<= 1; - if (PicoCDBuffers > 4096) PicoCDBuffers = 4096; + if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M } break; - case 8: return; + case 7: currentConfig.PicoOpt^=0x8000; break; + case 8: currentConfig.PicoOpt^=0x1000; break; + case 9: currentConfig.PicoOpt^=0x2000; break; + case 10: return; } } if(inp & (GP2X_X|GP2X_A)) return; @@ -843,16 +874,15 @@ static void draw_amenu_options(int menu_sel) //memset(gp2x_screen, 0, 320*240); gp2x_pd_clone_buffer2(); - gp2x_text_out8(tl_x, y, "Scale 32 column mode %s", (currentConfig.PicoOpt&0x100)?"ON":"OFF"); // 0 - gp2x_text_out8(tl_x, (y+=10), "Gamma correction %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 1 - gp2x_text_out8(tl_x, (y+=10), "Emulate Z80 %s", (currentConfig.PicoOpt&0x004)?"ON":"OFF"); // 2 - gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM) %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 3 - gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG) %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 4 - gp2x_text_out8(tl_x, (y+=10), "gzip savestates %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 5 - gp2x_text_out8(tl_x, (y+=10), "Don't save config on exit %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 6 + gp2x_text_out8(tl_x, y, "Gamma correction %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 0 + gp2x_text_out8(tl_x, (y+=10), "Emulate Z80 %s", (currentConfig.PicoOpt&0x004)?"ON":"OFF"); // 1 + gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM) %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 2 + gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG) %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 3 + gp2x_text_out8(tl_x, (y+=10), "gzip savestates %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 4 + gp2x_text_out8(tl_x, (y+=10), "Don't save last used ROM %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 5 gp2x_text_out8(tl_x, (y+=10), "needs restart:"); - gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings %s", (currentConfig.EmuOpt &0x100)?"ON":"OFF"); // 8 - gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s", mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 9 + gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings %s", (currentConfig.EmuOpt &0x100)?"ON":"OFF"); // 7 + gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s", mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 8 gp2x_text_out8(tl_x, (y+=10), "Done"); // draw cursor @@ -863,7 +893,7 @@ static void draw_amenu_options(int menu_sel) static void amenu_loop_options(void) { - int menu_sel = 0, menu_sel_max = 10; + int menu_sel = 0, menu_sel_max = 9; unsigned long inp = 0; for(;;) @@ -874,21 +904,20 @@ static void amenu_loop_options(void) if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; } if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options switch (menu_sel) { - case 0: currentConfig.PicoOpt^=0x100; break; - case 2: currentConfig.PicoOpt^=0x004; break; - case 3: currentConfig.PicoOpt^=0x001; break; - case 4: currentConfig.PicoOpt^=0x002; break; - case 5: currentConfig.EmuOpt ^=0x008; break; - case 6: currentConfig.EmuOpt ^=0x020; break; - case 8: currentConfig.EmuOpt ^=0x100; break; - case 9: currentConfig.EmuOpt ^=0x010; break; - case 10: return; + case 1: currentConfig.PicoOpt^=0x004; break; + case 2: currentConfig.PicoOpt^=0x001; break; + case 3: currentConfig.PicoOpt^=0x002; break; + case 4: currentConfig.EmuOpt ^=0x008; break; + case 5: currentConfig.EmuOpt ^=0x020; break; + case 7: currentConfig.EmuOpt ^=0x100; break; + case 8: currentConfig.EmuOpt ^=0x010; break; + case 9: return; } } if(inp & (GP2X_X|GP2X_A)) return; if(inp & (GP2X_LEFT|GP2X_RIGHT)) { // multi choise switch (menu_sel) { - case 1: + case 0: while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) { currentConfig.gamma += (inp & GP2X_LEFT) ? -1 : 1; if (currentConfig.gamma < 1) currentConfig.gamma = 1; @@ -928,8 +957,8 @@ static const char *region_name(unsigned int code) static void draw_menu_options(int menu_sel) { - int tl_x = 25, tl_y = 40, y; - char monostereo[8], strframeskip[8], *strrend; + int tl_x = 25, tl_y = 32, y; + char monostereo[8], strframeskip[8], *strrend, *strscaling, *strssconfirm; strcpy(monostereo, (currentConfig.PicoOpt&0x08)?"stereo":"mono"); if (currentConfig.Frameskip < 0) @@ -942,27 +971,40 @@ static void draw_menu_options(int menu_sel) } else { strrend = " 8bit accurate"; } + switch (currentConfig.scaling) { + default: strscaling = " OFF"; break; + case 1: strscaling = "hw horizontal"; break; + case 2: strscaling = "hw horiz. + vert."; break; + case 3: strscaling = "sw horizontal"; break; + } + switch ((currentConfig.EmuOpt >> 9) & 5) { + default: strssconfirm = "OFF"; break; + case 1: strssconfirm = "writes"; break; + case 4: strssconfirm = "loads"; break; + case 5: strssconfirm = "both"; break; + } y = tl_y; //memset(gp2x_screen, 0, 320*240); gp2x_pd_clone_buffer2(); gp2x_text_out8(tl_x, y, "Renderer: %s", strrend); // 0 - gp2x_text_out8(tl_x, (y+=10), "Accurate timing (slower) %s", (currentConfig.PicoOpt&0x040)?"ON":"OFF"); // 1 - gp2x_text_out8(tl_x, (y+=10), "Accurate sprites (slower) %s", (currentConfig.PicoOpt&0x080)?"ON":"OFF"); // 2 - gp2x_text_out8(tl_x, (y+=10), "Show FPS %s", (currentConfig.EmuOpt &0x002)?"ON":"OFF"); // 3 + gp2x_text_out8(tl_x, (y+=10), "Scaling: %s", strscaling); // 1 + gp2x_text_out8(tl_x, (y+=10), "Accurate timing (slower) %s", (currentConfig.PicoOpt&0x040)?"ON":"OFF"); // 2 + gp2x_text_out8(tl_x, (y+=10), "Accurate sprites (slower) %s", (currentConfig.PicoOpt&0x080)?"ON":"OFF"); // 3 + gp2x_text_out8(tl_x, (y+=10), "Show FPS %s", (currentConfig.EmuOpt &0x002)?"ON":"OFF"); // 4 gp2x_text_out8(tl_x, (y+=10), "Frameskip %s", strframeskip); - gp2x_text_out8(tl_x, (y+=10), "Enable sound %s", (currentConfig.EmuOpt &0x004)?"ON":"OFF"); // 5 + gp2x_text_out8(tl_x, (y+=10), "Enable sound %s", (currentConfig.EmuOpt &0x004)?"ON":"OFF"); // 6 gp2x_text_out8(tl_x, (y+=10), "Sound Quality: %5iHz %s", currentConfig.PsndRate, monostereo); - gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound %s", (currentConfig.PicoOpt&0x200)?"ON":"OFF"); // 7 - gp2x_text_out8(tl_x, (y+=10), "6 button pad %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 8 - gp2x_text_out8(tl_x, (y+=10), "Genesis Region: %s", region_name(currentConfig.PicoRegion)); - gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 10 - gp2x_text_out8(tl_x, (y+=10), "Confirm save overwrites %s", (currentConfig.EmuOpt &0x200)?"ON":"OFF"); // 11 - gp2x_text_out8(tl_x, (y+=10), "Save slot %i", state_slot); // 12 + gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound %s", (currentConfig.PicoOpt&0x200)?"ON":"OFF"); // 8 + gp2x_text_out8(tl_x, (y+=10), "6 button pad %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 9 + gp2x_text_out8(tl_x, (y+=10), "Region: %s", region_name(currentConfig.PicoRegion)); + gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 11 + gp2x_text_out8(tl_x, (y+=10), "Confirm savestate %s", strssconfirm); // 12 + gp2x_text_out8(tl_x, (y+=10), "Save slot %i", state_slot); // 13 gp2x_text_out8(tl_x, (y+=10), "GP2X CPU clocks %iMhz", currentConfig.CPUclock); gp2x_text_out8(tl_x, (y+=10), "[Sega/Mega CD options]"); - gp2x_text_out8(tl_x, (y+=10), "[advanced options]"); // 15 + gp2x_text_out8(tl_x, (y+=10), "[advanced options]"); // 16 gp2x_text_out8(tl_x, (y+=10), "Save cfg as default"); if (rom_data) gp2x_text_out8(tl_x, (y+=10), "Save cfg for current game only"); @@ -1021,11 +1063,12 @@ static void menu_options_save(void) } else { actionNames[8] = actionNames[9] = actionNames[10] = actionNames[11] = 0; } + scaling_update(); } static int menu_loop_options(void) { - int menu_sel = 0, menu_sel_max = 16; + int menu_sel = 0, menu_sel_max = 17; unsigned long inp = 0; if (rom_data) menu_sel_max++; @@ -1041,25 +1084,24 @@ static int menu_loop_options(void) if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; } if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options switch (menu_sel) { - case 1: currentConfig.PicoOpt^=0x040; break; - case 2: currentConfig.PicoOpt^=0x080; break; - case 3: currentConfig.EmuOpt ^=0x002; break; - case 5: currentConfig.EmuOpt ^=0x004; break; - case 7: currentConfig.PicoOpt^=0x200; break; - case 8: currentConfig.PicoOpt^=0x020; break; - case 10: currentConfig.EmuOpt ^=0x001; break; - case 11: currentConfig.EmuOpt ^=0x200; break; - case 14: cd_menu_loop_options(); + case 2: currentConfig.PicoOpt^=0x040; break; + case 3: currentConfig.PicoOpt^=0x080; break; + case 4: currentConfig.EmuOpt ^=0x002; break; + case 6: currentConfig.EmuOpt ^=0x004; break; + case 8: currentConfig.PicoOpt^=0x200; break; + case 9: currentConfig.PicoOpt^=0x020; break; + case 11: currentConfig.EmuOpt ^=0x001; break; + case 15: cd_menu_loop_options(); if (engineState == PGS_ReloadRom) return 0; // test BIOS break; - case 15: amenu_loop_options(); break; - case 16: // done (update and write) + case 16: amenu_loop_options(); break; + case 17: // done (update and write) menu_options_save(); if (emu_WriteConfig(0)) strcpy(menuErrorMsg, "config saved"); else strcpy(menuErrorMsg, "failed to write config"); return 1; - case 17: // done (update and write for current game) + case 18: // done (update and write for current game) menu_options_save(); if (emu_WriteConfig(1)) strcpy(menuErrorMsg, "config saved"); else strcpy(menuErrorMsg, "failed to write config"); @@ -1083,28 +1125,42 @@ static int menu_loop_options(void) else if ( currentConfig.EmuOpt &0x80) currentConfig.EmuOpt &= ~0x80; } break; - case 4: + case 1: + currentConfig.scaling += (inp & GP2X_LEFT) ? -1 : 1; + if (currentConfig.scaling < 0) currentConfig.scaling = 0; + if (currentConfig.scaling > 3) currentConfig.scaling = 3; + break; + case 5: currentConfig.Frameskip += (inp & GP2X_LEFT) ? -1 : 1; if (currentConfig.Frameskip < 0) currentConfig.Frameskip = -1; if (currentConfig.Frameskip > 32) currentConfig.Frameskip = 32; break; - case 6: + case 7: if ((inp & GP2X_RIGHT) && currentConfig.PsndRate == 44100 && !(currentConfig.PicoOpt&0x08)) { currentConfig.PsndRate = 8000; currentConfig.PicoOpt|= 0x08; } else if ((inp & GP2X_LEFT) && currentConfig.PsndRate == 8000 && (currentConfig.PicoOpt&0x08)) { currentConfig.PsndRate = 44100; currentConfig.PicoOpt&=~0x08; } else currentConfig.PsndRate = sndrate_prevnext(currentConfig.PsndRate, inp & GP2X_RIGHT); break; - case 9: + case 10: region_prevnext(inp & GP2X_RIGHT); break; - case 12: + case 12: { + int n = ((currentConfig.EmuOpt>>9)&1) | ((currentConfig.EmuOpt>>10)&2); + n += (inp & GP2X_LEFT) ? -1 : 1; + if (n < 0) n = 0; else if (n > 3) n = 3; + n |= n << 1; n &= ~2; + currentConfig.EmuOpt &= ~0xa00; + currentConfig.EmuOpt |= n << 9; + break; + } + case 13: if (inp & GP2X_RIGHT) { state_slot++; if (state_slot > 9) state_slot = 0; } else {state_slot--; if (state_slot < 0) state_slot = 9; } break; - case 13: + case 14: while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) { currentConfig.CPUclock += (inp & GP2X_LEFT) ? -1 : 1; if (currentConfig.CPUclock < 1) currentConfig.CPUclock = 1; @@ -1201,7 +1257,11 @@ static void menu_loop_root(void) if (rom_data) menu_sel = menu_sel_min = 0; if (PicoPatches) menu_sel_max = 9; - for(;;) + /* make sure action buttons are not pressed on entering menu */ + draw_menu_root(menu_sel); + while (gp2x_joystick_read(1) & (GP2X_B|GP2X_X|GP2X_SELECT)) usleep(50*1000); + + for (;;) { draw_menu_root(menu_sel); inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT); @@ -1217,7 +1277,11 @@ static void menu_loop_root(void) if(inp & GP2X_B ) { switch (menu_sel) { case 0: // resume game - if (rom_data) { engineState = PGS_Running; return; } + if (rom_data) { + while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000); + engineState = PGS_Running; + return; + } break; case 1: // save state if (rom_data) { @@ -1303,7 +1367,7 @@ static void menu_gfx_prepare(void) // switch to 8bpp gp2x_video_changemode2(8); - gp2x_video_RGB_setscaling(320, 240); + gp2x_video_RGB_setscaling(0, 320, 240); gp2x_video_flip2(); } @@ -1316,3 +1380,85 @@ void menu_loop(void) menuErrorMsg[0] = 0; } + + +// --------- CD tray close menu ---------- + +static void draw_menu_tray(int menu_sel) +{ + int tl_x = 70, tl_y = 90, y; + memset(gp2x_screen, 0xe0, 320*240); + + gp2x_text_out8(tl_x, 20, "The unit is about to"); + gp2x_text_out8(tl_x, 30, "close the CD tray."); + + y = tl_y; + gp2x_text_out8(tl_x, y, "Load new CD image"); + gp2x_text_out8(tl_x, (y+=10), "Insert nothing"); + + // draw cursor + gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">"); + // error + if (menuErrorMsg[0]) gp2x_text_out8(5, 226, menuErrorMsg); + gp2x_video_flip2(); +} + + +int menu_loop_tray(void) +{ + int menu_sel = 0, menu_sel_max = 1; + unsigned long inp = 0; + char curr_path[PATH_MAX], *selfname; + FILE *tstf; + + gp2x_memset_all_buffers(0, 0xe0, 320*240); + menu_gfx_prepare(); + + if ( (tstf = fopen(currentConfig.lastRomFile, "rb")) ) + { + fclose(tstf); + strcpy(curr_path, currentConfig.lastRomFile); + } + else + { + getcwd(curr_path, PATH_MAX); + } + + /* make sure action buttons are not pressed on entering menu */ + draw_menu_tray(menu_sel); + while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000); + + for (;;) + { + draw_menu_tray(menu_sel); + inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B); + if(inp & GP2X_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; } + if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; } + if(inp & GP2X_B ) { + switch (menu_sel) { + case 0: // select image + selfname = romsel_loop(curr_path); + if (selfname) { + int ret = -1, cd_type; + cd_type = emu_cd_check(NULL); + if (cd_type > 0) + ret = Insert_CD(romFileName, cd_type == 2); + if (ret != 0) { + sprintf(menuErrorMsg, "Load failed, invalid CD image?"); + printf("%s\n", menuErrorMsg); + continue; + } + engineState = PGS_RestartRun; + return 1; + } + break; + case 1: // insert nothing + engineState = PGS_RestartRun; + return 0; + } + } + menuErrorMsg[0] = 0; // clear error msg + } +} + +