X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmenu.c;h=22752796564b93c9f423fdbbfdcc50f0b78ad057;hb=fb88e614316e559b8c2e419da97619218c046b2f;hp=f9c8065498f1430cc7e2ac8294c4abc310bd54a7;hpb=79cad122559536a7831b121c5ec798847102d0de;p=libpicofe.git diff --git a/gp2x/menu.c b/gp2x/menu.c index f9c8065..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; @@ -356,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) { @@ -767,8 +772,9 @@ 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), "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), "ReadAhead buffer %s", ra_buff); // 6 - gp2x_text_out8(tl_x, (y+=10), "Scale/Rot. fx (slow) %s", (currentConfig.PicoOpt&0x1000)?"ON":"OFF"); // 7 - gp2x_text_out8(tl_x, (y+=10), "Better sync (slow) %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 8 + 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 @@ -784,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 = 9; + int menu_sel = 0, menu_sel_max = 10; unsigned long inp = 0; char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p; @@ -824,9 +830,10 @@ static void cd_menu_loop_options(void) if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M } break; - case 7: currentConfig.PicoOpt^=0x1000; break; - case 8: currentConfig.PicoOpt^=0x2000; break; - case 9: 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; @@ -872,7 +879,7 @@ static void draw_amenu_options(int menu_sel) 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 config on exit %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 5 + 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"); // 7 gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s", mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 8 @@ -951,7 +958,7 @@ static const char *region_name(unsigned int code) static void draw_menu_options(int menu_sel) { int tl_x = 25, tl_y = 32, y; - char monostereo[8], strframeskip[8], *strrend, *strscaling; + char monostereo[8], strframeskip[8], *strrend, *strscaling, *strssconfirm; strcpy(monostereo, (currentConfig.PicoOpt&0x08)?"stereo":"mono"); if (currentConfig.Frameskip < 0) @@ -970,6 +977,12 @@ static void draw_menu_options(int menu_sel) 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); @@ -985,9 +998,9 @@ static void draw_menu_options(int menu_sel) 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"); // 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), "Genesis Region: %s", region_name(currentConfig.PicoRegion)); + 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 save overwrites %s", (currentConfig.EmuOpt &0x200)?"ON":"OFF"); // 12 + 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]"); @@ -1078,7 +1091,6 @@ static int menu_loop_options(void) case 8: currentConfig.PicoOpt^=0x200; break; case 9: currentConfig.PicoOpt^=0x020; break; case 11: currentConfig.EmuOpt ^=0x001; break; - case 12: currentConfig.EmuOpt ^=0x200; break; case 15: cd_menu_loop_options(); if (engineState == PGS_ReloadRom) return 0; // test BIOS @@ -1133,6 +1145,15 @@ static int menu_loop_options(void) case 10: region_prevnext(inp & GP2X_RIGHT); break; + 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; @@ -1256,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) { @@ -1355,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 + } +} + +