More gamepad work.

[virtualjaguar] / src / gui / mainwin.cpp

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 892d5a74ff7e8d6aeb08080fa4af29307db8927d..9a739870df9083a596593f11d30c84204fd3db4f 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -35,13 +35,14 @@
 
 #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/cpubrowser.h"
 #include "debug/m68kdasmbrowser.h"
@@ -503,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)
 {
 }
@@ -606,6 +622,7 @@ void MainWin::Timer(void)
        else
        {
                // Otherwise, run the Jaguar simulation
+               HandleGamepads();
                JaguarExecuteNew();
        }