summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Paalanen <ppaalanen@gmail.com>2013-01-22 14:53:55 +0200
committerKristian Høgsberg <krh@bitplanet.net>2013-01-24 16:42:38 -0500
commit0eab05d2a7cf610e4d049dfd81b0100d4219e305 (patch)
treea93c8046334ba5adcddf34f88c24734e6fe3985e
parentcc9acfc75efb2460a40661cfa517e39334eb7d1d (diff)
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>
-rw-r--r--clients/screenshot.c9
-rw-r--r--clients/simple-egl.c9
-rw-r--r--clients/simple-shm.c9
-rw-r--r--clients/simple-touch.c8
-rw-r--r--clients/weston-info.c8
-rw-r--r--clients/weston-simple-im.c9
-rw-r--r--clients/window.c24
7 files changed, 69 insertions, 7 deletions
diff --git a/clients/screenshot.c b/clients/screenshot.c
index 8681a41c..efacfed6 100644
--- a/clients/screenshot.c
+++ b/clients/screenshot.c
@@ -128,8 +128,15 @@ handle_global(void *data, struct wl_registry *registry,
}
}
+static void
+handle_global_remove(void *data, struct wl_registry *registry, uint32_t name)
+{
+ /* XXX: unimplemented */
+}
+
static const struct wl_registry_listener registry_listener = {
- handle_global
+ handle_global,
+ handle_global_remove
};
static struct wl_buffer *
diff --git a/clients/simple-egl.c b/clients/simple-egl.c
index b84fae34..26ebe5ce 100644
--- a/clients/simple-egl.c
+++ b/clients/simple-egl.c
@@ -588,8 +588,15 @@ registry_handle_global(void *data, struct wl_registry *registry,
}
}
+static void
+registry_handle_global_remove(void *data, struct wl_registry *registry,
+ uint32_t name)
+{
+}
+
static const struct wl_registry_listener registry_listener = {
- registry_handle_global
+ registry_handle_global,
+ registry_handle_global_remove
};
static void
diff --git a/clients/simple-shm.c b/clients/simple-shm.c
index 831f9a40..c2eda617 100644
--- a/clients/simple-shm.c
+++ b/clients/simple-shm.c
@@ -322,8 +322,15 @@ registry_handle_global(void *data, struct wl_registry *registry,
}
}
+static void
+registry_handle_global_remove(void *data, struct wl_registry *registry,
+ uint32_t name)
+{
+}
+
static const struct wl_registry_listener registry_listener = {
- registry_handle_global
+ registry_handle_global,
+ registry_handle_global_remove
};
static struct display *
diff --git a/clients/simple-touch.c b/clients/simple-touch.c
index cbe38770..b8473f10 100644
--- a/clients/simple-touch.c
+++ b/clients/simple-touch.c
@@ -264,8 +264,14 @@ handle_global(void *data, struct wl_registry *registry,
}
}
+static void
+handle_global_remove(void *data, struct wl_registry *registry, uint32_t name)
+{
+}
+
static const struct wl_registry_listener registry_listener = {
- handle_global
+ handle_global,
+ handle_global_remove
};
static struct touch *
diff --git a/clients/weston-info.c b/clients/weston-info.c
index edd826e0..a5db02ab 100644
--- a/clients/weston-info.c
+++ b/clients/weston-info.c
@@ -387,8 +387,14 @@ global_handler(void *data, struct wl_registry *registry, uint32_t id,
add_global_info(info, id, interface, version);
}
+static void
+global_remove_handler(void *data, struct wl_registry *registry, uint32_t name)
+{
+}
+
static const struct wl_registry_listener registry_listener = {
- global_handler
+ global_handler,
+ global_remove_handler
};
static void
diff --git a/clients/weston-simple-im.c b/clients/weston-simple-im.c
index 36af0959..46887e81 100644
--- a/clients/weston-simple-im.c
+++ b/clients/weston-simple-im.c
@@ -300,8 +300,15 @@ registry_handle_global(void *data, struct wl_registry *registry,
}
}
+static void
+registry_handle_global_remove(void *data, struct wl_registry *registry,
+ uint32_t name)
+{
+}
+
static const struct wl_registry_listener registry_listener = {
- registry_handle_global
+ registry_handle_global,
+ registry_handle_global_remove
};
static int
diff --git a/clients/window.c b/clients/window.c
index 0701981e..799926ce 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -4079,6 +4079,27 @@ registry_handle_global(void *data, struct wl_registry *registry, uint32_t id,
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 @@ display_bind(struct display *display, uint32_t name,
}
static const struct wl_registry_listener registry_listener = {
- registry_handle_global
+ registry_handle_global,
+ registry_handle_global_remove
};
#ifdef HAVE_CAIRO_EGL