X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;h=0e19488f9eeed77ee44423c24be5a07ded56de65;hb=9d399cea8466c7e4a6a1336dafdc830c4680d977;hp=ac017ceb4b5e87c5ea573a542e45b2bbb7e5bf1f;hpb=178d7f01b40cf8367cfe5b71219e6d20f60f92d4;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index ac017ce..0e19488 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
@@ -35,16 +35,20 @@
 
 #include "SDL.h"
 #include "app.h"
-#include "glwidget.h"
 #include "about.h"
-#include "help.h"
-#include "settings.h"
-#include "filepicker.h"
 #include "configdialog.h"
+#include "filepicker.h"
+#include "gamepad.h"
 #include "generaltab.h"
+#include "glwidget.h"
+#include "help.h"
+#include "settings.h"
 #include "version.h"
-#include "debug/memorybrowser.h"
 #include "debug/cpubrowser.h"
+#include "debug/m68kdasmbrowser.h"
+#include "debug/memorybrowser.h"
+#include "debug/opbrowser.h"
+#include "debug/riscdasmbrowser.h"
 
 #include "dac.h"
 #include "jaguar.h"
@@ -52,6 +56,7 @@
 #include "log.h"
 #include "file.h"
 #include "jagbios.h"
+#include "jagbios2.h"
 #include "jagcdbios.h"
 #include "jagstub2bios.h"
 #include "joystick.h"
@@ -74,11 +79,8 @@
 // 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(QString filenameToRun): running(true), powerButtonOn(false),
 MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
 	showUntunedTankCircuit(true), cartridgeLoaded(false), CDActive(false),
