}\r
\r
// load custom font and selector (stored as 1st symbol in font table)\r
- readpng(menu_font_data, "skin/font.png", READPNG_FONT);\r
+ emu_make_path(buff, "skin/font.png", sizeof(buff));\r
+ readpng(menu_font_data, buff, READPNG_FONT);\r
// default selector symbol is '>'\r
memcpy(menu_font_data, menu_font_data + ((int)'>') * me_mfont_w * me_mfont_h / 2,\r
me_mfont_w * me_mfont_h / 2);\r
- readpng(menu_font_data, "skin/selector.png", READPNG_SELECTOR);\r
+ emu_make_path(buff, "skin/selector.png", sizeof(buff));\r
+ readpng(menu_font_data, buff, READPNG_SELECTOR);\r
\r
// load custom colors\r
- f = fopen("skin/skin.txt", "r");\r
+ emu_make_path(buff, "skin/skin.txt", sizeof(buff));\r
+ f = fopen(buff, "r");\r
if (f != NULL)\r
{\r
lprintf("found skin.txt\n");\r
static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_idx,\r
int sel, int dev_id, int dev_count, int is_bind)\r
{\r
+ char buff[64], buff2[32];\r
const char *dev_name;\r
int x, y, w, i;\r
\r
\r
x = g_screen_width / 2 - w / 2;\r
\r
- if (dev_count > 1) {\r
- text_out16(x, g_screen_height - 4 * me_mfont_h, "Viewing binds for:");\r
- text_out16(x, g_screen_height - 3 * me_mfont_h, dev_name);\r
+ if (!is_bind) {\r
+ snprintf(buff2, sizeof(buff2), "%s", in_get_key_name(-1, -PBTN_MOK));\r
+ snprintf(buff, sizeof(buff), "%s - bind, %s - clear", buff2,\r
+ in_get_key_name(-1, -PBTN_MA2));\r
+ text_out16(x, g_screen_height - 4 * me_mfont_h, buff);\r
}\r
+ else\r
+ text_out16(x, g_screen_height - 4 * me_mfont_h, "Press a button to bind/unbind");\r
\r
- if (is_bind)\r
- text_out16(x, g_screen_height - 2 * me_mfont_h, "Press a button to bind/unbind");\r
- else if (dev_count > 1)\r
+ if (dev_count > 1) {\r
+ text_out16(x, g_screen_height - 3 * me_mfont_h, dev_name);\r
text_out16(x, g_screen_height - 2 * me_mfont_h, "Press left/right for other devs");\r
+ }\r
\r
plat_video_menu_end();\r
}\r
{\r
int i, sel = 0, menu_sel_max = opt_cnt - 1;\r
int dev_id, dev_count, kc, is_down, mkey;\r
- int unbind, bindtype, mask;\r
+ int unbind, bindtype, mask_shift;\r
\r
for (i = 0, dev_id = -1, dev_count = 0; i < IN_MAX_DEVS; i++) {\r
if (in_get_dev_name(i, 1, 0) != NULL) {\r
return;\r
}\r
\r
+ mask_shift = 0;\r
+ if (player_idx == 1)\r
+ mask_shift = 16;\r
+ bindtype = player_idx >= 0 ? IN_BINDTYPE_PLAYER12 : IN_BINDTYPE_EMU;\r
+\r
for (;;)\r
{\r
draw_key_config(opts, opt_cnt, player_idx, sel, dev_id, dev_count, 0);\r
- mkey = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MBACK|PBTN_MOK, 100);\r
+ mkey = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MBACK|PBTN_MOK|PBTN_MA2, 100);\r
switch (mkey) {\r
case PBTN_UP: sel--; if (sel < 0) sel = menu_sel_max; continue;\r
case PBTN_DOWN: sel++; if (sel > menu_sel_max) sel = 0; continue;\r
return;\r
while (in_menu_wait_any(30) & PBTN_MOK);\r
break;\r
+ case PBTN_MA2:\r
+ in_unbind_all(dev_id, opts[sel].mask << mask_shift, bindtype);\r
+ continue;\r
default:continue;\r
}\r
\r
for (is_down = 1; is_down; )\r
kc = in_update_keycode(&dev_id, &is_down, -1);\r
\r
- bindtype = player_idx >= 0 ? IN_BINDTYPE_PLAYER12 : IN_BINDTYPE_EMU;\r
- mask = opts[sel].mask;\r
- if (player_idx == 1)\r
- mask <<= 16;\r
-\r
- i = count_bound_keys(dev_id, mask, bindtype);\r
+ i = count_bound_keys(dev_id, opts[sel].mask << mask_shift, bindtype);\r
unbind = (i > 0);\r
\r
/* allow combos if device supports them */\r
in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS))\r
unbind = 0;\r
\r
- in_bind_key(dev_id, kc, bindtype, mask, unbind);\r
+ in_bind_key(dev_id, kc, opts[sel].mask << mask_shift, bindtype, unbind);\r
}\r
}\r
\r
static int menu_loop_keyconfig(menu_id id, int keys)\r
{\r
static int sel = 0;\r
+\r
+ me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, rom_loaded);\r
me_loop(e_menu_keyconfig, &sel);\r
return 0;\r
}\r
\r
// ------------ gfx options menu ------------\r
\r
+static int mh_opt_render(menu_id id, int keys)\r
+{\r
+ plat_video_toggle_renderer((keys & PBTN_RIGHT) ? 1 : 0, 1);\r
+ return 0;\r
+}\r
+\r
+static const char *mgn_opt_renderer(menu_id id, int *offs)\r
+{\r
+ *offs = -11;\r
+ if (PicoOpt & POPT_ALT_RENDERER)\r
+ return " 8bit fast";\r
+ else if (currentConfig.EmuOpt & EOPT_16BPP)\r
+ return "16bit accurate";\r
+ else\r
+ return " 8bit accurate";\r
+}\r
+\r
static const char *mgn_opt_scaling(menu_id id, int *offs)\r
{\r
*offs = -13;\r
\r
static menu_entry e_menu_gfx_options[] =\r
{\r
+ mee_cust ("Renderer", MA_OPT_RENDERER, mh_opt_render, mgn_opt_renderer),\r
mee_range_cust("Scaling", MA_OPT_SCALING, currentConfig.scaling, 0, 3, mgn_opt_scaling),\r
+ mee_onoff ("Tearing Fix", MA_OPT_TEARING_FIX, currentConfig.EmuOpt, EOPT_WIZ_TEAR_FIX),\r
mee_range_cust("Gamma correction", MA_OPT2_GAMMA, currentConfig.gamma, 1, 300, mgn_aopt_gamma),\r
mee_onoff ("A_SN's gamma curve", MA_OPT2_A_SN_GAMMA, currentConfig.EmuOpt, EOPT_A_SN_GAMMA),\r
mee_onoff ("Perfect vsync", MA_OPT2_VSYNC, currentConfig.EmuOpt, EOPT_PSYNC),\r
\r
static menu_entry e_menu_options[];\r
\r
-/* TODO: move to plat */\r
-static int mh_opt_render(menu_id id, int keys)\r
-{\r
- if (keys & PBTN_LEFT) {\r
- if (PicoOpt&0x10) PicoOpt&= ~0x10;\r
- else if (!(currentConfig.EmuOpt &0x80))currentConfig.EmuOpt |= 0x80;\r
- } else {\r
- if (PicoOpt&0x10) return 0;\r
- else if (!(currentConfig.EmuOpt &0x80))PicoOpt|= 0x10;\r
- else if ( currentConfig.EmuOpt &0x80) currentConfig.EmuOpt &= ~0x80;\r
- }\r
- return 0;\r
-}\r
-\r
static int sndrate_prevnext(int rate, int dir)\r
{\r
static const int rates[] = { 8000, 11025, 16000, 22050, 44100 };\r
return 1;\r
}\r
\r
-static const char *mgn_opt_renderer(menu_id id, int *offs)\r
+static int mh_restore_defaults(menu_id id, int keys)\r
{\r
- *offs = -6;\r
- if (PicoOpt & POPT_ALT_RENDERER)\r
- return " 8bit fast";\r
- else if (currentConfig.EmuOpt & 0x80)\r
- return "16bit accurate";\r
- else\r
- return " 8bit accurate";\r
+ emu_set_defconfig();\r
+ me_update_msg("defaults restored");\r
+ return 1;\r
}\r
\r
static const char *mgn_opt_fskip(menu_id id, int *offs)\r
mee_range ("Save slot", MA_OPT_SAVE_SLOT, state_slot, 0, 9),\r
mee_range_cust("Frameskip", MA_OPT_FRAMESKIP, currentConfig.Frameskip, -1, 16, mgn_opt_fskip),\r
mee_cust ("Region", MA_OPT_REGION, mh_opt_misc, mgn_opt_region),\r
- mee_cust ("Renderer", MA_OPT_RENDERER, mh_opt_render, mgn_opt_renderer),\r
- mee_onoff ("Show FPS", MA_OPT_SHOW_FPS, currentConfig.EmuOpt, 0x002),\r
- mee_onoff ("Enable sound", MA_OPT_ENABLE_SOUND, currentConfig.EmuOpt, 0x004),\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_range (cpu_clk_name, MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 900),\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_handler ("Restore defaults", mh_restore_defaults),\r
mee_end,\r
};\r
\r
notaz.gp2x.de / libpicofe.git / blobdiff