X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=picodrive.git;a=blobdiff_plain;f=platform%2Fcommon%2Fmenu_pico.c;h=cc1163826236a1d637bf60bc178900a1d27c1a71;hp=da1a6be3d933a318dbe4fdb83d98afa4d5d08325;hb=e0bcb7a90d06b295b1ca989b6ad70412912cca5b;hpb=e743be2070a13d14cae39a55b815b62b0edb6776 diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c index da1a6be..cc11638 100644 --- a/platform/common/menu_pico.c +++ b/platform/common/menu_pico.c @@ -1,30 +1,53 @@ +/* + * PicoDrive + * (C) notaz, 2010,2011 + * + * This work is licensed under the terms of MAME license. + * See COPYING file in the top-level directory. + */ +#include #include +#include #include "emu.h" #include "menu_pico.h" #include "input_pico.h" +#include "version.h" -#include - -#include +#include #include +#ifdef PANDORA +#define MENU_X2 1 +#else +#define MENU_X2 0 +#endif + // FIXME #define REVISION "0" static const char *rom_exts[] = { - "zip", "bin", "smd", "gen", - "iso", "cso", "cue", NULL + "zip", + "bin", "smd", "gen", "md", + "iso", "cso", "cue", + "32x", + "sms", + NULL }; // rrrr rggg gggb bbbb static unsigned short fname2color(const char *fname) { - const char *ext = fname + strlen(fname) - 3; static const char *other_exts[] = { "gmv", "pat" }; + const char *ext; int i; - if (ext < fname) ext = fname; + ext = strrchr(fname, '.'); + if (ext++ == NULL) { + ext = fname + strlen(fname) - 3; + if (ext < fname) ext = fname; + } + for (i = 0; rom_exts[i] != NULL; i++) if (strcasecmp(ext, rom_exts[i]) == 0) return 0xbdff; // FIXME: mk defines for (i = 0; i < array_size(other_exts); i++) @@ -34,6 +57,8 @@ static unsigned short fname2color(const char *fname) #include "../libpicofe/menu.c" +static const char *men_dummy[] = { NULL }; + /* platform specific options and handlers */ #if defined(__GP2X__) #include "../gp2x/menu.c" @@ -42,23 +67,66 @@ static unsigned short fname2color(const char *fname) #else #define MENU_OPTIONS_GFX #define MENU_OPTIONS_ADV -#define menu_main_plat_draw NULL #endif +static void make_bg(int no_scale) +{ + unsigned short *src = (void *)g_menubg_src_ptr; + int w = g_screen_width, h = g_screen_height; + short *dst; + int x, y; + + if (src == NULL) { + memset(g_menubg_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2); + return; + } + + if (!no_scale && g_menuscreen_w / w >= 2 && g_menuscreen_h / h >= 2) + { + unsigned int t, *d = g_menubg_ptr; + d += (g_menuscreen_h / 2 - h * 2 / 2) + * g_menuscreen_w / 2; + d += (g_menuscreen_w / 2 - w * 2 / 2) / 2; + for (y = 0; y < h; y++, src += w, d += g_menuscreen_w*2/2) { + for (x = 0; x < w; x++) { + t = src[x]; + t = ((t & 0xf79e)>>1) - ((t & 0xc618)>>3); + t |= t << 16; + d[x] = d[x + g_menuscreen_w / 2] = t; + } + } + return; + } + + if (w > g_menuscreen_w) + w = g_menuscreen_w; + if (h > g_menuscreen_h) + h = g_menuscreen_h; + dst = (short *)g_menubg_ptr + + (g_menuscreen_h / 2 - h / 2) * g_menuscreen_w + + (g_menuscreen_w / 2 - w / 2); + + // darken the active framebuffer + for (; h > 0; dst += g_menuscreen_w, src += g_screen_width, h--) + menu_darken_bg(dst, src, w, 1); +} + static void menu_enter(int is_rom_loaded) { if (is_rom_loaded) { - // darken the active framebuffer - menu_darken_bg(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h, 1); + make_bg(0); } else { + int pos; char buff[256]; + pos = plat_get_skin_dir(buff, 256); + strcpy(buff + pos, "background.png"); // should really only happen once, on startup.. - emu_make_path(buff, "skin/background.png", sizeof(buff)); - if (readpng(g_menubg_ptr, buff, READPNG_BG, g_menuscreen_w, g_menuscreen_h) < 0) + if (readpng(g_menubg_ptr, buff, READPNG_BG, + g_menuscreen_w, g_menuscreen_h) < 0) memset(g_menubg_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2); } @@ -70,7 +138,7 @@ static void draw_savestate_bg(int slot) const char *fname; void *tmp_state; - fname = emu_get_save_fname(1, 0, slot); + fname = emu_get_save_fname(1, 0, slot, NULL); if (!fname) return; @@ -81,7 +149,7 @@ static void draw_savestate_bg(int slot) /* do a frame and fetch menu bg */ pemu_forced_frame(0, 0); - menu_darken_bg(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h, 1); + make_bg(0); PicoTmpStateRestore(tmp_state); } @@ -290,12 +358,15 @@ static const char *mgn_dev_name(int id, int *offs) static int mh_saveloadcfg(int id, int keys); static const char *mgn_saveloadcfg(int id, int *offs); +const char *indev_names[] = { "none", "3 button pad", "6 button pad", NULL }; + static menu_entry e_menu_keyconfig[] = { mee_handler_id("Player 1", MA_CTRL_PLAYER1, key_config_loop_wrap), mee_handler_id("Player 2", MA_CTRL_PLAYER2, key_config_loop_wrap), mee_handler_id("Emulator controls", MA_CTRL_EMU, key_config_loop_wrap), - mee_onoff ("6 button pad", MA_OPT_6BUTTON_PAD, PicoOpt, POPT_6BTN_PAD), + mee_enum ("Input device 1", MA_OPT_INPUT_DEV0, currentConfig.input_dev0, indev_names), + mee_enum ("Input device 2", MA_OPT_INPUT_DEV1, currentConfig.input_dev1, indev_names), mee_range ("Turbo rate", MA_CTRL_TURBO_RATE, currentConfig.turbo_rate, 1, 30), mee_range ("Analog deadzone", MA_CTRL_DEADZONE, currentConfig.analog_deadzone, 1, 99), mee_cust_nosave("Save global config", MA_OPT_SAVECFG, mh_saveloadcfg, mgn_saveloadcfg), @@ -316,38 +387,17 @@ static int menu_loop_keyconfig(int id, int keys) { static int sel = 0; - me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, rom_loaded); + me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, PicoGameLoaded); me_loop(e_menu_keyconfig, &sel); - return 0; -} -// ------------ SCD options menu ------------ - -static const char *mgn_cdopt_ra(int id, int *offs) -{ - *offs = -5; - if (PicoCDBuffers <= 0) - return " OFF"; - sprintf(static_buff, "%5iK", PicoCDBuffers * 2); - return static_buff; -} + PicoSetInputDevice(0, currentConfig.input_dev0); + PicoSetInputDevice(1, currentConfig.input_dev1); -static int mh_cdopt_ra(int id, int keys) -{ - if (keys & PBTN_LEFT) { - PicoCDBuffers >>= 1; - if (PicoCDBuffers < 2) - PicoCDBuffers = 0; - } else { - if (PicoCDBuffers <= 0) - PicoCDBuffers = 1; - PicoCDBuffers <<= 1; - if (PicoCDBuffers > 8*1024) - PicoCDBuffers = 8*1024; // 16M - } return 0; } +// ------------ SCD options menu ------------ + static const char h_cdleds[] = "Show power/CD LEDs of emulated console"; static const char h_cdda[] = "Play audio tracks from mp3s/wavs/bins"; static const char h_cdpcm[] = "Emulate PCM audio chip for effects/voices/music"; @@ -363,10 +413,8 @@ static menu_entry e_menu_cd_options[] = mee_onoff_h("CD LEDs", MA_CDOPT_LEDS, currentConfig.EmuOpt, EOPT_EN_CD_LEDS, h_cdleds), mee_onoff_h("CDDA audio", MA_CDOPT_CDDA, PicoOpt, POPT_EN_MCD_CDDA, h_cdda), mee_onoff_h("PCM audio", MA_CDOPT_PCM, PicoOpt, POPT_EN_MCD_PCM, h_cdpcm), - mee_cust ("ReadAhead buffer", MA_CDOPT_READAHEAD, mh_cdopt_ra, mgn_cdopt_ra), mee_onoff_h("SaveRAM cart", MA_CDOPT_SAVERAM, PicoOpt, POPT_EN_MCD_RAMCART, h_srcart), - mee_onoff_h("Scale/Rot. fx (slow)", MA_CDOPT_SCALEROT_CHIP, PicoOpt, POPT_EN_MCD_GFX, h_scfx), - mee_onoff_h("Better sync (slow)", MA_CDOPT_BETTER_SYNC, PicoOpt, POPT_EN_MCD_PSYNC, h_bsync), + mee_onoff_h("Scale/Rot. fx", MA_CDOPT_SCALEROT_CHIP, PicoOpt, POPT_EN_MCD_GFX, h_scfx), mee_end, }; @@ -384,26 +432,28 @@ static int menu_loop_cd_options(int id, int keys) // convert from multiplier of VClk static int mh_opt_sh2cycles(int id, int keys) { - int *mul = (id == MA_32XOPT_MSH2_CYCLES) ? &p32x_msh2_multiplier : &p32x_ssh2_multiplier; + int *khz = (id == MA_32XOPT_MSH2_CYCLES) ? + ¤tConfig.msh2_khz : ¤tConfig.ssh2_khz; if (keys & (PBTN_LEFT|PBTN_RIGHT)) - *mul += (keys & PBTN_LEFT) ? -10 : 10; + *khz += (keys & PBTN_LEFT) ? -50 : 50; if (keys & (PBTN_L|PBTN_R)) - *mul += (keys & PBTN_L) ? -100 : 100; + *khz += (keys & PBTN_L) ? -500 : 500; - if (*mul < 1) - *mul = 1; - else if (*mul > (10 << SH2_MULTI_SHIFT)) - *mul = 10 << SH2_MULTI_SHIFT; + if (*khz < 1) + *khz = 1; + else if (*khz > 0x7fffffff / 1000) + *khz = 0x7fffffff / 1000; return 0; } static const char *mgn_opt_sh2cycles(int id, int *offs) { - int mul = (id == MA_32XOPT_MSH2_CYCLES) ? p32x_msh2_multiplier : p32x_ssh2_multiplier; - - sprintf(static_buff, "%d", 7670 * mul >> SH2_MULTI_SHIFT); + int khz = (id == MA_32XOPT_MSH2_CYCLES) ? + currentConfig.msh2_khz : currentConfig.ssh2_khz; + + sprintf(static_buff, "%d", khz); return static_buff; } @@ -430,6 +480,8 @@ static int menu_loop_32x_options(int id, int keys) me_enable(e_menu_32x_options, MA_32XOPT_RENDERER, renderer_names32x[0] != NULL); me_loop(e_menu_32x_options, &sel); + Pico32xSetClocks(currentConfig.msh2_khz * 1000, currentConfig.msh2_khz * 1000); + return 0; } @@ -448,6 +500,8 @@ static menu_entry e_menu_adv_options[] = mee_onoff ("Don't save last used ROM", MA_OPT2_NO_LAST_ROM, currentConfig.EmuOpt, EOPT_NO_AUTOSVCFG), mee_onoff ("Disable idle loop patching",MA_OPT2_NO_IDLE_LOOPS,PicoOpt, POPT_DIS_IDLE_DET), mee_onoff ("Disable frame limiter", MA_OPT2_NO_FRAME_LIMIT,currentConfig.EmuOpt, EOPT_NO_FRMLIMIT), + mee_onoff ("Enable dynarecs", MA_OPT2_DYNARECS, PicoOpt, POPT_EN_DRC), + mee_onoff ("Status line in main menu", MA_OPT2_STATUS_LINE, currentConfig.EmuOpt, EOPT_SHOW_RTC), MENU_OPTIONS_ADV mee_end, }; @@ -461,9 +515,20 @@ static int menu_loop_adv_options(int id, int keys) // ------------ gfx options menu ------------ +static const char h_gamma[] = "Gamma/brightness adjustment (default 1.00)"; + +static const char *mgn_aopt_gamma(int id, int *offs) +{ + sprintf(static_buff, "%i.%02i", currentConfig.gamma / 100, currentConfig.gamma % 100); + return static_buff; +} + static menu_entry e_menu_gfx_options[] = { - mee_enum("Renderer", MA_OPT_RENDERER, currentConfig.renderer, renderer_names), + mee_enum ("Video output mode", MA_OPT_VOUT_MODE, plat_target.vout_method, men_dummy), + mee_enum ("Renderer", MA_OPT_RENDERER, currentConfig.renderer, renderer_names), + mee_enum ("Filter", MA_OPT3_FILTERING, currentConfig.filter, men_dummy), + mee_range_cust_h("Gamma correction", MA_OPT2_GAMMA, currentConfig.gamma, 1, 300, mgn_aopt_gamma, h_gamma), MENU_OPTIONS_GFX mee_end, }; @@ -655,7 +720,7 @@ static menu_entry e_menu_options[] = mee_onoff ("Enable sound", MA_OPT_ENABLE_SOUND, currentConfig.EmuOpt, EOPT_EN_SOUND), mee_cust ("Sound Quality", MA_OPT_SOUND_QUALITY, mh_opt_misc, mgn_opt_sound), mee_enum_h ("Confirm savestate", MA_OPT_CONFIRM_STATES,currentConfig.confirm_save, men_confirm_save, h_confirm_save), - mee_range ("", MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 1200), + mee_range ("", MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 3200), mee_handler ("[Display options]", menu_loop_gfx_options), mee_handler ("[Sega/Mega CD options]", menu_loop_cd_options), #ifndef NO_32X @@ -672,11 +737,8 @@ static menu_entry e_menu_options[] = static int menu_loop_options(int id, int keys) { static int sel = 0; - int i; - i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS); - e_menu_options[i].enabled = e_menu_options[i].name[0] ? 1 : 0; - me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, rom_loaded); + me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, PicoGameLoaded); me_enable(e_menu_options, MA_OPT_LOADCFG, config_slot != config_slot_current); me_loop(e_menu_options, &sel); @@ -699,10 +761,10 @@ static void mplayer_loop(void) PDebugZ80Frame(); if (in_menu_wait_any(NULL, 0) & PBTN_MA3) break; - pemu_sound_wait(); + emu_sound_wait(); } - pemu_sound_stop(); + emu_sound_stop(); } static void draw_text_debug(const char *str, int skip, int from) @@ -741,20 +803,24 @@ static void draw_text_debug(const char *str, int skip, int from) static void draw_frame_debug(void) { char layer_str[48] = "layers: "; - if (PicoDrawMask & PDRAW_LAYERB_ON) memcpy(layer_str + 8, "B", 1); - if (PicoDrawMask & PDRAW_LAYERA_ON) memcpy(layer_str + 10, "A", 1); - if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6); - if (PicoDrawMask & PDRAW_SPRITES_HI_ON) memcpy(layer_str + 19, "spr_hi", 6); - if (PicoDrawMask & PDRAW_32X_ON) memcpy(layer_str + 26, "32x", 4); + struct PicoVideo *pv = &Pico.video; + + if (!(pv->debug_p & PVD_KILL_B)) memcpy(layer_str + 8, "B", 1); + if (!(pv->debug_p & PVD_KILL_A)) memcpy(layer_str + 10, "A", 1); + if (!(pv->debug_p & PVD_KILL_S_LO)) memcpy(layer_str + 12, "spr_lo", 6); + if (!(pv->debug_p & PVD_KILL_S_HI)) memcpy(layer_str + 19, "spr_hi", 6); + if (!(pv->debug_p & PVD_KILL_32X)) memcpy(layer_str + 26, "32x", 4); pemu_forced_frame(1, 0); - memcpy(g_menuscreen_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2); + make_bg(1); + smalltext_out16(4, 1, "build: r" REVISION " "__DATE__ " " __TIME__ " " COMPILER, 0xffff); smalltext_out16(4, g_menuscreen_h - me_sfont_h, layer_str, 0xffff); } static void debug_menu_loop(void) { + struct PicoVideo *pv = &Pico.video; int inp, mode = 0; int spr_offs = 0, dumped = 0; char *tmp; @@ -776,7 +842,7 @@ static void debug_menu_loop(void) case 1: draw_frame_debug(); break; case 2: pemu_forced_frame(1, 0); - menu_darken_bg(g_menuscreen_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h, 0); + make_bg(1); PDebugShowSpriteStats((unsigned short *)g_menuscreen_ptr + (g_menuscreen_h/2 - 240/2)*g_menuscreen_w + g_menuscreen_w/2 - 320/2, g_menuscreen_w); break; @@ -815,11 +881,11 @@ static void debug_menu_loop(void) } break; case 1: - if (inp & PBTN_LEFT) PicoDrawMask ^= PDRAW_LAYERB_ON; - if (inp & PBTN_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON; - if (inp & PBTN_DOWN) PicoDrawMask ^= PDRAW_SPRITES_LOW_ON; - if (inp & PBTN_UP) PicoDrawMask ^= PDRAW_SPRITES_HI_ON; - if (inp & PBTN_MA2) PicoDrawMask ^= PDRAW_32X_ON; + if (inp & PBTN_LEFT) pv->debug_p ^= PVD_KILL_B; + if (inp & PBTN_RIGHT) pv->debug_p ^= PVD_KILL_A; + if (inp & PBTN_DOWN) pv->debug_p ^= PVD_KILL_S_LO; + if (inp & PBTN_UP) pv->debug_p ^= PVD_KILL_S_HI; + if (inp & PBTN_MA2) pv->debug_p ^= PVD_KILL_32X; if (inp & PBTN_MOK) { PsndOut = NULL; // just in case PicoSkipFrame = 1; @@ -839,16 +905,29 @@ static void debug_menu_loop(void) // ------------ main menu ------------ +static void draw_frame_credits(void) +{ + smalltext_out16(4, 1, "build: " __DATE__ " " __TIME__, 0xe7fc); +} + static const char credits[] = - "PicoDrive v" VERSION " (c) notaz, 2006-2011\n\n\n" + "PicoDrive v" VERSION " (c) notaz, 2006-2013\n\n\n" "Credits:\n" - "fDave: Cyclone 68000 core,\n" - " base code of PicoDrive\n" + "fDave: initial code\n" +#ifdef EMU_C68K + " Cyclone 68000 core\n" +#else + "Stef, Chui: FAME/C 68k core\n" +#endif +#ifdef _USE_DRZ80 "Reesy & FluBBa: DrZ80 core\n" - "MAME devs: YM2612 and SN76496 cores\n" +#else + "Stef, NJ: CZ80 core\n" +#endif + "MAME devs: SH2, YM2612 and SN76496 cores\n" + "Eke, Stef: some Sega CD code\n" "Inder, ketchupgun: graphics\n" #ifdef __GP2X__ - "rlyeh and others: minimal SDK\n" "Squidge: mmuhack\n" "Dzz: ARM940 sample\n" #endif @@ -857,21 +936,56 @@ static const char credits[] = " Charles MacDonald, Haze,\n" " Stephane Dallongeville,\n" " Lordus, Exophase, Rokas,\n" - " Nemesis, Tasco Deluxe"; + " Eke, Nemesis, Tasco Deluxe"; -static const char *romsel_run(void) +static void menu_main_draw_status(void) { - const char *ret; - char *sel_name; + static time_t last_bat_read = 0; + static int last_bat_val = -1; + unsigned short *bp = g_screen_ptr; + int bat_h = me_mfont_h * 2 / 3; + int i, u, w, wfill, batt_val; + struct tm *tmp; + time_t ltime; + char time_s[16]; + + if (!(currentConfig.EmuOpt & EOPT_SHOW_RTC)) + return; - sel_name = malloc(sizeof(rom_fname_loaded)); - if (sel_name == NULL) - return NULL; - strcpy(sel_name, rom_fname_loaded); + ltime = time(NULL); + tmp = gmtime(<ime); + strftime(time_s, sizeof(time_s), "%H:%M", tmp); - ret = menu_loop_romsel(sel_name, sizeof(rom_fname_loaded), rom_exts, NULL); - free(sel_name); - return ret; + text_out16(g_screen_width - me_mfont_w * 6, me_mfont_h + 2, time_s); + + if (ltime - last_bat_read > 10) { + last_bat_read = ltime; + last_bat_val = batt_val = plat_target_bat_capacity_get(); + } + else + batt_val = last_bat_val; + + if (batt_val < 0 || batt_val > 100) + return; + + /* battery info */ + bp += (me_mfont_h * 2 + 2) * g_screen_width + g_screen_width - me_mfont_w * 3 - 3; + for (i = 0; i < me_mfont_w * 2; i++) + bp[i] = menu_text_color; + for (i = 0; i < me_mfont_w * 2; i++) + bp[i + g_screen_width * bat_h] = menu_text_color; + for (i = 0; i <= bat_h; i++) + bp[i * g_screen_width] = + bp[i * g_screen_width + me_mfont_w * 2] = menu_text_color; + for (i = 2; i < bat_h - 1; i++) + bp[i * g_screen_width - 1] = + bp[i * g_screen_width - 2] = menu_text_color; + + w = me_mfont_w * 2 - 1; + wfill = batt_val * w / 100; + for (u = 1; u < bat_h; u++) + for (i = 0; i < wfill; i++) + bp[(w - i) + g_screen_width * u] = menu_text_color; } static int main_menu_handler(int id, int keys) @@ -881,40 +995,52 @@ static int main_menu_handler(int id, int keys) switch (id) { case MA_MAIN_RESUME_GAME: - if (rom_loaded) + if (PicoGameLoaded) return 1; break; case MA_MAIN_SAVE_STATE: - if (rom_loaded) + if (PicoGameLoaded) return menu_loop_savestate(0); break; case MA_MAIN_LOAD_STATE: - if (rom_loaded) + if (PicoGameLoaded) return menu_loop_savestate(1); break; case MA_MAIN_RESET_GAME: - if (rom_loaded) { + if (PicoGameLoaded) { emu_reset_game(); return 1; } break; case MA_MAIN_LOAD_ROM: - ret_name = romsel_run(); + rom_fname_reload = NULL; + ret_name = menu_loop_romsel(rom_fname_loaded, + sizeof(rom_fname_loaded), rom_exts, NULL); if (ret_name != NULL) { lprintf("selected file: %s\n", ret_name); + rom_fname_reload = ret_name; engineState = PGS_ReloadRom; return 1; } break; + case MA_MAIN_CHANGE_CD: + if (PicoAHW & PAHW_MCD) { + // if cd is loaded, cdd_unload() triggers eject and + // returns 1, else we'll select and load new CD here + if (!cdd_unload()) + menu_loop_tray(); + return 1; + } + break; case MA_MAIN_CREDITS: - draw_menu_message(credits, NULL); + draw_menu_message(credits, draw_frame_credits); in_menu_wait(PBTN_MOK|PBTN_MBACK, NULL, 70); break; case MA_MAIN_EXIT: engineState = PGS_Quit; return 1; case MA_MAIN_PATCHES: - if (rom_loaded && PicoPatches) { + if (PicoGameLoaded && PicoPatches) { menu_loop_patches(); PicoPatchApply(); menu_update_msg("Patches applied"); @@ -939,6 +1065,7 @@ static menu_entry e_menu_main[] = mee_handler_id("Load State", MA_MAIN_LOAD_STATE, main_menu_handler), mee_handler_id("Reset game", MA_MAIN_RESET_GAME, main_menu_handler), mee_handler_id("Load new ROM/ISO", MA_MAIN_LOAD_ROM, main_menu_handler), + mee_handler_id("Change CD/ISO", MA_MAIN_CHANGE_CD, main_menu_handler), mee_handler ("Change options", menu_loop_options), mee_handler ("Configure controls", menu_loop_keyconfig), mee_handler_id("Credits", MA_MAIN_CREDITS, main_menu_handler), @@ -951,17 +1078,18 @@ void menu_loop(void) { static int sel = 0; - me_enable(e_menu_main, MA_MAIN_RESUME_GAME, rom_loaded); - me_enable(e_menu_main, MA_MAIN_SAVE_STATE, rom_loaded); - me_enable(e_menu_main, MA_MAIN_LOAD_STATE, rom_loaded); - me_enable(e_menu_main, MA_MAIN_RESET_GAME, rom_loaded); + me_enable(e_menu_main, MA_MAIN_RESUME_GAME, PicoGameLoaded); + me_enable(e_menu_main, MA_MAIN_SAVE_STATE, PicoGameLoaded); + me_enable(e_menu_main, MA_MAIN_LOAD_STATE, PicoGameLoaded); + me_enable(e_menu_main, MA_MAIN_RESET_GAME, PicoGameLoaded); + me_enable(e_menu_main, MA_MAIN_CHANGE_CD, PicoAHW & PAHW_MCD); me_enable(e_menu_main, MA_MAIN_PATCHES, PicoPatches != NULL); - menu_enter(rom_loaded); + menu_enter(PicoGameLoaded); in_set_config_int(0, IN_CFG_BLOCKING, 1); - me_loop_d(e_menu_main, &sel, NULL, menu_main_plat_draw); + me_loop_d(e_menu_main, &sel, NULL, menu_main_draw_status); - if (rom_loaded) { + if (PicoGameLoaded) { if (engineState == PGS_Menu) engineState = PGS_Running; /* wait until menu, ok, back is released */ @@ -970,6 +1098,7 @@ void menu_loop(void) } in_set_config_int(0, IN_CFG_BLOCKING, 0); + plat_video_menu_leave(); } // --------- CD tray close menu ---------- @@ -978,10 +1107,13 @@ static int mh_tray_load_cd(int id, int keys) { const char *ret_name; - ret_name = romsel_run(); + rom_fname_reload = NULL; + ret_name = menu_loop_romsel(rom_fname_loaded, + sizeof(rom_fname_loaded), rom_exts, NULL); if (ret_name == NULL) return 0; + rom_fname_reload = ret_name; engineState = PGS_RestartRun; return emu_swap_cd(ret_name); } @@ -1005,7 +1137,7 @@ int menu_loop_tray(void) { int ret = 1, sel = 0; - menu_enter(rom_loaded); + menu_enter(PicoGameLoaded); in_set_config_int(0, IN_CFG_BLOCKING, 1); me_loop(e_menu_tray, &sel); @@ -1015,8 +1147,10 @@ int menu_loop_tray(void) ret = 0; /* no CD inserted */ } - while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK)); + while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK)) + ; in_set_config_int(0, IN_CFG_BLOCKING, 0); + plat_video_menu_leave(); return ret; } @@ -1036,6 +1170,7 @@ void menu_update_msg(const char *msg) static menu_entry e_menu_hidden[] = { mee_onoff("Accurate sprites", MA_OPT_ACC_SPRITES, PicoOpt, 0x080), + mee_onoff("autoload savestates", MA_OPT_AUTOLOAD_SAVE, g_autostateld_opt, 1), mee_end, }; @@ -1083,5 +1218,33 @@ menu_entry *me_list_get_next(void) void menu_init(void) { + int i; + menu_init_base(); + + i = 0; +#if defined(_SVP_DRC) || defined(DRC_SH2) + i = 1; +#endif + me_enable(e_menu_adv_options, MA_OPT2_DYNARECS, i); + + i = me_id2offset(e_menu_gfx_options, MA_OPT_VOUT_MODE); + e_menu_gfx_options[i].data = plat_target.vout_methods; + me_enable(e_menu_gfx_options, MA_OPT_VOUT_MODE, + plat_target.vout_methods != NULL); + + i = me_id2offset(e_menu_gfx_options, MA_OPT3_FILTERING); + e_menu_gfx_options[i].data = plat_target.hwfilters; + me_enable(e_menu_gfx_options, MA_OPT3_FILTERING, + plat_target.hwfilters != NULL); + + me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, + plat_target.gamma_set != NULL); + + i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS); + e_menu_options[i].enabled = 0; + if (plat_target.cpu_clock_set != NULL) { + e_menu_options[i].name = "CPU clock"; + e_menu_options[i].enabled = 1; + } }