LT/RT support

Author: drdaxxy

src/controllertab.cpp

@@ -80,6 +80,12 @@ ControllerTab::ControllerTab(QWidget *parent) : QWidget(parent) {
     if (!rbApp->controllerManager()->controllers().empty()) {
         mainLayout->addSpacing(12);
 
+        /* diagnostics */
+        /*
+        _axesLabel = new QLabel(this);
+        mainLayout->addWidget(_axesLabel);
+        */
+
         QSizePolicy spCol(QSizePolicy::Preferred, QSizePolicy::Preferred);
         spCol.setHorizontalStretch(1);
 
@@ -197,23 +203,45 @@ void ControllerTab::onActiveControllerChanged(DinputController *oldController,
     if (newController != nullptr) {
         connect(newController, &DinputController::buttonPressed, this,
                 &ControllerTab::onButtonPressed);
+        /* diagnostics */
+        /*
+        connect(newController, &DinputController::ticked, this,
+                &ControllerTab::updateAxesLabel);
+        */
         newController->startTracking((HWND)rbApp->window()->winId());
     }
     reloadData();
 }
 
-void ControllerTab::onButtonPressed(ControllerConfig::Button button) {
-    auto &confBinds =
-        rbApp->controllerManager()->activeController()->config()->binds;
-    for (int i = 0; i < (int)ControllerConfig::Bind::Num; i++) {
-        if (confBinds[i] == button) {
-            confBinds[i] = ControllerConfig::Button::Invalid;
-            _binds[i]->le()->setText("");
-        }
-    }
+void ControllerTab::updateAxesLabel() {
+    /* diagnostics */
+    /*
+    _axesLabel->setText(
+        QString("Two axes: %1, lZ: %2, lRZ: %3")
+            .arg(rbApp->controllerManager()->activeController()->twoAxes())
+            .arg(
+                rbApp->controllerManager()->activeController()->lastState()->lZ,
+                4, 16)
+            .arg(rbApp->controllerManager()
+                     ->activeController()
+                     ->lastState()
+                     ->lRz,
+                 4, 16));
+    */
+}
 
+void ControllerTab::onButtonPressed(ControllerConfig::Button button) {
     BtnRow *br = findFocusedBtnRow();
     if (br != nullptr) {
+        auto &confBinds =
+            rbApp->controllerManager()->activeController()->config()->binds;
+        for (int i = 0; i < (int)ControllerConfig::Bind::Num; i++) {
+            if (confBinds[i] == button) {
+                confBinds[i] = ControllerConfig::Button::Invalid;
+                _binds[i]->le()->setText("");
+            }
+        }
+
         rbApp->controllerManager()->activeController()->config()->preset =
             ControllerConfig::Preset::Custom;
         confBinds[(int)br->bind()] = button;

src/controllertab.h

@@ -25,6 +25,7 @@ class ControllerTab : public QWidget {
     QPushButton* _resetButton;
     BtnRow* _binds[(int)ControllerConfig::Bind::Num];
     bool _firstShowCaught = false;
+    QLabel* _axesLabel;
 
     BtnRow* findFocusedBtnRow();
 
@@ -36,4 +37,5 @@ class ControllerTab : public QWidget {
     void onActiveControllerChanged(DinputController* oldController,
                                    DinputController* newController);
     void onButtonPressed(ControllerConfig::Button button);
+    void updateAxesLabel();
 };

src/dinputcontroller.cpp

@@ -28,6 +28,16 @@ DinputController::DinputController(const DIDEVICEINSTANCE* pdidInstance,
 
     _config = new ControllerConfig(_guid, this);
 
+    DIDEVICEOBJECTINSTANCE obj = {0};
+    obj.dwSize = sizeof(DIDEVICEOBJECTINSTANCE);
+    _joystick->GetObjectInfo(&obj, 20, DIPH_BYOFFSET);
+    // this is how they do it in the original launcher...
+    if (obj.dwType == DIDFT_ALL) {
+        _twoAxes = false;
+    } else {
+        _twoAxes = true;
+    }
+
     _timer.setSingleShot(true);
     _timer.setInterval((int)(1000.f / 30.f));
     connect(&_timer, &QTimer::timeout, this, &DinputController::timerTick);
@@ -66,15 +76,28 @@ void DinputController::timerTick() {
         return;
     }
 
-    for (int i = 0; i < (int)ControllerConfig::Button::Num; i++) {
+    for (int i = 0; i < (int)ControllerConfig::Button::LT; i++) {
         if (newState.rgbButtons[i] & 0x80 &&
             !(_lastState.rgbButtons[i] & 0x80)) {
             emit buttonPressed((ControllerConfig::Button)i);
         }
     }
 
+    if (_twoAxes) {
+        // TODO: this
+    } else {
+        if (newState.lZ > 0x8FFF && _lastState.lZ <= 0x8FFF) {
+            emit buttonPressed(ControllerConfig::Button::LT);
+        }
+        if (newState.lZ < 0x6FFF && _lastState.lZ >= 0x6FFF) {
+            emit buttonPressed(ControllerConfig::Button::RT);
+        }
+    }
+
     _lastState = newState;
 
+    emit ticked();
+
     _timer.start();
 }
 

src/dinputcontroller.h

@@ -37,15 +37,22 @@ class DinputController : public QObject {
     void startTracking(HWND topLevelWindow);
     void stopTracking();
 
+    /* diagnostics */
+    const DIJOYSTATE* lastState() { return &_lastState; }
+    bool twoAxes() { return _twoAxes; }
+
    signals:
     void buttonPressed(ControllerConfig::Button button);
+    /* diagnostics */
+    void ticked();
 
    private:
     bool _isXinput;
     QString _guid;
     ControllerConfig* _config = nullptr;
     QString _deviceName;
     LPDIRECTINPUTDEVICE8 _joystick = nullptr;
+    bool _twoAxes;
     DIJOYSTATE _lastState = {0};
     QTimer _timer;