X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmenu.c;h=0b8264ef11dc29bf1e92104f0ff54e2a7a761916;hb=59d0f042a1bf325213ca8da779d89bb969881952;hp=881ea98e1c5a172b6fa630da9c9a88e38b2a2189;hpb=5e2e14f284d1abbee9f212f75d6766a5825c7ada;p=libpicofe.git diff --git a/gp2x/menu.c b/gp2x/menu.c index 881ea98..0b8264e 100644 --- a/gp2x/menu.c +++ b/gp2x/menu.c @@ -419,6 +419,36 @@ static char *romsel_loop(char *curr_path) return ret; } +// ------------ debug menu ------------ + +char *debugString(void); + +static void draw_debug(void) +{ + char *p, *str = debugString(); + int len, line; + + gp2x_pd_clone_buffer2(); + + p = str; + for (line = 0; line < 24; line++) + { + while (*p && *p != '\n') p++; + len = p - str; + if (len > 55) len = 55; + gp2x_smalltext8_lim(1, line*10, str, len); + if (*p == 0) break; + p++; str = p; + } + gp2x_video_flip2(); +} + +static void debug_menu_loop(void) +{ + draw_debug(); + wait_for_input(GP2X_B|GP2X_X); +} + // ------------ patch/gg menu ------------ static void draw_patchlist(int sel) @@ -444,7 +474,7 @@ static void draw_patchlist(int sel) } -void patches_menu_loop(void) +static void patches_menu_loop(void) { int menu_sel = 0; unsigned long inp = 0; @@ -567,7 +597,8 @@ static void draw_savestate_menu(int menu_sel, int is_loading) static int savestate_menu_loop(int is_loading) { - int menu_sel = 10, menu_sel_max = 10; + static int menu_sel = 10; + int menu_sel_max = 10; unsigned long inp = 0; state_check_slots(); @@ -772,8 +803,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 @@ -789,7 +821,8 @@ 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; + static int menu_sel = 0; + int menu_sel_max = 10; unsigned long inp = 0; char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p; @@ -829,9 +862,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; @@ -865,7 +899,7 @@ static void cd_menu_loop_options(void) static void draw_amenu_options(int menu_sel) { - int tl_x = 25, tl_y = 60, y; + int tl_x = 25, tl_y = 50, y; char *mms = mmuhack_status ? "active) " : "inactive)"; y = tl_y; @@ -873,14 +907,16 @@ static void draw_amenu_options(int menu_sel) gp2x_pd_clone_buffer2(); 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), "A_SN's gamma curve %s", (currentConfig.EmuOpt &0x1000)?"ON":"OFF"); + gp2x_text_out8(tl_x, (y+=10), "Perfecf vsync %s", (currentConfig.EmuOpt &0x2000)?"ON":"OFF"); + gp2x_text_out8(tl_x, (y+=10), "Emulate Z80 %s", (currentConfig.PicoOpt&0x0004)?"ON":"OFF"); + gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM) %s", (currentConfig.PicoOpt&0x0001)?"ON":"OFF"); + gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG) %s", (currentConfig.PicoOpt&0x0002)?"ON":"OFF"); // 5 + gp2x_text_out8(tl_x, (y+=10), "gzip savestates %s", (currentConfig.EmuOpt &0x0008)?"ON":"OFF"); + gp2x_text_out8(tl_x, (y+=10), "Don't save last used ROM %s", (currentConfig.EmuOpt &0x0020)?"ON":"OFF"); 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 + gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings %s", (currentConfig.EmuOpt &0x0100)?"ON":"OFF"); + gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s", mms, (currentConfig.EmuOpt &0x0010)?"ON":"OFF"); // 10 gp2x_text_out8(tl_x, (y+=10), "Done"); // draw cursor @@ -891,7 +927,8 @@ static void draw_amenu_options(int menu_sel) static void amenu_loop_options(void) { - int menu_sel = 0, menu_sel_max = 9; + static int menu_sel = 0; + int menu_sel_max = 11; unsigned long inp = 0; for(;;) @@ -902,14 +939,16 @@ 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 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; + case 1: currentConfig.EmuOpt ^=0x1000; break; + case 2: currentConfig.EmuOpt ^=0x2000; break; + case 3: currentConfig.PicoOpt^=0x0004; break; + case 4: currentConfig.PicoOpt^=0x0001; break; + case 5: currentConfig.PicoOpt^=0x0002; break; + case 6: currentConfig.EmuOpt ^=0x0008; break; + case 7: currentConfig.EmuOpt ^=0x0020; break; + case 9: currentConfig.EmuOpt ^=0x0100; break; + case 10: currentConfig.EmuOpt ^=0x0010; break; + case 11: return; } } if(inp & (GP2X_X|GP2X_A)) return; @@ -956,7 +995,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) @@ -975,6 +1014,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); @@ -990,9 +1035,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]"); @@ -1060,7 +1105,8 @@ static void menu_options_save(void) static int menu_loop_options(void) { - int menu_sel = 0, menu_sel_max = 17; + static int menu_sel = 0; + int menu_sel_max = 17; unsigned long inp = 0; if (rom_data) menu_sel_max++; @@ -1083,7 +1129,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 @@ -1138,6 +1183,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; @@ -1223,7 +1277,8 @@ static void draw_menu_root(int menu_sel) static void menu_loop_root(void) { - int ret, menu_sel = 4, menu_sel_max = 8, menu_sel_min = 4; + static int menu_sel = 4; + int ret, menu_sel_max = 8, menu_sel_min = 4; unsigned long inp = 0; char curr_path[PATH_MAX], *selfname; FILE *tstf; @@ -1238,7 +1293,7 @@ static void menu_loop_root(void) getcwd(curr_path, PATH_MAX); } - if (rom_data) menu_sel = menu_sel_min = 0; + if (rom_data) menu_sel_min = 0; if (PicoPatches) menu_sel_max = 9; /* make sure action buttons are not pressed on entering menu */ @@ -1248,9 +1303,10 @@ static void menu_loop_root(void) for (;;) { draw_menu_root(menu_sel); - inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT); + inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT|GP2X_L|GP2X_R); if(inp & GP2X_UP ) { menu_sel--; if (menu_sel < menu_sel_min) menu_sel = menu_sel_max; } if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = menu_sel_min; } + if((inp & (GP2X_L|GP2X_R)) == (GP2X_L|GP2X_R)) debug_menu_loop(); if(inp &(GP2X_SELECT|GP2X_X)){ if (rom_data) { while (gp2x_joystick_read(1) & (GP2X_SELECT|GP2X_X)) usleep(50*1000); // wait until select is released