encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change order we enumerate Windows joysticks. 

Make it so XInput devices are listed before DirectInput devices, and that the XInput
 devices are sorted by userid in ascending numeric order (so device 0 comes first).
This commit is contained in:
Ryan C. Gordon 2013-08-28 22:09:17 -04:00
parent ea4350d821
commit 257cef3024
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/joystick/windows/SDL_dxjoystick.c
View File

@ -766,8 +766,10 @@ static void
EnumXInputDevices(JoyStick_DeviceData **pContext) EnumXInputDevices(JoyStick_DeviceData **pContext)
{ {
if (s_bXInputEnabled) { if (s_bXInputEnabled) {
Uint8 userid; int iuserid;
for (userid = 0; userid < SDL_XINPUT_MAX_DEVICES; userid++) { /* iterate in reverse, so these are in the final list in ascending numeric order. */
for (iuserid = SDL_XINPUT_MAX_DEVICES-1; iuserid >= 0; iuserid--) {
const Uint8 userid = (Uint8) iuserid;
XINPUT_CAPABILITIES capabilities; XINPUT_CAPABILITIES capabilities;
if (XINPUTGETCAPABILITIES(userid, XINPUT_FLAG_GAMEPAD, &capabilities) == ERROR_SUCCESS) { if (XINPUTGETCAPABILITIES(userid, XINPUT_FLAG_GAMEPAD, &capabilities) == ERROR_SUCCESS) {
/* Current version of XInput mistakenly returns 0 as the Type. Ignore it and ensure the subtype is a gamepad. */ /* Current version of XInput mistakenly returns 0 as the Type. Ignore it and ensure the subtype is a gamepad. */
@ -796,9 +798,6 @@ void SDL_SYS_JoystickDetect()
pCurList = SYS_Joystick; pCurList = SYS_Joystick;
SYS_Joystick = NULL; SYS_Joystick = NULL;
/* Look for XInput devices... */
EnumXInputDevices(&pCurList);
/* Look for DirectInput joysticks, wheels, head trackers, gamepads, etc.. */ /* Look for DirectInput joysticks, wheels, head trackers, gamepads, etc.. */
IDirectInput8_EnumDevices(dinput, IDirectInput8_EnumDevices(dinput,
DI8DEVCLASS_GAMECTRL, DI8DEVCLASS_GAMECTRL,
@ -809,6 +808,9 @@ void SDL_SYS_JoystickDetect()
SDL_RawDevList = NULL; SDL_RawDevList = NULL;
SDL_RawDevListCount = 0; SDL_RawDevListCount = 0;
/* Look for XInput devices. Do this last, so they're first in the final list. */
EnumXInputDevices(&pCurList);
SDL_UnlockMutex( s_mutexJoyStickEnum ); SDL_UnlockMutex( s_mutexJoyStickEnum );
} }