X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Fmenu_pico.c;h=2dd582dc353c080bb1272914eb7828a9edf17764;hb=0a91c6e9029e87029b4e7993145f4d05608be34d;hp=f6e9b264016980bdb04cd12ff4cd11020973460b;hpb=134503079f50f267e9f6e3a2b4c40ff60c8146f3;p=picodrive.git diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c index f6e9b26..2dd582d 100644 --- a/platform/common/menu_pico.c +++ b/platform/common/menu_pico.c @@ -1,36 +1,62 @@ +/* + * 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 "emu.h" #include "menu_pico.h" - -#include -#include +#include "input_pico.h" +#include "version.h" #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", "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 *rom_exts[] = { "zip", "bin", "smd", "gen", "iso", "cso", "cue" }; static const char *other_exts[] = { "gmv", "pat" }; + const char *ext; int i; - if (ext < fname) ext = fname; - for (i = 0; i < array_size(rom_exts); i++) + 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++) if (strcasecmp(ext, other_exts[i]) == 0) return 0xaff5; return 0xffff; } -static const char *filter_exts[] = { - ".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html", - ".jpg", ".gpe" -}; +#include "../libpicofe/menu.c" -#include "menu.c" +static const char *men_dummy[] = { NULL }; /* platform specific options and handlers */ #if defined(__GP2X__) @@ -43,12 +69,48 @@ static const char *filter_exts[] = { #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 (!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 { @@ -79,7 +141,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); } @@ -96,7 +158,7 @@ static void load_progress_cb(int percent) if (len > g_menuscreen_w) len = g_menuscreen_w; - menu_draw_begin(0); + menu_draw_begin(0, 1); dst = (unsigned short *)g_menuscreen_ptr + g_menuscreen_w * me_sfont_h * 2; for (ln = me_sfont_h - 2; ln > 0; ln--, dst += g_menuscreen_w) memset(dst, 0xff, len * 2); @@ -108,7 +170,7 @@ static void cdload_progress_cb(const char *fname, int percent) int ln, len = percent * g_menuscreen_w / 100; unsigned short *dst; - menu_draw_begin(0); + menu_draw_begin(0, 1); dst = (unsigned short *)g_menuscreen_ptr + g_menuscreen_w * me_sfont_h * 2; memset(dst, 0xff, g_menuscreen_w * (me_sfont_h - 2) * 2); @@ -136,7 +198,7 @@ void menu_romload_prepare(const char *rom_name) /* fill all buffers, callbacks won't update in full */ for (i = 0; i < 3; i++) { - menu_draw_begin(1); + menu_draw_begin(1, 1); smalltext_out16(1, 1, "Loading", 0xffff); smalltext_out16(1, me_sfont_h, p, 0xffff); menu_draw_end(); @@ -152,7 +214,7 @@ void menu_romload_end(void) PicoCartLoadProgressCB = NULL; PicoCDLoadProgressCB = NULL; - menu_draw_begin(0); + menu_draw_begin(0, 1); smalltext_out16(1, (cdload_called ? 6 : 3) * me_sfont_h, "Starting emulation...", 0xffff); menu_draw_end(); @@ -167,7 +229,7 @@ static void draw_patchlist(int sel) max_cnt = g_menuscreen_h / me_sfont_h; start = max_cnt / 2 - sel; - menu_draw_begin(1); + menu_draw_begin(1, 0); for (i = 0; i < PicoPatchCount; i++) { pos = start + i; @@ -314,7 +376,7 @@ 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; } @@ -459,9 +521,14 @@ static int menu_loop_adv_options(int id, int keys) // ------------ gfx options menu ------------ +static const char h_gamma[] = "Gamma/brightness adjustment (default 100)"; + 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_h("Gamma adjustment", MA_OPT3_GAMMA, currentConfig.gamma, 1, 200, h_gamma), MENU_OPTIONS_GFX mee_end, }; @@ -565,15 +632,15 @@ static int mh_saveloadcfg(int id, int keys) case MA_OPT_SAVECFG: case MA_OPT_SAVECFG_GAME: if (emu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0)) - me_update_msg("config saved"); + menu_update_msg("config saved"); else - me_update_msg("failed to write config"); + menu_update_msg("failed to write config"); break; case MA_OPT_LOADCFG: ret = emu_read_config(rom_fname_loaded, 1); if (!ret) ret = emu_read_config(NULL, 1); - if (ret) me_update_msg("config loaded"); - else me_update_msg("failed to load config"); + if (ret) menu_update_msg("config loaded"); + else menu_update_msg("failed to load config"); break; default: return 0; @@ -585,7 +652,7 @@ static int mh_saveloadcfg(int id, int keys) static int mh_restore_defaults(int id, int keys) { emu_set_defconfig(); - me_update_msg("defaults restored"); + menu_update_msg("defaults restored"); return 1; } @@ -674,7 +741,7 @@ static int menu_loop_options(int id, int keys) 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); @@ -697,10 +764,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) @@ -746,7 +813,8 @@ static void draw_frame_debug(void) if (PicoDrawMask & PDRAW_32X_ON) 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); } @@ -759,7 +827,7 @@ static void debug_menu_loop(void) while (1) { - menu_draw_begin(1); + menu_draw_begin(1, 0); switch (mode) { case 0: tmp = PDebugMain(); @@ -774,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; @@ -857,48 +925,37 @@ static const char credits[] = " Lordus, Exophase, Rokas,\n" " Nemesis, Tasco Deluxe"; -static char *romsel_run(void) -{ - char *ret, *sel_name; - - sel_name = malloc(sizeof(rom_fname_loaded)); - if (sel_name == NULL) - return NULL; - strcpy(sel_name, rom_fname_loaded); - - ret = menu_loop_romsel(sel_name, sizeof(rom_fname_loaded)); - free(sel_name); - return ret; -} - static int main_menu_handler(int id, int keys) { - char *ret_name; + const char *ret_name; 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; } @@ -911,10 +968,10 @@ static int main_menu_handler(int id, int keys) engineState = PGS_Quit; return 1; case MA_MAIN_PATCHES: - if (rom_loaded && PicoPatches) { + if (PicoGameLoaded && PicoPatches) { menu_loop_patches(); PicoPatchApply(); - me_update_msg("Patches applied"); + menu_update_msg("Patches applied"); } break; default: @@ -948,17 +1005,17 @@ 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_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); - if (rom_loaded) { + if (PicoGameLoaded) { if (engineState == PGS_Menu) engineState = PGS_Running; /* wait until menu, ok, back is released */ @@ -967,18 +1024,22 @@ void menu_loop(void) } in_set_config_int(0, IN_CFG_BLOCKING, 0); + plat_video_menu_leave(); } // --------- CD tray close menu ---------- static int mh_tray_load_cd(int id, int keys) { - char *ret_name; + 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); } @@ -1002,7 +1063,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); @@ -1014,11 +1075,12 @@ int menu_loop_tray(void) 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; } -void me_update_msg(const char *msg) +void menu_update_msg(const char *msg) { strncpy(menu_error_msg, msg, sizeof(menu_error_msg)); menu_error_msg[sizeof(menu_error_msg) - 1] = 0; @@ -1078,3 +1140,22 @@ menu_entry *me_list_get_next(void) return me_list_i; } +void menu_init(void) +{ + int i; + + menu_init_base(); + + 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_OPT3_GAMMA, + plat_target.gamma_set != NULL); +}