sinput: add capability sub_types for most common controllers

antheas · antheas · commit 4fe152a2732c · 2025-08-02T15:25:54.000+02:00
The previous commit 6e66d80 ("sinput: refactor to make unknown controllers fully dynamic") introduces the ability to add dynamic capabilities for uknown controllers without hardcoding them to SDL. This commit introduces 8 major types of controller capabilities that are found in the market. Specifically, it adds a normal XInput capability map. Then, it adds XInput + share, which covers most handhelds without extra buttons, switch controllers, and new Xbox controllers. Following, it adds combinations with 2 and 4 paddles, which include e.g., devices such as the Legion Go S and Stadia controllers with 2 paddles, and Legion Go/Xbox Elite with 4 paddles. Finally, it adds the same paddle combos + clicks, where e.g., click + 2 paddles covers the Go S when emulating the touchpad and click + 4 paddles covers the dualsense edge controller capabilities fully.
diff --git a/src/joystick/SDL_gamepad.c b/src/joystick/SDL_gamepad.c
@@ -30,6 +30,7 @@
 #include "controller_type.h"
 #include "usb_ids.h"
 #include "hidapi/SDL_hidapi_nintendo.h"
+#include "hidapi/SDL_hidapi_sinput.h"
 #include "../events/SDL_events_c.h"
 
 
@@ -817,8 +818,29 @@ static GamepadMapping_t *SDL_CreateMappingForHIDAPIGamepad(SDL_GUID guid)
         case USB_PRODUCT_HANDHELDLEGEND_SINPUT_GENERIC:
             // Apply mapping profile for type
             switch (sinput_id) {
+            case k_eSinputControllerType_XInputOnly:
+                SDL_strlcat(mapping_string, "leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,b:b0,a:b1,y:b2,x:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b4,rightstick:b5,leftshoulder:b6,rightshoulder:b7,start:b8,back:b9,guide:b10,", sizeof(mapping_string));
+                break;
+            case k_eSinputControllerType_XInputShareNone:
+                SDL_strlcat(mapping_string, "leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,b:b0,a:b1,y:b2,x:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b4,rightstick:b5,leftshoulder:b6,rightshoulder:b7,start:b8,back:b9,guide:b10,misc1:b11,", sizeof(mapping_string));
+                break;
+            case k_eSinputControllerType_XInputShareDual:
+                SDL_strlcat(mapping_string, "leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,b:b0,a:b1,y:b2,x:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b4,rightstick:b5,leftshoulder:b6,rightshoulder:b7,paddle1:b8,paddle2:b9,start:b10,back:b11,guide:b12,misc1:b13,", sizeof(mapping_string));
+                break;
+            case k_eSinputControllerType_XInputShareQuad:
+                SDL_strlcat(mapping_string, "leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,b:b0,a:b1,y:b2,x:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b4,rightstick:b5,leftshoulder:b6,rightshoulder:b7,paddle1:b8,paddle2:b9,start:b10,back:b11,guide:b12,misc1:b13,paddle3:b14,paddle4:b15,", sizeof(mapping_string));
+                break;
+            case k_eSinputControllerType_XInputShareNoneClick:
+                SDL_strlcat(mapping_string, "leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,b:b0,a:b1,y:b2,x:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b4,rightstick:b5,leftshoulder:b6,rightshoulder:b7,start:b8,back:b9,guide:b10,misc1:b11,touchpad:b12,", sizeof(mapping_string));
+                break;
+            case k_eSinputControllerType_XInputShareDualClick:
+                SDL_strlcat(mapping_string, "leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,b:b0,a:b1,y:b2,x:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b4,rightstick:b5,leftshoulder:b6,rightshoulder:b7,paddle1:b8,paddle2:b9,start:b10,back:b11,guide:b12,misc1:b13,touchpad:b14,", sizeof(mapping_string));
+                break;
+            case k_eSinputControllerType_XInputShareQuadClick:
+                SDL_strlcat(mapping_string, "leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,b:b0,a:b1,y:b2,x:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b4,rightstick:b5,leftshoulder:b6,rightshoulder:b7,paddle1:b8,paddle2:b9,start:b10,back:b11,guide:b12,misc1:b13,paddle3:b14,paddle4:b15,touchpad:b16,", sizeof(mapping_string));
+                break;
             default:
-            case 0:
+            case k_eSinputControllerType_FullMapping:
                 // Default Fully Exposed Mapping
                 SDL_strlcat(mapping_string, "leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,b:b0,a:b1,y:b2,x:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b4,rightstick:b5,leftshoulder:b6,rightshoulder:b7,paddle1:b10,paddle2:b11,start:b12,back:b13,guide:b14,misc1:b15,paddle3:b16,paddle4:b17,touchpad:b18,misc2:b19,misc3:b20,misc4:b21,misc5:b22,misc6:b23", sizeof(mapping_string));
                 break;
diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
@@ -3216,7 +3216,9 @@ bool SDL_IsJoystickSInputController(Uint16 vendor_id, Uint16 product_id)
             return true;
         }
     }
