X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;h=5efca0a5eb587c3bd54dc7af4b13dd2f8be9ad0d;hb=685bb45b7766e8a12cd0de8ee486b9a61183c425;hp=88b4d19e160e201a4e2876f8d104e480fa27ef0b;hpb=dffa89ebdee4d328a8e166b30fcdf38a3fc54b28;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 88b4d19..5efca0a 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -24,7 +24,7 @@
 // - Remove SDL dependencies (sound, mainly) from Jaguar core lib
 // - Fix inconsistency with trailing slashes in paths (eeproms needs one, software doesn't)
 //
-// SFDX CODE: 9XF9TUHFM2359
+// SFDX CODE: S1E9T8H5M23YS
 
 // Uncomment this for debugging...
 //#define DEBUG
@@ -382,6 +382,7 @@ void MainWin::SyncUI(void)
 	palAct->setChecked(!vjs.hardwareTypeNTSC);
 	powerAct->setIcon(vjs.hardwareTypeNTSC ? powerRed : powerGreen);
 
+	fullScreenAct->setChecked(vjs.fullscreen);
 	fullScreen = vjs.fullscreen;
 	SetFullScreen(fullScreen);
 
@@ -403,12 +404,22 @@ void MainWin::closeEvent(QCloseEvent * event)
 
 void MainWin::keyPressEvent(QKeyEvent * e)
 {
+	// From jaguar.cpp
+	extern bool startM68KTracing;
+
 	// We ignore the Alt key for now, since it causes problems with the GUI
 	if (e->key() == Qt::Key_Alt)
 	{
 		e->accept();
 		return;
 	}
+	else if (e->key() == Qt::Key_F11)
+	{
+		startM68KTracing = true;
+		e->accept();
+		return;
+	}
+
 /*
 	if (e->key() == Qt::Key_F9)
 	{
@@ -865,8 +876,14 @@ void MainWin::SetFullScreen(bool state/*= true*/)
 //		mainWinSize = size();
 		menuBar()->hide();
 		statusBar()->hide();
+		x1Act->setDisabled(true);
+		x2Act->setDisabled(true);
+		x3Act->setDisabled(true);
 		showFullScreen();
-		QRect r = QApplication::desktop()->availableGeometry();
+		// This is needed because the fullscreen may happen on a different
+		// screen than screen 0:
+		int screenNum = QApplication::desktop()->screenNumber(videoWidget);
+		QRect r = QApplication::desktop()->availableGeometry(screenNum);
 //		double targetWidth = 320.0, targetHeight = (vjs.hardwareTypeNTSC ? 240.0 : 256.0);
 		double targetWidth = (double)VIRTUAL_SCREEN_WIDTH,
 			targetHeight = (double)(vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL);
@@ -874,12 +891,22 @@ void MainWin::SetFullScreen(bool state/*= true*/)
 		// NOTE: Really should check here to see which dimension constrains the other.
 		//       Right now, we assume that height is the constraint.
 		int newWidth = (int)(aspectRatio * (double)r.height());
+		videoWidget->offset = (r.width() - newWidth) / 2;
+		videoWidget->fullscreen = true;
+		videoWidget->outputWidth = newWidth;
 
-		videoWidget->setFixedSize(newWidth, r.height());
+//		videoWidget->setFixedSize(newWidth, r.height());
+		videoWidget->setFixedSize(r.width(), r.height());
 		showFullScreen();
 	}
 	else
 	{
+		// Reset the video widget to windowed mode
+		videoWidget->offset = 0;
+		videoWidget->fullscreen = false;
+		x1Act->setDisabled(false);
+		x2Act->setDisabled(false);
+		x3Act->setDisabled(false);
 		menuBar()->show();
 		statusBar()->show();
 		showNormal();