-	//, alpineLoadSuccessful(false),
-//	pauseForFileSelector(false), loadAndGo(false), plzDontKillMyComputer(false)
 	pauseForFileSelector(false), loadAndGo(autoRun), plzDontKillMyComputer(false)
 {
 	for(int i=0; i<8; i++)
@@ -100,9 +102,12 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
 	filePickWin = new FilePickerWindow(this);
 	memBrowseWin = new MemoryBrowserWindow(this);
 	cpuBrowseWin = new CPUBrowserWindow(this);
+	opBrowseWin = new OPBrowserWindow(this);
+	m68kDasmBrowseWin = new M68KDasmBrowserWindow(this);
+	riscDasmBrowseWin = new RISCDasmBrowserWindow(this);
 
-    videoWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+	videoWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
 	setUnifiedTitleAndToolBarOnMac(true);
 
@@ -168,7 +173,7 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
 	palAct->setCheckable(true);
 	connect(palAct, SIGNAL(triggered()), this, SLOT(SetPAL()));
 
-	blurAct = new QAction(QIcon(":/res/generic.png"), tr("Blur"), this);
+	blurAct = new QAction(QIcon(":/res/blur.png"), tr("Blur"), this);
 	blurAct->setStatusTip(tr("Sets OpenGL rendering to GL_NEAREST"));
 	blurAct->setCheckable(true);
 	connect(blurAct, SIGNAL(triggered()), this, SLOT(ToggleBlur()));
@@ -201,17 +206,37 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
 	frameAdvanceAct->setShortcut(QKeySequence(tr("F7")));
 	connect(frameAdvanceAct, SIGNAL(triggered()), this, SLOT(FrameAdvance()));
 
+	fullScreenAct = new QAction(QIcon(":/res/fullscreen.png"), tr("F&ull Screen"), this);
+	fullScreenAct->setShortcut(QKeySequence(tr("F9")));
+	fullScreenAct->setCheckable(true);
+	connect(fullScreenAct, SIGNAL(triggered()), this, SLOT(ToggleFullScreen()));
+
 	// Debugger Actions
-	memBrowseAct = new QAction(QIcon(":/res/generic.png"), tr("Memory Browser"), this);
+	memBrowseAct = new QAction(QIcon(":/res/tool-memory.png"), tr("Memory Browser"), this);
 	memBrowseAct->setStatusTip(tr("Shows the Jaguar memory browser window"));
 //	memBrowseAct->setCheckable(true);
 	connect(memBrowseAct, SIGNAL(triggered()), this, SLOT(ShowMemoryBrowserWin()));
 
-	cpuBrowseAct = new QAction(QIcon(":/res/generic.png"), tr("CPU Browser"), this);
+	cpuBrowseAct = new QAction(QIcon(":/res/tool-cpu.png"), tr("CPU Browser"), this);
 	cpuBrowseAct->setStatusTip(tr("Shows the Jaguar CPU browser window"));
 //	memBrowseAct->setCheckable(true);
 	connect(cpuBrowseAct, SIGNAL(triggered()), this, SLOT(ShowCPUBrowserWin()));
 
+	opBrowseAct = new QAction(QIcon(":/res/tool-op.png"), tr("OP Browser"), this);
+	opBrowseAct->setStatusTip(tr("Shows the Jaguar OP browser window"));
+//	memBrowseAct->setCheckable(true);
+	connect(opBrowseAct, SIGNAL(triggered()), this, SLOT(ShowOPBrowserWin()));
+
+	m68kDasmBrowseAct = new QAction(QIcon(":/res/tool-68k-dis.png"), tr("68K Listing Browser"), this);
+	m68kDasmBrowseAct->setStatusTip(tr("Shows the 68K disassembly browser window"));
+//	memBrowseAct->setCheckable(true);
+	connect(m68kDasmBrowseAct, SIGNAL(triggered()), this, SLOT(ShowM68KDasmBrowserWin()));
+
+	riscDasmBrowseAct = new QAction(QIcon(":/res/tool-risc-dis.png"), tr("RISC Listing Browser"), this);
+	riscDasmBrowseAct->setStatusTip(tr("Shows the RISC disassembly browser window"));
+//	memBrowseAct->setCheckable(true);
+	connect(riscDasmBrowseAct, SIGNAL(triggered()), this, SLOT(ShowRISCDasmBrowserWin()));
+
 	// Misc. connections...
 	connect(filePickWin, SIGNAL(RequestLoad(QString)), this, SLOT(LoadSoftware(QString)));
 	connect(filePickWin, SIGNAL(FilePickerHiding()), this, SLOT(Unpause()));
@@ -232,6 +257,9 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
 		debugMenu = menuBar()->addMenu(tr("&Debug"));
 		debugMenu->addAction(memBrowseAct);
 		debugMenu->addAction(cpuBrowseAct);
+		debugMenu->addAction(opBrowseAct);
+		debugMenu->addAction(m68kDasmBrowseAct);
+		debugMenu->addAction(riscDasmBrowseAct);
 	}
 
 	helpMenu = menuBar()->addMenu(tr("&Help"));
@@ -252,12 +280,16 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
 	toolbar->addAction(palAct);
 	toolbar->addSeparator();
 	toolbar->addAction(blurAct);
+	toolbar->addAction(fullScreenAct);
 
 	if (vjs.hardwareTypeAlpine)
 	{
 		debugbar = addToolBar(tr("&Debug"));
 		debugbar->addAction(memBrowseAct);
 		debugbar->addAction(cpuBrowseAct);
+		debugbar->addAction(opBrowseAct);
+		debugbar->addAction(m68kDasmBrowseAct);
+		debugbar->addAction(riscDasmBrowseAct);
 	}
 
 	//	Create status bar
@@ -271,13 +303,13 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
 	// Set up timer based loop for animation...
 	timer = new QTimer(this);
 	connect(timer, SIGNAL(timeout()), this, SLOT(Timer()));
