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

Added Android SDK conditionals to game controller mappings

Browse source 
The Nintendo Switch Pro controller has a different mapping on Android 10 and newer
This commit is contained in:
Sam Lantinga 2020-02-17 14:15:47 -08:00
parent d7ece7ee6f
commit ad225047b6
3 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/joystick/SDL_gamecontroller.c
View file

@ -42,7 +42,9 @@
/* Many controllers turn the center button into an instantaneous button press */
#define SDL_MINIMUM_GUIDE_BUTTON_DELAY_MS 250
#define SDL_CONTROLLER_PLATFORM_FIELD "platform:"
#define SDL_CONTROLLER_PLATFORM_FIELD "platform:"
#define SDL_CONTROLLER_SDKGE_FIELD "sdk>=:"
#define SDL_CONTROLLER_SDKLE_FIELD "sdk<=:"
/* a list of currently opened game controllers */
static SDL_GameController *SDL_gamecontrollers = NULL;
@ -1136,7 +1138,7 @@ SDL_GameControllerAddMappingsFromRW(SDL_RWops * rw, int freerw)
}
}
}
line = line_end + 1;
}
@ -1162,6 +1164,27 @@ SDL_PrivateGameControllerAddMapping(const char *mappingString, SDL_ControllerMap
return SDL_InvalidParamError("mappingString");
}
#ifdef ANDROID
{ /* Extract and verify the SDK version */
const char *tmp;
tmp = SDL_strstr(mappingString, SDL_CONTROLLER_SDKGE_FIELD);
if (tmp != NULL) {
tmp += SDL_strlen(SDL_CONTROLLER_SDKGE_FIELD);
if (!(SDL_GetAndroidSDKVersion() >= SDL_atoi(tmp))) {
return SDL_SetError("SDK version %d < minimum version %d", SDL_GetAndroidSDKVersion(), SDL_atoi(tmp));
}
}
tmp = SDL_strstr(mappingString, SDL_CONTROLLER_SDKLE_FIELD);
if (tmp != NULL) {
tmp += SDL_strlen(SDL_CONTROLLER_SDKLE_FIELD);
if (!(SDL_GetAndroidSDKVersion() <= SDL_atoi(tmp))) {
return SDL_SetError("SDK version %d > maximum version %d", SDL_GetAndroidSDKVersion(), SDL_atoi(tmp));
}
}
}
#endif
pchGUID = SDL_PrivateGetControllerGUIDFromMappingString(mappingString);
if (!pchGUID) {
return SDL_SetError("Couldn't parse GUID from %s", mappingString);