aboutsummaryrefslogtreecommitdiff
path: root/wayland.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-08 16:20:34 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-08 16:20:34 +0000
commit04e566492cd831f038afb5ef8908453efca84cde (patch)
tree4c1afad056fa981fdc4293b4bc9afeeb22db9ea1 /wayland.c
parentmulti-seat: re-enable mouse button+motion reporting support (diff)
multi-seat: re-enable scrollback search support
Diffstat (limited to 'wayland.c')
-rw-r--r--wayland.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/wayland.c b/wayland.c
index 19f8ce3e..54d65927 100644
--- a/wayland.c
+++ b/wayland.c
@@ -958,6 +958,7 @@ wayl_init(const struct config *conf, struct fdm *fdm)
goto out;
}
+ /* Trigger listeners registered when handling globals */
wl_display_roundtrip(wayl->display);
if (!wayl->have_argb8888) {
@@ -976,9 +977,6 @@ wayl_init(const struct config *conf, struct fdm *fdm)
it->item.ppi.scaled.x, it->item.ppi.scaled.y);
}
-#if 0
-#endif
-
wayl->fd = wl_display_get_fd(wayl->display);
if (fcntl(wayl->fd, F_SETFL, fcntl(wayl->fd, F_GETFL) | O_NONBLOCK) < 0) {
LOG_ERRNO("failed to make Wayland socket non-blocking");