X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Fmenu_pico.c;h=90d058ac20d20b36fd3452f68b6c78bdae61c09a;hb=d4d626658a7a999f48009f408b4a22d280ab80ea;hp=da1a6be3d933a318dbe4fdb83d98afa4d5d08325;hpb=e743be2070a13d14cae39a55b815b62b0edb6776;p=picodrive.git diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c index da1a6be..90d058a 100644 --- a/platform/common/menu_pico.c +++ b/platform/common/menu_pico.c @@ -1,3 +1,11 @@ +/* + * 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" @@ -9,12 +17,22 @@ #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", + "iso", "cso", "cue", + "32x", + "sms", + NULL }; // rrrr rggg gggb bbbb @@ -34,6 +52,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" @@ -45,12 +65,48 @@ static unsigned short fname2color(const char *fname) #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 { @@ -81,7 +137,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); } @@ -461,9 +517,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, }; @@ -699,10 +760,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) @@ -748,7 +809,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); } @@ -776,7 +838,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; @@ -859,21 +921,6 @@ static const char credits[] = " Lordus, Exophase, Rokas,\n" " Nemesis, Tasco Deluxe"; -static const char *romsel_run(void) -{ - const char *ret; - char *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), rom_exts, NULL); - free(sel_name); - return ret; -} - static int main_menu_handler(int id, int keys) { const char *ret_name; @@ -899,9 +946,12 @@ static int main_menu_handler(int id, int keys) } 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; } @@ -970,6 +1020,7 @@ void menu_loop(void) } in_set_config_int(0, IN_CFG_BLOCKING, 0); + plat_video_menu_leave(); } // --------- CD tray close menu ---------- @@ -978,10 +1029,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); } @@ -1017,6 +1071,7 @@ 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; } @@ -1083,5 +1138,20 @@ menu_entry *me_list_get_next(void) 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); }