if (name != NULL)\r
wt += (strlen(name) + offs) * me_mfont_w;\r
break;\r
+ case MB_OPT_ENUM:\r
+ wt += 10 * me_mfont_w;\r
+ break;\r
}\r
}\r
\r
\r
for (ent = entries; ent->name; ent++)\r
{\r
+ const char **names;\r
+ int len;\r
+\r
if (!ent->enabled)\r
continue;\r
\r
if (name != NULL)\r
text_out16(x + col2_offs + offs * me_mfont_w, y, "%s", name);\r
break;\r
+ case MB_OPT_ENUM:\r
+ names = (const char **)ent->data;\r
+ offs = 0;\r
+ for (i = 0; names[i] != NULL; i++) {\r
+ len = strlen(names[i]);\r
+ if (len > 10)\r
+ offs = 10 - len - 2;\r
+ if (i == *(int *)ent->var) {\r
+ text_out16(x + col2_offs + offs * me_mfont_w, y, "%s", names[i]);\r
+ break;\r
+ }\r
+ }\r
+ break;\r
}\r
\r
y += me_mfont_h;\r
}\r
\r
- /* display message if we have one */\r
+ /* display help or message if we have one */\r
+ h = (g_screen_height - h) / 2; // bottom area height\r
if (menu_error_msg[0] != 0) {\r
- if (g_screen_height - h >= 2 * me_mfont_h)\r
+ if (h >= me_mfont_h + 4)\r
text_out16(5, g_screen_height - me_mfont_h - 4, menu_error_msg);\r
else\r
lprintf("menu msg doesn't fit!\n");\r
if (plat_get_ticks_ms() - menu_error_time > 2048)\r
menu_error_msg[0] = 0;\r
}\r
+ else if (entries[asel].help != NULL) {\r
+ const char *tmp = entries[asel].help;\r
+ int l;\r
+ for (l = 0; tmp != NULL && *tmp != 0; l++)\r
+ tmp = strchr(tmp + 1, '\n');\r
+ if (h >= l * me_sfont_h + 4)\r
+ for (tmp = entries[asel].help; l > 0; l--, tmp = strchr(tmp, '\n') + 1)\r
+ smalltext_out16(5, g_screen_height - (l * me_sfont_h + 4), tmp, 0xffff);\r
+ }\r
\r
if (draw_more != NULL)\r
draw_more();\r
\r
static int me_process(menu_entry *entry, int is_next, int is_lr)\r
{\r
+ const char **names;\r
int c;\r
switch (entry->beh)\r
{\r
if (*(int *)entry->var > (int)entry->max)\r
*(int *)entry->var = (int)entry->min;\r
return 1;\r
+ case MB_OPT_ENUM:\r
+ names = (const char **)entry->data;\r
+ for (c = 0; names[c] != NULL; c++)\r
+ ;\r
+ *(int *)entry->var += is_next ? 1 : -1;\r
+ if (*(int *)entry->var < 0)\r
+ *(int *)entry->var = 0;\r
+ if (*(int *)entry->var >= c)\r
+ *(int *)entry->var = c - 1;\r
+ return 1;\r
default:\r
return 0;\r
}\r
continue;\r
}\r
\r
- if (inp & (PBTN_MOK|PBTN_LEFT|PBTN_RIGHT))\r
+ if (inp & (PBTN_MOK|PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R))\r
{\r
- if (menu[sel].handler != NULL) {\r
+ /* require PBTN_MOK for MB_NONE */\r
+ if (menu[sel].handler != NULL && (menu[sel].beh != MB_NONE || (inp & PBTN_MOK))) {\r
ret = menu[sel].handler(menu[sel].id, inp);\r
if (ret) break;\r
- menu_sel_max = me_count(menu) - 1; /* might change */\r
+ menu_sel_max = me_count(menu) - 1; /* might change, so update */\r
}\r
}\r
}\r
}\r
\r
static int mh_saveloadcfg(menu_id id, int keys);\r
-static const char *mgn_savecfg(menu_id id, int *offs);\r
+static const char *mgn_saveloadcfg(menu_id id, int *offs);\r
\r
static menu_entry e_menu_keyconfig[] =\r
{\r
mee_handler_id("Emulator controls", MA_CTRL_EMU, key_config_loop_wrap),\r
mee_onoff ("6 button pad", MA_OPT_6BUTTON_PAD, PicoOpt, POPT_6BTN_PAD),\r
mee_range ("Turbo rate", MA_CTRL_TURBO_RATE, currentConfig.turbo_rate, 1, 30),\r
- mee_handler_mkname_id(MA_OPT_SAVECFG, mh_saveloadcfg, mgn_savecfg),\r
- mee_handler_id("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_saveloadcfg),\r
+ mee_cust_nosave("Save global config", MA_OPT_SAVECFG, mh_saveloadcfg, mgn_saveloadcfg),\r
+ mee_cust_nosave("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_saveloadcfg, mgn_saveloadcfg),\r
mee_label (""),\r
mee_label ("Input devices:"),\r
mee_label_mk (MA_CTRL_DEV_FIRST, mgn_dev_name),\r
return 0;\r
}\r
\r
+static const char h_cdleds[] = "Show power/CD LEDs of emulated console";\r
+static const char h_cdda[] = "Play audio tracks from mp3s/wavs/bins";\r
+static const char h_cdpcm[] = "Emulate PCM audio chip for effects/voices/music";\r
+static const char h_srcart[] = "Emulate the save RAM cartridge accessory\n"\r
+ "most games don't need this";\r
+static const char h_scfx[] = "Emulate scale/rotate ASIC chip for graphics effects\n"\r
+ "disable to improve performance";\r
+static const char h_bsync[] = "More accurate mode for CPUs (needed for some games)\n"\r
+ "disable to improve performance";\r
+\r
static menu_entry e_menu_cd_options[] =\r
{\r
- mee_onoff("CD LEDs", MA_CDOPT_LEDS, currentConfig.EmuOpt, EOPT_EN_CD_LEDS),\r
- mee_onoff("CDDA audio", MA_CDOPT_CDDA, PicoOpt, POPT_EN_MCD_CDDA),\r
- mee_onoff("PCM audio", MA_CDOPT_PCM, PicoOpt, POPT_EN_MCD_PCM),\r
- mee_cust ("ReadAhead buffer", MA_CDOPT_READAHEAD, mh_cdopt_ra, mgn_cdopt_ra),\r
- mee_onoff("SaveRAM cart", MA_CDOPT_SAVERAM, PicoOpt, POPT_EN_MCD_RAMCART),\r
- mee_onoff("Scale/Rot. fx (slow)", MA_CDOPT_SCALEROT_CHIP, PicoOpt, POPT_EN_MCD_GFX),\r
- mee_onoff("Better sync (slow)", MA_CDOPT_BETTER_SYNC, PicoOpt, POPT_EN_MCD_PSYNC),\r
+ mee_onoff_h("CD LEDs", MA_CDOPT_LEDS, currentConfig.EmuOpt, EOPT_EN_CD_LEDS, h_cdleds),\r
+ mee_onoff_h("CDDA audio", MA_CDOPT_CDDA, PicoOpt, POPT_EN_MCD_CDDA, h_cdda),\r
+ mee_onoff_h("PCM audio", MA_CDOPT_PCM, PicoOpt, POPT_EN_MCD_PCM, h_cdpcm),\r
+ mee_cust ("ReadAhead buffer", MA_CDOPT_READAHEAD, mh_cdopt_ra, mgn_cdopt_ra),\r
+ mee_onoff_h("SaveRAM cart", MA_CDOPT_SAVERAM, PicoOpt, POPT_EN_MCD_RAMCART, h_srcart),\r
+ mee_onoff_h("Scale/Rot. fx (slow)", MA_CDOPT_SCALEROT_CHIP, PicoOpt, POPT_EN_MCD_GFX, h_scfx),\r
+ mee_onoff_h("Better sync (slow)", MA_CDOPT_BETTER_SYNC, PicoOpt, POPT_EN_MCD_PSYNC, h_bsync),\r
mee_end,\r
};\r
\r
\r
// ------------ 32X options menu ------------\r
\r
-static const char *get_rname(const char **rn, int val, int *offs)\r
+// convert from multiplier of VClk\r
+static int mh_opt_sh2cycles(menu_id id, int keys)\r
{\r
- int i, len, found = -1, maxlen = 0;\r
+ int *mul = (id == MA_32XOPT_MSH2_CYCLES) ? &p32x_msh2_multiplier : &p32x_ssh2_multiplier;\r
\r
- for (i = 0; rn[i] != NULL; i++) {\r
- len = strlen(rn[i]);\r
- if (len > maxlen)\r
- maxlen = len;\r
- if (i == val)\r
- found = i;\r
- }\r
+ if (keys & (PBTN_LEFT|PBTN_RIGHT))\r
+ *mul += (keys & PBTN_LEFT) ? -10 : 10;\r
+ if (keys & (PBTN_L|PBTN_R))\r
+ *mul += (keys & PBTN_L) ? -100 : 100;\r
+\r
+ if (*mul < 1)\r
+ *mul = 1;\r
+ else if (*mul > (10 << SH2_MULTI_SHIFT))\r
+ *mul = 10 << SH2_MULTI_SHIFT;\r
\r
- *offs = 3 - maxlen;\r
- if (found >= 0)\r
- return rn[found];\r
- return "???";\r
+ return 0;\r
}\r
\r
-static const char *mgn_opt_renderer32x(menu_id id, int *offs)\r
+static const char *mgn_opt_sh2cycles(menu_id id, int *offs)\r
{\r
- return get_rname(renderer_names32x, currentConfig.renderer32x, offs);\r
+ int mul = (id == MA_32XOPT_MSH2_CYCLES) ? p32x_msh2_multiplier : p32x_ssh2_multiplier;\r
+ \r
+ sprintf(static_buff, "%d", 7670 * mul >> SH2_MULTI_SHIFT);\r
+ return static_buff;\r
}\r
\r
+static const char h_32x_enable[] = "Enable emulation of the 32X addon";\r
+static const char h_pwm[] = "Disabling may improve performance, but break sound";\r
+static const char h_sh2cycles[] = "Cycles/millisecond (similar to DOSBox)\n"\r
+ "lower values speed up emulation but break games\n"\r
+ "at least 11000 recommended for compatibility";\r
+\r
static menu_entry e_menu_32x_options[] =\r
{\r
- mee_onoff ("32X enabled", MA_32XOPT_ENABLE_32X, PicoOpt, POPT_EN_32X),\r
- mee_range_cust("32X renderer", MA_32XOPT_RENDERER, currentConfig.renderer32x, 0, 0, mgn_opt_renderer32x),\r
- mee_onoff ("PWM sound", MA_32XOPT_PWM, PicoOpt, POPT_EN_PWM),\r
+ mee_onoff_h ("32X enabled", MA_32XOPT_ENABLE_32X, PicoOpt, POPT_EN_32X, h_32x_enable),\r
+ mee_enum ("32X renderer", MA_32XOPT_RENDERER, currentConfig.renderer32x, renderer_names32x),\r
+ mee_onoff_h ("PWM sound", MA_32XOPT_PWM, PicoOpt, POPT_EN_PWM, h_pwm),\r
+ mee_cust_h ("Master SH2 cycles", MA_32XOPT_MSH2_CYCLES, mh_opt_sh2cycles, mgn_opt_sh2cycles, h_sh2cycles),\r
+ mee_cust_h ("Slave SH2 cycles", MA_32XOPT_SSH2_CYCLES, mh_opt_sh2cycles, mgn_opt_sh2cycles, h_sh2cycles),\r
mee_end,\r
};\r
\r
static int menu_loop_32x_options(menu_id id, int keys)\r
{\r
static int sel = 0;\r
- int i, c;\r
-\r
- for (c = 0; renderer_names32x != NULL && renderer_names32x[c] != NULL; )\r
- c++;\r
- i = me_id2offset(e_menu_32x_options, MA_32XOPT_RENDERER);\r
- e_menu_32x_options[i].max = c > 0 ? (c - 1) : 0;\r
\r
+ me_enable(e_menu_32x_options, MA_32XOPT_RENDERER, renderer_names32x != NULL);\r
me_loop(e_menu_32x_options, &sel, NULL);\r
+\r
return 0;\r
}\r
\r
\r
// ------------ gfx options menu ------------\r
\r
-static const char *mgn_opt_renderer(menu_id id, int *offs)\r
-{\r
- return get_rname(renderer_names, currentConfig.renderer, offs);\r
-}\r
-\r
static menu_entry e_menu_gfx_options[] =\r
{\r
- mee_range_cust("Renderer", MA_OPT_RENDERER, currentConfig.renderer, 0, 0, mgn_opt_renderer),\r
+ mee_enum("Renderer", MA_OPT_RENDERER, currentConfig.renderer, renderer_names),\r
MENU_OPTIONS_GFX\r
mee_end,\r
};\r
static int menu_loop_gfx_options(menu_id id, int keys)\r
{\r
static int sel = 0;\r
- int i, c;\r
-\r
- for (c = 0; renderer_names != NULL && renderer_names[c] != NULL; )\r
- c++;\r
- i = me_id2offset(e_menu_gfx_options, MA_OPT_RENDERER);\r
- e_menu_gfx_options[i].max = c > 0 ? (c - 1) : 0;\r
- me_enable(e_menu_gfx_options, MA_OPT_RENDERER, renderer_names != NULL);\r
\r
+ me_enable(e_menu_gfx_options, MA_OPT_RENDERER, renderer_names[0] != NULL);\r
me_loop(e_menu_gfx_options, &sel, NULL);\r
+\r
return 0;\r
}\r
\r
\r
static int mh_opt_misc(menu_id id, int keys)\r
{\r
- int i;\r
-\r
switch (id) {\r
case MA_OPT_SOUND_QUALITY:\r
PsndRate = sndrate_prevnext(PsndRate, keys & PBTN_RIGHT);\r
case MA_OPT_REGION:\r
region_prevnext(keys & PBTN_RIGHT);\r
break;\r
- case MA_OPT_CONFIRM_STATES:\r
- i = ((currentConfig.EmuOpt>>9)&1) | ((currentConfig.EmuOpt>>10)&2);\r
- i += (keys & PBTN_LEFT) ? -1 : 1;\r
- if (i < 0) i = 0; else if (i > 3) i = 3;\r
- i |= i << 1; i &= ~2;\r
- currentConfig.EmuOpt &= ~0xa00;\r
- currentConfig.EmuOpt |= i << 9;\r
- break;\r
default:\r
break;\r
}\r
me_update_msg("failed to write config");\r
break;\r
case MA_OPT_LOADCFG:\r
- ret = emu_read_config(1, 1);\r
- if (!ret) ret = emu_read_config(0, 1);\r
+ ret = emu_read_config(rom_fname_loaded, 1);\r
+ if (!ret) ret = emu_read_config(NULL, 1);\r
if (ret) me_update_msg("config loaded");\r
else me_update_msg("failed to load config");\r
break;\r
}\r
}\r
\r
-static const char *mgn_opt_c_saves(menu_id id, int *offs)\r
+static const char *mgn_saveloadcfg(menu_id id, int *offs)\r
{\r
- switch ((currentConfig.EmuOpt >> 9) & 5) {\r
- default: return "OFF";\r
- case 1: return "writes";\r
- case 4: return "loads";\r
- case 5: return "both";\r
- }\r
-}\r
-\r
-static const char *mgn_savecfg(menu_id id, int *offs)\r
-{\r
- strcpy(static_buff, "Save global config");\r
+ static_buff[0] = 0;\r
if (config_slot != 0)\r
- sprintf(static_buff + strlen(static_buff), " (profile: %i)", config_slot);\r
+ sprintf(static_buff, "[%i]", config_slot);\r
return static_buff;\r
}\r
\r
-static const char *mgn_loadcfg(menu_id id, int *offs)\r
-{\r
- sprintf(static_buff, "Load cfg from profile %i", config_slot);\r
- return static_buff;\r
-}\r
+static const char *men_confirm_save[] = { "OFF", "writes", "loads", "both", NULL };\r
+static const char h_confirm_save[] = "Ask for confirmation when overwriting save,\n"\r
+ "loading state or both";\r
\r
static menu_entry e_menu_options[] =\r
{\r
mee_onoff ("Show FPS", MA_OPT_SHOW_FPS, currentConfig.EmuOpt, EOPT_SHOW_FPS),\r
mee_onoff ("Enable sound", MA_OPT_ENABLE_SOUND, currentConfig.EmuOpt, EOPT_EN_SOUND),\r
mee_cust ("Sound Quality", MA_OPT_SOUND_QUALITY, mh_opt_misc, mgn_opt_sound),\r
- mee_cust ("Confirm savestate", MA_OPT_CONFIRM_STATES,mh_opt_misc, mgn_opt_c_saves),\r
+ mee_enum_h ("Confirm savestate", MA_OPT_CONFIRM_STATES,currentConfig.confirm_save, men_confirm_save, h_confirm_save),\r
mee_range (cpu_clk_name, MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 900),\r
mee_handler ("[Display options]", menu_loop_gfx_options),\r
mee_handler ("[Sega/Mega CD options]", menu_loop_cd_options),\r
mee_handler ("[32X options]", menu_loop_32x_options),\r
mee_handler ("[Advanced options]", menu_loop_adv_options),\r
- mee_handler_mkname_id(MA_OPT_SAVECFG, mh_saveloadcfg, mgn_savecfg),\r
- mee_handler_id("Save cfg for current game only", MA_OPT_SAVECFG_GAME, mh_saveloadcfg),\r
- mee_handler_mkname_id(MA_OPT_LOADCFG, mh_saveloadcfg, mgn_loadcfg),\r
+ mee_cust_nosave("Save global config", MA_OPT_SAVECFG, mh_saveloadcfg, mgn_saveloadcfg),\r
+ mee_cust_nosave("Save cfg for loaded game",MA_OPT_SAVECFG_GAME, mh_saveloadcfg, mgn_saveloadcfg),\r
+ mee_cust_nosave("Load cfg from profile", MA_OPT_LOADCFG, mh_saveloadcfg, mgn_saveloadcfg),\r
mee_handler ("Restore defaults", mh_restore_defaults),\r
mee_end,\r
};\r
mee_handler_id("Load State", MA_MAIN_LOAD_STATE, main_menu_handler),\r
mee_handler_id("Reset game", MA_MAIN_RESET_GAME, main_menu_handler),\r
mee_handler_id("Load new ROM/ISO", MA_MAIN_LOAD_ROM, main_menu_handler),\r
- mee_handler_id("Change options", MA_MAIN_OPTIONS, menu_loop_options),\r
- mee_handler_id("Configure controls", MA_MAIN_OPTIONS, menu_loop_keyconfig),\r
+ mee_handler ("Change options", menu_loop_options),\r
+ mee_handler ("Configure controls", menu_loop_keyconfig),\r
mee_handler_id("Credits", MA_MAIN_CREDITS, main_menu_handler),\r
mee_handler_id("Patches / GameGenie",MA_MAIN_PATCHES, main_menu_handler),\r
mee_handler_id("Exit", MA_MAIN_EXIT, main_menu_handler),\r
notaz.gp2x.de / libpicofe.git / blobdiff