-    return false;
+
+    EControllerType eType = GuessControllerType(vendor_id, product_id);
+    return eType == k_eControllerType_Sinput;
 }
 
 bool SDL_IsJoystickFlydigiController(Uint16 vendor_id, Uint16 product_id)
diff --git a/src/joystick/controller_list.h b/src/joystick/controller_list.h
@@ -598,4 +598,7 @@ static const ControllerDescription_t arrControllers[] = {
 	{ MAKE_CONTROLLER_ID( 0x28de, 0x1201 ), k_eControllerType_SteamControllerV2, NULL },	// Valve wired Steam Controller (HEADCRAB)
 	{ MAKE_CONTROLLER_ID( 0x28de, 0x1202 ), k_eControllerType_SteamControllerV2, NULL },	// Valve Bluetooth Steam Controller (HEADCRAB)
 	{ MAKE_CONTROLLER_ID( 0x28de, 0x1205 ), k_eControllerType_SteamControllerNeptune, NULL },	// Valve Steam Deck Builtin Controller
+
+	// Sinput dynamic layout controllers
+	{ MAKE_CONTROLLER_ID( 0x16d0, 0x145b ), k_eControllerType_Sinput, NULL },
 };
diff --git a/src/joystick/controller_type.c b/src/joystick/controller_type.c
@@ -106,6 +106,10 @@ EControllerType GuessControllerType( int nVID, int nPID )
 		{
 			return k_eControllerType_SteamController;
 		}
+		if ( SDL_strncasecmp( pszOverride, "sinput", 5 ) == 0 )
+		{
+			return k_eControllerType_Sinput;
+		}
 		return k_eControllerType_UnknownNonSteamController;
 	}
 
diff --git a/src/joystick/controller_type.h b/src/joystick/controller_type.h
@@ -57,6 +57,7 @@ typedef enum
 	k_eControllerType_XInputSwitchController = 44,  // Client-side only, used to mark Nintendo Switch style controllers as using XInput instead of the Nintendo Switch protocol
 	k_eControllerType_PS5Controller = 45,
 	k_eControllerType_XInputPS4Controller = 46,     // Client-side only, used to mark DualShock 4 style controllers using XInput instead of the DualShock 4 controller protocol
+	k_eControllerType_Sinput = 47,
 	k_eControllerType_LastController,			// Don't add game controllers below this enumeration - this enumeration can change value
 
 	// Keyboards and Mice
diff --git a/src/joystick/hidapi/SDL_hidapi_sinput.c b/src/joystick/hidapi/SDL_hidapi_sinput.c
@@ -27,6 +27,7 @@
 
 #include "SDL_hidapijoystick_c.h"
 #include "SDL_hidapi_rumble.h"
+#include "SDL_hidapi_sinput.h"
 
 #ifdef SDL_JOYSTICK_HIDAPI_SINPUT
 
