diff options
| author | emersion <contact@emersion.fr> | 2017-11-17 23:29:47 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2017-11-17 23:29:47 +0100 |
| commit | 27937add762bb2594828ac678859bfdde4275f1e (patch) | |
| tree | aa9813fd534d019a5e967ffad31d153d30ae7fa1 /backend/x11/backend.c | |
| parent | 3e3209cba22c9a5a562acc5e543946408a36e2f4 (diff) | |
| parent | bf5640db128b930b38ebca2b1d8a79e028ad9f39 (diff) | |
Merge branch 'master' into laggy-move-resize
Diffstat (limited to 'backend/x11/backend.c')
| -rw-r--r-- | backend/x11/backend.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 97b0dd8c..b798daf6 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -155,9 +155,14 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e static int x11_event(int fd, uint32_t mask, void *data) { struct wlr_x11_backend *x11 = data; + + if ((mask & WL_EVENT_HANGUP) || (mask & WL_EVENT_ERROR)) { + wl_display_terminate(x11->wl_display); + return 0; + } + xcb_generic_event_t *e; bool quit = false; - while (!quit && (e = xcb_poll_for_event(x11->xcb_conn))) { quit = handle_x11_event(x11, e); free(e); @@ -205,7 +210,8 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, int fd = xcb_get_file_descriptor(x11->xcb_conn); struct wl_event_loop *ev = wl_display_get_event_loop(display); - x11->event_source = wl_event_loop_add_fd(ev, fd, WL_EVENT_READABLE, x11_event, x11); + int events = WL_EVENT_READABLE | WL_EVENT_ERROR | WL_EVENT_HANGUP; + x11->event_source = wl_event_loop_add_fd(ev, fd, events, x11_event, x11); if (!x11->event_source) { wlr_log(L_ERROR, "Could not create event source"); goto error_x11; |