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

Fixed incorrect WGI controller state when the application loses focus

Browse Source 
Recenter the controller elements when WGI stops reporting valid state

Fixes https://github.com/libsdl-org/SDL/issues/5261
This commit is contained in:
Sam Lantinga
2022-11-11 08:57:07 -08:00
parent 875e9b35d7
commit b7e65a81f1
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/joystick/windows/SDL_windows_gaming_input.c
View File

@@ -852,15 +852,27 @@ WGI_JoystickUpdate(SDL_Joystick *joystick)
hr = __x_ABI_CWindows_CGaming_CInput_CIRawGameController_GetCurrentReading(hwdata->controller, nbuttons, buttons, nhats, hats, naxes, axes, &timestamp);
if (SUCCEEDED(hr) && timestamp != hwdata->timestamp) {
UINT32 i;
SDL_bool all_zero = SDL_TRUE;
for (i = 0; i < nbuttons; ++i) {
SDL_PrivateJoystickButton(joystick, (Uint8)i, buttons[i]);
}
for (i = 0; i < nhats; ++i) {
SDL_PrivateJoystickHat(joystick, (Uint8)i, ConvertHatValue(hats[i]));
}
/* The axes are all zero when the application loses focus */
for (i = 0; i < naxes; ++i) {
SDL_PrivateJoystickAxis(joystick, (Uint8)i, (Sint16)((int) (axes[i] * 65535) - 32768));
if (axes[i] != 0.0f) {
all_zero = SDL_FALSE;
break;
}
}
if (all_zero) {
SDL_PrivateJoystickForceRecentering(joystick);
} else {
for (i = 0; i < nbuttons; ++i) {
SDL_PrivateJoystickButton(joystick, (Uint8) i, buttons[i]);
}
for (i = 0; i < nhats; ++i) {
SDL_PrivateJoystickHat(joystick, (Uint8) i, ConvertHatValue(hats[i]));
}
for (i = 0; i < naxes; ++i) {
SDL_PrivateJoystickAxis(joystick, (Uint8)i, (Sint16)((int) (axes[i] * 65535) - 32768));
}
}
hwdata->timestamp = timestamp;
}