zinface
/
SDL
mirror of https://github.com/libsdl-org/SDL
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't overwrite the default binding when changing the binding for a controller that was using the default.

This commit is contained in:
Sam Lantinga 2018-09-05 12:16:01 -07:00
parent 963e74d68c
commit 96259f1f85
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/joystick/SDL_gamecontroller.c
View File

@ -422,7 +422,7 @@ static int SDLCALL SDL_GameControllerEventWatcher(void *userdata, SDL_Event * ev
/* /*
* Helper function to scan the mappings database for a controller with the specified GUID * Helper function to scan the mappings database for a controller with the specified GUID
*/ */
static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickGUID *guid) static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickGUID *guid, SDL_bool exact_match)
{ {
ControllerMapping_t *pSupportedController = s_pSupportedControllers; ControllerMapping_t *pSupportedController = s_pSupportedControllers;
while (pSupportedController) { while (pSupportedController) {
@ -431,16 +431,18 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickG
} }
pSupportedController = pSupportedController->next; pSupportedController = pSupportedController->next;
} }
if (guid->data[14] == 'h') { if (!exact_match) {
/* This is a HIDAPI device */ if (guid->data[14] == 'h') {
return s_pHIDAPIMapping; /* This is a HIDAPI device */
} return s_pHIDAPIMapping;
}
#if SDL_JOYSTICK_XINPUT #if SDL_JOYSTICK_XINPUT
if (guid->data[14] == 'x') { if (guid->data[14] == 'x') {
/* This is an XInput device */ /* This is an XInput device */
return s_pXInputMapping; return s_pXInputMapping;
} }
#endif #endif
}
return NULL; return NULL;
} }
@ -836,7 +838,7 @@ SDL_PrivateAddMappingForGUID(SDL_JoystickGUID jGUID, const char *mappingString,
return NULL; return NULL;
} }
pControllerMapping = SDL_PrivateGetControllerMappingForGUID(&jGUID); pControllerMapping = SDL_PrivateGetControllerMappingForGUID(&jGUID, SDL_TRUE);
if (pControllerMapping) { if (pControllerMapping) {
/* Only overwrite the mapping if the priority is the same or higher. */ /* Only overwrite the mapping if the priority is the same or higher. */
if (pControllerMapping->priority <= priority) { if (pControllerMapping->priority <= priority) {
@ -1005,7 +1007,7 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForNameAndGUID(const
{ {
ControllerMapping_t *mapping; ControllerMapping_t *mapping;
mapping = SDL_PrivateGetControllerMappingForGUID(&guid); mapping = SDL_PrivateGetControllerMappingForGUID(&guid, SDL_FALSE);
#ifdef __LINUX__ #ifdef __LINUX__
if (!mapping && name) { if (!mapping && name) {
if (SDL_strstr(name, "Xbox 360 Wireless Receiver")) { if (SDL_strstr(name, "Xbox 360 Wireless Receiver")) {
@ -1244,7 +1246,7 @@ char *
SDL_GameControllerMappingForGUID(SDL_JoystickGUID guid) SDL_GameControllerMappingForGUID(SDL_JoystickGUID guid)
{ {
char *pMappingString = NULL; char *pMappingString = NULL;
ControllerMapping_t *mapping = SDL_PrivateGetControllerMappingForGUID(&guid); ControllerMapping_t *mapping = SDL_PrivateGetControllerMappingForGUID(&guid, SDL_FALSE);
if (mapping) { if (mapping) {
char pchGUID[33]; char pchGUID[33];
size_t needed; size_t needed;