diff options
| author | Scott Anderson <ascent12@hotmail.com> | 2017-07-11 18:51:19 +1200 |
|---|---|---|
| committer | Scott Anderson <ascent12@hotmail.com> | 2017-08-06 13:25:26 +1200 |
| commit | ae4478e17f56c1fb52a77d1f034387f154eddef5 (patch) | |
| tree | e2318946e5679221ceff80710905d348a8dd96da /include | |
| parent | 41b98f21e50a6d57ba4b7fd8ba90066bba614e6a (diff) | |
Changed ownership of wlr_session to the multi backend.
Currently breaks VT switching for examples.
Diffstat (limited to 'include')
| -rw-r--r-- | include/backend/multi.h | 4 | ||||
| -rw-r--r-- | include/wlr/backend.h | 3 | ||||
| -rw-r--r-- | include/wlr/backend/multi.h | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/include/backend/multi.h b/include/backend/multi.h index efaf61b9..617d4c98 100644 --- a/include/backend/multi.h +++ b/include/backend/multi.h @@ -3,10 +3,14 @@ #include <wlr/backend/interface.h> #include <wlr/backend/multi.h> +#include <wlr/backend/udev.h> #include <wlr/util/list.h> +#include <wlr/session.h> struct wlr_backend_state { struct wlr_backend *backend; + struct wlr_session *session; + struct wlr_udev *udev; list_t *backends; }; diff --git a/include/wlr/backend.h b/include/wlr/backend.h index db85c169..74cb34a9 100644 --- a/include/wlr/backend.h +++ b/include/wlr/backend.h @@ -19,8 +19,7 @@ struct wlr_backend { } events; }; -struct wlr_backend *wlr_backend_autocreate(struct wl_display *display, - struct wlr_session *session); +struct wlr_backend *wlr_backend_autocreate(struct wl_display *display); bool wlr_backend_init(struct wlr_backend *backend); void wlr_backend_destroy(struct wlr_backend *backend); diff --git a/include/wlr/backend/multi.h b/include/wlr/backend/multi.h index a07ca770..00b34722 100644 --- a/include/wlr/backend/multi.h +++ b/include/wlr/backend/multi.h @@ -2,8 +2,11 @@ #define _WLR_BACKEND_MULTI_H #include <wlr/backend.h> +#include <wlr/backend/udev.h> +#include <wlr/session.h> -struct wlr_backend *wlr_multi_backend_create(); +struct wlr_backend *wlr_multi_backend_create(struct wlr_session *session, + struct wlr_udev *udev); void wlr_multi_backend_add(struct wlr_backend *multi, struct wlr_backend *backend); |