blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

handle display destroy

This commit is contained in:
Tony Crisci 2017-12-21 08:13:36 -05:00
parent 6c8fd6017e
commit d1dce19253
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/multi/backend.c
View File

@ -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 wlr_multi_backend *backend = (struct wlr_multi_backend *)wlr_backend;
struct subbackend_state *sub, *next; struct subbackend_state *sub, *next;
wl_list_for_each_safe(sub, next, &backend->backends, link) { 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); wlr_backend_destroy(sub->backend);
} }
free(backend); free(backend);
@ -68,6 +67,12 @@ struct wlr_backend_impl backend_impl = {
.get_egl = multi_backend_get_egl, .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_backend *wlr_multi_backend_create(struct wl_display *display) {
struct wlr_multi_backend *backend = struct wlr_multi_backend *backend =
calloc(1, sizeof(struct wlr_multi_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_add);
wl_signal_init(&backend->events.backend_remove); 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; return &backend->backend;
} }

2
include/backend/multi.h
View File

@ -11,6 +11,8 @@ struct wlr_multi_backend {
struct wl_list backends; struct wl_list backends;
struct wl_listener display_destroy;
struct { struct {
struct wl_signal backend_add; struct wl_signal backend_add;
struct wl_signal backend_remove; struct wl_signal backend_remove;