return ret;\r
}\r
\r
+// ------------ debug menu ------------\r
+\r
+char *debugString(void);\r
+\r
+static void draw_debug(void)\r
+{\r
+ char *p, *str = debugString();\r
+ int len, line;\r
+\r
+ gp2x_pd_clone_buffer2();\r
+\r
+ p = str;\r
+ for (line = 0; line < 24; line++)\r
+ {\r
+ while (*p && *p != '\n') p++;\r
+ len = p - str;\r
+ if (len > 55) len = 55;\r
+ gp2x_smalltext8_lim(1, line*10, str, len);\r
+ if (*p == 0) break;\r
+ p++; str = p;\r
+ }\r
+ gp2x_video_flip2();\r
+}\r
+\r
+static void debug_menu_loop(void)\r
+{\r
+ draw_debug();\r
+ wait_for_input(GP2X_B|GP2X_X);\r
+}\r
+\r
// ------------ patch/gg menu ------------\r
\r
static void draw_patchlist(int sel)\r
}\r
\r
\r
-void patches_menu_loop(void)\r
+static void patches_menu_loop(void)\r
{\r
int menu_sel = 0;\r
unsigned long inp = 0;\r
\r
static int savestate_menu_loop(int is_loading)\r
{\r
- int menu_sel = 10, menu_sel_max = 10;\r
+ static int menu_sel = 10;\r
+ int menu_sel_max = 10;\r
unsigned long inp = 0;\r
\r
state_check_slots();\r
\r
static void cd_menu_loop_options(void)\r
{\r
- int menu_sel = 0, menu_sel_max = 10;\r
+ static int menu_sel = 0;\r
+ int menu_sel_max = 10;\r
unsigned long inp = 0;\r
char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p;\r
\r
\r
static void draw_amenu_options(int menu_sel)\r
{\r
- int tl_x = 25, tl_y = 60, y;\r
+ int tl_x = 25, tl_y = 50, y;\r
char *mms = mmuhack_status ? "active) " : "inactive)";\r
\r
y = tl_y;\r
gp2x_pd_clone_buffer2();\r
\r
gp2x_text_out8(tl_x, y, "Gamma correction %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 0\r
- gp2x_text_out8(tl_x, (y+=10), "Emulate Z80 %s", (currentConfig.PicoOpt&0x004)?"ON":"OFF"); // 1\r
- gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM) %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 2\r
- gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG) %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 3\r
- gp2x_text_out8(tl_x, (y+=10), "gzip savestates %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 4\r
- gp2x_text_out8(tl_x, (y+=10), "Don't save last used ROM %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 5\r
+ gp2x_text_out8(tl_x, (y+=10), "A_SN's gamma curve %s", (currentConfig.EmuOpt &0x1000)?"ON":"OFF");\r
+ gp2x_text_out8(tl_x, (y+=10), "Perfecf vsync %s", (currentConfig.EmuOpt &0x2000)?"ON":"OFF");\r
+ gp2x_text_out8(tl_x, (y+=10), "Emulate Z80 %s", (currentConfig.PicoOpt&0x0004)?"ON":"OFF");\r
+ gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM) %s", (currentConfig.PicoOpt&0x0001)?"ON":"OFF");\r
+ gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG) %s", (currentConfig.PicoOpt&0x0002)?"ON":"OFF"); // 5\r
+ gp2x_text_out8(tl_x, (y+=10), "gzip savestates %s", (currentConfig.EmuOpt &0x0008)?"ON":"OFF");\r
+ gp2x_text_out8(tl_x, (y+=10), "Don't save last used ROM %s", (currentConfig.EmuOpt &0x0020)?"ON":"OFF");\r
gp2x_text_out8(tl_x, (y+=10), "needs restart:");\r
- gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings %s", (currentConfig.EmuOpt &0x100)?"ON":"OFF"); // 7\r
- gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s", mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 8\r
+ gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings %s", (currentConfig.EmuOpt &0x0100)?"ON":"OFF");\r
+ gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s", mms, (currentConfig.EmuOpt &0x0010)?"ON":"OFF"); // 10\r
gp2x_text_out8(tl_x, (y+=10), "Done");\r
\r
// draw cursor\r
\r
static void amenu_loop_options(void)\r
{\r
- int menu_sel = 0, menu_sel_max = 9;\r
+ static int menu_sel = 0;\r
+ int menu_sel_max = 11;\r
unsigned long inp = 0;\r
\r
for(;;)\r
if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options\r
switch (menu_sel) {\r
- case 1: currentConfig.PicoOpt^=0x004; break;\r
- case 2: currentConfig.PicoOpt^=0x001; break;\r
- case 3: currentConfig.PicoOpt^=0x002; break;\r
- case 4: currentConfig.EmuOpt ^=0x008; break;\r
- case 5: currentConfig.EmuOpt ^=0x020; break;\r
- case 7: currentConfig.EmuOpt ^=0x100; break;\r
- case 8: currentConfig.EmuOpt ^=0x010; break;\r
- case 9: return;\r
+ case 1: currentConfig.EmuOpt ^=0x1000; break;\r
+ case 2: currentConfig.EmuOpt ^=0x2000; break;\r
+ case 3: currentConfig.PicoOpt^=0x0004; break;\r
+ case 4: currentConfig.PicoOpt^=0x0001; break;\r
+ case 5: currentConfig.PicoOpt^=0x0002; break;\r
+ case 6: currentConfig.EmuOpt ^=0x0008; break;\r
+ case 7: currentConfig.EmuOpt ^=0x0020; break;\r
+ case 9: currentConfig.EmuOpt ^=0x0100; break;\r
+ case 10: currentConfig.EmuOpt ^=0x0010; break;\r
+ case 11: return;\r
}\r
}\r
if(inp & (GP2X_X|GP2X_A)) return;\r
\r
static int menu_loop_options(void)\r
{\r
- int menu_sel = 0, menu_sel_max = 17;\r
+ static int menu_sel = 0;\r
+ int menu_sel_max = 17;\r
unsigned long inp = 0;\r
\r
if (rom_data) menu_sel_max++;\r
\r
static void menu_loop_root(void)\r
{\r
- int ret, menu_sel = 4, menu_sel_max = 8, menu_sel_min = 4;\r
+ static int menu_sel = 4;\r
+ int ret, menu_sel_max = 8, menu_sel_min = 4;\r
unsigned long inp = 0;\r
char curr_path[PATH_MAX], *selfname;\r
FILE *tstf;\r
getcwd(curr_path, PATH_MAX);\r
}\r
\r
- if (rom_data) menu_sel = menu_sel_min = 0;\r
+ if (rom_data) menu_sel_min = 0;\r
if (PicoPatches) menu_sel_max = 9;\r
\r
/* make sure action buttons are not pressed on entering menu */\r
for (;;)\r
{\r
draw_menu_root(menu_sel);\r
- inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT);\r
+ inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT|GP2X_L|GP2X_R);\r
if(inp & GP2X_UP ) { menu_sel--; if (menu_sel < menu_sel_min) menu_sel = menu_sel_max; }\r
if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = menu_sel_min; }\r
+ if((inp & (GP2X_L|GP2X_R)) == (GP2X_L|GP2X_R)) debug_menu_loop();\r
if(inp &(GP2X_SELECT|GP2X_X)){\r
if (rom_data) {\r
while (gp2x_joystick_read(1) & (GP2X_SELECT|GP2X_X)) usleep(50*1000); // wait until select is released\r
notaz.gp2x.de / picodrive.git / blobdiff