Fixed sticky keys on keyboard input handler. No longer sticky! :-D

[virtualjaguar] / src / gui / mainwin.cpp

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 042e607d099025aa42529b9abf486950ee2b7095..d05599d35c2bdb3817f08d2743a51707c28023e3 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -469,6 +469,22 @@ void MainWin::keyPressEvent(QKeyEvent * e)
                e->accept();
                return;
        }
+       else if (e->key() == Qt::Key_F8)
+       {
+               // ggn: For extra NYAN pleasure...
+               // ggn: There you go James :P
+               // Shamus: Thanks for the patch! :-D
+               WriteLog("    o  +           +        +\n");
+               WriteLog("+        o     o       +        o\n");
+               WriteLog("-_-_-_-_-_-_-_,------,      o \n");
+               WriteLog("_-_-_-_-_-_-_-|   /\\_/\\  \n");
+               WriteLog("-_-_-_-_-_-_-~|__( ^ .^)  +     +  \n");
+               WriteLog("_-_-_-_-_-_-_-\"\"  \"\"      \n");
+               WriteLog("+      o         o   +       o\n");
+               WriteLog("    +         +\n");
+               e->accept();
+               return;
+       }
 
 /*
 This is done now by a QAction...
@@ -551,12 +567,27 @@ void MainWin::HandleKeys(QKeyEvent * e, bool state)
        else if (e->key() == (int)vjs.p2KeyBindings[BUTTON_D])
                keyHeld[P2DOWN] = state;
 
+#if 0
        // Next, check for conflicts and bail out if there are any...
        if ((keyHeld[P1LEFT] && keyHeld[P1RIGHT])
                || (keyHeld[P1UP] && keyHeld[P1DOWN])
                || (keyHeld[P2LEFT] && keyHeld[P2RIGHT])
                || (keyHeld[P2UP] && keyHeld[P2DOWN]))
                return;
+#else
+       // Next, check for conflicts and kill 'em if there are any...
+       if (keyHeld[P1LEFT] && keyHeld[P1RIGHT])
+               keyHeld[P1LEFT] = keyHeld[P1RIGHT] = false;
+
+       if (keyHeld[P1UP] && keyHeld[P1DOWN])
+               keyHeld[P1UP] = keyHeld[P1DOWN] = false;
+
+       if (keyHeld[P2LEFT] && keyHeld[P2RIGHT])
+               keyHeld[P2LEFT] = keyHeld[P2RIGHT] = false;
+
+       if (keyHeld[P2UP] && keyHeld[P2DOWN])
+               keyHeld[P2UP] = keyHeld[P2DOWN] = false;
+#endif
 #endif
 #endif
 
@@ -1108,7 +1139,7 @@ void MainWin::ReadSettings(void)
        vjs.frameSkip        = settings.value("frameSkip", 0).toInt();
        vjs.useJaguarBIOS    = settings.value("useJaguarBIOS", false).toBool();
        vjs.GPUEnabled       = settings.value("GPUEnabled", true).toBool();
-       vjs.DSPEnabled       = settings.value("DSPEnabled", false).toBool();
+       vjs.DSPEnabled       = settings.value("DSPEnabled", true).toBool();
        vjs.audioEnabled     = settings.value("audioEnabled", true).toBool();
        vjs.usePipelinedDSP  = settings.value("usePipelinedDSP", false).toBool();
        vjs.fullscreen       = settings.value("fullscreen", false).toBool();
@@ -1117,6 +1148,7 @@ void MainWin::ReadSettings(void)
        vjs.renderType       = settings.value("renderType", 0).toInt();
        vjs.allowWritesToROM = settings.value("writeROM", false).toBool();
        vjs.biosType         = settings.value("biosType", BT_M_SERIES).toInt();
+       vjs.useFastBlitter   = settings.value("useFastBlitter", false).toBool();
        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());
@@ -1204,6 +1236,7 @@ void MainWin::WriteSettings(void)
        settings.setValue("renderType", vjs.renderType);
        settings.setValue("writeROM", vjs.allowWritesToROM);
        settings.setValue("biosType", vjs.biosType);
+       settings.setValue("useFastBlitter", vjs.useFastBlitter);
        settings.setValue("JagBootROM", vjs.jagBootPath);
        settings.setValue("CDBootROM", vjs.CDBootPath);
        settings.setValue("EEPROMs", vjs.EEPROMPath);