From 4e804ef40f46136d4fe84603a8236adc172260f8 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Tue, 19 Dec 2017 18:14:47 -0500 Subject: add backend destroy event --- backend/backend.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'backend/backend.c') diff --git a/backend/backend.c b/backend/backend.c index f93dde38..58181947 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -18,6 +18,7 @@ void wlr_backend_init(struct wlr_backend *backend, const struct wlr_backend_impl *impl) { assert(backend); backend->impl = impl; + wl_signal_init(&backend->events.destroy); wl_signal_init(&backend->events.input_add); wl_signal_init(&backend->events.input_remove); wl_signal_init(&backend->events.output_add); @@ -32,6 +33,7 @@ bool wlr_backend_start(struct wlr_backend *backend) { } void wlr_backend_destroy(struct wlr_backend *backend) { + wl_signal_emit(&backend->events.destroy, backend); if (backend->impl && backend->impl->destroy) { backend->impl->destroy(backend); } else { -- cgit v1.2.3 From a937016e38efe3d7ad71540755833242059e6902 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Tue, 19 Dec 2017 18:25:46 -0500 Subject: remove session from multibackend --- backend/backend.c | 2 +- backend/drm/backend.c | 5 +++++ backend/multi/backend.c | 22 +++++++++------------- include/backend/drm/drm.h | 2 ++ include/backend/multi.h | 1 - include/wlr/backend/multi.h | 4 ++-- 6 files changed, 19 insertions(+), 17 deletions(-) (limited to 'backend/backend.c') diff --git a/backend/backend.c b/backend/backend.c index 58181947..7dfd6676 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -93,7 +93,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) { return NULL; } - backend = wlr_multi_backend_create(display, session); + backend = wlr_multi_backend_create(display); if (!backend) { goto error_session; } diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 6be5e5d5..112b2b61 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -174,3 +174,8 @@ error_fd: free(drm); return NULL; } + +struct wlr_session *wlr_drm_backend_get_session(struct wlr_backend *backend) { + struct wlr_drm_backend *drm = (struct wlr_drm_backend *)backend; + return drm->session; +} diff --git a/backend/multi/backend.c b/backend/multi/backend.c index 3815a0bc..df7c8c6d 100644 --- a/backend/multi/backend.c +++ b/backend/multi/backend.c @@ -5,6 +5,7 @@ #include #include #include "backend/multi.h" +#include "backend/drm/drm.h" struct subbackend_state { struct wlr_backend *backend; @@ -57,14 +58,7 @@ 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(&backend->backend); -} - -struct wlr_backend *wlr_multi_backend_create(struct wl_display *display, - struct wlr_session *session) { +struct wlr_backend *wlr_multi_backend_create(struct wl_display *display) { struct wlr_multi_backend *backend = calloc(1, sizeof(struct wlr_multi_backend)); if (!backend) { @@ -72,13 +66,9 @@ struct wlr_backend *wlr_multi_backend_create(struct wl_display *display, return NULL; } - backend->session = session; wl_list_init(&backend->backends); wlr_backend_init(&backend->backend, &backend_impl); - session->display_destroy.notify = handle_display_destroy; - wl_display_add_destroy_listener(display, &session->display_destroy); - return &backend->backend; } @@ -140,5 +130,11 @@ struct wlr_session *wlr_multi_get_session(struct wlr_backend *_backend) { assert(wlr_backend_is_multi(_backend)); struct wlr_multi_backend *backend = (struct wlr_multi_backend *)_backend; - return backend->session; + struct subbackend_state *sub; + wl_list_for_each(sub, &backend->backends, link) { + if (wlr_backend_is_drm(sub->backend)) { + return wlr_drm_backend_get_session(sub->backend); + } + } + return NULL; } diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 278c387c..72671f45 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -143,4 +143,6 @@ int wlr_drm_event(int fd, uint32_t mask, void *data); void wlr_drm_connector_start_renderer(struct wlr_drm_connector *conn); +struct wlr_session *wlr_drm_backend_get_session(struct wlr_backend *backend); + #endif diff --git a/include/backend/multi.h b/include/backend/multi.h index 2798048d..f0e50fc0 100644 --- a/include/backend/multi.h +++ b/include/backend/multi.h @@ -9,7 +9,6 @@ struct wlr_multi_backend { struct wlr_backend backend; - struct wlr_session *session; struct wl_list backends; struct wl_listener display_destroy; diff --git a/include/wlr/backend/multi.h b/include/wlr/backend/multi.h index e56b07b1..fc53f369 100644 --- a/include/wlr/backend/multi.h +++ b/include/wlr/backend/multi.h @@ -4,8 +4,8 @@ #include #include -struct wlr_backend *wlr_multi_backend_create(struct wl_display *display, - struct wlr_session *session); +struct wlr_backend *wlr_multi_backend_create(struct wl_display *display); + void wlr_multi_backend_add(struct wlr_backend *multi, struct wlr_backend *backend); -- cgit v1.2.3 From ca6a0ef1bbbd611c9ebf0ace08b8fc6af3883d09 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Tue, 19 Dec 2017 19:07:33 -0500 Subject: always return multibakend from autocreate --- backend/backend.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'backend/backend.c') diff --git a/backend/backend.c b/backend/backend.c index 7dfd6676..2adc3171 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -72,30 +72,31 @@ static struct wlr_backend *attempt_wl_backend(struct wl_display *display) { } struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) { - struct wlr_backend *backend; + struct wlr_backend *backend = wlr_multi_backend_create(display); + if (!backend) { + wlr_log(L_ERROR, "could not allocate multibackend"); + return NULL; + } + if (getenv("WAYLAND_DISPLAY") || getenv("_WAYLAND_DISPLAY")) { - backend = attempt_wl_backend(display); - if (backend) { - return backend; + struct wlr_backend *wl_backend = attempt_wl_backend(display); + if (wl_backend) { + wlr_multi_backend_add(backend, wl_backend); } } const char *x11_display = getenv("DISPLAY"); if (x11_display) { - return wlr_x11_backend_create(display, x11_display); + struct wlr_backend *x11_backend = + wlr_x11_backend_create(display, x11_display); + wlr_multi_backend_add(backend, x11_backend); } // Attempt DRM+libinput - struct wlr_session *session = wlr_session_create(display); if (!session) { wlr_log(L_ERROR, "Failed to start a DRM session"); - return NULL; - } - - backend = wlr_multi_backend_create(display); - if (!backend) { - goto error_session; + return backend; } struct wlr_backend *libinput = wlr_libinput_backend_create(display, session); @@ -134,9 +135,8 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) { error_multi: wlr_backend_destroy(backend); -error_session: wlr_session_destroy(session); - return NULL; + return backend; } uint32_t usec_to_msec(uint64_t usec) { -- cgit v1.2.3 From b4159c52d5ee8bbcfdee291b19b503f9af7b24cd Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Thu, 21 Dec 2017 08:33:34 -0500 Subject: autocreate backend returns null instead of empty --- backend/backend.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'backend/backend.c') diff --git a/backend/backend.c b/backend/backend.c index 2adc3171..359ee0e5 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -96,16 +96,14 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) { struct wlr_session *session = wlr_session_create(display); if (!session) { wlr_log(L_ERROR, "Failed to start a DRM session"); - return backend; + goto out; } struct wlr_backend *libinput = wlr_libinput_backend_create(display, session); - if (!libinput) { - goto error_multi; + if (libinput) { + wlr_multi_backend_add(backend, libinput); } - wlr_multi_backend_add(backend, libinput); - int gpus[8]; size_t num_gpus = wlr_session_find_gpus(session, 8, gpus); struct wlr_backend *primary_drm = NULL; @@ -128,14 +126,14 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) { if (!primary_drm) { wlr_log(L_ERROR, "Failed to open any DRM device"); - goto error_multi; } - return backend; +out: + if (wlr_multi_is_empty(backend)) { + wlr_backend_destroy(backend); + return NULL; + } -error_multi: - wlr_backend_destroy(backend); - wlr_session_destroy(session); return backend; } -- cgit v1.2.3 From 4cec7f54e24a58fd9756395ce64a5bd73f412c9e Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Thu, 21 Dec 2017 18:38:58 -0500 Subject: only add first backend to multi autocreate --- backend/backend.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'backend/backend.c') diff --git a/backend/backend.c b/backend/backend.c index 359ee0e5..6b32bc6a 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -33,6 +33,10 @@ bool wlr_backend_start(struct wlr_backend *backend) { } void wlr_backend_destroy(struct wlr_backend *backend) { + if (!backend) { + return; + } + wl_signal_emit(&backend->events.destroy, backend); if (backend->impl && backend->impl->destroy) { backend->impl->destroy(backend); @@ -82,6 +86,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) { struct wlr_backend *wl_backend = attempt_wl_backend(display); if (wl_backend) { wlr_multi_backend_add(backend, wl_backend); + return backend; } } @@ -90,18 +95,25 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) { struct wlr_backend *x11_backend = wlr_x11_backend_create(display, x11_display); wlr_multi_backend_add(backend, x11_backend); + return backend; } // Attempt DRM+libinput struct wlr_session *session = wlr_session_create(display); if (!session) { wlr_log(L_ERROR, "Failed to start a DRM session"); - goto out; + wlr_backend_destroy(backend); + return NULL; } struct wlr_backend *libinput = wlr_libinput_backend_create(display, session); if (libinput) { wlr_multi_backend_add(backend, libinput); + } else { + wlr_log(L_ERROR, "Failed to start libinput backend"); + wlr_backend_destroy(backend); + wlr_session_destroy(session); + return NULL; } int gpus[8]; @@ -126,10 +138,8 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) { if (!primary_drm) { wlr_log(L_ERROR, "Failed to open any DRM device"); - } - -out: - if (wlr_multi_is_empty(backend)) { + wlr_backend_destroy(libinput); + wlr_session_destroy(session); wlr_backend_destroy(backend); return NULL; } -- cgit v1.2.3