asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #54313 from nekomatata/x11-fix-input-delay-3.x

Browse source
This commit is contained in:
Rémi Verschelde 2021-11-02 08:53:06 +01:00 • committed by GitHub
commit 2c47e33905
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
platform/x11/os_x11.cpp
View file

@ -2310,6 +2310,15 @@ void OS_X11::_poll_events() {
{ {
MutexLock mutex_lock(events_mutex); MutexLock mutex_lock(events_mutex);
_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. // Non-blocking wait for next event and remove it from the queue.
XEvent ev; XEvent ev;
while (XCheckIfEvent(x11_display, &ev, _predicate_all_events, nullptr)) { while (XCheckIfEvent(x11_display, &ev, _predicate_all_events, nullptr)) {
@ -2328,9 +2337,7 @@ void OS_X11::_poll_events() {
continue; continue;
} }
polled_events.push_back(ev); r_events.push_back(ev);
}
}
} }
} }
@ -2352,6 +2359,9 @@ void OS_X11::process_xevents() {
MutexLock mutex_lock(events_mutex); MutexLock mutex_lock(events_mutex);
events = polled_events; events = polled_events;
polled_events.clear(); 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) { 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); static void _poll_events_thread(void *ud);
bool _wait_for_events() const; bool _wait_for_events() const;
void _poll_events(); 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_all_events(Display *display, XEvent *event, XPointer arg);
static Bool _predicate_clipboard_selection(Display *display, XEvent *event, XPointer arg); static Bool _predicate_clipboard_selection(Display *display, XEvent *event, XPointer arg);