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

Merge pull request #504 from emersion/multi-display-destroy 

Destroy multi backend on display destroy
This commit is contained in:
Drew DeVault 2017-12-19 12:41:48 -05:00 committed by GitHub
parent fc78e269a5 4a36ba4bdd
commit 36d8751363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/backend.c
View File

@ -91,7 +91,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) {
return NULL; return NULL;
} }
backend = wlr_multi_backend_create(session); backend = wlr_multi_backend_create(display, session);
if (!backend) { if (!backend) {
goto error_session; goto error_session;
} }

29
backend/multi/backend.c
View File

@ -16,8 +16,8 @@ struct subbackend_state {
struct wl_list link; struct wl_list link;
}; };
static bool multi_backend_start(struct wlr_backend *_backend) { static bool multi_backend_start(struct wlr_backend *wlr_backend) {
struct wlr_multi_backend *backend = (struct wlr_multi_backend *)_backend; struct wlr_multi_backend *backend = (struct wlr_multi_backend *)wlr_backend;
struct subbackend_state *sub; struct subbackend_state *sub;
wl_list_for_each(sub, &backend->backends, link) { wl_list_for_each(sub, &backend->backends, link) {
if (!wlr_backend_start(sub->backend)) { if (!wlr_backend_start(sub->backend)) {
@ -28,8 +28,9 @@ static bool multi_backend_start(struct wlr_backend *_backend) {
return true; return true;
} }
static void multi_backend_destroy(struct wlr_backend *_backend) { static void multi_backend_destroy(struct wlr_backend *wlr_backend) {
struct wlr_multi_backend *backend = (struct wlr_multi_backend *)_backend; struct wlr_multi_backend *backend = (struct wlr_multi_backend *)wlr_backend;
wl_list_remove(&backend->display_destroy.link);
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) {
wlr_backend_destroy(sub->backend); wlr_backend_destroy(sub->backend);
@ -38,8 +39,8 @@ static void multi_backend_destroy(struct wlr_backend *_backend) {
free(backend); free(backend);
} }
static struct wlr_egl *multi_backend_get_egl(struct wlr_backend *_backend) { static struct wlr_egl *multi_backend_get_egl(struct wlr_backend *wlr_backend) {
struct wlr_multi_backend *backend = (struct wlr_multi_backend *)_backend; struct wlr_multi_backend *backend = (struct wlr_multi_backend *)wlr_backend;
struct subbackend_state *sub; struct subbackend_state *sub;
wl_list_for_each(sub, &backend->backends, link) { wl_list_for_each(sub, &backend->backends, link) {
struct wlr_egl *egl = wlr_backend_get_egl(sub->backend); struct wlr_egl *egl = wlr_backend_get_egl(sub->backend);
@ -53,10 +54,17 @@ static struct wlr_egl *multi_backend_get_egl(struct wlr_backend *_backend) {
struct wlr_backend_impl backend_impl = { struct wlr_backend_impl backend_impl = {
.start = multi_backend_start, .start = multi_backend_start,
.destroy = multi_backend_destroy, .destroy = multi_backend_destroy,
.get_egl = multi_backend_get_egl .get_egl = multi_backend_get_egl,
}; };
struct wlr_backend *wlr_multi_backend_create(struct wlr_session *session) { 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(&backend->backend);
}
struct wlr_backend *wlr_multi_backend_create(struct wl_display *display,
struct wlr_session *session) {
struct wlr_multi_backend *backend = struct wlr_multi_backend *backend =
calloc(1, sizeof(struct wlr_multi_backend)); calloc(1, sizeof(struct wlr_multi_backend));
if (!backend) { if (!backend) {
@ -64,10 +72,13 @@ struct wlr_backend *wlr_multi_backend_create(struct wlr_session *session) {
return NULL; return NULL;
} }
backend->session = session;
wl_list_init(&backend->backends); wl_list_init(&backend->backends);
wlr_backend_init(&backend->backend, &backend_impl); wlr_backend_init(&backend->backend, &backend_impl);
backend->session = session; session->display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &session->display_destroy);
return &backend->backend; return &backend->backend;
} }

2
include/backend/multi.h
View File

@ -11,6 +11,8 @@ struct wlr_multi_backend {
struct wlr_session *session; struct wlr_session *session;
struct wl_list backends; struct wl_list backends;
struct wl_listener display_destroy;
}; };
#endif #endif

3
include/wlr/backend/multi.h
View File

@ -4,7 +4,8 @@
#include <wlr/backend.h> #include <wlr/backend.h>
#include <wlr/backend/session.h> #include <wlr/backend/session.h>
struct wlr_backend *wlr_multi_backend_create(struct wlr_session *session); struct wlr_backend *wlr_multi_backend_create(struct wl_display *display,
struct wlr_session *session);
void wlr_multi_backend_add(struct wlr_backend *multi, void wlr_multi_backend_add(struct wlr_backend *multi,
struct wlr_backend *backend); struct wlr_backend *backend);

1
rootston/main.c
View File

@ -73,7 +73,6 @@ int main(int argc, char **argv) {
#endif #endif
wl_display_run(server.wl_display); wl_display_run(server.wl_display);
wlr_backend_destroy(server.backend);
wl_display_destroy(server.wl_display); wl_display_destroy(server.wl_display);
return 0; return 0;
} }