@@ -291,35 +292,76 @@ static void ProcessSDLFeaturesResponse(SDL_HIDAPI_Device *device, Uint8 *data)
     // For backwards compatibility with existing firmwares
     // when we know the PID, we will passthrough the mask.
     // sub_type is only 5 bits, so 0xff can be used.
-    bool known = (
+    if (
         device->product_id == USB_PRODUCT_HANDHELDLEGEND_PROGCC ||
-        device->product_id == USB_PRODUCT_HANDHELDLEGEND_GCULTIMATE
-    );
-    if (known)
-        ctx->sub_type = 0xFF;
+        device->product_id == USB_PRODUCT_HANDHELDLEGEND_GCULTIMATE)
+        ctx->sub_type = k_eSinputControllerType_LoadFirmware;
 
     switch (ctx->sub_type) {
-        case 0xFF:
-            ctx->usage_masks[0] = buttons[0];
-            ctx->usage_masks[1] = buttons[1];
-            ctx->usage_masks[2] = buttons[2];
-            ctx->usage_masks[3] = buttons[3];
-            ctx->left_analog_stick_supported = left_analog_stick_supported;
-            ctx->right_analog_stick_supported = right_analog_stick_supported;
-            ctx->left_analog_trigger_supported = left_analog_trigger_supported;
-            ctx->right_analog_trigger_supported = right_analog_trigger_supported;
-            break;
-        default:
-            ctx->usage_masks[0] = 0xFF;
-            ctx->usage_masks[1] = 0xFF;
-            ctx->usage_masks[2] = 0xFF;
-            ctx->usage_masks[3] = 0xFF;
-            ctx->left_analog_stick_supported = true;
-            ctx->right_analog_stick_supported = true;
-            ctx->left_analog_trigger_supported = true;
-            ctx->right_analog_trigger_supported = true;
-            break;
-        }
+    case k_eSinputControllerType_XInputOnly:
+    case k_eSinputControllerType_XInputShareNone:
+    case k_eSinputControllerType_XInputShareDual:
+    case k_eSinputControllerType_XInputShareQuad:
+    case k_eSinputControllerType_XInputShareNoneClick:
+    case k_eSinputControllerType_XInputShareDualClick:
+    case k_eSinputControllerType_XInputShareQuadClick:
+        // Basic xinput mask with share
+        ctx->usage_masks[0] = 0xFF;
+        ctx->usage_masks[1] = 0x0F;
+        ctx->usage_masks[2] = 0x0F;
+        ctx->usage_masks[3] = 0x00;
+        ctx->left_analog_stick_supported = true;
+        ctx->right_analog_stick_supported = true;
+        ctx->left_analog_trigger_supported = true;
+        ctx->right_analog_trigger_supported = true;
+
+        // Add primary paddles
+        if (
+            ctx->sub_type == k_eSinputControllerType_XInputShareDual ||
+            ctx->sub_type == k_eSinputControllerType_XInputShareQuad ||
+            ctx->sub_type == k_eSinputControllerType_XInputShareDualClick ||
+            ctx->sub_type == k_eSinputControllerType_XInputShareQuadClick)
+            ctx->usage_masks[1] |= 0xC0;
+
+        // Remove share/capture button if not supported
+        if (ctx->sub_type == k_eSinputControllerType_XInputOnly)
+            ctx->usage_masks[2] &= ~0x08;
+
+        // Add secondary paddles
+        if (
+            ctx->sub_type == k_eSinputControllerType_XInputShareQuad ||
+            ctx->sub_type == k_eSinputControllerType_XInputShareQuadClick)
+            ctx->usage_masks[2] |= 0x30;
+
+        // Add touchpad click
+        if (
+            ctx->sub_type == k_eSinputControllerType_XInputShareNoneClick ||
+            ctx->sub_type == k_eSinputControllerType_XInputShareDualClick ||
+            ctx->sub_type == k_eSinputControllerType_XInputShareQuadClick)
+            ctx->usage_masks[2] |= 0x40;
+        break;
+    case k_eSinputControllerType_LoadFirmware:
+        ctx->usage_masks[0] = buttons[0];
+        ctx->usage_masks[1] = buttons[1];
+        ctx->usage_masks[2] = buttons[2];
+        ctx->usage_masks[3] = buttons[3];
+        ctx->left_analog_stick_supported = left_analog_stick_supported;
+        ctx->right_analog_stick_supported = right_analog_stick_supported;
+        ctx->left_analog_trigger_supported = left_analog_trigger_supported;
+        ctx->right_analog_trigger_supported = right_analog_trigger_supported;
+        break;
+    case k_eSinputControllerType_FullMapping:
+    default:
+        ctx->usage_masks[0] = 0xFF;
+        ctx->usage_masks[1] = 0xFF;
+        ctx->usage_masks[2] = 0xFF;
+        ctx->usage_masks[3] = 0xFF;
+        ctx->left_analog_stick_supported = true;
+        ctx->right_analog_stick_supported = true;
+        ctx->left_analog_trigger_supported = true;
+        ctx->right_analog_trigger_supported = true;
+        break;
+    }
 
     // Since SDL uses fixed mappings, unfortunately we cannot use the
     // button mask from the protocol. SInput defines a set of predefined
