Adding meumart's Citra SDL Joystick support. Citra PR #3116

1 files changed, 155 insertions, 141 deletions

diff --git a/src/yuzu/configuration/configure_input.ui b/src/yuzu/configuration/configure_input.ui
index 5143c9d72..c162ca02c 100644
--- a/src/yuzu/configuration/configure_input.ui
+++ b/src/yuzu/configuration/configure_input.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>343</width>
-    <height>665</height>
+    <height>677</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,10 +16,10 @@
   <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
     <layout class="QGridLayout" name="gridLayout_7">
-     <item row="0" column="0">
-      <widget class="QGroupBox" name="faceButtons">
+     <item row="3" column="1">
+      <widget class="QGroupBox" name="faceButtons_6">
        <property name="title">
-        <string>Face Buttons</string>
+        <string>Misc.</string>
        </property>
        <property name="flat">
         <bool>false</bool>
@@ -27,18 +27,18 @@
        <property name="checkable">
         <bool>false</bool>
        </property>
-       <layout class="QGridLayout" name="gridLayout">
+       <layout class="QGridLayout" name="gridLayout_6">
         <item row="0" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout">
+         <layout class="QVBoxLayout" name="verticalLayout_25">
           <item>
-           <widget class="QLabel" name="label">
+           <widget class="QLabel" name="label_29">
             <property name="text">
-             <string>A:</string>
+             <string>Plus:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonA">
+           <widget class="QPushButton" name="buttonPlus">
             <property name="text">
              <string/>
             </property>
@@ -47,16 +47,16 @@
          </layout>
         </item>
         <item row="0" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_2">
+         <layout class="QVBoxLayout" name="verticalLayout_26">
           <item>
-           <widget class="QLabel" name="label_2">
+           <widget class="QLabel" name="label_30">
             <property name="text">
-             <string>B:</string>
+             <string>Minus:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonB">
+           <widget class="QPushButton" name="buttonMinus">
             <property name="text">
              <string/>
             </property>
@@ -65,16 +65,16 @@
          </layout>
         </item>
         <item row="1" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_3">
+         <layout class="QVBoxLayout" name="verticalLayout_27">
           <item>
-           <widget class="QLabel" name="label_3">
+           <widget class="QLabel" name="label_31">
             <property name="text">
-             <string>X:</string>
+             <string>Home:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonX">
+           <widget class="QPushButton" name="buttonHome">
             <property name="text">
              <string/>
             </property>
@@ -83,16 +83,17 @@
          </layout>
         </item>
         <item row="1" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_4">
+         <layout class="QVBoxLayout" name="verticalLayout_28">
           <item>
-           <widget class="QLabel" name="label_4">
+           <widget class="QLabel" name="label_11">
             <property name="text">
-             <string>Y:</string>
+             <string>Screen
+Capture:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonY">
+           <widget class="QPushButton" name="buttonScreenshot">
             <property name="text">
              <string/>
             </property>
@@ -100,13 +101,26 @@
           </item>
          </layout>
         </item>
+        <item row="2" column="1">
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
        </layout>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QGroupBox" name="faceButtons_2">
+     <item row="0" column="0">
+      <widget class="QGroupBox" name="faceButtons">
        <property name="title">
-        <string>Directional Pad</string>
+        <string>Face Buttons</string>
        </property>
        <property name="flat">
         <bool>false</bool>
@@ -114,18 +128,18 @@
        <property name="checkable">
         <bool>false</bool>
        </property>
-       <layout class="QGridLayout" name="gridLayout_2">
-        <item row="1" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_12">
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="0">
+         <layout class="QVBoxLayout" name="verticalLayout">
           <item>
-           <widget class="QLabel" name="label_34">
+           <widget class="QLabel" name="label">
             <property name="text">
-             <string>Up:</string>
+             <string>A:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonDpadUp">
+           <widget class="QPushButton" name="buttonA">
             <property name="text">
              <string/>
             </property>
