Fixed 24BPP mode (used R twice instead of B), fixed problem with Object

[virtualjaguar] / src / gui / mainwin.cpp

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index c700976d798c4ff8498286dc7f3df52d5b75b24c..75b4bc385ae734ca09a6e89ce7a5c849ddfbceaa 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -9,15 +9,27 @@
 // ---  ----------  -------------------------------------------------------------
 // JLH  12/23/2009  Created this file
 // JLH  12/20/2010  Added settings, menus & toolbars
+// JLH  07/05/2011  Added CD BIOS functionality to GUI
 //
 
 // FIXED:
 //
+// - Add dbl click/enter to select in cart list, ESC to dimiss [DONE]
 //
 // STILL TO BE DONE:
 //
+// - Autoscan/autoload all available BIOS from 'software' folder
+// - Controller configuration
+// - Remove SDL dependencies (sound, mainly) from Jaguar core lib
+// - Add 1 key jumping in cartridge list (press 'R', jumps to carts starting with 'R', etc)
 //
 
+/*
+For BIOS autoscan, infrastructure is already there in filethread.cpp; just need to figure out
+if we want to scan every time, or stuff filenames found into the config file, or what.
+Should filethread emit signal that's intercepted here? Maybe...
+*/
+
 // Uncomment this for debugging...
 //#define DEBUG
 //#define DEBUGFOO                     // Various tool debugging...
@@ -47,6 +59,7 @@
 
 // Uncomment this to use built-in BIOS/CD-ROM BIOS
 // You'll need a copy of jagboot.h & jagcd.h for this to work...!
+// Creating those is left as an exercise for the reader. ;-)
 //#define USE_BUILT_IN_BIOS
 
 #ifdef USE_BUILT_IN_BIOS
@@ -67,7 +80,7 @@
 // use, we can drop it in anywhere and use it as-is.
 
 MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit(true),
-       cartridgeLoaded(false)
+       cartridgeLoaded(false), CDActive(false)
 {
        videoWidget = new GLWidget(this);
        setCentralWidget(videoWidget);
@@ -152,6 +165,12 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit
        configAct->setShortcut(QKeySequence(tr("Ctrl+c")));
        connect(configAct, SIGNAL(triggered()), this, SLOT(Configure()));
 
+       useCDAct = new QAction(QIcon(":/res/compact-disc.png"), tr("&Use CD Unit"), this);
+       useCDAct->setStatusTip(tr("Use Jaguar Virtual CD unit"));
+//     useCDAct->setShortcut(QKeySequence(tr("Ctrl+c")));
+       useCDAct->setCheckable(true);
+       connect(useCDAct, SIGNAL(triggered()), this, SLOT(ToggleCDUsage()));
+
        // Misc. connections...
        connect(filePickWin, SIGNAL(RequestLoad(QString)), this, SLOT(LoadSoftware(QString)));
 
@@ -159,6 +178,7 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit
 
        fileMenu = menuBar()->addMenu(tr("&File"));
        fileMenu->addAction(filePickAct);
+       fileMenu->addAction(useCDAct);
        fileMenu->addAction(powerAct);
        fileMenu->addAction(pauseAct);
        fileMenu->addAction(configAct);
@@ -171,6 +191,7 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit
        toolbar->addAction(powerAct);
        toolbar->addAction(pauseAct);
        toolbar->addAction(filePickAct);
+       toolbar->addAction(useCDAct);
        toolbar->addSeparator();
        toolbar->addAction(x1Act);
        toolbar->addAction(x2Act);
@@ -458,12 +479,29 @@ void MainWin::TogglePowerState(void)
                pauseAct->setDisabled(true);
                showUntunedTankCircuit = true;
                running = true;
+               // This is just in case the ROM we were playing was in a narrow or wide field mode
+               TOMReset();
        }
        else
        {
-               showUntunedTankCircuit = (cartridgeLoaded ? false : true);
-               pauseAct->setChecked(false);
-               pauseAct->setDisabled(!cartridgeLoaded);
+               if (!CDActive)
+               {
+                       showUntunedTankCircuit = (cartridgeLoaded ? false : true);
+                       pauseAct->setChecked(false);
+                       pauseAct->setDisabled(!cartridgeLoaded);
+               }
+               else
+               {
+// Should check for cartridgeLoaded here as well...!
+// We can clear it when toggling CDActive on, so that when we power cycle it does the
+// expected thing. Otherwise, if we use the file picker to insert a cart, we expect
+// to run the cart! Maybe have a RemoveCart function that only works if the CD unit
+// is active?
+                       showUntunedTankCircuit = false;
+                       pauseAct->setChecked(false);
+                       pauseAct->setDisabled(false);
+                       memcpy(jagMemSpace + 0x800000, jaguarCDBootROM, 0x40000);
+               }
 
 //(Err, what's so crappy about this? It seems to do what it's supposed to...)
 //This is crappy!!! !!! FIX !!!
@@ -568,6 +606,20 @@ void MainWin::LoadSoftware(QString file)
        setWindowTitle(newTitle);
 }
 
+void MainWin::ToggleCDUsage(void)
+{
+       CDActive = !CDActive;
+
+       if (CDActive)
+       {
+               powerAct->setDisabled(false);
+       }
+       else
+       {
+               powerAct->setDisabled(true);
+       }
+}
+
 void MainWin::ResizeMainWindow(void)
 {
        videoWidget->setFixedSize(zoomLevel * 320, zoomLevel * (vjs.hardwareTypeNTSC ? 240 : 256));