From ab6327da2699e81e877c6f9f63786ff6d3a271cd Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Tue, 24 Nov 2020 00:00:43 +0100 Subject: wayland: Use wl_output_release with wl_output v3 wl_output_release, the use of which was recently introduced, is not available until wl_output interface version 3. However, only wl_output version 2 was bound. This lead to protocol errors when a display was disconnected, causing foot to terminate. Instead, only use wl_output_release if wl_output version 3 is provided and bound. Otherwise, just use wl_output_destroy. Closes: https://codeberg.org/dnkl/foot/issues/219 --- wayland.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'wayland.c') diff --git a/wayland.c b/wayland.c index b8cd9cd9..8007eeba 100644 --- a/wayland.c +++ b/wayland.c @@ -841,11 +841,12 @@ handle_global(void *data, struct wl_registry *registry, return; struct wl_output *output = wl_registry_bind( - wayl->registry, name, &wl_output_interface, required); + wayl->registry, name, &wl_output_interface, min(version, 3)); tll_push_back( wayl->monitors, - ((struct monitor){.wayl = wayl, .output = output, .wl_name = name})); + ((struct monitor){.wayl = wayl, .output = output, .wl_name = name, + .use_output_release = version >= WL_OUTPUT_RELEASE_SINCE_VERSION})); struct monitor *mon = &tll_back(wayl->monitors); wl_output_add_listener(output, &output_listener, mon); @@ -901,8 +902,12 @@ monitor_destroy(struct monitor *mon) { if (mon->xdg != NULL) zxdg_output_v1_destroy(mon->xdg); - if (mon->output != NULL) - wl_output_release(mon->output); + if (mon->output != NULL) { + if (mon->use_output_release) + wl_output_release(mon->output); + else + wl_output_destroy(mon->output); + } free(mon->make); free(mon->model); free(mon->name); -- cgit v1.3