X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;h=b8a7de0f610526534ee267d54edfc146133238ac;hb=576a7bd6373a53d9cff6a7bb88334429469e0751;hp=7abc8c75509405412af2f2e2f8b606c159aeee30;hpb=8edf7ac06469707cc221b2cdaa8bea0ed4e2f898;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 7abc8c7..b8a7de0 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -1,9 +1,9 @@
 //
 // mainwin.cpp - Qt-based GUI for Virtual Jaguar: Main Application Window
-// by James L. Hammons
+// by James Hammons
 // (C) 2009 Underground Software
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // Who  When        What
 // ---  ----------  -------------------------------------------------------------
@@ -34,6 +34,7 @@
 #include "mainwin.h"
 
 #include "SDL.h"
+#include "app.h"
 #include "glwidget.h"
 #include "about.h"
 #include "help.h"
@@ -70,9 +71,10 @@
 // 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(): running(true), powerButtonOn(false), showUntunedTankCircuit(true),
-	cartridgeLoaded(false), CDActive(false),//, alpineLoadSuccessful(false),
-	pauseForFileSelector(false)
+MainWin::MainWin(QString filenameToRun): running(true), powerButtonOn(false),
+	showUntunedTankCircuit(true), cartridgeLoaded(false), CDActive(false),
+	//, alpineLoadSuccessful(false),
+	pauseForFileSelector(false), loadAndGo(false), plzDontKillMyComputer(false)
 {
 	videoWidget = new GLWidget(this);
 	setCentralWidget(videoWidget);
@@ -185,6 +187,10 @@ MainWin::MainWin(): running(true), powerButtonOn(false), showUntunedTankCircuit(
 	useCDAct->setCheckable(true);
 	connect(useCDAct, SIGNAL(triggered()), this, SLOT(ToggleCDUsage()));
 
+	frameAdvanceAct = new QAction(QIcon(":/res/generic.png"), tr("&Frame Advance"), this);
+	frameAdvanceAct->setShortcut(QKeySequence(tr("F7")));
+	connect(frameAdvanceAct, SIGNAL(triggered()), this, SLOT(FrameAdvance()));
+
 	// Misc. connections...
 	connect(filePickWin, SIGNAL(RequestLoad(QString)), this, SLOT(LoadSoftware(QString)));
 	connect(filePickWin, SIGNAL(FilePickerHiding()), this, SLOT(Unpause()));
@@ -194,6 +200,7 @@ MainWin::MainWin(): running(true), powerButtonOn(false), showUntunedTankCircuit(
 	fileMenu = menuBar()->addMenu(tr("&Jaguar"));
 	fileMenu->addAction(powerAct);
 	fileMenu->addAction(pauseAct);
+	fileMenu->addAction(frameAdvanceAct);
 	fileMenu->addAction(filePickAct);
 	fileMenu->addAction(useCDAct);
 	fileMenu->addAction(configAct);
@@ -253,8 +260,18 @@ MainWin::MainWin(): running(true), powerButtonOn(false), showUntunedTankCircuit(
 	WriteLog("Virtual Jaguar %s (Last full build was on %s %s)\n", VJ_RELEASE_VERSION, __DATE__, __TIME__);
 	WriteLog("VJ: Initializing jaguar subsystem...\n");
 	JaguarInit();
+	memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000);	// Use the stock BIOS
 
-	filePickWin->ScanSoftwareFolder(allowUnknownSoftware);
+	// Check for filename passed in on the command line...
+	if (!filenameToRun.isEmpty())
+	{
+		loadAndGo = true;
+		// Attempt to load/run the file the user passed in...
+		LoadSoftware(filenameToRun);
+//		memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000);	// Use the stock BIOS
+		// Prevent the scanner from running...
+		return;
+	}
 
 	// Load up the default ROM if in Alpine mode:
 	if (vjs.hardwareTypeAlpine)
@@ -274,9 +291,15 @@ MainWin::MainWin(): running(true), powerButtonOn(false), showUntunedTankCircuit(
 		// Attempt to load/run the ABS file...
 		LoadSoftware(vjs.absROMPath);
 		memcpy(jagMemSpace + 0xE00000, jaguarDevBootROM2, 0x20000);	// Use the stub BIOS
+		// Prevent the scanner from running...
+		return;
 	}
-	else
-		memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000);	// Otherwise, use the stock BIOS
+//	else
+//		memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000);	// Otherwise, use the stock BIOS
+
+	// Run the scanner if nothing passed in and *not* Alpine mode...
+	// NB: Really need to look into caching the info scanned in here...
+	filePickWin->ScanSoftwareFolder(allowUnknownSoftware);
 }
 
 void MainWin::closeEvent(QCloseEvent * event)
@@ -437,6 +460,9 @@ void MainWin::Timer(void)
 
 	if (showUntunedTankCircuit)
 	{
+		// Some machines can't handle this, so we give them the option to disable it. :-)
+		if (!plzDontKillMyComputer)
+		{
 		// Random hash & trash
 		// We try to simulate an untuned tank circuit here... :-)
 		for(uint32_t x=0; x<videoWidget->rasterWidth; x++)
@@ -447,6 +473,7 @@ void MainWin::Timer(void)
 					= (rand() & 0xFF) << 8 | (rand() & 0xFF) << 16 | (rand() & 0xFF) << 24;
 			}
 		}
+		}
 	}
 	else
 	{
@@ -587,7 +614,10 @@ void MainWin::Unpause(void)
 	if (pauseForFileSelector)
 	{
 		pauseForFileSelector = false;
-		ToggleRunState();
+
+		// Some nutter might have unpaused while in the file selector, so check for that
+		if (!running)
+			ToggleRunState();
 	}
 }
 
@@ -610,7 +640,7 @@ void MainWin::LoadSoftware(QString file)
 	powerButtonOn = false;
 	TogglePowerState();
 
-	if (!vjs.hardwareTypeAlpine)
+	if (!vjs.hardwareTypeAlpine && !loadAndGo)
 	{
 		QString newTitle = QString("Virtual Jaguar " VJ_RELEASE_VERSION " - Now playing: %1")
 			.arg(filePickWin->GetSelectedPrettyName());
@@ -640,6 +670,14 @@ void MainWin::ToggleCDUsage(void)
 #endif
 }
 
+void MainWin::FrameAdvance(void)
+{
+//printf("Frame Advance...\n");
+	// Execute 1 frame, then exit (only useful in Pause mode)
+	JaguarExecuteNew();
+	videoWidget->updateGL();
+}
+
 void MainWin::ResizeMainWindow(void)
 {
 	videoWidget->setFixedSize(zoomLevel * 320, zoomLevel * (vjs.hardwareTypeNTSC ? 240 : 256));