diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-08-05 23:11:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-05 23:11:26 -0400 |
| commit | f95c02eebe54785a4f64332f7e574dddff7e3669 (patch) | |
| tree | 0e29dfa81a30d6172c558d2b5df6d95f31a32b20 /include/wlr | |
| parent | 41b98f21e50a6d57ba4b7fd8ba90066bba614e6a (diff) | |
| parent | 5bf61ca7edb658737f3ccbaed0a99f4779d329bb (diff) | |
Merge pull request #29 from ascent12/session
Moved session into backend/session and changed ownership
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/backend.h | 5 | ||||
| -rw-r--r-- | include/wlr/backend/drm.h | 2 | ||||
| -rw-r--r-- | include/wlr/backend/libinput.h | 2 | ||||
| -rw-r--r-- | include/wlr/backend/multi.h | 9 | ||||
| -rw-r--r-- | include/wlr/backend/session.h (renamed from include/wlr/session.h) | 0 | ||||
| -rw-r--r-- | include/wlr/backend/session/interface.h (renamed from include/wlr/session/interface.h) | 2 |
6 files changed, 13 insertions, 7 deletions
diff --git a/include/wlr/backend.h b/include/wlr/backend.h index db85c169..3910e406 100644 --- a/include/wlr/backend.h +++ b/include/wlr/backend.h @@ -2,7 +2,7 @@ #define _WLR_BACKEND_H #include <wayland-server.h> -#include <wlr/session.h> +#include <wlr/backend/session.h> struct wlr_backend_impl; struct wlr_backend_state; @@ -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/drm.h b/include/wlr/backend/drm.h index a486757d..7332d608 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -2,7 +2,7 @@ #define WLR_BACKEND_DRM_H #include <wayland-server.h> -#include <wlr/session.h> +#include <wlr/backend/session.h> #include <wlr/backend.h> #include <wlr/backend/udev.h> diff --git a/include/wlr/backend/libinput.h b/include/wlr/backend/libinput.h index 29748b77..bba68888 100644 --- a/include/wlr/backend/libinput.h +++ b/include/wlr/backend/libinput.h @@ -3,7 +3,7 @@ #include <libinput.h> #include <wayland-server.h> -#include <wlr/session.h> +#include <wlr/backend/session.h> #include <wlr/backend.h> #include <wlr/backend/udev.h> #include <wlr/types/wlr_input_device.h> diff --git a/include/wlr/backend/multi.h b/include/wlr/backend/multi.h index a07ca770..e8e46bed 100644 --- a/include/wlr/backend/multi.h +++ b/include/wlr/backend/multi.h @@ -2,9 +2,16 @@ #define _WLR_BACKEND_MULTI_H #include <wlr/backend.h> +#include <wlr/backend/udev.h> +#include <wlr/backend/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); +bool wlr_backend_is_multi(struct wlr_backend *backend); + +struct wlr_session *wlr_multi_get_session(struct wlr_backend *base); + #endif diff --git a/include/wlr/session.h b/include/wlr/backend/session.h index 7961e620..7961e620 100644 --- a/include/wlr/session.h +++ b/include/wlr/backend/session.h diff --git a/include/wlr/session/interface.h b/include/wlr/backend/session/interface.h index 4938110d..16814446 100644 --- a/include/wlr/session/interface.h +++ b/include/wlr/backend/session/interface.h @@ -1,7 +1,7 @@ #ifndef WLR_SESSION_INTERFACE_H #define WLR_SESSION_INTERFACE_H -#include <wlr/session.h> +#include <wlr/backend/session.h> struct session_impl { struct wlr_session *(*start)(struct wl_display *disp); |