KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'wayland' of https://github.com/kennylevinsen/kitty

Browse Source
This commit is contained in:
Kovid Goyal 2020-01-15 06:51:24 +05:30
commit c68b302fa2
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glfw/wl_window.c vendored
View File

@ -762,18 +762,10 @@ handleEvents(monotonic_t timeout)
EVDBG("starting handleEvents(%.2f)", monotonic_t_to_s_double(timeout)); EVDBG("starting handleEvents(%.2f)", monotonic_t_to_s_double(timeout));
while (wl_display_prepare_read(display) != 0) { while (wl_display_prepare_read(display) != 0) {
while(1) { if (wl_display_dispatch_pending(display) == -1) {
errno = 0; abortOnFatalError(errno);
int num_dispatched = wl_display_dispatch_pending(display);
if (num_dispatched < 0) {
if (errno == EAGAIN) continue;
int last_error = wl_display_get_error(display);
wl_display_cancel_read(display);
if (last_error) abortOnFatalError(last_error);
return; return;
} }
break;
}
} }
// If an error different from EAGAIN happens, we have likely been // If an error different from EAGAIN happens, we have likely been
@ -782,8 +774,8 @@ handleEvents(monotonic_t timeout)
errno = 0; errno = 0;
if (wl_display_flush(display) < 0 && errno != EAGAIN) if (wl_display_flush(display) < 0 && errno != EAGAIN)
{ {
abortOnFatalError(errno);
wl_display_cancel_read(display); wl_display_cancel_read(display);
abortOnFatalError(errno);
return; return;
} }