encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't send game controller touchpad or sensor events unless the application has focus 

Fixes https://github.com/libsdl-org/SDL/issues/4891
This commit is contained in:
Sam Lantinga 2021-11-09 12:09:01 -08:00
parent d2f756360e
commit d31f90d9e1
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/joystick/SDL_joystick.c
View File

@ -2721,6 +2721,13 @@ int SDL_PrivateJoystickTouchpad(SDL_Joystick *joystick, int touchpad, int finger
} }
#endif #endif
/* We ignore events if we don't have keyboard focus, except for touch release */
if (SDL_PrivateJoystickShouldIgnoreEvent()) {
if (event_type != SDL_CONTROLLERTOUCHPADUP) {
return 0;
}
}
/* Update internal joystick state */ /* Update internal joystick state */
finger_info->state = state; finger_info->state = state;
finger_info->x = x; finger_info->x = x;
@ -2750,6 +2757,11 @@ int SDL_PrivateJoystickSensor(SDL_Joystick *joystick, SDL_SensorType type, const
int i; int i;
int posted = 0; int posted = 0;
/* We ignore events if we don't have keyboard focus */
if (SDL_PrivateJoystickShouldIgnoreEvent()) {
return 0;
}
for (i = 0; i < joystick->nsensors; ++i) { for (i = 0; i < joystick->nsensors; ++i) {
SDL_JoystickSensorInfo *sensor = &joystick->sensors[i]; SDL_JoystickSensorInfo *sensor = &joystick->sensors[i];