blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #81 from martinetd/wayland_loop 

wayland backend: do not watch wayland fd for writable
This commit is contained in:
Drew DeVault 2017-08-13 07:24:10 -04:00 committed by GitHub
parent 60d1131df2 f2e2794365
commit de4dff79b2
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/wayland/backend.c
View File

@ -17,9 +17,6 @@ static int dispatch_events(int fd, uint32_t mask, void *data) {
if (mask & WL_EVENT_READABLE) { if (mask & WL_EVENT_READABLE) {
count = wl_display_dispatch(backend->remote_display); count = wl_display_dispatch(backend->remote_display);
} }
if (mask & WL_EVENT_WRITABLE) {
count = wl_display_flush(backend->remote_display);
}
if (mask == 0) { if (mask == 0) {
count = wl_display_dispatch_pending(backend->remote_display); count = wl_display_dispatch_pending(backend->remote_display);
wl_display_flush(backend->remote_display); wl_display_flush(backend->remote_display);
@ -63,7 +60,7 @@ static bool wlr_wl_backend_init(struct wlr_backend *_backend) {
struct wl_event_loop *loop = wl_display_get_event_loop(backend->local_display); struct wl_event_loop *loop = wl_display_get_event_loop(backend->local_display);
int fd = wl_display_get_fd(backend->remote_display); int fd = wl_display_get_fd(backend->remote_display);
int events = WL_EVENT_READABLE | WL_EVENT_ERROR | int events = WL_EVENT_READABLE | WL_EVENT_ERROR |
WL_EVENT_HANGUP | WL_EVENT_WRITABLE; WL_EVENT_HANGUP;
backend->remote_display_src = wl_event_loop_add_fd(loop, fd, events, backend->remote_display_src = wl_event_loop_add_fd(loop, fd, events,
dispatch_events, backend); dispatch_events, backend);
wl_event_source_check(backend->remote_display_src); wl_event_source_check(backend->remote_display_src);