X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Fmenu.c;h=bd4eb70a774bb342eb44e452282c35b41ca020c4;hb=5354c909ec807c4ad0dc238370b9e4984888f7b6;hp=80fdff81d33376d4ac69916c93abf8370754eeaa;hpb=053bef765a5dba9d5a050c0944676e96412e293d;p=libpicofe.git diff --git a/common/menu.c b/common/menu.c index 80fdff8..bd4eb70 100644 --- a/common/menu.c +++ b/common/menu.c @@ -17,10 +17,10 @@ #include "plat.h" #include "posix.h" #include +#include #include #include -#include #define array_size(x) (sizeof(x) / sizeof(x[0])) @@ -455,8 +455,9 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void)) plat_video_menu_end(); } -static int me_process(menu_entry *entry, int is_next) +static int me_process(menu_entry *entry, int is_next, int is_lr) { + int c; switch (entry->beh) { case MB_OPT_ONOFF: @@ -465,7 +466,8 @@ static int me_process(menu_entry *entry, int is_next) return 1; case MB_OPT_RANGE: case MB_OPT_CUSTRANGE: - *(int *)entry->var += is_next ? 1 : -1; + c = is_lr ? 10 : 1; + *(int *)entry->var += is_next ? c : -c; if (*(int *)entry->var < (int)entry->min) *(int *)entry->var = (int)entry->max; if (*(int *)entry->var > (int)entry->max) @@ -524,8 +526,9 @@ static void me_loop(menu_entry *menu, int *menu_sel, void (*draw_more)(void)) if ((inp & (PBTN_L|PBTN_R)) == (PBTN_L|PBTN_R)) debug_menu_loop(); - if (inp & (PBTN_LEFT|PBTN_RIGHT)) { /* multi choice */ - if (me_process(&menu[sel], (inp & PBTN_RIGHT) ? 1 : 0)) + if (inp & (PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R)) { /* multi choice */ + if (me_process(&menu[sel], (inp & (PBTN_RIGHT|PBTN_R)) ? 1 : 0, + inp & (PBTN_L|PBTN_R))) continue; } @@ -968,8 +971,8 @@ static void draw_savestate_bg(int slot) struct PicoVideo tmp_pv; unsigned short tmp_cram[0x40]; unsigned short tmp_vsram[0x40]; - void *tmp_vram, *file; - char *fname; + void *tmp_vram; + const char *fname; fname = emu_get_save_fname(1, 0, slot); if (!fname) return; @@ -982,28 +985,7 @@ static void draw_savestate_bg(int slot) memcpy(tmp_vsram, Pico.vsram, sizeof(Pico.vsram)); memcpy(&tmp_pv, &Pico.video, sizeof(Pico.video)); - if (strcmp(fname + strlen(fname) - 3, ".gz") == 0) { - file = gzopen(fname, "rb"); - emu_setSaveStateCbs(1); - } else { - file = fopen(fname, "rb"); - emu_setSaveStateCbs(0); - } - - if (file) { - if (PicoAHW & PAHW_MCD) { - PicoCdLoadStateGfx(file); - } else { - areaSeek(file, 0x10020, SEEK_SET); // skip header and RAM in state file - areaRead(Pico.vram, 1, sizeof(Pico.vram), file); - areaSeek(file, 0x2000, SEEK_CUR); - areaRead(Pico.cram, 1, sizeof(Pico.cram), file); - areaRead(Pico.vsram, 1, sizeof(Pico.vsram), file); - areaSeek(file, 0x221a0, SEEK_SET); - areaRead(&Pico.video, 1, sizeof(Pico.video), file); - } - areaClose(file); - } + PicoStateLoadVDP(fname); /* do a frame and fetch menu bg */ pemu_forced_frame(POPT_EN_SOFTSCALE); @@ -1055,6 +1037,9 @@ static int menu_loop_savestate(int is_loading) state_check_slots(); + if (!(state_slot_flags & (1 << menu_sel)) && is_loading) + menu_sel = menu_sel_max; + for (;;) { draw_savestate_menu(menu_sel, is_loading); @@ -1418,7 +1403,7 @@ static int mh_cdopt_ra(menu_id id, int keys) static menu_entry e_menu_cd_options[] = { - mee_onoff("CD LEDs", MA_CDOPT_LEDS, currentConfig.EmuOpt, 0x0400), + mee_onoff("CD LEDs", MA_CDOPT_LEDS, currentConfig.EmuOpt, EOPT_EN_CD_LEDS), mee_onoff("CDDA audio", MA_CDOPT_CDDA, PicoOpt, POPT_EN_MCD_CDDA), mee_onoff("PCM audio", MA_CDOPT_PCM, PicoOpt, POPT_EN_MCD_PCM), mee_cust ("ReadAhead buffer", MA_CDOPT_READAHEAD, mh_cdopt_ra, mgn_cdopt_ra), @@ -1447,6 +1432,7 @@ static menu_entry e_menu_adv_options[] = mee_onoff ("gzip savestates", MA_OPT2_GZIP_STATES, currentConfig.EmuOpt, EOPT_GZIP_SAVES), 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), MENU_GP2X_OPTIONS_ADV mee_end, }; @@ -1681,8 +1667,8 @@ static menu_entry e_menu_options[] = mee_cust ("Confirm savestate", MA_OPT_CONFIRM_STATES,mh_opt_misc, mgn_opt_c_saves), mee_range (cpu_clk_name, MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 900), mee_handler ("[Display options]", menu_loop_gfx_options), - mee_handler ("[Advanced options]", menu_loop_adv_options), mee_handler ("[Sega/Mega CD options]", menu_loop_cd_options), + mee_handler ("[Advanced options]", menu_loop_adv_options), mee_handler_mkname_id(MA_OPT_SAVECFG, mh_saveloadcfg, mgn_savecfg), mee_handler_id("Save cfg for current game only", MA_OPT_SAVECFG_GAME, mh_saveloadcfg), mee_handler_mkname_id(MA_OPT_LOADCFG, mh_saveloadcfg, mgn_loadcfg), @@ -1754,6 +1740,12 @@ static void draw_text_debug(const char *str, int skip, int from) } } +#ifdef __GNUC__ +#define COMPILER "gcc " __VERSION__ +#else +#define COMPILER +#endif + static void draw_frame_debug(void) { char layer_str[48] = "layers: "; @@ -1764,7 +1756,7 @@ static void draw_frame_debug(void) memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2); pemu_forced_frame(0); - smalltext_out16(4, 1, "build: " __DATE__ " " __TIME__, 0xffff); + smalltext_out16(4, 1, "build: r" REVISION " "__DATE__ " " __TIME__ " " COMPILER, 0xffff); smalltext_out16(4, g_screen_height - me_sfont_h, layer_str, 0xffff); } @@ -1964,24 +1956,14 @@ void menu_loop(void) static int mh_tray_load_cd(menu_id id, int keys) { - cd_img_type cd_type; char *ret_name; - int ret = -1; ret_name = romsel_run(); if (ret_name == NULL) return 0; - cd_type = emu_cd_check(NULL, ret_name); - if (cd_type != CIT_NOT_CD) - ret = Insert_CD(ret_name, cd_type); - if (ret != 0) { - me_update_msg("Load failed, invalid CD image?"); - return 0; - } - engineState = PGS_RestartRun; - return 1; + return emu_swap_cd(ret_name); } static int mh_tray_nothing(menu_id id, int keys) @@ -1991,12 +1973,12 @@ static int mh_tray_nothing(menu_id id, int keys) static menu_entry e_menu_tray[] = { - mee_label ("The unit is about to"), - mee_label ("close the CD tray."), + mee_label ("The CD tray has opened."), mee_label (""), mee_label (""), mee_handler("Load CD image", mh_tray_load_cd), mee_handler("Insert nothing", mh_tray_nothing), + mee_end, }; int menu_loop_tray(void) @@ -2039,6 +2021,8 @@ void menu_plat_setup(int is_wiz) if (!is_wiz) { me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 0); + i = me_id2offset(e_menu_gfx_options, MA_OPT_TEARING_FIX); + e_menu_gfx_options[i].need_to_save = 0; return; } @@ -2048,6 +2032,8 @@ void menu_plat_setup(int is_wiz) i = me_id2offset(e_menu_gfx_options, MA_OPT_SCALING); e_menu_gfx_options[i].max = 1; /* only off and sw */ + i = me_id2offset(e_menu_gfx_options, MA_OPT_ARM940_SOUND); + e_menu_gfx_options[i].need_to_save = 0; } /* TODO: rename */