X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;h=60e7fbda2f303502ea7141d2ff08d780b333caf1;hb=f548beede257a2252a2639e3fe03c7cda99433ed;hp=4f9dcce2e8576ea89525adf5ea984197a09e571d;hpb=f45b4acc547ca85d9af9efa37d8caa68c20a42e6;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 4f9dcce..60e7fbd 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -25,18 +25,18 @@
 
 #include "mainwin.h"
 
-//#include <QtGui>
-//#include <QtOpenGL>
+#include "SDL.h"
 #include "glwidget.h"
 #include "about.h"
 #include "settings.h"
 #include "filepicker.h"
+#include "configdialog.h"
 
 #include "jaguar.h"
-#include "video.h"
 #include "tom.h"
 #include "log.h"
 #include "file.h"
+#include "joystick.h"
 
 // Uncomment this to use built-in BIOS/CD-ROM BIOS
 // You'll need a copy of jagboot.h & jagcd.h for this to work...!
@@ -63,16 +63,18 @@
 // We'll make the VJ core modular so that it doesn't matter what GUI is in
 // use, we can drop it in anywhere and use it as-is.
 
-MainWin::MainWin(): showUntunedTankCircuit(true)
+MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit(true),
+	cartridgeLoaded(false)
 {
 	videoWidget = new GLWidget(this);
 	setCentralWidget(videoWidget);
-	setWindowIcon(QIcon(":/res/vj.xpm"));
+	setWindowIcon(QIcon(":/res/vj-icon.png"));
 	setWindowTitle("Virtual Jaguar v2.0.0");
 
 	ReadSettings();
 	setUnifiedTitleAndToolBarOnMac(true);
 
+#warning "!!! Save/Restore window location for FilePickerWindow !!!"
 	aboutWin = new AboutWindow(this);
 	filePickWin = new FilePickerWindow(this);
 
@@ -87,9 +89,17 @@ MainWin::MainWin(): showUntunedTankCircuit(true)
 	connect(quitAppAct, SIGNAL(triggered()), this, SLOT(close()));
 
 	powerAct = new QAction(QIcon(":/res/power.png"), tr("&Power"), this);
-	powerAct->setStatusTip(tr("Toggle running state"));
+	powerAct->setStatusTip(tr("Powers Jaguar on/off"));
 	powerAct->setCheckable(true);
-	connect(powerAct, SIGNAL(triggered()), this, SLOT(ToggleRunState()));
+	powerAct->setChecked(false);
+	powerAct->setDisabled(true);
+	connect(powerAct, SIGNAL(triggered()), this, SLOT(TogglePowerState()));
+
+	pauseAct = new QAction(QIcon(":/res/pause.png"), tr("Pause"), this);
+	pauseAct->setStatusTip(tr("Toggles the running state"));
+	pauseAct->setCheckable(true);
+	pauseAct->setDisabled(true);
+	connect(pauseAct, SIGNAL(triggered()), this, SLOT(ToggleRunState()));
 
 	zoomActs = new QActionGroup(this);
 
@@ -129,10 +139,15 @@ MainWin::MainWin(): showUntunedTankCircuit(true)
 	aboutAct->setStatusTip(tr("Blatant self-promotion"));
 	connect(aboutAct, SIGNAL(triggered()), this, SLOT(ShowAboutWin()));
 
-	filePickAct = new QAction(QIcon(":/res/generic.png"), tr("&Insert Cartridge..."), this);
+#warning "!!! Set up a decent keyboard shortcut for Insert Cartridge !!!"
+	filePickAct = new QAction(QIcon(":/res/software.png"), tr("&Insert Cartridge..."), this);
 	filePickAct->setStatusTip(tr("Insert a cartridge into Virtual Jaguar"));
 	connect(filePickAct, SIGNAL(triggered()), this, SLOT(InsertCart()));
 
+	configAct = new QAction(QIcon(":/res/generic.png"), tr("&Configure"), this);
+	configAct->setStatusTip(tr("Configure options for Virtual Jaguar"));
+	connect(configAct, SIGNAL(triggered()), this, SLOT(Configure()));
+
 	// Misc. connections...
 	connect(filePickWin, SIGNAL(RequestLoad(QString)), this, SLOT(LoadSoftware(QString)));
 
@@ -141,6 +156,8 @@ MainWin::MainWin(): showUntunedTankCircuit(true)
 	fileMenu = menuBar()->addMenu(tr("&File"));
 	fileMenu->addAction(filePickAct);
 	fileMenu->addAction(powerAct);
+	fileMenu->addAction(pauseAct);
+	fileMenu->addAction(configAct);
 	fileMenu->addAction(quitAppAct);
 
 	helpMenu = menuBar()->addMenu(tr("&Help"));
@@ -148,6 +165,7 @@ MainWin::MainWin(): showUntunedTankCircuit(true)
 
 	toolbar = addToolBar(tr("Stuff"));
 	toolbar->addAction(powerAct);
+	toolbar->addAction(pauseAct);
 	toolbar->addAction(filePickAct);
 	toolbar->addSeparator();
 	toolbar->addAction(x1Act);
@@ -234,10 +252,62 @@ void MainWin::closeEvent(QCloseEvent * event)
 	event->accept(); // ignore() if can't close for some reason
 }
 
