X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=546125ff9506fdf3f2fcd824bd785915788b2ac8;hp=8eb6c04363ed46b57f46ba137f63af93d22c2413;hb=ef94866c5ee97402b81a173093c0be4ca0daa4a0;hpb=c22b95ab8ab42f87d0af5ce8333b5b6b386b98ee

diff --git a/frontend/menu.c b/frontend/menu.c
index 8eb6c043..546125ff 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -20,11 +20,16 @@
 #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"
+#include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/dfinput/pad.h"
 #include "revision.h"
 
@@ -67,7 +72,7 @@ static int last_psx_w, last_psx_h, last_psx_bpp;
 static int scaling, filter, cpu_clock, cpu_clock_st;
 static char rom_fname_reload[MAXPATHLEN];
 static char last_selected_fname[MAXPATHLEN];
-static int region, in_type_sel;
+static int warned_about_bios, region, in_type_sel;
 int g_opts;
 
 // from softgpu plugin
@@ -134,12 +139,18 @@ 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
@@ -154,6 +165,7 @@ 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;
 
@@ -224,6 +236,8 @@ static const struct {
 	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)
@@ -441,7 +455,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];
@@ -665,6 +678,7 @@ me_bind_action emuctrl_actions[] =
 	{ "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 },
 	{ NULL,                0 }
 };
@@ -838,6 +852,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)
@@ -891,7 +906,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[] =
 {
@@ -900,8 +925,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),
@@ -1055,9 +1082,9 @@ static int menu_loop_plugin_spu(int id, int keys)
 	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 savestates\n"
+				   "and can't be changed there. Must save config and reload\n"
+				   "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";
@@ -1141,12 +1168,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, UseFrameSkip, 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),
@@ -1175,24 +1203,75 @@ static int menu_loop_options(int id, int keys)
 
 // ------------ 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);
+}
+
+// ------------ main menu ------------
+
+static void menu_bios_warn(void)
+{
+	int inp;
+	static const char msg[] =
+		"You don't seem to have copied any BIOS files to\n"
+		"<SD card>/pandora/appdata/pcsx_rearmed/bios/\n\n"
+		"While many games work fine with fake (HLE) BIOS,\n"
+		"others (like MGS and FF8) require BIOS to work.\n"
+		"After copying the file, you'll also need to\n"
+		"select it in the emu's options->[BIOS/Plugins]\n\n"
+		"The file is usually named SCPH1001.BIN, but\n"
+		"other not compressed files can be 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;
 	}
 }
@@ -1217,20 +1296,18 @@ static void draw_frame_credits(void)
 	smalltext_out16(4, 1, "build: "__DATE__ " " __TIME__ " " REV, 0xe7fc);
 }
 
-const char *plat_get_credits(void)
-{
-	return	"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 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)
 {
@@ -1322,6 +1399,8 @@ static int romsel_run(void)
 
 	printf("selected file: %s\n", fname);
 
+	new_dynarec_clear_full();
+
 	if (run_cd_image(fname) != 0)
 		return -1;
 
@@ -1405,7 +1484,7 @@ static int main_menu_handler(int id, int keys)
 			return 1;
 		break;
 	case MA_MAIN_CREDITS:
-		draw_menu_credits(draw_frame_credits);
+		draw_menu_message(credits_text, draw_frame_credits);
 		in_menu_wait(PBTN_MOK|PBTN_MBACK, 70);
 		break;
 	case MA_MAIN_EXIT:
@@ -1447,6 +1526,11 @@ 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 && CdromId[0]);
 	me_enable(e_menu_main, MA_MAIN_LOAD_STATE,  ready_to_go && CdromId[0]);