Hotfix for bug #28.

[virtualjaguar] / src / gui / controllerwidget.cpp

diff --git a/src/gui/controllerwidget.cpp b/src/gui/controllerwidget.cpp
index 79e91b602859c25b345b4fe1405db8535e624f8d..f7ea8d03ce1746b0b8546290256e0e9f88c5ff9b 100644 (file)
--- a/src/gui/controllerwidget.cpp
+++ b/src/gui/controllerwidget.cpp
@@ -19,8 +19,8 @@
 #include "keygrabber.h"
 
 
-// These tables are used to convert Qt keycodes into human readable form. Note that
-// a lot of these are just filler.
+// These tables are used to convert Qt keycodes into human readable form. Note
+// that a lot of these are just filler.
 char ControllerWidget::keyName1[96][16] = {
        "Space",
        "!", "\"", "#", "$", "%", "&", "'", "(", ")", "*", "+", ",", "-", ".", "/",
@@ -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.
@@ -63,6 +65,8 @@ ControllerWidget::ControllerWidget(QWidget * parent/*= 0*/): QWidget(parent),
        widgetSize += QSize(4, 4);
        // We want to know when the mouse is moving over our widget...
        setMouseTracking(true);
+//nope
+//setFixedSize(widgetSize);
 }
 
 
@@ -113,6 +117,10 @@ void ControllerWidget::paintEvent(QPaintEvent * /*event*/)
        painter.setPen(colorPen);
        painter.drawLine(line);
 
+//#define DEBUG_CWPAINT
+#ifdef DEBUG_CWPAINT
+printf("------------------------------\n");
+#endif
        for(int i=BUTTON_FIRST; i<=BUTTON_LAST; i++)
        {
                if (keyToHighlight == i)
@@ -128,28 +136,63 @@ void ControllerWidget::paintEvent(QPaintEvent * /*event*/)
                        painter.setFont(font);
                }
 
+#ifdef DEBUG_CWPAINT
+printf("key %02i: ", i);
+#endif
+
                if (keys[i] < 0x80)
+#ifdef DEBUG_CWPAINT
+{
+printf("Drawing a key < 0x80 [keys[i]=%X, keyname=%s]...\n", keys[i], keyName1[keys[i] - 0x20]);
+#endif
                        DrawBorderedText(painter, buttonPos[i][0], buttonPos[i][1],
                                QString(keyName1[keys[i] - 0x20]));
+#ifdef DEBUG_CWPAINT
+}
+#endif
                else if ((keys[i] & 0xFFFFFF00) == 0x01000000)
                {
+#ifdef DEBUG_CWPAINT
+printf("Drawing a key with bit 48 set...\n");
+#endif
                        DrawBorderedText(painter, buttonPos[i][0], buttonPos[i][1],
                                QString(keyName2[keys[i] & 0x3F]));
                }
 #if 1
                else if (keys[i] & JOY_BUTTON)
                {
+#ifdef DEBUG_CWPAINT
+printf("Drawing a joystick button...\n");
+#endif
                        DrawBorderedText(painter, buttonPos[i][0], buttonPos[i][1],
                                QString("JB%1").arg(keys[i] & JOY_BUTTON_MASK));
                }
                else if (keys[i] & JOY_HAT)
                {
+#ifdef DEBUG_CWPAINT
+printf("Drawing a joystick hat...\n");
+#endif
                        DrawBorderedText(painter, buttonPos[i][0], buttonPos[i][1],
                                QString("j%1").arg(hatName[keys[i] & JOY_BUTTON_MASK]));
                }
+               else if (keys[i] & JOY_AXIS)
+               {
+#ifdef DEBUG_CWPAINT
+printf("Drawing a joystick axis...\n");
+#endif
+                       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
+#ifdef DEBUG_CWPAINT
+{
+printf("Drawing ???...\n");
+#endif
                        DrawBorderedText(painter, buttonPos[i][0], buttonPos[i][1], QString("???"));
+#ifdef DEBUG_CWPAINT
+}
+#endif
        }
 }
 
@@ -164,7 +207,8 @@ void ControllerWidget::mousePressEvent(QMouseEvent * /*event*/)
 void ControllerWidget::mouseReleaseEvent(QMouseEvent * /*event*/)
 {
        mouseDown = false;
-       // Spawning the keygrabber causes leaveEvent() to be called, so we need to save this
+       // Spawning the keygrabber causes leaveEvent() to be called, so we need to
+       // save this
        int keyToHighlightSave = keyToHighlight;
 
        KeyGrabber keyGrab(this);
@@ -173,7 +217,10 @@ void ControllerWidget::mouseReleaseEvent(QMouseEvent * /*event*/)
        int key = keyGrab.key;
 
        if (key != Qt::Key_Escape)
+       {
                keys[keyToHighlightSave] = key;
+               emit(KeyDefined(keyToHighlightSave, key));
+       }
 
        keyToHighlight = keyToHighlightSave;
        update();