X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=f07c7375cb434ea81f520459f8cbcd165b35438e;hp=baf7f2cba301c851990b892305f2f3c69b7abf1f;hb=76f7048eff4f5357df048268e40b5bc6b9387fe5;hpb=ff847a2ebb9f89594332aeb52cecfa0bd51669b7 diff --git a/frontend/menu.c b/frontend/menu.c index baf7f2cb..f07c7375 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -30,7 +30,7 @@ #include "../libpcsxcore/cdrom.h" #include "../libpcsxcore/psemu_plugin_defs.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" -#include "../plugins/dfinput/pad.h" +#include "../plugins/dfinput/main.h" #include "revision.h" #define MENU_X2 1 @@ -46,6 +46,7 @@ typedef enum MA_MAIN_LOAD_ROM, MA_MAIN_SWAP_CD, MA_MAIN_RUN_BIOS, + MA_MAIN_RUN_EXE, MA_MAIN_CONTROLS, MA_MAIN_CREDITS, MA_MAIN_EXIT, @@ -69,10 +70,11 @@ enum { }; static int last_psx_w, last_psx_h, last_psx_bpp; -static int scaling, filter, cpu_clock, cpu_clock_st; +static int scaling, filter, cpu_clock, cpu_clock_st, volume_boost; static char rom_fname_reload[MAXPATHLEN]; static char last_selected_fname[MAXPATHLEN]; -static int warned_about_bios, region, in_type_sel; +static int warned_about_bios, region, in_type_sel1, in_type_sel2; +static int memcard1_sel, memcard2_sel; int g_opts; // sound plugin @@ -81,10 +83,12 @@ extern int iUseInterpolation; extern int iXAPitch; extern int iSPUIRQWait; extern int iUseTimer; +extern int iVolume; static const char *bioses[24]; static const char *gpu_plugins[16]; static const char *spu_plugins[16]; +static const char *memcards[32]; static int bios_sel, gpu_plugsel, spu_plugsel; @@ -139,29 +143,37 @@ static void menu_sync_config(void) Config.PsxAuto = 0; Config.PsxType = region - 1; } - in_type = in_type_sel ? PSE_PAD_TYPE_ANALOGPAD : PSE_PAD_TYPE_STANDARD; + switch (in_type_sel1) { + case 1: in_type1 = PSE_PAD_TYPE_ANALOGPAD; break; + case 2: in_type1 = PSE_PAD_TYPE_GUNCON; break; + default: in_type1 = PSE_PAD_TYPE_STANDARD; + } + switch (in_type_sel2) { + case 1: in_type2 = PSE_PAD_TYPE_ANALOGPAD; break; + case 2: in_type2 = PSE_PAD_TYPE_GUNCON; break; + default: in_type2 = PSE_PAD_TYPE_STANDARD; + } if (in_evdev_allow_abs_only != allow_abs_only_old) { pandora_rescan_inputs(); allow_abs_only_old = in_evdev_allow_abs_only; } - pl_frame_interval = Config.PsxType ? 20000 : 16667; - // used by P.E.Op.S. frameskip code - pl_rearmed_cbs.gpu_peops.fFrameRateHz = Config.PsxType ? 50.0f : 59.94f; - pl_rearmed_cbs.gpu_peops.dwFrameRateTicks = - (100000*100 / (unsigned long)(pl_rearmed_cbs.gpu_peops.fFrameRateHz*100)); + iVolume = 768 + 128 * volume_boost; + pl_timing_prepare(Config.PsxType); } static void menu_set_defconfig(void) { g_opts = 0; scaling = SCALE_4_3; + volume_boost = 0; region = 0; - in_type_sel = 0; + in_type_sel1 = in_type_sel2 = 0; in_evdev_allow_abs_only = 0; Config.Xa = Config.Cdda = Config.Sio = Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0; + Config.CdrReschedule = 0; pl_rearmed_cbs.frameskip = 0; pl_rearmed_cbs.gpu_peops.iUseDither = 0; @@ -214,6 +226,7 @@ static const struct { CE_CONFIG_VAL(RCntFix), CE_CONFIG_VAL(VSyncWA), CE_CONFIG_VAL(Cpu), + CE_CONFIG_VAL(CdrReschedule), CE_INTVAL(region), CE_INTVAL(scaling), CE_INTVAL(g_layer_x), @@ -224,7 +237,8 @@ static const struct { CE_INTVAL(state_slot), CE_INTVAL(cpu_clock), CE_INTVAL(g_opts), - CE_INTVAL(in_type_sel), + CE_INTVAL(in_type_sel1), + CE_INTVAL(in_type_sel2), CE_INTVAL_P(frameskip), CE_INTVAL_P(gpu_peops.iUseDither), CE_INTVAL_P(gpu_peops.dwActFixes), @@ -235,6 +249,7 @@ static const struct { CE_INTVAL(iUseTimer), CE_INTVAL(warned_about_bios), CE_INTVAL(in_evdev_allow_abs_only), + CE_INTVAL(volume_boost), }; static char *get_cd_label(void) @@ -426,7 +441,7 @@ fail: // rrrr rggg gggb bbbb static unsigned short fname2color(const char *fname) { - static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".cue", ".z", ".bz", ".znx", ".pbp" }; + static const char *cdimg_exts[] = { ".bin", ".img", ".mdf", ".iso", ".cue", ".z", ".bz", ".znx", ".pbp" }; static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table", ".index", ".sbi" }; const char *ext = strrchr(fname, '.'); int i; @@ -444,6 +459,10 @@ static unsigned short fname2color(const char *fname) static void draw_savestate_bg(int slot); +static const char *filter_exts[] = { + ".mp3", ".MP3", ".txt", ".htm", "html", ".jpg", ".pnd" +}; + #define MENU_ALIGN_LEFT #define menu_init menu_init_common #include "common/menu.c" @@ -694,6 +713,10 @@ me_bind_action emuctrl_actions[] = { "Toggle Frameskip ", 1 << SACTION_TOGGLE_FSKIP }, { "Take Screenshot ", 1 << SACTION_SCREENSHOT }, { "Enter Menu ", 1 << SACTION_ENTER_MENU }, + { "Gun Trigger ", 1 << SACTION_GUN_TRIGGER }, + { "Gun A button ", 1 << SACTION_GUN_A }, + { "Gun B button ", 1 << SACTION_GUN_B }, + { "Gun Offscreen Trigger", 1 << SACTION_GUN_TRIGGER2 }, { NULL, 0 } }; @@ -929,17 +952,25 @@ static int mh_input_rescan(int id, int keys) return 0; } -static const char *men_in_type_sel[] = { "Standard (SCPH-1080)", "Analog (SCPH-1150)", NULL }; +static const char *men_in_type_sel[] = { + "Standard (SCPH-1080)", + "Analog (SCPH-1150)", + "GunCon", + NULL +}; static const char h_nub_btns[] = "Experimental, keep this OFF if unsure. Select rescan after change."; +static const char h_notsgun[] = "Don't trigger (shoot) when touching screen in gun games."; 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_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/Gun controls", MA_CTRL_EMU, key_config_loop_wrap), mee_label (""), - mee_enum ("Controller", 0, in_type_sel, men_in_type_sel), + mee_enum ("Port 1 device", 0, in_type_sel1, men_in_type_sel), + mee_enum ("Port 2 device", 0, in_type_sel2, men_in_type_sel), mee_onoff_h ("Nubs as buttons", 0, in_evdev_allow_abs_only, 1, h_nub_btns), + mee_onoff_h ("No TS Gun trigger", 0, g_opts, OPT_TSGUN_NOTRIGGER, h_notsgun), mee_cust_nosave("Save global config", MA_OPT_SAVECFG, mh_savecfg, mgn_saveloadcfg), mee_cust_nosave("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_savecfg, mgn_saveloadcfg), mee_handler ("Rescan devices", mh_input_rescan), @@ -960,7 +991,7 @@ static int menu_loop_keyconfig(int id, int keys) static int sel = 0; // me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, ready_to_go && CdromId[0]); - me_loop(e_menu_keyconfig, &sel, NULL); + me_loop(e_menu_keyconfig, &sel); return 0; } @@ -1034,7 +1065,7 @@ static int menu_loop_gfx_options(int id, int keys) { static int sel = 0; - me_loop(e_menu_gfx_options, &sel, NULL); + me_loop(e_menu_gfx_options, &sel); return 0; } @@ -1070,18 +1101,19 @@ static menu_entry e_menu_plugin_gpu[] = static int menu_loop_plugin_gpu(int id, int keys) { static int sel = 0; - me_loop(e_menu_plugin_gpu, &sel, NULL); + me_loop(e_menu_plugin_gpu, &sel); return 0; } -static const char *men_spu_reverb[] = { "Off", "Fake", "On", NULL }; static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL }; +static const char h_spu_volboost[] = "Large values cause distortion"; static const char h_spu_irq_wait[] = "Wait for CPU (recommended set to ON)"; static const char h_spu_thread[] = "Run sound emulation in main thread (recommended)"; static menu_entry e_menu_plugin_spu[] = { - mee_enum ("Reverb", 0, iUseReverb, men_spu_reverb), + mee_range_h ("Volume boost", 0, volume_boost, -5, 30, h_spu_volboost), + mee_onoff ("Reverb", 0, iUseReverb, 2), mee_enum ("Interpolation", 0, iUseInterpolation, men_spu_interp), mee_onoff ("Adjust XA pitch", 0, iXAPitch, 1), mee_onoff_h ("SPU IRQ Wait", 0, iSPUIRQWait, 1, h_spu_irq_wait), @@ -1092,7 +1124,7 @@ static menu_entry e_menu_plugin_spu[] = static int menu_loop_plugin_spu(int id, int keys) { static int sel = 0; - me_loop(e_menu_plugin_spu, &sel, NULL); + me_loop(e_menu_plugin_spu, &sel); return 0; } @@ -1114,39 +1146,47 @@ static menu_entry e_menu_plugin_options[] = mee_end, }; -static menu_entry e_menu_main[]; +static menu_entry e_menu_main2[]; static int menu_loop_plugin_options(int id, int keys) { static int sel = 0; - me_loop(e_menu_plugin_options, &sel, NULL); + me_loop(e_menu_plugin_options, &sel); // sync BIOS/plugins snprintf(Config.Bios, sizeof(Config.Bios), "%s", bioses[bios_sel]); snprintf(Config.Gpu, sizeof(Config.Gpu), "%s", gpu_plugins[gpu_plugsel]); snprintf(Config.Spu, sizeof(Config.Spu), "%s", spu_plugins[spu_plugsel]); - me_enable(e_menu_main, MA_MAIN_RUN_BIOS, bios_sel != 0); + me_enable(e_menu_main2, MA_MAIN_RUN_BIOS, bios_sel != 0); return 0; } // ------------ adv options menu ------------ +static const char *men_cfg_cdrr[] = { "Auto", "ON", "OFF", NULL }; static const char h_cfg_cpul[] = "Shows CPU usage in %"; +static const char h_cfg_spu[] = "Shows active SPU channels\n" + "(green: normal, red: fmod, blue: noise)"; static const char h_cfg_fl[] = "Frame Limiter keeps the game from running too fast"; static const char h_cfg_xa[] = "Disables XA sound, which can sometimes improve performance"; static const char h_cfg_cdda[] = "Disable CD Audio for a performance boost\n" "(proper .cue/.bin dump is needed otherwise)"; -static const char h_cfg_sio[] = "This should be enabled for certain memcards/gamepads"; -static const char h_cfg_spuirq[] = "Compatibility tweak; should probably be left off"; -static const char h_cfg_rcnt1[] = "Parasite Eve 2, Vandal Hearts 1/2 Fix"; -static const char h_cfg_rcnt2[] = "InuYasha Sengoku Battle Fix"; +static const char h_cfg_sio[] = "You should not need this, breaks games"; +static const char h_cfg_spuirq[] = "Compatibility tweak; should be left off"; +static const char h_cfg_rcnt1[] = "Parasite Eve 2, Vandal Hearts 1/2 Fix\n" + "(timing hack, breaks other games)"; +static const char h_cfg_rcnt2[] = "InuYasha Sengoku Battle Fix\n" + "(timing hack, breaks other games)"; +static const char h_cfg_cdrr[] = "Compatibility tweak (fixes Team Buddies, maybe more)\n" + "(CD timing hack, breaks FMVs)"; static const char h_cfg_nodrc[] = "Disable dynamic recompiler and use interpreter\n" "Might be useful to overcome some dynarec bugs"; static menu_entry e_menu_adv_options[] = { mee_onoff_h ("Show CPU load", 0, g_opts, OPT_SHOWCPU, h_cfg_cpul), + mee_onoff_h ("Show SPU channels", 0, g_opts, OPT_SHOWSPU, h_cfg_spu), mee_onoff_h ("Disable Frame Limiter", 0, g_opts, OPT_NO_FRAMELIM, h_cfg_fl), mee_onoff_h ("Disable XA Decoding", 0, Config.Xa, 1, h_cfg_xa), mee_onoff_h ("Disable CD Audio", 0, Config.Cdda, 1, h_cfg_cdda), @@ -1154,6 +1194,7 @@ static menu_entry e_menu_adv_options[] = mee_onoff_h ("SPU IRQ Always Enabled", 0, Config.SpuIrq, 1, h_cfg_spuirq), mee_onoff_h ("Rootcounter hack", 0, Config.RCntFix, 1, h_cfg_rcnt1), mee_onoff_h ("Rootcounter hack 2", 0, Config.VSyncWA, 1, h_cfg_rcnt2), + mee_enum_h ("CD read reschedule hack",0, Config.CdrReschedule, men_cfg_cdrr, h_cfg_cdrr), mee_onoff_h ("Disable dynarec (slow!)",0, Config.Cpu, 1, h_cfg_nodrc), mee_end, }; @@ -1161,7 +1202,7 @@ static menu_entry e_menu_adv_options[] = static int menu_loop_adv_options(int id, int keys) { static int sel = 0; - me_loop(e_menu_adv_options, &sel, NULL); + me_loop(e_menu_adv_options, &sel); return 0; } @@ -1210,7 +1251,7 @@ static int menu_loop_options(int id, int keys) e_menu_options[i].enabled = cpu_clock != 0 ? 1 : 0; me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, ready_to_go && CdromId[0]); - me_loop(e_menu_options, &sel, NULL); + me_loop(e_menu_options, &sel); return 0; } @@ -1264,7 +1305,115 @@ static void debug_menu_loop(void) free(gpuf); } -// ------------ main menu ------------ +// --------- memcard manager --------- + +static void draw_mc_icon(int dx, int dy, const u16 *s) +{ + u16 *d; + int x, y, l, p; + + d = (u16 *)g_menuscreen_ptr + g_menuscreen_w * dy + dx; + + for (y = 0; y < 16; y++, s += 16) { + for (l = 0; l < 2; l++, d += g_menuscreen_w) { + for (x = 0; x < 16; x++) { + p = s[x]; + d[x*2] = d[x*2 + 1] = ((p & 0x7c00) >> 10) + | ((p & 0x03e0) << 1) | ((p & 0x1f) << 11); + } + } + } +} + +static void draw_mc_bg(void) +{ + McdBlock *blocks1, *blocks2; + int maxicons = 15; + int i, y, row2; + + blocks1 = malloc(15 * sizeof(blocks1[0])); + blocks2 = malloc(15 * sizeof(blocks1[0])); + if (blocks1 == NULL || blocks2 == NULL) + goto out; + + for (i = 0; i < 15; i++) { + GetMcdBlockInfo(1, i + 1, &blocks1[i]); + GetMcdBlockInfo(2, i + 1, &blocks2[i]); + } + + menu_draw_begin(1); + + memcpy(g_menuscreen_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2); + + y = g_menuscreen_h / 2 - 15 * 32 / 2; + if (y < 0) { + // doesn't fit.. + y = 0; + maxicons = g_menuscreen_h / 32; + } + + row2 = g_menuscreen_w / 2; + for (i = 0; i < maxicons; i++) { + draw_mc_icon(8, y + i * 32, (u16 *)blocks1[i].Icon); + smalltext_out16(10+32, y + i * 32 + 8, blocks1[i].sTitle, 0xf71e); + + draw_mc_icon(row2 + 8, y + i * 32, (u16 *)blocks2[i].Icon); + smalltext_out16(row2 + 10+32, y + i * 32 + 8, blocks2[i].sTitle, 0xf71e); + } + + menu_darken_bg(g_menubg_ptr, g_menuscreen_ptr, g_menuscreen_w * g_menuscreen_h, 0); + + menu_draw_end(); +out: + free(blocks1); + free(blocks2); +} + +static void handle_memcard_sel(void) +{ + Config.Mcd1[0] = 0; + if (memcard1_sel != 0) + snprintf(Config.Mcd1, sizeof(Config.Mcd1), ".%s%s", MEMCARD_DIR, memcards[memcard1_sel]); + Config.Mcd2[0] = 0; + if (memcard2_sel != 0) + snprintf(Config.Mcd2, sizeof(Config.Mcd2), ".%s%s", MEMCARD_DIR, memcards[memcard2_sel]); + LoadMcds(Config.Mcd1, Config.Mcd2); + draw_mc_bg(); +} + +static menu_entry e_memcard_options[] = +{ + mee_enum("Memory card 1", 0, memcard1_sel, memcards), + mee_enum("Memory card 2", 0, memcard2_sel, memcards), + mee_end, +}; + +static int menu_loop_memcards(int id, int keys) +{ + static int sel = 0; + char *p; + int i; + + memcard1_sel = memcard2_sel = 0; + p = strrchr(Config.Mcd1, '/'); + if (p != NULL) + for (i = 0; memcards[i] != NULL; i++) + if (strcmp(p + 1, memcards[i]) == 0) + { memcard1_sel = i; break; } + p = strrchr(Config.Mcd2, '/'); + if (p != NULL) + for (i = 0; memcards[i] != NULL; i++) + if (strcmp(p + 1, memcards[i]) == 0) + { memcard2_sel = i; break; } + + me_loop_d(e_memcard_options, &sel, handle_memcard_sel, NULL); + + memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2); + + return 0; +} + +// --------- main menu help ---------- static void menu_bios_warn(void) { @@ -1338,16 +1487,13 @@ static int reset_game(void) return 0; } -static int run_bios(void) +static int reload_plugins(const char *cdimg) { - if (bios_sel == 0) - return -1; - - ready_to_go = 0; - pl_fbdev_buf = NULL; + pl_vout_buf = NULL; ClosePlugins(); - set_cd_image(NULL); + + set_cd_image(cdimg); LoadPlugins(); pcnt_hook_plugins(); NetOpened = 0; @@ -1360,27 +1506,50 @@ static int run_bios(void) CdromId[0] = '\0'; CdromLabel[0] = '\0'; + return 0; +} + +static int run_bios(void) +{ + if (bios_sel == 0) + return -1; + + ready_to_go = 0; + if (reload_plugins(NULL) != 0) + return -1; SysReset(); ready_to_go = 1; return 0; } -static int run_cd_image(const char *fname) +static int run_exe(void) { + const char *fname; + + fname = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname)); + if (fname == NULL) + return -1; + ready_to_go = 0; - pl_fbdev_buf = NULL; + if (reload_plugins(NULL) != 0) + return -1; - ClosePlugins(); - set_cd_image(fname); - LoadPlugins(); - pcnt_hook_plugins(); - NetOpened = 0; - if (OpenPlugins() == -1) { - me_update_msg("failed to open plugins"); + SysReset(); + if (Load(fname) != 0) { + me_update_msg("exe load failed, bad file?"); + printf("meh\n"); return -1; } - plugin_call_rearmed_cbs(); + + ready_to_go = 1; + return 0; +} + +static int run_cd_image(const char *fname) +{ + ready_to_go = 0; + reload_plugins(fname); if (CheckCdrom() == -1) { // Only check the CD if we are starting the console with a CD @@ -1405,7 +1574,7 @@ static int run_cd_image(const char *fname) static int romsel_run(void) { int prev_gpu, prev_spu; - char *fname; + const char *fname; fname = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname)); if (fname == NULL) @@ -1497,6 +1666,10 @@ static int main_menu_handler(int id, int keys) if (run_bios() == 0) return 1; break; + case MA_MAIN_RUN_EXE: + if (run_exe() == 0) + return 1; + break; case MA_MAIN_CREDITS: draw_menu_message(credits_text, draw_frame_credits); in_menu_wait(PBTN_MOK|PBTN_MBACK, 70); @@ -1512,6 +1685,27 @@ static int main_menu_handler(int id, int keys) return 0; } +static menu_entry e_menu_main2[] = +{ + mee_handler_id("Change CD image", MA_MAIN_SWAP_CD, main_menu_handler), + mee_handler_id("Run BIOS", MA_MAIN_RUN_BIOS, main_menu_handler), + mee_handler_id("Run EXE", MA_MAIN_RUN_EXE, main_menu_handler), + mee_handler ("Memcard manager", menu_loop_memcards), + mee_end, +}; + +static int main_menu2_handler(int id, int keys) +{ + static int sel = 0; + + me_enable(e_menu_main2, MA_MAIN_SWAP_CD, ready_to_go); + me_enable(e_menu_main2, MA_MAIN_RUN_BIOS, bios_sel != 0); + + return me_loop_d(e_menu_main2, &sel, NULL, draw_frame_main); +} + +static const char h_extra[] = "Change CD, manage memcards..\n"; + static menu_entry e_menu_main[] = { mee_label (""), @@ -1521,10 +1715,9 @@ 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 CD image", MA_MAIN_LOAD_ROM, main_menu_handler), - mee_handler_id("Change CD image", MA_MAIN_SWAP_CD, main_menu_handler), - mee_handler_id("Run BIOS", MA_MAIN_RUN_BIOS, main_menu_handler), mee_handler ("Options", menu_loop_options), mee_handler ("Controls", menu_loop_keyconfig), + mee_handler_h ("Extra stuff", main_menu2_handler, h_extra), mee_handler_id("Credits", MA_MAIN_CREDITS, main_menu_handler), mee_handler_id("Exit", MA_MAIN_EXIT, main_menu_handler), mee_end, @@ -1549,13 +1742,11 @@ void menu_loop(void) me_enable(e_menu_main, MA_MAIN_SAVE_STATE, ready_to_go && CdromId[0]); me_enable(e_menu_main, MA_MAIN_LOAD_STATE, ready_to_go && CdromId[0]); me_enable(e_menu_main, MA_MAIN_RESET_GAME, ready_to_go); - me_enable(e_menu_main, MA_MAIN_SWAP_CD, ready_to_go); - me_enable(e_menu_main, MA_MAIN_RUN_BIOS, bios_sel != 0); in_set_config_int(0, IN_CFG_BLOCKING, 1); do { - me_loop(e_menu_main, &sel, draw_frame_main); + me_loop_d(e_menu_main, &sel, NULL, draw_frame_main); } while (!ready_to_go); /* wait until menu, ok, back is released */ @@ -1567,18 +1758,26 @@ void menu_loop(void) menu_prepare_emu(); } +static int qsort_strcmp(const void *p1, const void *p2) +{ + char * const *s1 = (char * const *)p1; + char * const *s2 = (char * const *)p2; + return strcasecmp(*s1, *s2); +} + static void scan_bios_plugins(void) { char fname[MAXPATHLEN]; struct dirent *ent; - int bios_i, gpu_i, spu_i; + int bios_i, gpu_i, spu_i, mc_i; char *p; DIR *dir; bioses[0] = "HLE"; gpu_plugins[0] = "builtin_gpu"; spu_plugins[0] = "builtin_spu"; - bios_i = gpu_i = spu_i = 1; + memcards[0] = "(none)"; + bios_i = gpu_i = spu_i = mc_i = 1; snprintf(fname, sizeof(fname), "%s/", Config.BiosDir); dir = opendir(fname); @@ -1621,8 +1820,8 @@ do_plugins: snprintf(fname, sizeof(fname), "%s/", Config.PluginsDir); dir = opendir(fname); if (dir == NULL) { - perror("scan_bios_plugins opendir"); - return; + perror("scan_bios_plugins plugins opendir"); + goto do_memcards; } while (1) { @@ -1668,6 +1867,46 @@ do_plugins: } closedir(dir); + +do_memcards: + dir = opendir("." MEMCARD_DIR); + if (dir == NULL) { + perror("scan_bios_plugins memcards opendir"); + return; + } + + while (1) { + struct stat st; + + errno = 0; + ent = readdir(dir); + if (ent == NULL) { + if (errno != 0) + perror("readdir"); + break; + } + + if (ent->d_type != DT_REG && ent->d_type != DT_LNK) + continue; + + snprintf(fname, sizeof(fname), "." MEMCARD_DIR "%s", ent->d_name); + if (stat(fname, &st) != 0) { + printf("bad memcard file: %s\n", ent->d_name); + continue; + } + + if (mc_i < ARRAY_SIZE(memcards) - 1) { + memcards[mc_i++] = strdup(ent->d_name); + continue; + } + + printf("too many memcards, dropping \"%s\"\n", ent->d_name); + } + + if (mc_i > 2) + qsort(memcards + 1, mc_i - 1, sizeof(memcards[0]), qsort_strcmp); + + closedir(dir); } void menu_init(void) @@ -1714,13 +1953,13 @@ static void menu_leave_emu(void) } memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2); - if (pl_fbdev_buf != NULL && ready_to_go && last_psx_bpp == 16) { + if (pl_vout_buf != NULL && ready_to_go && last_psx_bpp == 16) { int x = max(0, g_menuscreen_w - last_psx_w); int y = max(0, g_menuscreen_h / 2 - last_psx_h / 2); int w = min(g_menuscreen_w, last_psx_w); int h = min(g_menuscreen_h, last_psx_h); u16 *d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x; - u16 *s = pl_fbdev_buf; + u16 *s = pl_vout_buf; for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w) menu_darken_bg(d, s, w, 0); @@ -1778,7 +2017,7 @@ void menu_prepare_emu(void) fprintf(stderr, "Warning: GPU_open returned %d\n", ret); } - dfinput_activate(in_type == PSE_PAD_TYPE_ANALOGPAD); + dfinput_activate(); } void me_update_msg(const char *msg)