-//This is only correct for PAL. !!! FIX !!! [DONE]
-//Use timer->setInterval( int msec ) to fix this on the fly
-//	timer->start(20);
+
 	// This isn't very accurate for NTSC: This is early by 40 msec per frame.
 	// This is because it's discarding the 0.6666... on the end of the fraction.
 	// Alas, 6 doesn't divide cleanly into 10. :-P
-	timer->start(vjs.hardwareTypeNTSC ? 16 : 20);
+//Should we defer this until SyncUI? Probably.
+//No, it doesn't work, because it uses setInterval() instead of start()...
+//	timer->start(vjs.hardwareTypeNTSC ? 16 : 20);
 
 	// We set this initially, to make VJ behave somewhat as it would if no
 	// cart were inserted and the BIOS was set as active...
@@ -285,19 +317,13 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
 	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
+//	memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000);	// Use the stock BIOS
+	memcpy(jagMemSpace + 0xE00000, (vjs.biosType == BT_K_SERIES ? jaguarBootROM : jaguarBootROM2), 0x20000);	// Use the stock BIOS
 
-	// Check for filename passed in on the command line...
-//	if (!filenameToRun.isEmpty())
+	// Prevent the file scanner from running if filename passed
+	// in on the command line...
 	if (autoRun)
-	{
-//		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 file scanner from running...
 		return;
-	}
 
 	// Load up the default ROM if in Alpine mode:
 	if (vjs.hardwareTypeAlpine)
@@ -320,8 +346,6 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
 		// Prevent the scanner from running...
 		return;
 	}
-//	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...
@@ -338,6 +362,7 @@ void MainWin::LoadFile(QString file)
 void MainWin::SyncUI(void)
 {
 	// Set toolbar buttons/menus based on settings read in (sync the UI)...
+	// (Really, this is to sync command line options passed in)
 	blurAct->setChecked(vjs.glFilter);
 	x1Act->setChecked(zoomLevel == 1);
 	x2Act->setChecked(zoomLevel == 2);
@@ -346,6 +371,14 @@ void MainWin::SyncUI(void)
 	ntscAct->setChecked(vjs.hardwareTypeNTSC);
 	palAct->setChecked(!vjs.hardwareTypeNTSC);
 	powerAct->setIcon(vjs.hardwareTypeNTSC ? powerRed : powerGreen);
+
+	fullScreenAct->setChecked(vjs.fullscreen);
+	fullScreen = vjs.fullscreen;
+	SetFullScreen(fullScreen);
+
+	// Reset the timer to be what was set in the command line (if any):
+//	timer->setInterval(vjs.hardwareTypeNTSC ? 16 : 20);
+	timer->start(vjs.hardwareTypeNTSC ? 16 : 20);
 }
 
 
@@ -361,13 +394,29 @@ 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)
+	{
+		ToggleFullScreen();
+		return;
+	}
+*/
 	HandleKeys(e, true);
 }
 
@@ -466,6 +515,21 @@ void MainWin::HandleKeys(QKeyEvent * e, bool state)
 }
 
 
+void MainWin::HandleGamepads(void)
+{
+	Gamepad::Update();
+
+	for(int i=BUTTON_FIRST; i<=BUTTON_LAST; i++)
+	{
+		if (vjs.p1KeyBindings[i] & (JOY_BUTTON | JOY_HAT | JOY_AXIS))
+			joypad_0_buttons[i] = (Gamepad::GetState(0, vjs.p1KeyBindings[i]) ? 0x01 : 0x00);
+
+		if (vjs.p2KeyBindings[i] & (JOY_BUTTON | JOY_HAT | JOY_AXIS))
+			joypad_1_buttons[i] = (Gamepad::GetState(1, vjs.p2KeyBindings[i]) ? 0x01 : 0x00);
+	}
+}
+
+
 void MainWin::Open(void)
 {
 }
