More gamepad work.

[virtualjaguar] / src / gui / mainwin.cpp

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 72869fb7515723f7751715621b0c400c4137ac61..9a739870df9083a596593f11d30c84204fd3db4f 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -35,16 +35,18 @@
 
 #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 "dac.h"
@@ -102,6 +104,7 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
        memBrowseWin = new MemoryBrowserWindow(this);
        cpuBrowseWin = new CPUBrowserWindow(this);
        opBrowseWin = new OPBrowserWindow(this);
+       m68kDasmBrowseWin = new M68KDasmBrowserWindow(this);
 
     videoWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
@@ -223,6 +226,11 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
 //     memBrowseAct->setCheckable(true);
        connect(opBrowseAct, SIGNAL(triggered()), this, SLOT(ShowOPBrowserWin()));
 
+       m68kDasmBrowseAct = new QAction(QIcon(":/res/generic.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()));
+
        // Misc. connections...
        connect(filePickWin, SIGNAL(RequestLoad(QString)), this, SLOT(LoadSoftware(QString)));
        connect(filePickWin, SIGNAL(FilePickerHiding()), this, SLOT(Unpause()));
@@ -244,6 +252,7 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
                debugMenu->addAction(memBrowseAct);
                debugMenu->addAction(cpuBrowseAct);
                debugMenu->addAction(opBrowseAct);
+               debugMenu->addAction(m68kDasmBrowseAct);
        }
 
        helpMenu = menuBar()->addMenu(tr("&Help"));
@@ -272,6 +281,7 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
                debugbar->addAction(memBrowseAct);
                debugbar->addAction(cpuBrowseAct);
                debugbar->addAction(opBrowseAct);
+               debugbar->addAction(m68kDasmBrowseAct);
        }
 
        //      Create status bar
@@ -494,6 +504,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))
+                       joypad_0_buttons[i] = (Gamepad::GetState(0, vjs.p1KeyBindings[i]) ? 0x01 : 0x00);
+
+               if (vjs.p2KeyBindings[i] & (JOY_BUTTON | JOY_HAT))
+                       joypad_1_buttons[i] = (Gamepad::GetState(1, vjs.p2KeyBindings[i]) ? 0x01 : 0x00);
+       }
+}
+
+
 void MainWin::Open(void)
 {
 }
@@ -597,6 +622,7 @@ void MainWin::Timer(void)
        else
        {
                // Otherwise, run the Jaguar simulation
+               HandleGamepads();
                JaguarExecuteNew();
        }
 
@@ -818,14 +844,6 @@ void MainWin::FrameAdvance(void)
 
 void MainWin::SetFullScreen(bool state/*= true*/)
 {
-#if 0
-       QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
-       QSize size = settings.value("size", QSize(400, 400)).toSize();
-       resize(size);
-       move(pos);
-       settings.setValue("pos", pos());
-       settings.setValue("size", size());
-#endif
        if (state)
        {
                mainWinPosition = pos();
@@ -888,6 +906,13 @@ void MainWin::ShowOPBrowserWin(void)
 }
 
 
+void MainWin::ShowM68KDasmBrowserWin(void)
+{
+       m68kDasmBrowseWin->show();
+       m68kDasmBrowseWin->RefreshContents();
+}
+
+
 void MainWin::ResizeMainWindow(void)
 {
 //     videoWidget->setFixedSize(zoomLevel * 320, zoomLevel * (vjs.hardwareTypeNTSC ? 240 : 256));