mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-21 17:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't filter out controllers when launched by Steam under Proton

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/11579
Fixes https://github.com/libsdl-org/SDL/issues/12106

(cherry picked from commit 3060105cfa)
This commit is contained in:
Sam Lantinga
2024-12-05 19:22:32 -08:00
parent da0cf3f634
commit 482d964733
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/joystick/SDL_gamecontroller.c
View File

@@ -2127,15 +2127,20 @@ SDL_bool SDL_ShouldIgnoreGameController(const char *name, SDL_JoystickGUID guid)
SDL_GetJoystickGUIDInfo(guid, &vendor, &product, &version, NULL); SDL_GetJoystickGUIDInfo(guid, &vendor, &product, &version, NULL);
#ifdef __WIN32__ #ifdef __WIN32__
if (SDL_GetHintBoolean("SDL_GAMECONTROLLER_ALLOW_STEAM_VIRTUAL_GAMEPAD", SDL_FALSE)) { if (SDL_GetHintBoolean("SDL_GAMECONTROLLER_ALLOW_STEAM_VIRTUAL_GAMEPAD", SDL_FALSE) &&
/* We're running under Steam and it will hide any controllers that we shouldn't open */ SDL_GetHintBoolean("STEAM_COMPAT_PROTON", SDL_FALSE)) {
return FALSE; /* We are launched by Steam and running under Proton
* We can't tell whether this controller is a Steam Virtual Gamepad,
* so assume that Proton is doing the appropriate filtering of controllers
* and anything we see here is fine to use.
*/
return SDL_FALSE;
} }
#else #endif // __WIN32__
if (SDL_IsJoystickSteamVirtualGamepad(vendor, product, version)) { if (SDL_IsJoystickSteamVirtualGamepad(vendor, product, version)) {
return !SDL_GetHintBoolean("SDL_GAMECONTROLLER_ALLOW_STEAM_VIRTUAL_GAMEPAD", SDL_FALSE); return !SDL_GetHintBoolean("SDL_GAMECONTROLLER_ALLOW_STEAM_VIRTUAL_GAMEPAD", SDL_FALSE);
} }
#endif
if (SDL_allowed_controllers.num_included_entries > 0) { if (SDL_allowed_controllers.num_included_entries > 0) {
if (SDL_VIDPIDInList(vendor, product, &SDL_allowed_controllers)) { if (SDL_VIDPIDInList(vendor, product, &SDL_allowed_controllers)) {