X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=baf7f2cba301c851990b892305f2f3c69b7abf1f;hp=d16eaca2ee5bf6c409e60a3f8a6582e81575f7a3;hb=ff847a2ebb9f89594332aeb52cecfa0bd51669b7;hpb=29a8c4f3e7fee7678e4b18de1748b9c4255dcef2 diff --git a/frontend/menu.c b/frontend/menu.c index d16eaca2..baf7f2cb 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -20,9 +20,12 @@ #include "plugin.h" #include "plugin_lib.h" #include "omap.h" +#include "pandora.h" #include "pcnt.h" #include "arm_utils.h" #include "common/plat.h" +#include "common/input.h" +#include "linux/in_evdev.h" #include "../libpcsxcore/misc.h" #include "../libpcsxcore/cdrom.h" #include "../libpcsxcore/psemu_plugin_defs.h" @@ -72,13 +75,6 @@ static char last_selected_fname[MAXPATHLEN]; static int warned_about_bios, region, in_type_sel; int g_opts; -// from softgpu plugin -extern int iUseDither; -extern int UseFrameSkip; -extern uint32_t dwActFixes; -extern float fFrameRateHz; -extern int dwFrameRateTicks; - // sound plugin extern int iUseReverb; extern int iUseInterpolation; @@ -136,17 +132,24 @@ static int emu_save_load_game(int load, int unused) // 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; } in_type = in_type_sel ? PSE_PAD_TYPE_ANALOGPAD : 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 - fFrameRateHz = Config.PsxType ? 50.0f : 59.94f; - dwFrameRateTicks = (100000*100 / (unsigned long)(fFrameRateHz*100)); + 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)); } static void menu_set_defconfig(void) @@ -156,12 +159,13 @@ static void menu_set_defconfig(void) region = 0; in_type_sel = 0; + in_evdev_allow_abs_only = 0; Config.Xa = Config.Cdda = Config.Sio = Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0; - iUseDither = 0; - UseFrameSkip = 1; - dwActFixes = 1<<7; + pl_rearmed_cbs.frameskip = 0; + pl_rearmed_cbs.gpu_peops.iUseDither = 0; + pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7; iUseReverb = 2; iUseInterpolation = 1; @@ -184,6 +188,9 @@ 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 } @@ -218,15 +225,16 @@ static const struct { CE_INTVAL(cpu_clock), CE_INTVAL(g_opts), CE_INTVAL(in_type_sel), - CE_INTVAL(iUseDither), - CE_INTVAL(UseFrameSkip), - CE_INTVAL(dwActFixes), + CE_INTVAL_P(frameskip), + CE_INTVAL_P(gpu_peops.iUseDither), + CE_INTVAL_P(gpu_peops.dwActFixes), CE_INTVAL(iUseReverb), CE_INTVAL(iXAPitch), CE_INTVAL_V(iUseInterpolation, 2), CE_INTVAL_V(iSPUIRQWait, 2), CE_INTVAL(iUseTimer), CE_INTVAL(warned_about_bios), + CE_INTVAL(in_evdev_allow_abs_only), }; static char *get_cd_label(void) @@ -482,12 +490,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); @@ -501,7 +509,10 @@ static void draw_savestate_bg(int slot) 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); + if (gpu->ulStatus & 0x200000) + bgr888_to_rgb565(d, s, w * 3); + else + bgr555_to_rgb565(d, s, w * 2); out: free(gpu); @@ -556,6 +567,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) @@ -841,6 +866,7 @@ static void keys_load_all(const char *cfg) lprintf("config: unhandled action \"%s\"\n", act); } } + in_clean_binds(); } static int key_config_loop_wrap(int id, int keys) @@ -894,7 +920,17 @@ static int mh_savecfg(int id, int keys) return 1; } +static int mh_input_rescan(int id, int keys) +{ + //menu_sync_config(); + pandora_rescan_inputs(); + me_update_msg("rescan complete."); + + return 0; +} + static const char *men_in_type_sel[] = { "Standard (SCPH-1080)", "Analog (SCPH-1150)", NULL }; +static const char h_nub_btns[] = "Experimental, keep this OFF if unsure. Select rescan after change."; static menu_entry e_menu_keyconfig[] = { @@ -903,8 +939,10 @@ static menu_entry e_menu_keyconfig[] = mee_handler_id("Emulator controls", MA_CTRL_EMU, key_config_loop_wrap), mee_label (""), mee_enum ("Controller", 0, in_type_sel, men_in_type_sel), + mee_onoff_h ("Nubs as buttons", 0, in_evdev_allow_abs_only, 1, h_nub_btns), 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), @@ -1016,16 +1054,16 @@ 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), + 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, }; @@ -1063,7 +1101,7 @@ static const char h_bios[] = "HLE is simulated BIOS. BIOS selection is sav "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[] = "Configure P.E.Op.S. SoftGL Driver V1.17"; static const char h_spu[] = "Configure built-in P.E.Op.S. Sound Driver V1.7"; static menu_entry e_menu_plugin_options[] = @@ -1071,7 +1109,7 @@ 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, h_gpu), mee_handler_h ("Configure built-in SPU plugin", menu_loop_plugin_spu, h_spu), mee_end, }; @@ -1144,12 +1182,13 @@ 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_onoff_h ("Frameskip", 0, pl_rearmed_cbs.frameskip, 1, h_frameskip), mee_onoff ("Show FPS", 0, g_opts, OPT_SHOWFPS), mee_enum ("Region", 0, region, men_region), mee_range ("CPU clock", MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000), @@ -1243,9 +1282,7 @@ static void menu_bios_warn(void) while (1) { - menu_draw_begin(1); draw_menu_message(msg, NULL); - menu_draw_end(); inp = in_menu_wait(PBTN_MOK|PBTN_MBACK, 70); if (inp & (PBTN_MBACK|PBTN_MOK)) @@ -1716,8 +1753,6 @@ void menu_prepare_emu(void) case SCALE_CUSTOM: break; } - apply_filter(filter); - apply_cpu_clock(); psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec; if (psxCpu != prev_cpu) @@ -1730,6 +1765,12 @@ void menu_prepare_emu(void) CDR_stop(); menu_sync_config(); + apply_lcdrate(Config.PsxType); + apply_filter(filter); + apply_cpu_clock(); + + // push config to GPU plugin + plugin_call_rearmed_cbs(); if (GPU_open != NULL) { int ret = GPU_open(&gpuDisp, "PCSX", NULL);