diff --git a/src/joystick/hidapi/SDL_hidapi_sinput.h b/src/joystick/hidapi/SDL_hidapi_sinput.h
@@ -0,0 +1,40 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 2025 Antheas Kapenekakis <git@antheas.dev>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+// Subtypes define the buttons and axes available on the device to
+// generate a mapping string. Everything else is dynamic.
+// Xinput means all Xbox360 buttons.
+// Xinput_share adds a share button, and then dual, quad add 2, 4 paddles
+// to those. Click adds a touchpad click. Touchpad is not used in the name
+// because not all of them have clicks. In fact, there are no controllers
+// with dual touchpads w/ clicks so there is no point in adding them. Yet.
+typedef enum
+{
+    k_eSinputControllerType_FullMapping = 0x00,
+    k_eSinputControllerType_XInputOnly = 0x01,
+    k_eSinputControllerType_XInputShareNone = 0x02,
+    k_eSinputControllerType_XInputShareDual = 0x03,
+    k_eSinputControllerType_XInputShareQuad = 0x04,
+    k_eSinputControllerType_XInputShareNoneClick = 0x05,
+    k_eSinputControllerType_XInputShareDualClick = 0x06,
+    k_eSinputControllerType_XInputShareQuadClick = 0x07,
+    k_eSinputControllerType_LoadFirmware = 0xff,
+} ESinputControllerType;

Original file line number	Diff line number	Diff line change
`@@ -3216,7 +3216,9 @@ bool SDL_IsJoystickSInputController(Uint16 vendor_id, Uint16 product_id)`
`3216`	`3216`	`return true;`
`3217`	`3217`	`}`
`3218`	`3218`	`}`
`3219`		`- return false;`
	`3219`	`+`
	`3220`	`+ EControllerType eType = GuessControllerType(vendor_id, product_id);`
	`3221`	`+ return eType == k_eControllerType_Sinput;`
`3220`	`3222`	`}`
`3221`	`3223`
`3222`	`3224`	`bool SDL_IsJoystickFlydigiController(Uint16 vendor_id, Uint16 product_id)`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,10 @@ EControllerType GuessControllerType( int nVID, int nPID )`
`106`	`106`	`{`
`107`	`107`	`return k_eControllerType_SteamController;`
`108`	`108`	`}`
	`109`	`+ if ( SDL_strncasecmp( pszOverride, "sinput", 5 ) == 0 )`
	`110`	`+ {`
	`111`	`+ return k_eControllerType_Sinput;`
	`112`	`+ }`
`109`	`113`	`return k_eControllerType_UnknownNonSteamController;`
`110`	`114`	`}`
`111`	`115`