X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=e720de6a28c6719f3c278938d145c514f2cc94dc;hp=8e663572253cb81905ceb20a84e24de5eb44d460;hb=1b0c513996d57548fc5df8726e21a68e5ace4f99;hpb=e6eb2066c0d198d793067caed47b670b691eb865 diff --git a/frontend/menu.c b/frontend/menu.c index 8e663572..e720de6a 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -20,12 +20,20 @@ #include "plugin.h" #include "plugin_lib.h" #include "omap.h" +#include "plat.h" +#include "pcnt.h" +#include "cspace.h" #include "common/plat.h" +#include "common/input.h" +#include "linux/in_evdev.h" #include "../libpcsxcore/misc.h" +#include "../libpcsxcore/cdrom.h" +#include "../libpcsxcore/cdriso.h" +#include "../libpcsxcore/psemu_plugin_defs.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" +#include "../plugins/dfinput/main.h" #include "revision.h" -#define MENU_X2 1 #define array_size(x) (sizeof(x) / sizeof(x[0])) typedef enum @@ -36,41 +44,55 @@ typedef enum MA_MAIN_LOAD_STATE, MA_MAIN_RESET_GAME, MA_MAIN_LOAD_ROM, + MA_MAIN_SWAP_CD, + MA_MAIN_SWAP_CD_MULTI, + MA_MAIN_RUN_BIOS, + MA_MAIN_RUN_EXE, MA_MAIN_CONTROLS, MA_MAIN_CREDITS, MA_MAIN_EXIT, MA_CTRL_PLAYER1, MA_CTRL_PLAYER2, + MA_CTRL_ANALOG, MA_CTRL_EMU, MA_CTRL_DEV_FIRST, MA_CTRL_DEV_NEXT, + MA_CTRL_NUBS_BTNS, + MA_CTRL_DEADZONE, + MA_CTRL_VIBRATION, MA_CTRL_DONE, MA_OPT_SAVECFG, MA_OPT_SAVECFG_GAME, MA_OPT_CPU_CLOCKS, MA_OPT_FILTERING, + MA_OPT_DISP_OPTS, } menu_id; enum { SCALE_1_1, SCALE_4_3, + SCALE_4_3v2, SCALE_FULLSCREEN, SCALE_CUSTOM, }; static int last_psx_w, last_psx_h, last_psx_bpp; -static int scaling, filter, state_slot, cpu_clock, cpu_clock_st; +static int scaling, filter, cpu_clock, cpu_clock_st, volume_boost, frameskip; static char rom_fname_reload[MAXPATHLEN]; static char last_selected_fname[MAXPATHLEN]; +static int warned_about_bios, region, in_type_sel1, in_type_sel2; +static int psx_clock; +static int memcard1_sel, memcard2_sel; int g_opts; +int analog_deadzone; // for Caanoo -// from softgpu plugin -extern int iUseDither; -extern int UseFrameSkip; -extern int UseFrameLimit; -extern uint32_t dwActFixes; -extern float fFrameRateHz; -extern int dwFrameRateTicks; +#ifdef __ARM_ARCH_7A__ +#define DEFAULT_PSX_CLOCK 57 +#define DEFAULT_PSX_CLOCK_S "57" +#else +#define DEFAULT_PSX_CLOCK 50 +#define DEFAULT_PSX_CLOCK_S "50" +#endif // sound plugin extern int iUseReverb; @@ -78,10 +100,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; @@ -102,49 +126,78 @@ void emu_make_path(char *buff, const char *end, int size) static int emu_check_save_file(int slot) { - char fname[MAXPATHLEN]; - int ret; - - ret = get_state_filename(fname, sizeof(fname), slot); - if (ret != 0) - return 0; - - ret = CheckState(fname); + int ret = emu_check_state(slot); return ret == 0 ? 1 : 0; } -static int emu_save_load_game(int load, int sram) +static int emu_save_load_game(int load, int unused) { - char fname[MAXPATHLEN]; int ret; - ret = get_state_filename(fname, sizeof(fname), state_slot); - if (ret != 0) - return 0; + if (load) { + ret = emu_load_state(state_slot); - if (load) - ret = LoadState(fname); + // reflect hle/bios mode from savestate + if (Config.HLE) + bios_sel = 0; + else if (bios_sel == 0 && bioses[1] != NULL) + // XXX: maybe find the right bios instead + bios_sel = 1; + } else - ret = SaveState(fname); + ret = emu_save_state(state_slot); return ret; } +// propagate menu settings to the emu vars +static void menu_sync_config(void) +{ + static int allow_abs_only_old; + + Config.PsxAuto = 1; + if (region > 0) { + Config.PsxAuto = 0; + Config.PsxType = region - 1; + } + cycle_multiplier = 10000 / psx_clock; + + 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) { + in_probe(); + allow_abs_only_old = in_evdev_allow_abs_only; + } + + iVolume = 768 + 128 * volume_boost; + pl_rearmed_cbs.frameskip = frameskip - 1; + pl_timing_prepare(Config.PsxType); +} + static void menu_set_defconfig(void) { - scaling = SCALE_4_3; + emu_set_default_config(); - Config.Xa = Config.Cdda = Config.Sio = - Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0; + g_opts = 0; + scaling = SCALE_4_3; + volume_boost = 0; + frameskip = 0; + analog_deadzone = 50; + psx_clock = DEFAULT_PSX_CLOCK; - iUseDither = UseFrameSkip = 0; - UseFrameLimit = 1; - dwActFixes = 1<<7; + region = 0; + in_type_sel1 = in_type_sel2 = 0; + in_evdev_allow_abs_only = 0; - iUseReverb = 2; - iUseInterpolation = 1; - iXAPitch = iSPUIRQWait = 0; - iUseTimer = 2; + menu_sync_config(); } #define CE_CONFIG_STR(val) \ @@ -159,6 +212,16 @@ static void menu_set_defconfig(void) #define CE_INTVAL(val) \ { #val, sizeof(val), &val } +#define CE_INTVAL_P(val) \ + { #val, sizeof(pl_rearmed_cbs.val), &pl_rearmed_cbs.val } + +// 'versioned' var, used when defaults change +#define CE_INTVAL_V(val, ver) \ + { #val #ver, sizeof(val), &val } + +#define CE_INTVAL_PV(val, ver) \ + { #val #ver, sizeof(pl_rearmed_cbs.val), &pl_rearmed_cbs.val } + static const struct { const char *name; size_t len; @@ -167,11 +230,10 @@ static const struct { CE_CONFIG_STR(Bios), CE_CONFIG_STR(Gpu), CE_CONFIG_STR(Spu), - CE_CONFIG_STR(Cdr), +// CE_CONFIG_STR(Cdr), CE_CONFIG_VAL(Xa), CE_CONFIG_VAL(Sio), CE_CONFIG_VAL(Mdec), - CE_CONFIG_VAL(PsxAuto), CE_CONFIG_VAL(Cdda), CE_CONFIG_VAL(Debug), CE_CONFIG_VAL(PsxOut), @@ -179,8 +241,9 @@ static const struct { CE_CONFIG_VAL(RCntFix), CE_CONFIG_VAL(VSyncWA), CE_CONFIG_VAL(Cpu), - CE_CONFIG_VAL(PsxType), - CE_INTVAL(scaling), + CE_CONFIG_VAL(CdrReschedule), + CE_INTVAL(region), + CE_INTVAL_V(scaling, 2), CE_INTVAL(g_layer_x), CE_INTVAL(g_layer_y), CE_INTVAL(g_layer_w), @@ -189,20 +252,31 @@ static const struct { CE_INTVAL(state_slot), CE_INTVAL(cpu_clock), CE_INTVAL(g_opts), - CE_INTVAL(iUseDither), - CE_INTVAL(UseFrameSkip), - CE_INTVAL(UseFrameLimit), - CE_INTVAL(dwActFixes), - CE_INTVAL(iUseReverb), - CE_INTVAL(iUseInterpolation), - CE_INTVAL(iXAPitch), - CE_INTVAL(iSPUIRQWait), - CE_INTVAL(iUseTimer), + CE_INTVAL(in_type_sel1), + CE_INTVAL(in_type_sel2), + CE_INTVAL(analog_deadzone), + CE_INTVAL_V(frameskip, 2), + CE_INTVAL_P(gpu_peops.iUseDither), + CE_INTVAL_P(gpu_peops.dwActFixes), + CE_INTVAL_P(gpu_unai.abe_hack), + CE_INTVAL_P(gpu_unai.no_light), + CE_INTVAL_P(gpu_unai.no_blend), + CE_INTVAL_V(iUseReverb, 3), + CE_INTVAL_V(iXAPitch, 3), + CE_INTVAL_V(iUseInterpolation, 3), + CE_INTVAL_V(iSPUIRQWait, 3), + CE_INTVAL_V(iUseTimer, 3), + CE_INTVAL(warned_about_bios), + CE_INTVAL(in_evdev_allow_abs_only), + CE_INTVAL(volume_boost), + CE_INTVAL(psx_clock), + CE_INTVAL(new_dynarec_hacks), + CE_INTVAL(in_enable_vibration), }; -static void make_cfg_fname(char *buf, size_t size, int is_game) +static char *get_cd_label(void) { - char trimlabel[33]; + static char trimlabel[33]; int j; strncpy(trimlabel, CdromLabel, 32); @@ -211,12 +285,19 @@ static void make_cfg_fname(char *buf, size_t size, int is_game) if (trimlabel[j] == ' ') trimlabel[j] = 0; + return trimlabel; +} + +static void make_cfg_fname(char *buf, size_t size, int is_game) +{ if (is_game) - snprintf(buf, size, "." PCSX_DOT_DIR "cfg/%.32s-%.9s.cfg", trimlabel, CdromId); + snprintf(buf, size, "." PCSX_DOT_DIR "cfg/%.32s-%.9s.cfg", get_cd_label(), CdromId); else snprintf(buf, size, "." PCSX_DOT_DIR "%s", cfgfile_basename); } +static void keys_write_all(FILE *f); + static int menu_write_config(int is_game) { char cfgfile[MAXPATHLEN]; @@ -255,7 +336,9 @@ static int menu_write_config(int is_game) if (!is_game) fprintf(f, "lastcdimg = %s\n", last_selected_fname); + keys_write_all(f); fclose(f); + return 0; } @@ -271,6 +354,8 @@ static void parse_str_val(char *cval, const char *src) *tmp = 0; } +static void keys_load_all(const char *cfg); + static int menu_load_config(int is_game) { char cfgfile[MAXPATHLEN]; @@ -283,7 +368,7 @@ static int menu_load_config(int is_game) f = fopen(cfgfile, "r"); if (f == NULL) { printf("menu_load_config: failed to open: %s\n", cfgfile); - return -1; + goto fail; } fseek(f, 0, SEEK_END); @@ -351,6 +436,16 @@ static int menu_load_config(int is_game) } } + keys_load_all(cfg); + ret = 0; +fail_read: + free(cfg); +fail: + if (f != NULL) + fclose(f); + + menu_sync_config(); + // sync plugins for (i = bios_sel = 0; bioses[i] != NULL; i++) if (strcmp(Config.Bios, bioses[i]) == 0) @@ -364,19 +459,16 @@ static int menu_load_config(int is_game) if (strcmp(Config.Spu, spu_plugins[i]) == 0) { spu_plugsel = i; break; } - ret = 0; -fail_read: - free(cfg); -fail: - fclose(f); return ret; } // rrrr rggg gggb bbbb static unsigned short fname2color(const char *fname) { - static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".z", ".cue" }; - static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table" }; + static const char *cdimg_exts[] = { ".bin", ".img", ".mdf", ".iso", ".cue", ".z", + ".bz", ".znx", ".pbp", ".cbn" }; + static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", + ".table", ".index", ".sbi" }; const char *ext = strrchr(fname, '.'); int i; @@ -393,7 +485,17 @@ 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 +#ifdef __ARM_ARCH_7A__ // assume hires device +#define MENU_X2 1 +#else +#define MENU_X2 0 +#endif + #define menu_init menu_init_common #include "common/menu.c" #undef menu_init @@ -401,7 +503,6 @@ static void draw_savestate_bg(int slot); // a bit of black magic here static void draw_savestate_bg(int slot) { - extern void bgr555_to_rgb565(void *dst, void *src, int bytes); static const int psx_widths[8] = { 256, 368, 320, 384, 512, 512, 640, 640 }; int x, y, w, h; char fname[MAXPATHLEN]; @@ -440,12 +541,12 @@ static void draw_savestate_bg(int slot) memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2); - if ((gpu->ulStatus & 0x800000) || (gpu->ulStatus & 0x200000)) - goto out; // disabled || 24bpp (NYET) + if (gpu->ulStatus & 0x800000) + goto out; // disabled x = gpu->ulControl[5] & 0x3ff; y = (gpu->ulControl[5] >> 10) & 0x1ff; - s = (u16 *)gpu->psxVRam + y * 1024 + (x & ~3); + s = (u16 *)gpu->psxVRam + y * 1024 + (x & ~1); w = psx_widths[(gpu->ulStatus >> 16) & 7]; tmp = gpu->ulControl[7]; h = ((tmp >> 10) & 0x3ff) - (tmp & 0x3ff); @@ -458,41 +559,26 @@ static void draw_savestate_bg(int slot) h = min(g_menuscreen_h, h); d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x; - for (; h > 0; h--, d += g_menuscreen_w, s += 1024) - bgr555_to_rgb565(d, s, w * 2); + for (; h > 0; h--, d += g_menuscreen_w, s += 1024) { + if (gpu->ulStatus & 0x200000) + bgr888_to_rgb565(d, s, w * 3); + else + bgr555_to_rgb565(d, s, w * 2); +#ifndef __ARM_ARCH_7A__ + // better darken this on small screens + menu_darken_bg(d, d, w * 2, 0); +#endif + } out: free(gpu); } -// ---------- pandora specific ----------- +// ---------- XXX: pandora specific ----------- static const char pnd_script_base[] = "sudo -n /usr/pandora/scripts"; static char **pnd_filter_list; -static int get_cpu_clock(void) -{ - FILE *f; - int ret = 0; - f = fopen("/proc/pandora/cpu_mhz_max", "r"); - if (f) { - fscanf(f, "%d", &ret); - fclose(f); - } - return ret; -} - -static void apply_cpu_clock(void) -{ - char buf[128]; - - if (cpu_clock != 0 && cpu_clock != get_cpu_clock()) { - snprintf(buf, sizeof(buf), "unset DISPLAY; echo y | %s/op_cpuspeed.sh %d", - pnd_script_base, cpu_clock); - system(buf); - } -} - static void apply_filter(int which) { static int old = -1; @@ -514,6 +600,20 @@ static void apply_filter(int which) old = which; } +static void apply_lcdrate(int pal) +{ + static int old = -1; + char buf[128]; + + if (pal == old) + return; + + snprintf(buf, sizeof(buf), "%s/op_lcdrate.sh %d", + pnd_script_base, pal ? 50 : 60); + system(buf); + old = pal; +} + static menu_entry e_menu_gfx_options[]; static void pnd_menu_init(void) @@ -521,10 +621,10 @@ static void pnd_menu_init(void) struct dirent *ent; int i, count = 0; char **mfilters; - char buff[64], *p; + char buff[64]; DIR *dir; - cpu_clock_st = cpu_clock = get_cpu_clock(); + cpu_clock_st = cpu_clock = plat_cpu_clock_get(); dir = opendir("/etc/pandora/conf/dss_fir"); if (dir == NULL) { @@ -540,9 +640,11 @@ static void pnd_menu_init(void) perror("readdir"); break; } - p = strstr(ent->d_name, "_up"); - if (p != NULL && (p[3] == 0 || !strcmp(p + 3, "_h"))) - count++; + + if (ent->d_type != DT_REG && ent->d_type != DT_LNK) + continue; + + count++; } if (count == 0) @@ -556,11 +658,21 @@ static void pnd_menu_init(void) for (i = 0; (ent = readdir(dir)); ) { size_t len; - p = strstr(ent->d_name, "_up"); - if (p == NULL || (p[3] != 0 && strcmp(p + 3, "_h"))) + if (ent->d_type != DT_REG && ent->d_type != DT_LNK) continue; - len = p - ent->d_name; + len = strlen(ent->d_name); + + // skip pre-HF5 extra files + if (len >= 3 && strcmp(ent->d_name + len - 3, "_v3") == 0) + continue; + if (len >= 3 && strcmp(ent->d_name + len - 3, "_v5") == 0) + continue; + + // have to cut "_up_h" for pre-HF5 + if (len > 5 && strcmp(ent->d_name + len - 5, "_up_h") == 0) + len -= 5; + if (len > sizeof(buff) - 1) continue; @@ -579,8 +691,7 @@ static void pnd_menu_init(void) void menu_finish(void) { - cpu_clock = cpu_clock_st; - apply_cpu_clock(); + plat_cpu_clock_apply(cpu_clock_st); } // -------------- key config -------------- @@ -599,6 +710,8 @@ me_bind_action me_ctrl_actions[] = { "R1 ", 1 << DKEY_R1 }, { "L2 ", 1 << DKEY_L2 }, { "R2 ", 1 << DKEY_R2 }, + { "L3 ", 1 << DKEY_L3 }, + { "R3 ", 1 << DKEY_R3 }, { "START ", 1 << DKEY_START }, { "SELECT ", 1 << DKEY_SELECT }, { NULL, 0 } @@ -606,16 +719,217 @@ me_bind_action me_ctrl_actions[] = me_bind_action emuctrl_actions[] = { -/* - { "Load State ", PEV_STATE_LOAD }, - { "Save State ", PEV_STATE_SAVE }, - { "Prev Save Slot ", PEV_SSLOT_PREV }, - { "Next Save Slot ", PEV_SSLOT_NEXT }, -*/ - { "Enter Menu ", PEV_MENU }, + { "Save State ", 1 << SACTION_SAVE_STATE }, + { "Load State ", 1 << SACTION_LOAD_STATE }, + { "Prev Save Slot ", 1 << SACTION_PREV_SSLOT }, + { "Next Save Slot ", 1 << SACTION_NEXT_SSLOT }, + { "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 }, +#ifndef __ARM_ARCH_7A__ /* XXX */ + { "Volume Up ", 1 << SACTION_VOLUME_UP }, + { "Volume Down ", 1 << SACTION_VOLUME_DOWN }, +#endif { NULL, 0 } }; +static char *mystrip(char *str) +{ + int i, len; + + len = strlen(str); + for (i = 0; i < len; i++) + if (str[i] != ' ') break; + if (i > 0) memmove(str, str + i, len - i + 1); + + len = strlen(str); + for (i = len - 1; i >= 0; i--) + if (str[i] != ' ') break; + str[i+1] = 0; + + return str; +} + +static void get_line(char *d, size_t size, const char *s) +{ + const char *pe; + size_t len; + + for (pe = s; *pe != '\r' && *pe != '\n' && *pe != 0; pe++) + ; + len = pe - s; + if (len > size - 1) + len = size - 1; + strncpy(d, s, len); + d[len] = 0; + + mystrip(d); +} + +static void keys_write_all(FILE *f) +{ + int d; + + for (d = 0; d < IN_MAX_DEVS; d++) + { + const int *binds = in_get_dev_binds(d); + const char *name = in_get_dev_name(d, 0, 0); + int k, count = 0; + + if (binds == NULL || name == NULL) + continue; + + fprintf(f, "binddev = %s\n", name); + in_get_config(d, IN_CFG_BIND_COUNT, &count); + + for (k = 0; k < count; k++) + { + int i, kbinds, mask; + char act[32]; + + act[0] = act[31] = 0; + name = in_get_key_name(d, k); + + kbinds = binds[IN_BIND_OFFS(k, IN_BINDTYPE_PLAYER12)]; + for (i = 0; kbinds && i < ARRAY_SIZE(me_ctrl_actions) - 1; i++) { + mask = me_ctrl_actions[i].mask; + if (mask & kbinds) { + strncpy(act, me_ctrl_actions[i].name, 31); + fprintf(f, "bind %s = player1 %s\n", name, mystrip(act)); + kbinds &= ~mask; + } + mask = me_ctrl_actions[i].mask << 16; + if (mask & kbinds) { + strncpy(act, me_ctrl_actions[i].name, 31); + fprintf(f, "bind %s = player2 %s\n", name, mystrip(act)); + kbinds &= ~mask; + } + } + + kbinds = binds[IN_BIND_OFFS(k, IN_BINDTYPE_EMU)]; + for (i = 0; kbinds && emuctrl_actions[i].name != NULL; i++) { + mask = emuctrl_actions[i].mask; + if (mask & kbinds) { + strncpy(act, emuctrl_actions[i].name, 31); + fprintf(f, "bind %s = %s\n", name, mystrip(act)); + kbinds &= ~mask; + } + } + } + + for (k = 0; k < array_size(in_adev); k++) + { + if (in_adev[k] == d) + fprintf(f, "bind_analog = %d\n", k); + } + } +} + +static int parse_bind_val(const char *val, int *type) +{ + int i; + + *type = IN_BINDTYPE_NONE; + if (val[0] == 0) + return 0; + + if (strncasecmp(val, "player", 6) == 0) + { + int player, shift = 0; + player = atoi(val + 6) - 1; + + if ((unsigned int)player > 1) + return -1; + if (player == 1) + shift = 16; + + *type = IN_BINDTYPE_PLAYER12; + for (i = 0; me_ctrl_actions[i].name != NULL; i++) { + if (strncasecmp(me_ctrl_actions[i].name, val + 8, strlen(val + 8)) == 0) + return me_ctrl_actions[i].mask << shift; + } + } + for (i = 0; emuctrl_actions[i].name != NULL; i++) { + if (strncasecmp(emuctrl_actions[i].name, val, strlen(val)) == 0) { + *type = IN_BINDTYPE_EMU; + return emuctrl_actions[i].mask; + } + } + + return -1; +} + +static void keys_load_all(const char *cfg) +{ + char dev[256], key[128], *act; + const char *p; + int bind, bindtype; + int ret, dev_id; + + p = cfg; + while (p != NULL && (p = strstr(p, "binddev = ")) != NULL) { + p += 10; + + get_line(dev, sizeof(dev), p); + dev_id = in_config_parse_dev(dev); + if (dev_id < 0) { + printf("input: can't handle dev: %s\n", dev); + continue; + } + + in_unbind_all(dev_id, -1, -1); + while ((p = strstr(p, "bind"))) { + if (strncmp(p, "binddev = ", 10) == 0) + break; + + if (strncmp(p, "bind_analog", 11) == 0) { + ret = sscanf(p, "bind_analog = %d", &bind); + p += 11; + if (ret != 1) { + printf("input: parse error: %16s..\n", p); + continue; + } + if ((unsigned int)bind >= array_size(in_adev)) { + printf("input: analog id %d out of range\n", bind); + continue; + } + in_adev[bind] = dev_id; + continue; + } + + p += 4; + if (*p != ' ') { + printf("input: parse error: %16s..\n", p); + continue; + } + + get_line(key, sizeof(key), p); + act = strchr(key, '='); + if (act == NULL) { + printf("parse failed: %16s..\n", p); + continue; + } + *act = 0; + act++; + mystrip(key); + mystrip(act); + + bind = parse_bind_val(act, &bindtype); + if (bind != -1 && bind != 0) { + //printf("bind #%d '%s' %08x (%s)\n", dev_id, key, bind, act); + in_config_bind_key(dev_id, key, bind, bindtype); + } + else + lprintf("config: unhandled action \"%s\"\n", act); + } + } + in_clean_binds(); +} + static int key_config_loop_wrap(int id, int keys) { switch (id) { @@ -634,6 +948,57 @@ static int key_config_loop_wrap(int id, int keys) return 0; } +static const char *adevnames[IN_MAX_DEVS + 2]; +static int stick_sel[2]; + +static menu_entry e_menu_keyconfig_analog[] = +{ + mee_enum ("Left stick (L3)", 0, stick_sel[0], adevnames), + mee_range(" X axis", 0, in_adev_axis[0][0], 0, 7), + mee_range(" Y axis", 0, in_adev_axis[0][1], 0, 7), + mee_enum ("Right stick (R3)", 0, stick_sel[1], adevnames), + mee_range(" X axis", 0, in_adev_axis[1][0], 0, 7), + mee_range(" Y axis", 0, in_adev_axis[1][1], 0, 7), + mee_end, +}; + +static int key_config_analog(int id, int keys) +{ + int i, d, count, sel = 0; + int sel2dev_map[IN_MAX_DEVS]; + + memset(adevnames, 0, sizeof(adevnames)); + memset(sel2dev_map, 0xff, sizeof(sel2dev_map)); + memset(stick_sel, 0, sizeof(stick_sel)); + + adevnames[0] = "None"; + i = 1; + for (d = 0; d < IN_MAX_DEVS; d++) + { + const char *name = in_get_dev_name(d, 0, 1); + if (name == NULL) + continue; + + count = 0; + in_get_config(d, IN_CFG_ABS_AXIS_COUNT, &count); + if (count == 0) + continue; + + if (in_adev[0] == d) stick_sel[0] = i; + if (in_adev[1] == d) stick_sel[1] = i; + sel2dev_map[i] = d; + adevnames[i++] = name; + } + adevnames[i] = NULL; + + me_loop(e_menu_keyconfig_analog, &sel); + + in_adev[0] = sel2dev_map[stick_sel[0]]; + in_adev[1] = sel2dev_map[stick_sel[1]]; + + return 0; +} + static const char *mgn_dev_name(int id, int *offs) { const char *name = NULL; @@ -667,15 +1032,42 @@ static int mh_savecfg(int id, int keys) return 1; } +static int mh_input_rescan(int id, int keys) +{ + //menu_sync_config(); + in_probe(); + me_update_msg("rescan complete."); + + return 0; +} + +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 const char h_vibration[]= "Must select analog above and enable this ingame too."; + 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_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_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("Analog controls", MA_CTRL_ANALOG, key_config_analog), + mee_handler_id("Emulator/Gun controls", MA_CTRL_EMU, key_config_loop_wrap), + mee_label (""), + 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", MA_CTRL_NUBS_BTNS, in_evdev_allow_abs_only, 1, h_nub_btns), + mee_onoff_h ("Vibration", MA_CTRL_VIBRATION, in_enable_vibration, 1, h_vibration), + mee_range ("Analog deadzone", MA_CTRL_DEADZONE, analog_deadzone, 1, 99), + 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), mee_label (""), - mee_label ("Input devices:"), mee_label_mk (MA_CTRL_DEV_FIRST, mgn_dev_name), mee_label_mk (MA_CTRL_DEV_NEXT, mgn_dev_name), mee_label_mk (MA_CTRL_DEV_NEXT, mgn_dev_name), @@ -690,14 +1082,14 @@ 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); - me_loop(e_menu_keyconfig, &sel, NULL); +// me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, ready_to_go && CdromId[0]); + me_loop(e_menu_keyconfig, &sel); return 0; } // ------------ gfx options menu ------------ -static const char *men_scaler[] = { "1x1", "scaled 4:3", "fullscreen", "custom", NULL }; +static const char *men_scaler[] = { "1x1", "scaled 4:3", "integer scaled 4:3", "fullscreen", "custom", NULL }; static const char h_cscaler[] = "Displays the scaler layer, you can resize it\n" "using d-pad or move it using R+d-pad"; static const char *men_dummy[] = { NULL }; @@ -765,13 +1157,28 @@ 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; } // ------------ bios/plugins ------------ +static menu_entry e_menu_plugin_gpu_unai[] = +{ + mee_onoff ("Abe's Odyssey hack", 0, pl_rearmed_cbs.gpu_unai.abe_hack, 1), + mee_onoff ("Disable lighting", 0, pl_rearmed_cbs.gpu_unai.no_light, 1), + mee_onoff ("Disable blending", 0, pl_rearmed_cbs.gpu_unai.no_blend, 1), + mee_end, +}; + +static int menu_loop_plugin_gpu_unai(int id, int keys) +{ + int sel = 0; + me_loop(e_menu_plugin_gpu_unai, &sel); + return 0; +} + static const char *men_gpu_dithering[] = { "None", "Game dependant", "Always", NULL }; static const char h_gpu_0[] = "Needed for Chrono Cross"; static const char h_gpu_1[] = "Capcom fighting games"; @@ -783,56 +1190,58 @@ static const char h_gpu_8[] = "Needed by Dark Forces"; static const char h_gpu_9[] = "better g-colors, worse textures"; static const char h_gpu_10[] = "Toggle busy flags after drawing"; -static menu_entry e_menu_plugin_gpu[] = -{ - mee_enum ("Dithering", 0, iUseDither, men_gpu_dithering), - mee_onoff_h ("Odd/even bit hack", 0, dwActFixes, 1<<0, h_gpu_0), - mee_onoff_h ("Expand screen width", 0, dwActFixes, 1<<1, h_gpu_1), - mee_onoff_h ("Ignore brightness color", 0, dwActFixes, 1<<2, h_gpu_2), - mee_onoff_h ("Disable coordinate check", 0, dwActFixes, 1<<3, h_gpu_3), - mee_onoff_h ("Lazy screen update", 0, dwActFixes, 1<<6, h_gpu_6), - mee_onoff_h ("Old frame skipping", 0, dwActFixes, 1<<7, h_gpu_7), - mee_onoff_h ("Repeated flat tex triangles ",0,dwActFixes, 1<<8, h_gpu_8), - mee_onoff_h ("Draw quads with triangles", 0, dwActFixes, 1<<9, h_gpu_9), - mee_onoff_h ("Fake 'gpu busy' states", 0, dwActFixes, 1<<10, h_gpu_10), +static menu_entry e_menu_plugin_gpu_peops[] = +{ + mee_enum ("Dithering", 0, pl_rearmed_cbs.gpu_peops.iUseDither, men_gpu_dithering), + mee_onoff_h ("Odd/even bit hack", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<0, h_gpu_0), + mee_onoff_h ("Expand screen width", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<1, h_gpu_1), + mee_onoff_h ("Ignore brightness color", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<2, h_gpu_2), + mee_onoff_h ("Disable coordinate check", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<3, h_gpu_3), + mee_onoff_h ("Lazy screen update", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<6, h_gpu_6), + mee_onoff_h ("Old frame skipping", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<7, h_gpu_7), + mee_onoff_h ("Repeated flat tex triangles ",0,pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<8, h_gpu_8), + mee_onoff_h ("Draw quads with triangles", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<9, h_gpu_9), + mee_onoff_h ("Fake 'gpu busy' states", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<10, h_gpu_10), mee_end, }; -static int menu_loop_plugin_gpu(int id, int keys) +static int menu_loop_plugin_gpu_peops(int id, int keys) { static int sel = 0; - me_loop(e_menu_plugin_gpu, &sel, NULL); + me_loop(e_menu_plugin_gpu_peops, &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_irq_wait[] = "Wait for CPU; only useful for some games, may cause glitches"; -static const char h_spu_thread[] = "Run sound emulation in separate thread"; +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), - mee_onoff_h ("Use sound thread", 0, iUseTimer, 1, h_spu_thread), + mee_onoff_h ("Sound in main thread", 0, iUseTimer, 2, h_spu_thread), mee_end, }; 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; } -static const char h_bios[] = "HLE is simulated BIOS. BIOS is saved in savestates.\n" - "Must save config and reload the game\n" - "for change to take effect"; +static const char h_bios[] = "HLE is simulated BIOS. BIOS selection is saved in\n" + "savestates and can't be changed there. Must save\n" + "config and reload the game for change to take effect"; static const char h_plugin_xpu[] = "Must save config and reload the game\n" "for plugin change to take effect"; -static const char h_gpu[] = "Configure built-in P.E.Op.S. SoftGL Driver V1.17"; +static const char h_gpu_peops[] = "Configure P.E.Op.S. SoftGL Driver V1.17"; +static const char h_gpu_unai[] = "Configure Unai/PCSX4ALL Team GPU plugin"; static const char h_spu[] = "Configure built-in P.E.Op.S. Sound Driver V1.7"; static menu_entry e_menu_plugin_options[] = @@ -840,53 +1249,92 @@ static menu_entry e_menu_plugin_options[] = mee_enum_h ("BIOS", 0, bios_sel, bioses, h_bios), mee_enum_h ("GPU plugin", 0, gpu_plugsel, gpu_plugins, h_plugin_xpu), mee_enum_h ("SPU plugin", 0, spu_plugsel, spu_plugins, h_plugin_xpu), - mee_handler_h ("Configure built-in GPU plugin", menu_loop_plugin_gpu, h_gpu), + mee_handler_h ("Configure gpu_peops plugin", menu_loop_plugin_gpu_peops, h_gpu_peops), + mee_handler_h ("Configure PCSX4ALL GPU plugin", menu_loop_plugin_gpu_unai, h_gpu_unai), mee_handler_h ("Configure built-in SPU plugin", menu_loop_plugin_spu, h_spu), mee_end, }; +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_main2, MA_MAIN_RUN_BIOS, bios_sel != 0); return 0; } // ------------ adv options menu ------------ -static const char h_cfg_cpul[] = "Shows CPU usage in %%"; -static const char h_cfg_fl[] = "Keeps the game from running too fast"; +static const char h_cfg_psxclk[] = "Over/under-clock the PSX, default is " DEFAULT_PSX_CLOCK_S "\n"; +static const char h_cfg_nosmc[] = "Will cause crashes when loading, break memcards"; +static const char h_cfg_gteunn[] = "May cause graphical glitches"; +static const char h_cfg_gteflgs[] = "Will cause graphical glitches"; + +static menu_entry e_menu_speed_hacks[] = +{ + mee_range_h ("PSX CPU clock, %%", 0, psx_clock, 1, 500, h_cfg_psxclk), + mee_onoff_h ("Disable SMC checks", 0, new_dynarec_hacks, NDHACK_NO_SMC_CHECK, h_cfg_nosmc), + mee_onoff_h ("Assume GTE regs unneeded", 0, new_dynarec_hacks, NDHACK_GTE_UNNEEDED, h_cfg_gteunn), + mee_onoff_h ("Disable GTE flags", 0, new_dynarec_hacks, NDHACK_GTE_NO_FLAGS, h_cfg_gteflgs), + mee_end, +}; + +static int menu_loop_speed_hacks(int id, int keys) +{ + static int sel = 0; + me_loop(e_menu_speed_hacks, &sel); + return 0; +} + +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 (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 const char h_cfg_shacks[] = "Breaks games but may give better performance\n" + "must reload game for any change to take effect"; static menu_entry e_menu_adv_options[] = { mee_onoff_h ("Show CPU load", 0, g_opts, OPT_SHOWCPU, h_cfg_cpul), - mee_onoff_h ("Frame Limiter", 0, UseFrameLimit, 1, h_cfg_fl), + 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), mee_onoff_h ("SIO IRQ Always Enabled", 0, Config.Sio, 1, h_cfg_sio), 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", 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_handler_h ("[Speed hacks]", menu_loop_speed_hacks, h_cfg_shacks), mee_end, }; 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; } @@ -899,7 +1347,8 @@ static int mh_restore_defaults(int id, int keys) return 1; } -static const char *men_region[] = { "NTSC", "PAL", NULL }; +static const char *men_region[] = { "Auto", "NTSC", "PAL", NULL }; +static const char *men_frameskip[] = { "Auto", "Off", "1", NULL }; /* static const char *men_confirm_save[] = { "OFF", "writes", "loads", "both", NULL }; static const char h_confirm_save[] = "Ask for confirmation when overwriting save,\n" @@ -907,16 +1356,17 @@ static const char h_confirm_save[] = "Ask for confirmation when overwriting s */ static const char h_restore_def[] = "Switches back to default / recommended\n" "configuration"; +static const char h_frameskip[] = "Warning: frameskip sometimes causes glitches\n"; static menu_entry e_menu_options[] = { // mee_range ("Save slot", 0, state_slot, 0, 9), // mee_enum_h ("Confirm savestate", 0, dummy, men_confirm_save, h_confirm_save), - mee_onoff ("Frameskip", 0, UseFrameSkip, 1), + mee_enum_h ("Frameskip", 0, frameskip, men_frameskip, h_frameskip), mee_onoff ("Show FPS", 0, g_opts, OPT_SHOWFPS), - mee_enum ("Region", 0, Config.PsxType, men_region), + mee_enum ("Region", 0, region, men_region), mee_range ("CPU clock", MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000), - mee_handler ("[Display]", menu_loop_gfx_options), + mee_handler_id("[Display]", MA_OPT_DISP_OPTS, menu_loop_gfx_options), mee_handler ("[BIOS/Plugins]", menu_loop_plugin_options), mee_handler ("[Advanced]", menu_loop_adv_options), mee_cust_nosave("Save global config", MA_OPT_SAVECFG, mh_savecfg, mgn_saveloadcfg), @@ -932,33 +1382,200 @@ static int menu_loop_options(int id, int keys) i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS); e_menu_options[i].enabled = cpu_clock != 0 ? 1 : 0; - me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, ready_to_go); + 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; } // ------------ debug menu ------------ -static void draw_frame_debug(void) +static void draw_frame_debug(GPUFreeze_t *gpuf) { + int w = min(g_menuscreen_w, 1024); + int h = min(g_menuscreen_h, 512); + u16 *d = g_menuscreen_ptr; + u16 *s = (u16 *)gpuf->psxVRam; + char buff[64]; + int ty = 1; + + gpuf->ulFreezeVersion = 1; + if (GPU_freeze != NULL) + GPU_freeze(1, gpuf); + + for (; h > 0; h--, d += g_menuscreen_w, s += 1024) + bgr555_to_rgb565(d, s, w * 2); + smalltext_out16(4, 1, "build: "__DATE__ " " __TIME__ " " REV, 0xe7fc); + snprintf(buff, sizeof(buff), "GPU sr: %08x", gpuf->ulStatus); + smalltext_out16(4, (ty += me_sfont_h), buff, 0xe7fc); + snprintf(buff, sizeof(buff), "PC/SP: %08x %08x", psxRegs.pc, psxRegs.GPR.n.sp); + smalltext_out16(4, (ty += me_sfont_h), buff, 0xe7fc); } static void debug_menu_loop(void) { + GPUFreeze_t *gpuf; int inp; + gpuf = malloc(sizeof(*gpuf)); + if (gpuf == NULL) + return; + while (1) { - menu_draw_begin(1); - draw_frame_debug(); + menu_draw_begin(0); + draw_frame_debug(gpuf); menu_draw_end(); inp = in_menu_wait(PBTN_MOK|PBTN_MBACK|PBTN_MA2|PBTN_MA3|PBTN_L|PBTN_R | PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT, 70); if (inp & PBTN_MBACK) + break; + } + + free(gpuf); +} + +// --------- 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) +{ + int inp; + static const char msg[] = + "You don't seem to have copied any BIOS\n" + "files to\n" +#ifdef __ARM_ARCH_7A__ // XXX + "/pandora/appdata/pcsx_rearmed/bios/\n\n" +#else + "pcsx_rearmed/bios/\n\n" +#endif + "While many games work fine with fake\n" + "(HLE) BIOS, others (like MGS and FF8)\n" + "require BIOS to work.\n" + "After copying the file, you'll also need\n" + "to select it in the emu's menu:\n" + "options->[BIOS/Plugins]\n\n" + "The file is usually named SCPH1001.BIN,\n" + "but other not compressed files can be\n" + "used too.\n\n" + "Press (B) or (X) to continue"; + + while (1) + { + draw_menu_message(msg, NULL); + + inp = in_menu_wait(PBTN_MOK|PBTN_MBACK, 70); + if (inp & (PBTN_MBACK|PBTN_MOK)) return; } } @@ -967,30 +1584,71 @@ static void debug_menu_loop(void) void OnFile_Exit(); -const char *plat_get_credits(void) +static void draw_frame_main(void) { - return "PCSX-ReARMed\n\n" - "(C) 1999-2003 PCSX Team\n" - "(C) 2005-2009 PCSX-df Team\n" - "(C) 2009-2010 PCSX-Reloaded Team\n\n" - "GPU and SPU code by Pete Bernert\n" - " and the P.E.Op.S. team\n" - "ARM recompiler (C) 2009-2010 Ari64\n" - "PCSX4ALL plugins by PCSX4ALL team\n" - " Chui, Franxis, Unai\n\n" - "integration, optimization and\n" - " frontend (C) 2010-2011 notaz\n"; + struct tm *tmp; + time_t ltime; + char ltime_s[16]; + char buff[64]; + + if (CdromId[0] != 0) { + snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s, with %s)", + get_cd_label(), CdromId, Config.PsxType ? "PAL" : "NTSC", + Config.HLE ? "HLE" : "BIOS"); + smalltext_out16(4, 1, buff, 0x105f); + } + + if (ready_to_go) { + ltime = time(NULL); + tmp = localtime(<ime); + strftime(ltime_s, sizeof(ltime_s), "%H:%M", tmp); + snprintf(buff, sizeof(buff), "%s %3d%%", ltime_s, plat_get_bat_capacity()); + smalltext_out16(4, 1 + me_sfont_h, buff, 0x105f); + } } -static int run_cd_image(const char *fname) +static void draw_frame_credits(void) { - extern void set_cd_image(const char *fname); - ready_to_go = 0; - pl_fbdev_buf = NULL; + smalltext_out16(4, 1, "build: "__DATE__ " " __TIME__ " " REV, 0xe7fc); +} + +static const char credits_text[] = + "PCSX-ReARMed\n\n" + "(C) 1999-2003 PCSX Team\n" + "(C) 2005-2009 PCSX-df Team\n" + "(C) 2009-2011 PCSX-Reloaded Team\n\n" + "GPU and SPU code by Pete Bernert\n" + " and the P.E.Op.S. team\n" + "ARM recompiler (C) 2009-2011 Ari64\n" + "PCSX4ALL plugins by PCSX4ALL team\n" + " Chui, Franxis, Unai\n\n" + "integration, optimization and\n" + " frontend (C) 2010-2011 notaz\n"; + +static int reset_game(void) +{ + // sanity check + if (bios_sel == 0 && !Config.HLE) + return -1; ClosePlugins(); - set_cd_image(fname); + OpenPlugins(); + SysReset(); + if (CheckCdrom() != -1) { + LoadCdrom(); + } + return 0; +} + +static int reload_plugins(const char *cdimg) +{ + pl_vout_buf = NULL; + + ClosePlugins(); + + set_cd_image(cdimg); LoadPlugins(); + pcnt_hook_plugins(); NetOpened = 0; if (OpenPlugins() == -1) { me_update_msg("failed to open plugins"); @@ -998,6 +1656,58 @@ static int run_cd_image(const char *fname) } plugin_call_rearmed_cbs(); + cdrIsoMultidiskCount = 1; + 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_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; + if (reload_plugins(NULL) != 0) + return -1; + + SysReset(); + if (Load(fname) != 0) { + me_update_msg("exe load failed, bad file?"); + printf("meh\n"); + return -1; + } + + ready_to_go = 1; + return 0; +} + +static int run_cd_image(const char *fname) +{ + ready_to_go = 0; + reload_plugins(fname); + + // always autodetect, menu_sync_config will override as needed + Config.PsxAuto = 1; + if (CheckCdrom() == -1) { // Only check the CD if we are starting the console with a CD ClosePlugins(); @@ -1015,13 +1725,15 @@ static int run_cd_image(const char *fname) } ready_to_go = 1; + snprintf(hud_msg, sizeof(hud_msg), "Booting up..."); + hud_new_msg = 2; return 0; } 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) @@ -1029,6 +1741,8 @@ static int romsel_run(void) printf("selected file: %s\n", fname); + new_dynarec_clear_full(); + if (run_cd_image(fname) != 0) return -1; @@ -1045,10 +1759,61 @@ static int romsel_run(void) return -1; } + if (Config.HLE) + printf("note: running without BIOS, expect compatibility problems\n"); + + strcpy(last_selected_fname, rom_fname_reload); + return 0; +} + +static int swap_cd_image(void) +{ + char *fname; + + fname = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname)); + if (fname == NULL) + return -1; + + printf("selected file: %s\n", fname); + + CdromId[0] = '\0'; + CdromLabel[0] = '\0'; + + set_cd_image(fname); + if (ReloadCdromPlugin() < 0) { + me_update_msg("failed to load cdr plugin"); + return -1; + } + if (CDR_open() < 0) { + me_update_msg("failed to open cdr plugin"); + return -1; + } + + SetCdOpenCaseTime(time(NULL) + 2); + LidInterrupt(); + strcpy(last_selected_fname, rom_fname_reload); return 0; } +static int swap_cd_multidisk(void) +{ + cdrIsoMultidiskSelect++; + CdromId[0] = '\0'; + CdromLabel[0] = '\0'; + + CDR_close(); + if (CDR_open() < 0) { + me_update_msg("failed to open cdr plugin"); + return -1; + } + + SetCdOpenCaseTime(time(NULL) + 2); + LidInterrupt(); + + return 0; +} + static int main_menu_handler(int id, int keys) { switch (id) @@ -1066,22 +1831,31 @@ static int main_menu_handler(int id, int keys) return menu_loop_savestate(1); break; case MA_MAIN_RESET_GAME: - if (ready_to_go) { - ClosePlugins(); - OpenPlugins(); - SysReset(); - if (CheckCdrom() != -1) { - LoadCdrom(); - } + if (ready_to_go && reset_game() == 0) return 1; - } break; case MA_MAIN_LOAD_ROM: if (romsel_run() == 0) return 1; break; + case MA_MAIN_SWAP_CD: + if (swap_cd_image() == 0) + return 1; + break; + case MA_MAIN_SWAP_CD_MULTI: + if (swap_cd_multidisk() == 0) + return 1; + break; + case MA_MAIN_RUN_BIOS: + 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_credits(draw_frame_debug); + draw_menu_message(credits_text, draw_frame_credits); in_menu_wait(PBTN_MOK|PBTN_MBACK, 70); break; case MA_MAIN_EXIT: @@ -1095,6 +1869,29 @@ 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("Next multidisk CD", MA_MAIN_SWAP_CD_MULTI, 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_SWAP_CD_MULTI, ready_to_go && cdrIsoMultidiskCount > 1); + 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 (""), @@ -1106,6 +1903,7 @@ static menu_entry e_menu_main[] = mee_handler_id("Load CD image", MA_MAIN_LOAD_ROM, 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, @@ -1121,16 +1919,20 @@ void menu_loop(void) menu_leave_emu(); + if (bioses[1] == NULL && !warned_about_bios) { + menu_bios_warn(); + warned_about_bios = 1; + } + me_enable(e_menu_main, MA_MAIN_RESUME_GAME, ready_to_go); - me_enable(e_menu_main, MA_MAIN_SAVE_STATE, ready_to_go); - me_enable(e_menu_main, MA_MAIN_LOAD_STATE, ready_to_go); + 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); -// menu_enter(ready_to_go); in_set_config_int(0, IN_CFG_BLOCKING, 1); do { - me_loop(e_menu_main, &sel, NULL); + me_loop_d(e_menu_main, &sel, NULL, draw_frame_main); } while (!ready_to_go); /* wait until menu, ok, back is released */ @@ -1142,18 +1944,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); @@ -1196,8 +2006,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) { @@ -1243,6 +2053,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) @@ -1266,18 +2116,69 @@ void menu_init(void) exit(1); emu_make_path(buff, "skin/background.png", sizeof(buff)); readpng(g_menubg_src_ptr, buff, READPNG_BG, g_menuscreen_w, g_menuscreen_h); + +#ifndef __ARM_ARCH_7A__ /* XXX */ + me_enable(e_menu_options, MA_OPT_DISP_OPTS, 0); + me_enable(e_menu_keyconfig, MA_CTRL_NUBS_BTNS, 0); +#else + me_enable(e_menu_keyconfig, MA_CTRL_VIBRATION, 0); + me_enable(e_menu_keyconfig, MA_CTRL_DEADZONE, 0); +#endif } void menu_notify_mode_change(int w, int h, int bpp) { + float mult; + int imult; + last_psx_w = w; last_psx_h = h; last_psx_bpp = bpp; - if (scaling == SCALE_1_1) { - g_layer_x = 800/2 - w/2; g_layer_y = 480/2 - h/2; + switch (scaling) { + case SCALE_1_1: g_layer_w = w; g_layer_h = h; + break; + + case SCALE_4_3v2: + if (h > g_menuscreen_h || (240 < h && h <= 360)) + goto fractional_4_3; + + // 4:3 that prefers integer scaling + imult = g_menuscreen_h / h; + g_layer_w = w * imult; + g_layer_h = h * imult; + mult = (float)g_layer_w / (float)g_layer_h; + if (mult < 1.25f || mult > 1.666f) + g_layer_w = 4.0f/3.0f * (float)g_layer_h; + printf(" -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult); + break; + + fractional_4_3: + case SCALE_4_3: + mult = 240.0f / (float)h * 4.0f / 3.0f; + if (h > 256) + mult *= 2.0f; + g_layer_w = mult * (float)g_menuscreen_h; + g_layer_h = g_menuscreen_h; + printf(" -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult); + break; + + case SCALE_FULLSCREEN: + g_layer_w = g_menuscreen_w; + g_layer_h = g_menuscreen_h; + break; + + default: + break; } + + g_layer_x = g_menuscreen_w / 2 - g_layer_w / 2; + g_layer_y = g_menuscreen_h / 2 - g_layer_h / 2; + if (g_layer_x < 0) g_layer_x = 0; + if (g_layer_y < 0) g_layer_y = 0; + if (g_layer_w > g_menuscreen_w) g_layer_w = g_menuscreen_w; + if (g_layer_h > g_menuscreen_h) g_layer_w = g_menuscreen_h; } static void menu_leave_emu(void) @@ -1288,61 +2189,58 @@ static void menu_leave_emu(void) fprintf(stderr, "Warning: GPU_close returned %d\n", ret); } + plat_video_menu_enter(ready_to_go); + 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); } - plat_video_menu_enter(ready_to_go); + if (ready_to_go) + cpu_clock = plat_cpu_clock_get(); } void menu_prepare_emu(void) { + R3000Acpu *prev_cpu = psxCpu; + plat_video_menu_leave(); - switch (scaling) { - case SCALE_1_1: - menu_notify_mode_change(last_psx_w, last_psx_h, last_psx_bpp); - break; - case SCALE_4_3: - g_layer_x = 80; g_layer_y = 0; - g_layer_w = 640; g_layer_h = 480; - break; - case SCALE_FULLSCREEN: - g_layer_x = 0; g_layer_y = 0; - g_layer_w = 800; g_layer_h = 480; - break; - case SCALE_CUSTOM: - break; - } - apply_filter(filter); - apply_cpu_clock(); - stop = 0; + menu_notify_mode_change(last_psx_w, last_psx_h, last_psx_bpp); + + psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec; + if (psxCpu != prev_cpu) + // note that this does not really reset, just clears drc caches + psxCpu->Reset(); // core doesn't care about Config.Cdda changes, // so handle them manually here if (Config.Cdda) CDR_stop(); - // HACK to set up the frame limiter if softgpu is not used.. - if (gpu_plugsel != 0) { - fFrameRateHz = Config.PsxType ? 50.0f : 59.94f; - dwFrameRateTicks = (100000*100 / (unsigned long)(fFrameRateHz*100)); - } + menu_sync_config(); + apply_lcdrate(Config.PsxType); + apply_filter(filter); + plat_cpu_clock_apply(cpu_clock); + + // push config to GPU plugin + plugin_call_rearmed_cbs(); if (GPU_open != NULL) { int ret = GPU_open(&gpuDisp, "PCSX", NULL); if (ret) fprintf(stderr, "Warning: GPU_open returned %d\n", ret); } + + dfinput_activate(); } void me_update_msg(const char *msg)