Added analog axis support to Gamepad module.

[virtualjaguar] / src / gui / controllerwidget.cpp

diff --git a/src/gui/controllerwidget.cpp b/src/gui/controllerwidget.cpp
index 79e91b602859c25b345b4fe1405db8535e624f8d..0386334a92846cfc21e781c808b21f858101227e 100644 (file)
--- a/src/gui/controllerwidget.cpp
+++ b/src/gui/controllerwidget.cpp
@@ -44,6 +44,8 @@ char ControllerWidget::keyName2[64][16] = {
 
 char ControllerWidget::hatName[4][16] = { "Up", "Rt", "Dn", "Lf" };
 
+char ControllerWidget::axisName[2][8] = { "+", "-" };
+
 // This is hard-coded crap. It's crap-tastic!
 // These are the positions to draw the button names at, ordered by the BUTTON_* sequence
 // found in joystick.h.
@@ -147,6 +149,11 @@ void ControllerWidget::paintEvent(QPaintEvent * /*event*/)
                        DrawBorderedText(painter, buttonPos[i][0], buttonPos[i][1],
                                QString("j%1").arg(hatName[keys[i] & JOY_BUTTON_MASK]));
                }
+               else if (keys[i] & JOY_AXIS)
+               {
+                       DrawBorderedText(painter, buttonPos[i][0], buttonPos[i][1],
+                               QString("JA%1%2").arg((keys[i] & JOY_AXISNUM_MASK) >> 1).arg(axisName[keys[i] & JOY_AXISDIR_MASK]));
+               }
 #endif
                else
                        DrawBorderedText(painter, buttonPos[i][0], buttonPos[i][1], QString("???"));