@@ -552,23 +616,26 @@ void MainWin::Timer(void)
 	if (showUntunedTankCircuit)
 	{
 		// Some machines can't handle this, so we give them the option to disable it. :-)
+#warning "!!! Add test pattern here for -z option !!!"
+// Actually, should put test pattern in buffer in function below :-P
 		if (!plzDontKillMyComputer)
 		{
-		// Random hash & trash
-		// We try to simulate an untuned tank circuit here... :-)
-		for(uint32_t x=0; x<videoWidget->rasterWidth; x++)
-		{
-			for(uint32_t y=0; y<videoWidget->rasterHeight; y++)
+			// Random hash & trash
+			// We try to simulate an untuned tank circuit here... :-)
+			for(uint32_t x=0; x<videoWidget->rasterWidth; x++)
 			{
-				videoWidget->buffer[(y * videoWidget->textureWidth) + x]
-					= (rand() & 0xFF) << 8 | (rand() & 0xFF) << 16 | (rand() & 0xFF) << 24;
+				for(uint32_t y=0; y<videoWidget->rasterHeight; y++)
+				{
+					videoWidget->buffer[(y * videoWidget->textureWidth) + x]
+						= (rand() & 0xFF) << 8 | (rand() & 0xFF) << 16 | (rand() & 0xFF) << 24;
+				}
 			}
 		}
-		}
 	}
 	else
 	{
 		// Otherwise, run the Jaguar simulation
+		HandleGamepads();
 		JaguarExecuteNew();
 	}
 
@@ -592,6 +659,7 @@ void MainWin::TogglePowerState(void)
 		showUntunedTankCircuit = true;
 		// This is just in case the ROM we were playing was in a narrow or wide field mode,
 		// so the untuned tank sim doesn't look wrong. :-)
+		DACPauseAudioThread();
 		TOMReset();
 	}
 	else
@@ -617,6 +685,7 @@ void MainWin::TogglePowerState(void)
 
 		WriteLog("GUI: Resetting Jaguar...\n");
 		JaguarReset();
+		DACPauseAudioThread(false);
 	}
 }
 
@@ -637,6 +706,9 @@ void MainWin::ToggleRunState(void)
 
 		videoWidget->updateGL();
 	}
+
+	// Pause/unpause any running/non-running threads...
+	DACPauseAudioThread(!running);
 }
 
 
@@ -760,22 +832,11 @@ void MainWin::ToggleCDUsage(void)
 {
 	CDActive = !CDActive;
 
-#if 0
-	if (CDActive)
-	{
-		powerAct->setDisabled(false);
-	}
-	else
-	{
-		powerAct->setDisabled(true);
-	}
-#else
 	// Set up the Jaguar CD for execution, otherwise, clear memory
 	if (CDActive)
 		memcpy(jagMemSpace + 0x800000, jaguarCDBootROM, 0x40000);
 	else
 		memset(jagMemSpace + 0x800000, 0xFF, 0x40000);
-#endif
 }
 
 
@@ -788,6 +849,65 @@ void MainWin::FrameAdvance(void)
 }
 
 
+void MainWin::SetFullScreen(bool state/*= true*/)
+{
+	if (state)
+	{
+		mainWinPosition = pos();
+//		mainWinSize = size();
+		menuBar()->hide();
+		statusBar()->hide();
+		x1Act->setDisabled(true);
+		x2Act->setDisabled(true);
+		x3Act->setDisabled(true);
+		showFullScreen();
+		// 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);
+		double aspectRatio = targetWidth / targetHeight;
+		// 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(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();
+		ResizeMainWindow();
+		move(mainWinPosition);
+	}
+
+	// For some reason, this doesn't work: If the emu is paused, toggling from
+	// fullscreen to windowed (& vice versa) shows a white screen.
+//	videoWidget->updateGL();
+}
+
+
+void MainWin::ToggleFullScreen(void)
+{
+	fullScreen = !fullScreen;
+	SetFullScreen(fullScreen);
+}
+
+
 void MainWin::ShowMemoryBrowserWin(void)
 {
 	memBrowseWin->show();
@@ -802,9 +922,32 @@ void MainWin::ShowCPUBrowserWin(void)
 }
 
 