+void MainWin::keyPressEvent(QKeyEvent * e)
+{
+	HandleKeys(e, true);
+}
+
+void MainWin::keyReleaseEvent(QKeyEvent * e)
+{
+	HandleKeys(e, false);
+}
+
+void MainWin::HandleKeys(QKeyEvent * e, bool state)
+{
+	// We kill bad key combos here, before they can get to the emulator...
+	// This also kills the illegal instruction problem that cropped up in Rayman!
+	// May want to do this by killing the old one instead of ignoring the new one...
+	// Seems to work better that way...
+#if 0
+	if ((e->key() == vjs.p1KeyBindings[BUTTON_L] && joypad_0_buttons[BUTTON_R])
+		|| (e->key() == vjs.p1KeyBindings[BUTTON_R] && joypad_0_buttons[BUTTON_L])
+		|| (e->key() == vjs.p1KeyBindings[BUTTON_U] && joypad_0_buttons[BUTTON_D])
+		|| (e->key() == vjs.p1KeyBindings[BUTTON_D] && joypad_0_buttons[BUTTON_U]))
+		return;
+#else
+	if (e->key() == vjs.p1KeyBindings[BUTTON_L] && joypad_0_buttons[BUTTON_R])
+		joypad_0_buttons[BUTTON_R] = 0;
+	if (e->key() == vjs.p1KeyBindings[BUTTON_R] && joypad_0_buttons[BUTTON_L])
+		joypad_0_buttons[BUTTON_L] = 0;
+	if (e->key() == vjs.p1KeyBindings[BUTTON_U] && joypad_0_buttons[BUTTON_D])
+		joypad_0_buttons[BUTTON_D] = 0;
+	if (e->key() == vjs.p1KeyBindings[BUTTON_D] && joypad_0_buttons[BUTTON_U])
+		joypad_0_buttons[BUTTON_U] = 0;
+#endif
+
+	// No bad combos exist, let's stuff the emulator key buffers...!
+	for(int i=BUTTON_FIRST; i<=BUTTON_LAST; i++)
+	{
+		if (e->key() == vjs.p1KeyBindings[i])
+			joypad_0_buttons[i] = (uint8)state;
+	}
+}
+
 void MainWin::Open(void)
 {
 }
 
+void MainWin::Configure(void)
+{
+	// Call the configuration dialog and update settings
+	ConfigDialog dlg(this);
+
+	if (dlg.exec() == false)
+		return;
+
+	dlg.UpdateVJSettings();
+}
+
 //
 // Here's the main emulator loop
 //
@@ -380,6 +450,30 @@ doGPUDis = true;//*/
 }
 #endif
 
