Fixed limits on cartridge space from 4MB to 6MB.

[virtualjaguar] / src / gui / mainwin.cpp

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 28d022b073f83266973dfa12a4b1e4984f76a289..b17ef8d91e923b709fa28259a668416602058b4a 100644 (file)
--- 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
@@ -175,7 +175,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()));
@@ -208,32 +208,33 @@ 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/generic.png"), tr("F&ull Screen"), this);
+       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/generic.png"), tr("OP Browser"), this);
+       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/generic.png"), tr("68K Listing Browser"), this);
+       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/generic.png"), tr("RISC Listing Browser"), this);
+       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()));
@@ -402,12 +403,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)
        {
@@ -864,8 +875,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);
@@ -873,12 +890,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();