From 1e492b2f6d6ee76f414047d5729d083dbc547d4f Mon Sep 17 00:00:00 2001 From: diddily Date: Mon, 25 Jul 2022 10:12:53 -0400 Subject: [PATCH] Improve behavior of SDL_events_need_periodic_poll() and SDL_events_need_polling() SDL_events_need_periodic_poll() and SDL_events_need_polling() are intended to allow the event loop to update joysticks and/or sensors if needed, however those systems only update when the SDL_update_joysticks and/or SDL_update_sensors variables are true. This change brings the behavior of these functions in line with if work will actually need to be performed. This change allows the hints for AUTO_UPDATE to influence the polling behavior of the event loop such that an app can choose to update joysticks/sensors itself and avoid the expense of constantly sleeping and waking the event loop. Additionally in makes these functions marginally faster in some situations by not searching the active events. --- src/events/SDL_events.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c index fa58ed146..00a4053c7 100644 --- a/src/events/SDL_events.c +++ b/src/events/SDL_events.c @@ -903,13 +903,12 @@ SDL_events_need_periodic_poll() { #if !SDL_JOYSTICK_DISABLED need_periodic_poll = - SDL_WasInit(SDL_INIT_JOYSTICK) && - (!SDL_disabled_events[SDL_JOYAXISMOTION >> 8] || SDL_JoystickEventState(SDL_QUERY)); + SDL_WasInit(SDL_INIT_JOYSTICK) && SDL_update_joysticks; #endif #if !SDL_SENSOR_DISABLED need_periodic_poll = need_periodic_poll || - (SDL_WasInit(SDL_INIT_SENSOR) && !SDL_disabled_events[SDL_SENSORUPDATE >> 8]); + (SDL_WasInit(SDL_INIT_SENSOR) && SDL_update_sensors); #endif return need_periodic_poll; @@ -994,13 +993,13 @@ SDL_events_need_polling() { #if !SDL_JOYSTICK_DISABLED need_polling = SDL_WasInit(SDL_INIT_JOYSTICK) && - (!SDL_disabled_events[SDL_JOYAXISMOTION >> 8] || SDL_JoystickEventState(SDL_QUERY)) && + SDL_update_joysticks && (SDL_NumJoysticks() > 0); #endif #if !SDL_SENSOR_DISABLED need_polling = need_polling || - (SDL_WasInit(SDL_INIT_SENSOR) && !SDL_disabled_events[SDL_SENSORUPDATE >> 8] && (SDL_NumSensors() > 0)); + (SDL_WasInit(SDL_INIT_SENSOR) && SDL_update_sensors && (SDL_NumSensors() > 0)); #endif return need_polling;