+void MainWin::TogglePowerState(void)
+{
+	powerButtonOn = !powerButtonOn;
+
+	if (!powerButtonOn)
+	{
+		pauseAct->setChecked(false);
+		pauseAct->setDisabled(true);
+		showUntunedTankCircuit = true;
+		running = true;
+	}
+	else
+	{
+		showUntunedTankCircuit = (cartridgeLoaded ? false : true);
+		pauseAct->setDisabled(!cartridgeLoaded);
+//This is crappy!!! !!! FIX !!!
+//Is this even needed any more? Hmm. Maybe. Dunno.
+//Seems like it is... But then again, maybe not. Have to test it to see.
+		WriteLog("GUI: Resetting Jaguar...\n");
+		JaguarReset();
+		running = true;
+	}
+}
+
 void MainWin::ToggleRunState(void)
 {
 	running = !running;
@@ -459,13 +553,26 @@ void MainWin::LoadSoftware(QString file)
 {
 	running = false;							//  Prevent bad things(TM) from happening...
 	SET32(jaguarMainRAM, 0, 0x00200000);			// Set top of stack...
-	showUntunedTankCircuit = (JaguarLoadFile(file.toAscii().data()) ? false : true);
+	cartridgeLoaded = (JaguarLoadFile(file.toAscii().data()) ? true : false);
+
+#if 0
+	showUntunedTankCircuit = !cartridgeLoaded;
 //This is crappy!!! !!! FIX !!!
 //Is this even needed any more? Hmm. Maybe. Dunno.
 //Seems like it is... But then again, maybe not. Have to test it to see.
 	WriteLog("GUI: Resetting Jaguar...\n");
 	JaguarReset();
 	running = true;
+#else
+	powerAct->setDisabled(false);
+	powerAct->setChecked(true);
+	powerButtonOn = false;
+	TogglePowerState();
+#endif
+
+	QString newTitle = QString("Virtual Jaguar 2.0.0 - Now playing: %1")
+		.arg(filePickWin->GetSelectedPrettyName());
+	setWindowTitle(newTitle);
 }
 
 void MainWin::ResizeMainWindow(void)
@@ -511,6 +618,51 @@ WriteLog("    jagBootPath = \"%s\"\n", vjs.jagBootPath);
 WriteLog("    CDBootPath  = \"%s\"\n", vjs.CDBootPath);
 WriteLog("    EEPROMPath  = \"%s\"\n", vjs.EEPROMPath);
 WriteLog("    ROMPath     = \"%s\"\n", vjs.ROMPath);
+
+	// Keybindings in order of U, D, L, R, C, B, A, Op, Pa, 0-9, #, *
+	vjs.p1KeyBindings[BUTTON_U] = settings.value("p1k_up", Qt::Key_Up).toInt();
+	vjs.p1KeyBindings[BUTTON_D] = settings.value("p1k_down", Qt::Key_Down).toInt();
+	vjs.p1KeyBindings[BUTTON_L] = settings.value("p1k_left", Qt::Key_Left).toInt();
+	vjs.p1KeyBindings[BUTTON_R] = settings.value("p1k_right", Qt::Key_Right).toInt();
+	vjs.p1KeyBindings[BUTTON_C] = settings.value("p1k_c", Qt::Key_Z).toInt();
+	vjs.p1KeyBindings[BUTTON_B] = settings.value("p1k_b", Qt::Key_X).toInt();
+	vjs.p1KeyBindings[BUTTON_A] = settings.value("p1k_a", Qt::Key_C).toInt();
+	vjs.p1KeyBindings[BUTTON_OPTION] = settings.value("p1k_option", Qt::Key_Apostrophe).toInt();
+	vjs.p1KeyBindings[BUTTON_PAUSE] = settings.value("p1k_pause", Qt::Key_Return).toInt();
+	vjs.p1KeyBindings[BUTTON_0] = settings.value("p1k_0", Qt::Key_0).toInt();
+	vjs.p1KeyBindings[BUTTON_1] = settings.value("p1k_1", Qt::Key_1).toInt();
+	vjs.p1KeyBindings[BUTTON_2] = settings.value("p1k_2", Qt::Key_2).toInt();
+	vjs.p1KeyBindings[BUTTON_3] = settings.value("p1k_3", Qt::Key_3).toInt();
+	vjs.p1KeyBindings[BUTTON_4] = settings.value("p1k_4", Qt::Key_4).toInt();
+	vjs.p1KeyBindings[BUTTON_5] = settings.value("p1k_5", Qt::Key_5).toInt();
+	vjs.p1KeyBindings[BUTTON_6] = settings.value("p1k_6", Qt::Key_6).toInt();
+	vjs.p1KeyBindings[BUTTON_7] = settings.value("p1k_7", Qt::Key_7).toInt();
+	vjs.p1KeyBindings[BUTTON_8] = settings.value("p1k_8", Qt::Key_8).toInt();
+	vjs.p1KeyBindings[BUTTON_9] = settings.value("p1k_9", Qt::Key_9).toInt();
+	vjs.p1KeyBindings[BUTTON_d] = settings.value("p1k_pound", Qt::Key_Slash).toInt();
+	vjs.p1KeyBindings[BUTTON_s] = settings.value("p1k_star", Qt::Key_Asterisk).toInt();
+
+	vjs.p2KeyBindings[BUTTON_U] = settings.value("p2k_up", Qt::Key_Up).toInt();
+	vjs.p2KeyBindings[BUTTON_D] = settings.value("p2k_down", Qt::Key_Down).toInt();
+	vjs.p2KeyBindings[BUTTON_L] = settings.value("p2k_left", Qt::Key_Left).toInt();
+	vjs.p2KeyBindings[BUTTON_R] = settings.value("p2k_right", Qt::Key_Right).toInt();
+	vjs.p2KeyBindings[BUTTON_C] = settings.value("p2k_c", Qt::Key_Z).toInt();
+	vjs.p2KeyBindings[BUTTON_B] = settings.value("p2k_b", Qt::Key_X).toInt();
+	vjs.p2KeyBindings[BUTTON_A] = settings.value("p2k_a", Qt::Key_C).toInt();
+	vjs.p2KeyBindings[BUTTON_OPTION] = settings.value("p2k_option", Qt::Key_Apostrophe).toInt();
+	vjs.p2KeyBindings[BUTTON_PAUSE] = settings.value("p2k_pause", Qt::Key_Return).toInt();
+	vjs.p2KeyBindings[BUTTON_0] = settings.value("p2k_0", Qt::Key_0).toInt();
+	vjs.p2KeyBindings[BUTTON_1] = settings.value("p2k_1", Qt::Key_1).toInt();
+	vjs.p2KeyBindings[BUTTON_2] = settings.value("p2k_2", Qt::Key_2).toInt();
+	vjs.p2KeyBindings[BUTTON_3] = settings.value("p2k_3", Qt::Key_3).toInt();
+	vjs.p2KeyBindings[BUTTON_4] = settings.value("p2k_4", Qt::Key_4).toInt();
+	vjs.p2KeyBindings[BUTTON_5] = settings.value("p2k_5", Qt::Key_5).toInt();
+	vjs.p2KeyBindings[BUTTON_6] = settings.value("p2k_6", Qt::Key_6).toInt();
+	vjs.p2KeyBindings[BUTTON_7] = settings.value("p2k_7", Qt::Key_7).toInt();
+	vjs.p2KeyBindings[BUTTON_8] = settings.value("p2k_8", Qt::Key_8).toInt();
+	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();
 }
 
 void MainWin::WriteSettings(void)
