mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-09 10:06:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wayland: use a low priority FDM hook to flush the wayland socket

Browse source 
This way, we don't have to manually insert flushes in code paths that
may execute outside of a wl_display_dispatch_pending().

(Those that execute inside a wl_display_dispatch_pending() are subject
to the flush performed at the end of the normal wayland FDM handler).
This commit is contained in:
Daniel Eklöf 2020-01-04 23:27:59 +01:00
parent 6534f64e6a
commit 4cbd894803
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
render.c
View file

@ -852,7 +852,6 @@ grid_render(struct terminal *term)
}
wl_surface_commit(term->window->surface);
wayl_flush(term->wl);
#if TIME_FRAME_RENDERING
struct timeval end_time;
@ -1141,7 +1140,6 @@ render_xcursor_update(struct wayland *wayl, const struct terminal *term)
wl_callback_add_listener(wayl->pointer.xcursor_callback, &xcursor_listener, wayl);
wl_surface_commit(wayl->pointer.surface);
wayl_flush(wayl);
}
static void

15
wayland.c
View file

@ -556,6 +556,13 @@ static const struct wl_registry_listener registry_listener = {
.global_remove = &handle_global_remove,
};
static void
fdm_hook(struct fdm *fdm, void *data)
{
struct wayland *wayl = data;
wayl_flush(wayl);
}
static bool
fdm_wayl(struct fdm *fdm, int fd, int events, void *data)
{
@ -574,7 +581,6 @@ fdm_wayl(struct fdm *fdm, int fd, int events, void *data)
return false;
}
wayl_flush(wayl);
return event_count != -1;
}
@ -730,6 +736,11 @@ wayl_init(const struct config *conf, struct fdm *fdm)
goto out;
}
if (!fdm_hook_add(fdm, &fdm_hook, wayl, FDM_HOOK_PRIORITY_LOW)) {
LOG_ERR("failed to add FDM hook");
goto out;
}
return wayl;
out:
@ -755,6 +766,8 @@ wayl_destroy(struct wayland *wayl)
tll_free(wayl->terms);
fdm_hook_del(wayl->fdm, &fdm_hook, FDM_HOOK_PRIORITY_LOW);
if (wayl->kbd.repeat.fd != -1)
fdm_del(wayl->fdm, wayl->kbd.repeat.fd);