@@ -133,17 +147,17 @@
           </item>
          </layout>
         </item>
-        <item row="1" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_9">
+        <item row="0" column="1">
+         <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
-           <widget class="QLabel" name="label_35">
+           <widget class="QLabel" name="label_2">
             <property name="text">
-             <string>Down:</string>
+             <string>B:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonDpadDown">
+           <widget class="QPushButton" name="buttonB">
             <property name="text">
              <string/>
             </property>
@@ -151,17 +165,17 @@
           </item>
          </layout>
         </item>
-        <item row="0" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_10">
+        <item row="1" column="0">
+         <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
-           <widget class="QLabel" name="label_32">
+           <widget class="QLabel" name="label_3">
             <property name="text">
-             <string>Left:</string>
+             <string>X:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonDpadLeft">
+           <widget class="QPushButton" name="buttonX">
             <property name="text">
              <string/>
             </property>
@@ -169,17 +183,17 @@
           </item>
          </layout>
         </item>
-        <item row="0" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_11">
+        <item row="1" column="1">
+         <layout class="QVBoxLayout" name="verticalLayout_4">
           <item>
-           <widget class="QLabel" name="label_33">
+           <widget class="QLabel" name="label_4">
             <property name="text">
-             <string>Right:</string>
+             <string>Y:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonDpadRight">
+           <widget class="QPushButton" name="buttonY">
             <property name="text">
              <string/>
             </property>
@@ -190,10 +204,10 @@
        </layout>
       </widget>
      </item>
-     <item row="3" column="1">
-      <widget class="QGroupBox" name="faceButtons_6">
+     <item row="0" column="1">
+      <widget class="QGroupBox" name="faceButtons_2">
        <property name="title">
-        <string>Misc.</string>
+        <string>Directional Pad</string>
        </property>
        <property name="flat">
         <bool>false</bool>
@@ -201,18 +215,18 @@
        <property name="checkable">
         <bool>false</bool>
        </property>
-       <layout class="QGridLayout" name="gridLayout_6">
-        <item row="0" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_25">
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="1" column="0">
+         <layout class="QVBoxLayout" name="verticalLayout_12">
           <item>
-           <widget class="QLabel" name="label_29">
+           <widget class="QLabel" name="label_34">
             <property name="text">
-             <string>Plus:</string>
+             <string>Up:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonPlus">
+           <widget class="QPushButton" name="buttonDpadUp">
             <property name="text">
              <string/>
             </property>
@@ -220,17 +234,17 @@
           </item>
          </layout>
         </item>
-        <item row="0" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_26">
+        <item row="1" column="1">
+         <layout class="QVBoxLayout" name="verticalLayout_9">
           <item>
-           <widget class="QLabel" name="label_30">
+           <widget class="QLabel" name="label_35">
             <property name="text">
-             <string>Minus:</string>
+             <string>Down:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonMinus">
+           <widget class="QPushButton" name="buttonDpadDown">
             <property name="text">
              <string/>
             </property>
@@ -238,17 +252,17 @@
           </item>
          </layout>
         </item>
-        <item row="1" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_27">
+        <item row="0" column="0">
+         <layout class="QVBoxLayout" name="verticalLayout_10">
           <item>
-           <widget class="QLabel" name="label_31">
+           <widget class="QLabel" name="label_32">
             <property name="text">
-             <string>Home:</string>
+             <string>Left:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonHome">
+           <widget class="QPushButton" name="buttonDpadLeft">
             <property name="text">
              <string/>
             </property>
@@ -256,18 +270,17 @@
           </item>
          </layout>
         </item>
-        <item row="1" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_28">
+        <item row="0" column="1">
+         <layout class="QVBoxLayout" name="verticalLayout_11">
           <item>
-           <widget class="QLabel" name="label_11">
+           <widget class="QLabel" name="label_33">
             <property name="text">
-             <string>Screen
-Capture:</string>
+             <string>Right:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonScreenshot">
+           <widget class="QPushButton" name="buttonDpadRight">
             <property name="text">
              <string/>
             </property>
