X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;h=482b9cdff9e8176d7f309c3edef04c9882a64f7c;hb=b4975cbd28c54b5a8f5d7a119375fe05b46f19a1;hp=43ec937cbf5cfbaa123d7746f6f02bc06d40fe8f;hpb=eec77bddfd9b9169b23717cf3b37d182ca88bbc3;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 43ec937..482b9cd 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -38,11 +38,13 @@
 #include "app.h"
 #include "about.h"
 #include "configdialog.h"
+#include "controllertab.h"
 #include "filepicker.h"
 #include "gamepad.h"
 #include "generaltab.h"
 #include "glwidget.h"
 #include "help.h"
+#include "profile.h"
 #include "settings.h"
 #include "version.h"
 #include "debug/cpubrowser.h"
@@ -437,6 +439,11 @@ void MainWin::keyPressEvent(QKeyEvent * e)
 {
 	// From jaguar.cpp
 	extern bool startM68KTracing;
+	// From joystick.cpp
+	extern int blit_start_log;
+	// From blitter.cpp
+	extern bool startConciseBlitLogging;
+
 
 	// We ignore the Alt key for now, since it causes problems with the GUI
 	if (e->key() == Qt::Key_Alt)
@@ -450,8 +457,37 @@ void MainWin::keyPressEvent(QKeyEvent * e)
 		e->accept();
 		return;
 	}
+	else if (e->key() == Qt::Key_F12)
+	{
+		blit_start_log = true;
+		e->accept();
+		return;
+	}
+	else if (e->key() == Qt::Key_F10)
+	{
+		startConciseBlitLogging = true;
+		e->accept();
+		return;
+	}
+	else if (e->key() == Qt::Key_F8)
+	{
+		// ggn: For extra NYAN pleasure...
+		// ggn: There you go James :P
+		// Shamus: Thanks for the patch! :-D
+		WriteLog("    o  +           +        +\n");
+		WriteLog("+        o     o       +        o\n");
+		WriteLog("-_-_-_-_-_-_-_,------,      o \n");
+		WriteLog("_-_-_-_-_-_-_-|   /\\_/\\  \n");
+		WriteLog("-_-_-_-_-_-_-~|__( ^ .^)  +     +  \n");
+		WriteLog("_-_-_-_-_-_-_-\"\"  \"\"      \n");
+		WriteLog("+      o         o   +       o\n");
+		WriteLog("    +         +\n");
+		e->accept();
+		return;
+	}
 
 /*
+This is done now by a QAction...
 	if (e->key() == Qt::Key_F9)
 	{
 		ToggleFullScreen();
@@ -564,7 +600,10 @@ void MainWin::HandleGamepads(void)
 	{
 		if (vjs.p1KeyBindings[i] & (JOY_BUTTON | JOY_HAT | JOY_AXIS))
 			joypad0Buttons[i] = (Gamepad::GetState(0, vjs.p1KeyBindings[i]) ? 0x01 : 0x00);
-
+/*{
+if (vjs.p1KeyBindings[i] & JOY_AXIS)
+	printf("Axis state (HandleGamepads): %i\n", joypad0Buttons[i]);
+}*/
 		if (vjs.p2KeyBindings[i] & (JOY_BUTTON | JOY_HAT | JOY_AXIS))
 			joypad1Buttons[i] = (Gamepad::GetState(1, vjs.p2KeyBindings[i]) ? 0x01 : 0x00);
 	}
@@ -582,6 +621,8 @@ void MainWin::Configure(void)
 	ConfigDialog dlg(this);
 	//ick.
 	dlg.generalTab->useUnknownSoftware->setChecked(allowUnknownSoftware);
+	dlg.controllerTab1->profileNum = lastEditedProfile;
+	dlg.controllerTab1->SetupLastUsedProfile();
 
 	if (dlg.exec() == false)
 		return;
@@ -601,6 +642,7 @@ void MainWin::Configure(void)
 	bool allowOld = allowUnknownSoftware;
 	//ick.
 	allowUnknownSoftware = dlg.generalTab->useUnknownSoftware->isChecked();
+	lastEditedProfile = dlg.controllerTab1->profileNum;
 
 	// We rescan the "software" folder if the user either changed the path or
 	// checked/unchecked the "Allow unknown files" option in the config dialog.
