TeamHepta/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-03-20 15:51:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fallback for non-gamepad controllers in GameInput

Browse Source 
This PR makes the GameInput joystick backend ignore non-gamepad controllers if DirectInput or XInput backends are enabled. This is done to prevent possible bugs and/or regressions.

(cherry picked from commit 419dcfe747)
This commit is contained in:
Nintorch
2026-03-10 10:53:25 +05:00
committed by Sam Lantinga
parent c5bc4576fc
commit ffd2696516
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/joystick/gdk/SDL_gameinputjoystick.cpp
View File

@@ -76,6 +76,11 @@ static IGameInput *g_pGameInput = NULL;
static GameInputCallbackToken g_GameInputCallbackToken = 0; static GameInputCallbackToken g_GameInputCallbackToken = 0;
static Uint64 g_GameInputTimestampOffset; static Uint64 g_GameInputTimestampOffset;
extern "C"
{
extern bool SDL_XINPUT_Enabled(void);
}
static bool GAMEINPUT_InternalIsGamepad(const GameInputDeviceInfo *info) static bool GAMEINPUT_InternalIsGamepad(const GameInputDeviceInfo *info)
{ {
if (info->supportedInput & GameInputKindGamepad) { if (info->supportedInput & GameInputKindGamepad) {
@@ -173,6 +178,12 @@ static bool GAMEINPUT_InternalAddOrFind(IGameInputDevice *pDevice)
#endif #endif
if (!GAMEINPUT_InternalIsGamepad(info)) { if (!GAMEINPUT_InternalIsGamepad(info)) {
#if defined(SDL_JOYSTICK_DINPUT) || defined(SDL_JOYSTICK_XINPUT)
if (SDL_GetHintBoolean(SDL_HINT_JOYSTICK_DIRECTINPUT, true) || SDL_XINPUT_Enabled()) {
// Let other backends handle non-gamepad controllers to possibly avoid bugs and/or regressions.
return true;
}
#endif
if (info->supportedInput & GameInputKindController) { if (info->supportedInput & GameInputKindController) {
// Maintain GUID compatibility with DirectInput controller mappings. // Maintain GUID compatibility with DirectInput controller mappings.
driver_signature = 0; driver_signature = 0;