sway

commit 0ebb4107bc953aeaf07acd2258185879cf13f053
parent c2921b2e613642ec147513607fb13d98ee43cee7
Author: Ian Fan <ianfan0@gmail.com>
Date:   Mon, 26 Nov 2018 09:33:30 +0000

Merge pull request #3191 from emersion/fix-swayidle-busy-dispatch

swayidle: fix busy loop on writable FD
Diffstat:
M
swayidle/main.c
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/swayidle/main.c b/swayidle/main.c
@@ -192,8 +192,7 @@ static void setup_sleep_listener(void) {
 	acquire_sleep_lock();
 
 	struct wl_event_source *source = wl_event_loop_add_fd(state.event_loop,
-		sd_bus_get_fd(bus), WL_EVENT_READABLE | WL_EVENT_WRITABLE,
-		dbus_event, bus);
+		sd_bus_get_fd(bus), WL_EVENT_READABLE, dbus_event, bus);
 	wl_event_source_check(source);
 }
 #endif
@@ -401,10 +400,12 @@ static int display_event(int fd, uint32_t mask, void *data) {
 		count = wl_display_dispatch_pending(state.display);
 		wl_display_flush(state.display);
 	}
+
 	if (count < 0) {
 		wlr_log_errno(WLR_ERROR, "wl_display_dispatch failed, exiting");
 		sway_terminate(0);
 	}
+
 	return count;
 }
 
@@ -462,7 +463,7 @@ int main(int argc, char *argv[]) {
 	wl_display_roundtrip(state.display);
 
 	struct wl_event_source *source = wl_event_loop_add_fd(state.event_loop,
-		wl_display_get_fd(state.display), WL_EVENT_READABLE | WL_EVENT_WRITABLE,
+		wl_display_get_fd(state.display), WL_EVENT_READABLE,
 		display_event, NULL);
 	wl_event_source_check(source);