@@ -536,6 +688,50 @@ void MainWin::WriteSettings(void)
 	settings.setValue("CDBootROM", vjs.CDBootPath);
 	settings.setValue("EEPROMs", vjs.EEPROMPath);
 	settings.setValue("ROMs", vjs.ROMPath);
+
+	settings.setValue("p1k_up", vjs.p1KeyBindings[BUTTON_U]);
+	settings.setValue("p1k_down", vjs.p1KeyBindings[BUTTON_D]);
+	settings.setValue("p1k_left", vjs.p1KeyBindings[BUTTON_L]);
+	settings.setValue("p1k_right", vjs.p1KeyBindings[BUTTON_R]);
+	settings.setValue("p1k_c", vjs.p1KeyBindings[BUTTON_C]);
+	settings.setValue("p1k_b", vjs.p1KeyBindings[BUTTON_B]);
+	settings.setValue("p1k_a", vjs.p1KeyBindings[BUTTON_A]);
+	settings.setValue("p1k_option", vjs.p1KeyBindings[BUTTON_OPTION]);
+	settings.setValue("p1k_pause", vjs.p1KeyBindings[BUTTON_PAUSE]);
+	settings.setValue("p1k_0", vjs.p1KeyBindings[BUTTON_0]);
+	settings.setValue("p1k_1", vjs.p1KeyBindings[BUTTON_1]);
+	settings.setValue("p1k_2", vjs.p1KeyBindings[BUTTON_2]);
+	settings.setValue("p1k_3", vjs.p1KeyBindings[BUTTON_3]);
+	settings.setValue("p1k_4", vjs.p1KeyBindings[BUTTON_4]);
+	settings.setValue("p1k_5", vjs.p1KeyBindings[BUTTON_5]);
+	settings.setValue("p1k_6", vjs.p1KeyBindings[BUTTON_6]);
+	settings.setValue("p1k_7", vjs.p1KeyBindings[BUTTON_7]);
+	settings.setValue("p1k_8", vjs.p1KeyBindings[BUTTON_8]);
+	settings.setValue("p1k_9", vjs.p1KeyBindings[BUTTON_9]);
+	settings.setValue("p1k_pound", vjs.p1KeyBindings[BUTTON_d]);
+	settings.setValue("p1k_star", vjs.p1KeyBindings[BUTTON_s]);
+
+	settings.setValue("p2k_up", vjs.p2KeyBindings[BUTTON_U]);
+	settings.setValue("p2k_down", vjs.p2KeyBindings[BUTTON_D]);
+	settings.setValue("p2k_left", vjs.p2KeyBindings[BUTTON_L]);
+	settings.setValue("p2k_right", vjs.p2KeyBindings[BUTTON_R]);
+	settings.setValue("p2k_c", vjs.p2KeyBindings[BUTTON_C]);
+	settings.setValue("p2k_b", vjs.p2KeyBindings[BUTTON_B]);
+	settings.setValue("p2k_a", vjs.p2KeyBindings[BUTTON_A]);
+	settings.setValue("p2k_option", vjs.p2KeyBindings[BUTTON_OPTION]);
+	settings.setValue("p2k_pause", vjs.p2KeyBindings[BUTTON_PAUSE]);
+	settings.setValue("p2k_0", vjs.p2KeyBindings[BUTTON_0]);
+	settings.setValue("p2k_1", vjs.p2KeyBindings[BUTTON_1]);
+	settings.setValue("p2k_2", vjs.p2KeyBindings[BUTTON_2]);
+	settings.setValue("p2k_3", vjs.p2KeyBindings[BUTTON_3]);
+	settings.setValue("p2k_4", vjs.p2KeyBindings[BUTTON_4]);
+	settings.setValue("p2k_5", vjs.p2KeyBindings[BUTTON_5]);
+	settings.setValue("p2k_6", vjs.p2KeyBindings[BUTTON_6]);
+	settings.setValue("p2k_7", vjs.p2KeyBindings[BUTTON_7]);
+	settings.setValue("p2k_8", vjs.p2KeyBindings[BUTTON_8]);
+	settings.setValue("p2k_9", vjs.p2KeyBindings[BUTTON_9]);
+	settings.setValue("p2k_pound", vjs.p2KeyBindings[BUTTON_d]);
+	settings.setValue("p2k_star", vjs.p2KeyBindings[BUTTON_s]);
 }
 
 // Here's how Byuu does it...