eden-emu/SDL
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved XInput controller detection

Browse source 
Sometimes we'll get a Windows.Gaming.Input callback before the raw input device is even in the list, so try some other methods to better detect XInput devices.
This commit is contained in:
Sam Lantinga 2025-01-02 10:01:29 -08:00
parent 8ea4b326b3
commit 6b4b9b5f2b
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/joystick/windows/SDL_windows_gaming_input.c
View file

@ -107,7 +107,7 @@ DEFINE_GUID(IID___x_ABI_CWindows_CGaming_CInput_CIRawGameControllerStatics, 0xeb
extern bool SDL_XINPUT_Enabled(void); extern bool SDL_XINPUT_Enabled(void);
static bool SDL_IsXInputDevice(Uint16 vendor, Uint16 product) static bool SDL_IsXInputDevice(Uint16 vendor, Uint16 product, const char *name)
{ {
#if defined(SDL_JOYSTICK_XINPUT) || defined(SDL_JOYSTICK_RAWINPUT) #if defined(SDL_JOYSTICK_XINPUT) || defined(SDL_JOYSTICK_RAWINPUT)
PRAWINPUTDEVICELIST raw_devices = NULL; PRAWINPUTDEVICELIST raw_devices = NULL;
@ -123,6 +123,13 @@ static bool SDL_IsXInputDevice(Uint16 vendor, Uint16 product)
return false; return false;
} }
// Sometimes we'll get a Windows.Gaming.Input callback before the raw input device is even in the list,
// so try to do some checks up front to catch these cases.
if (SDL_IsJoystickXboxOne(vendor, product) ||
(name && SDL_strncmp(name, "Xbox ", 5) == 0)) {
return true;
}
// Go through RAWINPUT (WinXP and later) to find HID devices. // Go through RAWINPUT (WinXP and later) to find HID devices.
if ((GetRawInputDeviceList(NULL, &raw_device_count, sizeof(RAWINPUTDEVICELIST)) == -1) || (!raw_device_count)) { if ((GetRawInputDeviceList(NULL, &raw_device_count, sizeof(RAWINPUTDEVICELIST)) == -1) || (!raw_device_count)) {
return false; // oh well. return false; // oh well.
@ -453,7 +460,7 @@ static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeAdde
ignore_joystick = true; ignore_joystick = true;
} }
if (!ignore_joystick && SDL_IsXInputDevice(vendor, product)) { if (!ignore_joystick && SDL_IsXInputDevice(vendor, product, name)) {
// This hasn't been detected by the RAWINPUT driver yet, but it will be picked up later. // This hasn't been detected by the RAWINPUT driver yet, but it will be picked up later.
ignore_joystick = true; ignore_joystick = true;
} }