+void MainWin::ShowOPBrowserWin(void)
+{
+	opBrowseWin->show();
+	opBrowseWin->RefreshContents();
+}
+
+
+void MainWin::ShowM68KDasmBrowserWin(void)
+{
+	m68kDasmBrowseWin->show();
+	m68kDasmBrowseWin->RefreshContents();
+}
+
+
+void MainWin::ShowRISCDasmBrowserWin(void)
+{
+	riscDasmBrowseWin->show();
+	riscDasmBrowseWin->RefreshContents();
+}
+
+
 void MainWin::ResizeMainWindow(void)
 {
-	videoWidget->setFixedSize(zoomLevel * 320, zoomLevel * (vjs.hardwareTypeNTSC ? 240 : 256));
+//	videoWidget->setFixedSize(zoomLevel * 320, zoomLevel * (vjs.hardwareTypeNTSC ? 240 : 256));
+	videoWidget->setFixedSize(zoomLevel * VIRTUAL_SCREEN_WIDTH,
+		zoomLevel * (vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL));
 	show();
 
 	for(int i=0; i<2; i++)
@@ -821,11 +964,11 @@ void MainWin::ResizeMainWindow(void)
 void MainWin::ReadSettings(void)
 {
 	QSettings settings("Underground Software", "Virtual Jaguar");
-	QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
+	mainWinPosition = settings.value("pos", QPoint(200, 200)).toPoint();
 	QSize size = settings.value("size", QSize(400, 400)).toSize();
 	resize(size);
-	move(pos);
-	pos = settings.value("cartLoadPos", QPoint(200, 200)).toPoint();
+	move(mainWinPosition);
+	QPoint pos = settings.value("cartLoadPos", QPoint(200, 200)).toPoint();
 	filePickWin->move(pos);
 
 	zoomLevel = settings.value("zoom", 2).toInt();
@@ -845,15 +988,13 @@ void MainWin::ReadSettings(void)
 	vjs.glFilter         = settings.value("glFilterType", 1).toInt();
 	vjs.renderType       = settings.value("renderType", 0).toInt();
 	vjs.allowWritesToROM = settings.value("writeROM", false).toBool();
-//	strcpy(vjs.jagBootPath, settings.value("JagBootROM", "./bios/[BIOS] Atari Jaguar (USA, Europe).zip").toString().toAscii().data());
-//	strcpy(vjs.CDBootPath, settings.value("CDBootROM", "./bios/jagcd.rom").toString().toAscii().data());
+	vjs.biosType         = settings.value("biosType", BT_M_SERIES).toInt();
 	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());
 	strcpy(vjs.absROMPath, settings.value("DefaultABS", "").toString().toAscii().data());
+
 WriteLog("MainWin: Paths\n");
-//WriteLog("    jagBootPath = \"%s\"\n", vjs.jagBootPath);
-//WriteLog("    CDBootPath  = \"%s\"\n", vjs.CDBootPath);
 WriteLog("   EEPROMPath = \"%s\"\n", vjs.EEPROMPath);
 WriteLog("      ROMPath = \"%s\"\n", vjs.ROMPath);
 WriteLog("AlpineROMPath = \"%s\"\n", vjs.alpineROMPath);
@@ -931,6 +1072,7 @@ void MainWin::WriteSettings(void)
 	settings.setValue("glFilterType", vjs.glFilter);
 	settings.setValue("renderType", vjs.renderType);
 	settings.setValue("writeROM", vjs.allowWritesToROM);
+	settings.setValue("biosType", vjs.biosType);
 	settings.setValue("JagBootROM", vjs.jagBootPath);
 	settings.setValue("CDBootROM", vjs.CDBootPath);
 	settings.setValue("EEPROMs", vjs.EEPROMPath);