@@ -1074,6 +1116,7 @@ void MainWin::ReadSettings(void)
 
 	zoomLevel = settings.value("zoom", 2).toInt();
 	allowUnknownSoftware = settings.value("showUnknownSoftware", false).toBool();
+	lastEditedProfile = settings.value("lastEditedProfile", 0).toInt();
 
 	vjs.useJoystick      = settings.value("useJoystick", false).toBool();
 	vjs.joyport          = settings.value("joyport", 0).toInt();
@@ -1081,7 +1124,7 @@ void MainWin::ReadSettings(void)
 	vjs.frameSkip        = settings.value("frameSkip", 0).toInt();
 	vjs.useJaguarBIOS    = settings.value("useJaguarBIOS", false).toBool();
 	vjs.GPUEnabled       = settings.value("GPUEnabled", true).toBool();
-	vjs.DSPEnabled       = settings.value("DSPEnabled", false).toBool();
+	vjs.DSPEnabled       = settings.value("DSPEnabled", true).toBool();
 	vjs.audioEnabled     = settings.value("audioEnabled", true).toBool();
 	vjs.usePipelinedDSP  = settings.value("usePipelinedDSP", false).toBool();
 	vjs.fullscreen       = settings.value("fullscreen", false).toBool();
@@ -1090,6 +1133,7 @@ void MainWin::ReadSettings(void)
 	vjs.renderType       = settings.value("renderType", 0).toInt();
 	vjs.allowWritesToROM = settings.value("writeROM", false).toBool();
 	vjs.biosType         = settings.value("biosType", BT_M_SERIES).toInt();
+	vjs.useFastBlitter   = settings.value("useFastBlitter", false).toBool();
 	strcpy(vjs.EEPROMPath, settings.value("EEPROMs", "./eeproms/").toString().toAscii().data());
 	strcpy(vjs.ROMPath, settings.value("ROMs", "./software/").toString().toAscii().data());
 	strcpy(vjs.alpineROMPath, settings.value("DefaultROM", "").toString().toAscii().data());
@@ -1146,6 +1190,8 @@ WriteLog("Pipelined DSP = %s\n", (vjs.usePipelinedDSP ? "ON" : "off"));
 	vjs.p2KeyBindings[BUTTON_9] = settings.value("p2k_9", Qt::Key_9).toInt();
 	vjs.p2KeyBindings[BUTTON_d] = settings.value("p2k_pound", Qt::Key_Slash).toInt();
 	vjs.p2KeyBindings[BUTTON_s] = settings.value("p2k_star", Qt::Key_Asterisk).toInt();
+
+	ReadProfiles(&settings);
 }
 
 
@@ -1158,6 +1204,7 @@ void MainWin::WriteSettings(void)
 
 	settings.setValue("zoom", zoomLevel);
 	settings.setValue("showUnknownSoftware", allowUnknownSoftware);
+	settings.setValue("lastEditedProfile", lastEditedProfile);
 
 	settings.setValue("useJoystick", vjs.useJoystick);
 	settings.setValue("joyport", vjs.joyport);
@@ -1174,6 +1221,7 @@ void MainWin::WriteSettings(void)
 	settings.setValue("renderType", vjs.renderType);
 	settings.setValue("writeROM", vjs.allowWritesToROM);
 	settings.setValue("biosType", vjs.biosType);
+	settings.setValue("useFastBlitter", vjs.useFastBlitter);
 	settings.setValue("JagBootROM", vjs.jagBootPath);
 	settings.setValue("CDBootROM", vjs.CDBootPath);
 	settings.setValue("EEPROMs", vjs.EEPROMPath);
@@ -1224,6 +1272,8 @@ void MainWin::WriteSettings(void)
 	settings.setValue("p2k_9", vjs.p2KeyBindings[BUTTON_9]);
 	settings.setValue("p2k_pound", vjs.p2KeyBindings[BUTTON_d]);
 	settings.setValue("p2k_star", vjs.p2KeyBindings[BUTTON_s]);
+
+	WriteProfiles(&settings);
 }
 
 
@@ -1236,3 +1286,4 @@ void MainWin::WriteUISettings(void)
 
 	settings.setValue("zoom", zoomLevel);
 }
+