@@ -275,19 +288,6 @@ Capture:</string>
           </item>
          </layout>
         </item>
-        <item row="2" column="1">
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
        </layout>
       </widget>
      </item>
@@ -414,10 +414,13 @@ Capture:</string>
        </layout>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QGroupBox" name="faceButtons_4">
+     <item row="1" column="1">
+      <widget class="QGroupBox" name="faceButtons_5">
        <property name="title">
-        <string>Left Stick</string>
+        <string>Right Stick</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
        </property>
        <property name="flat">
         <bool>false</bool>
@@ -425,18 +428,18 @@ Capture:</string>
        <property name="checkable">
         <bool>false</bool>
        </property>
-       <layout class="QGridLayout" name="gridLayout_4">
-        <item row="0" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_17">
+       <layout class="QGridLayout" name="gridLayout_5">
+        <item row="1" column="1">
+         <layout class="QVBoxLayout" name="verticalLayout_24">
           <item>
-           <widget class="QLabel" name="label_21">
+           <widget class="QLabel" name="label_26">
             <property name="text">
-             <string>Left:</string>
+             <string>Down:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonLStickLeft">
+           <widget class="QPushButton" name="buttonRStickDown">
             <property name="text">
              <string/>
             </property>
@@ -445,16 +448,16 @@ Capture:</string>
          </layout>
         </item>
         <item row="0" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_18">
+         <layout class="QVBoxLayout" name="verticalLayout_22">
           <item>
-           <widget class="QLabel" name="label_23">
+           <widget class="QLabel" name="label_27">
             <property name="text">
              <string>Right:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonLStickRight">
+           <widget class="QPushButton" name="buttonRStickRight">
             <property name="text">
              <string/>
             </property>
@@ -462,17 +465,24 @@ Capture:</string>
           </item>
          </layout>
         </item>
+        <item row="3" column="0" colspan="2">
+         <widget class="QPushButton" name="buttonRStickAnalog">
+          <property name="text">
+           <string>Set Analog Stick</string>
+          </property>
+         </widget>
+        </item>
         <item row="1" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_19">
+         <layout class="QVBoxLayout" name="verticalLayout_21">
           <item>
-           <widget class="QLabel" name="label_24">
+           <widget class="QLabel" name="label_25">
             <property name="text">
-             <string>Up:</string>
+             <string>Left:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonLStickUp">
+           <widget class="QPushButton" name="buttonRStickLeft">
             <property name="text">
              <string/>
             </property>
@@ -480,17 +490,17 @@ Capture:</string>
           </item>
          </layout>
         </item>
-        <item row="1" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_20">
+        <item row="0" column="0">
+         <layout class="QVBoxLayout" name="verticalLayout_25">
           <item>
-           <widget class="QLabel" name="label_22">
+           <widget class="QLabel" name="label_28">
             <property name="text">
-             <string>Down:</string>
+             <string>Up:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonLStickDown">
+           <widget class="QPushButton" name="buttonRStickUp">
             <property name="text">
              <string/>
             </property>
@@ -499,16 +509,16 @@ Capture:</string>
          </layout>
         </item>
         <item row="2" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0,0">
+         <layout class="QVBoxLayout" name="verticalLayout_6">
           <item>
-           <widget class="QLabel" name="label_6">
+           <widget class="QLabel" name="label_5">
             <property name="text">
              <string>Pressed:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonLStick">
+           <widget class="QPushButton" name="buttonRStick">
             <property name="text">
              <string/>
             </property>
@@ -517,16 +527,16 @@ Capture:</string>
          </layout>
         </item>
         <item row="2" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_31">
+         <layout class="QVBoxLayout" name="verticalLayout_32">
           <item>
-           <widget class="QLabel" name="label_9">
+           <widget class="QLabel" name="label_10">
             <property name="text">
              <string>Modifier:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonLStickMod">
