From d1dce19253d0b4d30d99d2074a05fe7970391a61 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Thu, 21 Dec 2017 08:13:36 -0500 Subject: [PATCH] handle display destroy --- backend/multi/backend.c | 10 +++++++++- include/backend/multi.h | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/backend/multi/backend.c b/backend/multi/backend.c index 0dd3c54b9..07e84c01a 100644 --- a/backend/multi/backend.c +++ b/backend/multi/backend.c @@ -44,7 +44,6 @@ static void multi_backend_destroy(struct wlr_backend *wlr_backend) { struct wlr_multi_backend *backend = (struct wlr_multi_backend *)wlr_backend; struct subbackend_state *sub, *next; wl_list_for_each_safe(sub, next, &backend->backends, link) { - // XXX do we really want to take ownership over added backends? wlr_backend_destroy(sub->backend); } free(backend); @@ -68,6 +67,12 @@ struct wlr_backend_impl backend_impl = { .get_egl = multi_backend_get_egl, }; +static void handle_display_destroy(struct wl_listener *listener, void *data) { + struct wlr_multi_backend *backend = + wl_container_of(listener, backend, display_destroy); + multi_backend_destroy((struct wlr_backend*)backend); +} + struct wlr_backend *wlr_multi_backend_create(struct wl_display *display) { struct wlr_multi_backend *backend = calloc(1, sizeof(struct wlr_multi_backend)); @@ -82,6 +87,9 @@ struct wlr_backend *wlr_multi_backend_create(struct wl_display *display) { wl_signal_init(&backend->events.backend_add); wl_signal_init(&backend->events.backend_remove); + backend->display_destroy.notify = handle_display_destroy; + wl_display_add_destroy_listener(display, &backend->display_destroy); + return &backend->backend; } diff --git a/include/backend/multi.h b/include/backend/multi.h index 947464e14..3363c6082 100644 --- a/include/backend/multi.h +++ b/include/backend/multi.h @@ -11,6 +11,8 @@ struct wlr_multi_backend { struct wl_list backends; + struct wl_listener display_destroy; + struct { struct wl_signal backend_add; struct wl_signal backend_remove;