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

remove session from multibackend

This commit is contained in:
Tony Crisci 2017-12-19 18:25:46 -05:00
parent 4e804ef40f
commit a937016e38
6 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/backend.c
View File

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

5
backend/drm/backend.c
View File

@ -174,3 +174,8 @@ error_fd:
free(drm); free(drm);
return NULL; 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;
}

22
backend/multi/backend.c
View File

@ -5,6 +5,7 @@
#include <wlr/backend/session.h> #include <wlr/backend/session.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "backend/multi.h" #include "backend/multi.h"
#include "backend/drm/drm.h"
struct subbackend_state { struct subbackend_state {
struct wlr_backend *backend; struct wlr_backend *backend;
@ -57,14 +58,7 @@ 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_backend *wlr_multi_backend_create(struct wl_display *display) {
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) {
@ -72,13 +66,9 @@ struct wlr_backend *wlr_multi_backend_create(struct wl_display *display,
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);
session->display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &session->display_destroy);
return &backend->backend; return &backend->backend;
} }
@ -140,5 +130,11 @@ struct wlr_session *wlr_multi_get_session(struct wlr_backend *_backend) {
assert(wlr_backend_is_multi(_backend)); assert(wlr_backend_is_multi(_backend));
struct wlr_multi_backend *backend = (struct wlr_multi_backend *)_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;
} }

2
include/backend/drm/drm.h
View File

@ -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); void wlr_drm_connector_start_renderer(struct wlr_drm_connector *conn);
struct wlr_session *wlr_drm_backend_get_session(struct wlr_backend *backend);
#endif #endif

1
include/backend/multi.h
View File

@ -9,7 +9,6 @@
struct wlr_multi_backend { struct wlr_multi_backend {
struct wlr_backend backend; struct wlr_backend backend;
struct wlr_session *session;
struct wl_list backends; struct wl_list backends;
struct wl_listener display_destroy; struct wl_listener display_destroy;

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

@ -4,8 +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 wl_display *display, 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);