+           <widget class="QPushButton" name="buttonRStickMod">
             <property name="text">
              <string/>
             </property>
@@ -537,13 +547,10 @@ Capture:</string>
        </layout>
       </widget>
      </item>
-     <item row="1" column="1">
-      <widget class="QGroupBox" name="faceButtons_5">
+     <item row="1" column="0">
+      <widget class="QGroupBox" name="faceButtons_4">
        <property name="title">
-        <string>Right Stick</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+        <string>Left Stick</string>
        </property>
        <property name="flat">
         <bool>false</bool>
@@ -551,18 +558,18 @@ Capture:</string>
        <property name="checkable">
         <bool>false</bool>
        </property>
-       <layout class="QGridLayout" name="gridLayout_5">
+       <layout class="QGridLayout" name="gridLayout_4">
         <item row="1" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_24">
+         <layout class="QVBoxLayout" name="verticalLayout_20">
           <item>
-           <widget class="QLabel" name="label_26">
+           <widget class="QLabel" name="label_22">
             <property name="text">
              <string>Down:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonRStickDown">
+           <widget class="QPushButton" name="buttonLStickDown">
             <property name="text">
              <string/>
             </property>
@@ -570,17 +577,24 @@ Capture:</string>
           </item>
          </layout>
         </item>
+        <item row="4" column="0" colspan="2">
+         <widget class="QPushButton" name="buttonLStickAnalog">
+          <property name="text">
+           <string>Set Analog Stick</string>
+          </property>
+         </widget>
+        </item>
         <item row="0" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_22">
+         <layout class="QVBoxLayout" name="verticalLayout_18">
           <item>
-           <widget class="QLabel" name="label_27">
+           <widget class="QLabel" name="label_23">
             <property name="text">
              <string>Right:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonRStickRight">
+           <widget class="QPushButton" name="buttonLStickRight">
             <property name="text">
              <string/>
             </property>
@@ -588,17 +602,17 @@ Capture:</string>
           </item>
          </layout>
         </item>
-        <item row="1" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_23">
+        <item row="0" column="0">
+         <layout class="QVBoxLayout" name="verticalLayout_17">
           <item>
-           <widget class="QLabel" name="label_28">
+           <widget class="QLabel" name="label_21">
             <property name="text">
-             <string>Up:</string>
+             <string>Left:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonRStickUp">
+           <widget class="QPushButton" name="buttonLStickLeft">
             <property name="text">
              <string/>
             </property>
@@ -606,17 +620,17 @@ Capture:</string>
           </item>
          </layout>
         </item>
-        <item row="0" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_21">
+        <item row="1" column="0">
+         <layout class="QVBoxLayout" name="verticalLayout_19">
           <item>
-           <widget class="QLabel" name="label_25">
+           <widget class="QLabel" name="label_24">
             <property name="text">
-             <string>Left:</string>
+             <string>Up:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonRStickLeft">
+           <widget class="QPushButton" name="buttonLStickUp">
             <property name="text">
              <string/>
             </property>
@@ -624,17 +638,17 @@ Capture:</string>
           </item>
          </layout>
         </item>
-        <item row="2" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_32">
+        <item row="3" column="0">
+         <layout class="QVBoxLayout" name="verticalLayout_31">
           <item>
-           <widget class="QLabel" name="label_10">
+           <widget class="QLabel" name="label_9">
             <property name="text">
              <string>Modifier:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonRStickMod">
+           <widget class="QPushButton" name="buttonLStickMod">
             <property name="text">
              <string/>
             </property>
@@ -642,17 +656,17 @@ Capture:</string>
           </item>
          </layout>
         </item>
-        <item row="2" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_6">
+        <item row="3" column="1">
+         <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0,0">
           <item>
-           <widget class="QLabel" name="label_5">
+           <widget class="QLabel" name="label_6">
             <property name="text">
              <string>Pressed:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonRStick">
+           <widget class="QPushButton" name="buttonLStick">
             <property name="text">
              <string/>
             </property>