clients: add global_remove handler stubs
All the clients here were missing the global_remove handler. Because
window.c did not have it, weston-desktop-shell and weston-keyboard
segfaulted on compositor exit, as they received some
wl_registry.global_remove events.
Add more or less stub global_remove handlers, so that clients do not
crash on such events. Toytoolkit and all applications would need a lot
more code to properly handle the global object removal.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
diff --git a/clients/window.c b/clients/window.c
index 0701981..799926c 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -4079,6 +4079,27 @@
d->global_handler(d, id, interface, version, d->user_data);
}
+static void
+registry_handle_global_remove(void *data, struct wl_registry *registry,
+ uint32_t name)
+{
+ struct display *d = data;
+ struct global *global;
+ struct global *tmp;
+
+ wl_list_for_each_safe(global, tmp, &d->global_list, link) {
+ if (global->name != name)
+ continue;
+
+ /* XXX: Should destroy bound globals, and call
+ * the counterpart of display::global_handler
+ */
+ wl_list_remove(&global->link);
+ free(global->interface);
+ free(global);
+ }
+}
+
void *
display_bind(struct display *display, uint32_t name,
const struct wl_interface *interface, uint32_t version)
@@ -4087,7 +4108,8 @@
}
static const struct wl_registry_listener registry_listener = {
- registry_handle_global
+ registry_handle_global,
+ registry_handle_global_remove
};
#ifdef HAVE_CAIRO_EGL