aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-01-03 20:02:12 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-01-03 20:02:12 +0000
commit0ea0323d0fb3130e5bc1782812e70993e5cdb742 (patch)
tree531d73f9eac77d385122c94a1879ae4b30af7cbd /terminal.c
parentselection: remove unneeded wayland display roundtrips (diff)
wayland: don't use wl_display_dispatch()
wl_display_dispatch() calls poll(), which is unnecessary since we already know the FD is readable. Use the more lower level wl_display_read_events() + wl_display_dispatch_pending(). These require wl_display_prepare_read() to have been called. The idea is to call wl_display_prepare_read() **before** calling poll(). Thus, we do this more or less last in wayl_init(), and at the **end** of the FDM handler. However, having taking this lock also means we no longer can call wl_display_roundtrip() directly (it will hang). So, add a wrapper, wayl_roundtrip(), that cancels the read intent, does the roundtrip, and then re-acquires the read intent.
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/terminal.c b/terminal.c
index 6d2f7a04..463ceb90 100644
--- a/terminal.c
+++ b/terminal.c
@@ -659,9 +659,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
/* Let the Wayland backend know we exist */
tll_push_back(wayl->terms, term);
-
- /* Roundtrip to ensure the wayland window have been configured */
- wl_display_roundtrip(term->wl->display);
+ wayl_roundtrip(term->wl);
term_set_window_title(term, "foot");