maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix input events random delay on X11

Browse source 
The new system based on a thread gathering events from the X11 server
was causing delays in some scenarios where some events have just been
missed at the time of processing and we're waiting for a whole frame to
check them again.

Solved by flushing again and checking for pending events at the
beginning of the process loop, in addition to events already gathered
on the event thread.
This commit is contained in:
PouleyKetchoupp 2021-10-26 15:44:00 -07:00
parent 828898867f
commit 874c9ae89a
2 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
platform/x11/os_x11.cpp
View file

@ -2319,30 +2319,37 @@ void OS_X11::_poll_events() {
{
MutexLock mutex_lock(events_mutex);
// Non-blocking wait for next event and remove it from the queue.
XEvent ev;
while (XCheckIfEvent(x11_display, &ev, _predicate_all_events, nullptr)) {
// Check if the input manager wants to process the event.
if (XFilterEvent(&ev, None)) {
// Event has been filtered by the Input Manager,
// it has to be ignored and a new one will be received.
continue;
}
// Handle selection request events directly in the event thread, because
// communication through the x server takes several events sent back and forth
// and we don't want to block other programs while processing only one each frame.
if (ev.type == SelectionRequest) {
_handle_selection_request_event(&(ev.xselectionrequest));
continue;
}
polled_events.push_back(ev);
}
_check_pending_events(polled_events);
}
}
}
void OS_X11::_check_pending_events(LocalVector<XEvent> &r_events) {
// Flush to make sure to gather all pending events.
XFlush(x11_display);
// Non-blocking wait for next event and remove it from the queue.
XEvent ev;
while (XCheckIfEvent(x11_display, &ev, _predicate_all_events, nullptr)) {
// Check if the input manager wants to process the event.
if (XFilterEvent(&ev, None)) {
// Event has been filtered by the Input Manager,
// it has to be ignored and a new one will be received.
continue;
}
// Handle selection request events directly in the event thread, because
// communication through the x server takes several events sent back and forth
// and we don't want to block other programs while processing only one each frame.
if (ev.type == SelectionRequest) {
_handle_selection_request_event(&(ev.xselectionrequest));
continue;
}
r_events.push_back(ev);
}
}
void OS_X11::process_xevents() {
//printf("checking events %i\n", XPending(x11_display));
@ -2361,6 +2368,9 @@ void OS_X11::process_xevents() {
MutexLock mutex_lock(events_mutex);
events = polled_events;
polled_events.clear();
// Check for more pending events to avoid an extra frame delay.
_check_pending_events(events);
}
for (uint32_t event_index = 0; event_index < events.size(); ++event_index) {

1
platform/x11/os_x11.h
View file

@ -171,6 +171,7 @@ class OS_X11 : public OS_Unix {
static void _poll_events_thread(void *ud);
bool _wait_for_events() const;
void _poll_events();
void _check_pending_events(LocalVector<XEvent> &r_events);
static Bool _predicate_all_events(Display *display, XEvent *event, XPointer arg);
static Bool _predicate_clipboard_selection(Display *display, XEvent *event, XPointer arg);