Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-20 22:16:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed creating an Android game controller mapping for HIDAPI devices on initialization

Browse Source
This commit is contained in:
Sam Lantinga 2018-09-17 11:35:22 -07:00
parent 305e5968aa
commit 59a2d12cc3
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/joystick/SDL_gamecontroller.c
View File

@ -432,12 +432,12 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickG
pSupportedController = pSupportedController->next; pSupportedController = pSupportedController->next;
} }
if (!exact_match) { if (!exact_match) {
if (guid->data[14] == 'h') { if (SDL_IsJoystickHIDAPI(*guid)) {
/* This is a HIDAPI device */ /* This is a HIDAPI device */
return s_pHIDAPIMapping; return s_pHIDAPIMapping;
} }
#if SDL_JOYSTICK_XINPUT #if SDL_JOYSTICK_XINPUT
if (guid->data[14] == 'x') { if (SDL_IsJoystickXInput(*guid)) {
/* This is an XInput device */ /* This is an XInput device */
return s_pXInputMapping; return s_pXInputMapping;
} }
@ -1026,8 +1026,8 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForNameAndGUID(const
} }
} }
#ifdef __ANDROID__ #ifdef __ANDROID__
if (!mapping) { if (!mapping && name && !SDL_IsJoystickHIDAPI(guid)) {
mapping = SDL_CreateMappingForAndroidController(name, guid); mapping = SDL_CreateMappingForAndroidController(name, guid);
} }
#endif #endif
if (!mapping) { if (!mapping) {

14
src/joystick/SDL_joystick.c
View File

@ -1157,6 +1157,18 @@ SDL_IsJoystickXboxOne(Uint16 vendor, Uint16 product)
return (GuessControllerType(vendor, product) == k_eControllerType_XBoxOneController); return (GuessControllerType(vendor, product) == k_eControllerType_XBoxOneController);
} }
SDL_bool
SDL_IsJoystickXInput(SDL_JoystickGUID guid)
{
return (guid.data[14] == 'x') ? SDL_TRUE : SDL_FALSE;
}
SDL_bool
SDL_IsJoystickHIDAPI(SDL_JoystickGUID guid)
{
return (guid.data[14] == 'h') ? SDL_TRUE : SDL_FALSE;
}
static SDL_bool SDL_IsJoystickProductWheel(Uint32 vidpid) static SDL_bool SDL_IsJoystickProductWheel(Uint32 vidpid)
{ {
static Uint32 wheel_joysticks[] = { static Uint32 wheel_joysticks[] = {
@ -1222,7 +1234,7 @@ static SDL_JoystickType SDL_GetJoystickGUIDType(SDL_JoystickGUID guid)
Uint16 product; Uint16 product;
Uint32 vidpid; Uint32 vidpid;
if (guid.data[14] == 'x') { if (SDL_IsJoystickXInput(guid)) {
/* XInput GUID, get the type based on the XInput device subtype */ /* XInput GUID, get the type based on the XInput device subtype */
switch (guid.data[15]) { switch (guid.data[15]) {
case 0x01: /* XINPUT_DEVSUBTYPE_GAMEPAD */ case 0x01: /* XINPUT_DEVSUBTYPE_GAMEPAD */

6
src/joystick/SDL_joystick_c.h
View File

@ -62,6 +62,12 @@ extern SDL_bool SDL_IsJoystickXbox360(Uint16 vendor_id, Uint16 product_id);
/* Function to return whether a joystick is an Xbox One controller */ /* Function to return whether a joystick is an Xbox One controller */
extern SDL_bool SDL_IsJoystickXboxOne(Uint16 vendor_id, Uint16 product_id); extern SDL_bool SDL_IsJoystickXboxOne(Uint16 vendor_id, Uint16 product_id);
/* Function to return whether a joystick guid comes from the XInput driver */
extern SDL_bool SDL_IsJoystickXInput(SDL_JoystickGUID guid);
/* Function to return whether a joystick guid comes from the HIDAPI driver */
extern SDL_bool SDL_IsJoystickHIDAPI(SDL_JoystickGUID guid);
/* Function to return whether a joystick should be ignored */ /* Function to return whether a joystick should be ignored */
extern SDL_bool SDL_ShouldIgnoreJoystick(const char *name, SDL_JoystickGUID guid); extern SDL_bool SDL_ShouldIgnoreJoystick(const char *name, SDL_JoystickGUID guid);