Commit 5a2d165b7bf17fc411cd466ebbc5ac86a8f6c55c
2023-07-11T07:56:07
Improved RAWINPUT <-> XInput/WGI device correlation If there is only one controller slot available, assume that's the one matching new RAWINPUt devices. This will be right most of the time, and uncorrelation will fix any bad guesses. (cherry picked from commit 41882a1acb6054dc7a56fd5ff7f0a279ba1144c0) (cherry picked from commit 34c5bde3554d2a78d14eb73c14d971cee20f3108)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
diff --git a/src/joystick/windows/SDL_rawinputjoystick.c b/src/joystick/windows/SDL_rawinputjoystick.c
index b9ab6c0..b5efe96 100644
--- a/src/joystick/windows/SDL_rawinputjoystick.c
+++ b/src/joystick/windows/SDL_rawinputjoystick.c
@@ -79,7 +79,9 @@ typedef struct WindowsGamingInputGamepadState WindowsGamingInputGamepadState;
#endif
#endif
-/*#define DEBUG_RAWINPUT*/
+#if 0
+#define DEBUG_RAWINPUT
+#endif
#ifndef RIDEV_EXINPUTSINK
#define RIDEV_EXINPUTSINK 0x00001000
@@ -402,6 +404,21 @@ static SDL_bool RAWINPUT_GuessXInputSlot(const WindowsMatchState *state, Uint8 *
int user_index;
int match_count;
+ /* If there is only one available slot, let's use that
+ * That will be right most of the time, and uncorrelation will fix any bad guesses
+ */
+ match_count = 0;
+ for (user_index = 0; user_index < XUSER_MAX_COUNT; ++user_index) {
+ if (xinput_state[user_index].connected && !xinput_state[user_index].used) {
+ *slot_idx = user_index;
+ ++match_count;
+ }
+ }
+ if (match_count == 1) {
+ *correlation_id = ++xinput_state[*slot_idx].correlation_id;
+ return SDL_TRUE;
+ }
+
*slot_idx = 0;
match_count = 0;
@@ -717,10 +734,27 @@ static SDL_bool RAWINPUT_WindowsGamingInputSlotMatches(const WindowsMatchState *
static SDL_bool RAWINPUT_GuessWindowsGamingInputSlot(const WindowsMatchState *state, Uint8 *correlation_id, WindowsGamingInputGamepadState **slot, SDL_bool xinput_correlated)
{
int match_count, user_index;
+ WindowsGamingInputGamepadState *gamepad_state = NULL;
+
+ /* If there is only one available slot, let's use that
+ * That will be right most of the time, and uncorrelation will fix any bad guesses
+ */
+ match_count = 0;
+ for (user_index = 0; user_index < wgi_state.per_gamepad_count; ++user_index) {
+ gamepad_state = wgi_state.per_gamepad[user_index];
+ if (gamepad_state->connected && !gamepad_state->used) {
+ *slot = gamepad_state;
+ ++match_count;
+ }
+ }
+ if (match_count == 1) {
+ *correlation_id = ++gamepad_state->correlation_id;
+ return SDL_TRUE;
+ }
match_count = 0;
for (user_index = 0; user_index < wgi_state.per_gamepad_count; ++user_index) {
- WindowsGamingInputGamepadState *gamepad_state = wgi_state.per_gamepad[user_index];
+ gamepad_state = wgi_state.per_gamepad[user_index];
if (RAWINPUT_WindowsGamingInputSlotMatches(state, gamepad_state, xinput_correlated)) {
++match_count;
*slot = gamepad_state;