gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

events: Pump DBus messages in the main event loop

Browse Source 
DBus does not require a video backend, and DBus messages still need to be processed even when a video backend is not initialized. Move the DBus pump call to the main event message pump function so that DBus events are still dispatched, even when a video backend has not been initialized.
This commit is contained in:
Frank Praznik
2025-10-23 20:31:20 -04:00
parent b31c4b70b3
commit 39aedcef64
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/events/SDL_events.c
View File

@@ -36,6 +36,9 @@
#ifndef SDL_SENSOR_DISABLED #ifndef SDL_SENSOR_DISABLED
#include "../sensor/SDL_sensor_c.h" #include "../sensor/SDL_sensor_c.h"
#endif #endif
#ifdef HAVE_DBUS_DBUS_H
#include "core/linux/SDL_dbus.h"
#endif
#include "../video/SDL_sysvideo.h" #include "../video/SDL_sysvideo.h"
#ifdef SDL_PLATFORM_ANDROID #ifdef SDL_PLATFORM_ANDROID
@@ -59,6 +62,9 @@
// Determines how often to pump events if tray items are active // Determines how often to pump events if tray items are active
#define TRAY_POLL_INTERVAL_NS SDL_MS_TO_NS(50) #define TRAY_POLL_INTERVAL_NS SDL_MS_TO_NS(50)
// Determines how often to pump events if DBus is active
#define DBUS_POLL_INTERVAL_NS (3 * SDL_NS_PER_SECOND)
// Make sure the type in the SDL_Event aligns properly across the union // Make sure the type in the SDL_Event aligns properly across the union
SDL_COMPILE_TIME_ASSERT(SDL_Event_type, sizeof(Uint32) == sizeof(SDL_EventType)); SDL_COMPILE_TIME_ASSERT(SDL_Event_type, sizeof(Uint32) == sizeof(SDL_EventType));
@@ -1496,6 +1502,11 @@ static void SDL_PumpEventsInternal(bool push_sentinel)
// Run any pending main thread callbacks // Run any pending main thread callbacks
SDL_RunMainThreadCallbacks(); SDL_RunMainThreadCallbacks();
#ifdef SDL_USE_LIBDBUS
// DBus event processing is independent of the video subsystem
SDL_DBus_PumpEvents();
#endif
#ifdef SDL_PLATFORM_ANDROID #ifdef SDL_PLATFORM_ANDROID
// Android event processing is independent of the video subsystem // Android event processing is independent of the video subsystem
Android_PumpEvents(0); Android_PumpEvents(0);
@@ -1566,6 +1577,11 @@ static Sint64 SDL_events_get_polling_interval(void)
poll_intervalNS = SDL_min(poll_intervalNS, TRAY_POLL_INTERVAL_NS); poll_intervalNS = SDL_min(poll_intervalNS, TRAY_POLL_INTERVAL_NS);
} }
#endif #endif
#ifdef SDL_USE_LIBDBUS
// Wake periodically to pump DBus events
poll_intervalNS = SDL_min(poll_intervalNS, DBUS_POLL_INTERVAL_NS);
#endif
return poll_intervalNS; return poll_intervalNS;
} }

4
src/video/wayland/SDL_waylandevents.c
View File

@@ -599,10 +599,6 @@ void Wayland_PumpEvents(SDL_VideoDevice *_this)
} }
#endif #endif
#ifdef SDL_USE_LIBDBUS
SDL_DBus_PumpEvents();
#endif
// Synthesize key repeat events. // Synthesize key repeat events.
wl_list_for_each (seat, &d->seat_list, link) { wl_list_for_each (seat, &d->seat_list, link) {
if (keyboard_repeat_is_set(&seat->keyboard.repeat)) { if (keyboard_repeat_is_set(&seat->keyboard.repeat)) {

8
src/video/x11/SDL_x11events.c
View File

@@ -2271,10 +2271,6 @@ int X11_WaitEventTimeout(SDL_VideoDevice *_this, Sint64 timeoutNS)
} }
X11_DispatchEvent(_this, &xevent); X11_DispatchEvent(_this, &xevent);
#ifdef SDL_USE_LIBDBUS
SDL_DBus_PumpEvents();
#endif
return 1; return 1;
} }
@@ -2327,10 +2323,6 @@ void X11_PumpEvents(SDL_VideoDevice *_this)
X11_DispatchEvent(_this, &xevent); X11_DispatchEvent(_this, &xevent);
} }
#ifdef SDL_USE_LIBDBUS
SDL_DBus_PumpEvents();
#endif
// FIXME: Only need to do this when there are pending focus changes // FIXME: Only need to do this when there are pending focus changes
X11_HandleFocusChanges(_this); X11_HandleFocusChanges(_this);