From 2ae5cd6539253e03e065f3ecbf55179527bb5ea2 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Tue, 11 Jul 2017 19:03:09 +1200 Subject: Moved session/ into backend/ --- include/wlr/backend/session.h | 65 +++++++++++++++++++++++++++++++++ include/wlr/backend/session/interface.h | 14 +++++++ include/wlr/session.h | 65 --------------------------------- include/wlr/session/interface.h | 14 ------- 4 files changed, 79 insertions(+), 79 deletions(-) create mode 100644 include/wlr/backend/session.h create mode 100644 include/wlr/backend/session/interface.h delete mode 100644 include/wlr/session.h delete mode 100644 include/wlr/session/interface.h (limited to 'include/wlr') diff --git a/include/wlr/backend/session.h b/include/wlr/backend/session.h new file mode 100644 index 00000000..7961e620 --- /dev/null +++ b/include/wlr/backend/session.h @@ -0,0 +1,65 @@ +#ifndef WLR_SESSION_H +#define WLR_SESSION_H + +#include +#include +#include + +struct session_impl; + +struct wlr_session { + const struct session_impl *impl; + /* + * Signal for when the session becomes active/inactive. + * It's called when we swap virtual terminal. + */ + struct wl_signal session_signal; + bool active; + + int drm_fd; + unsigned vtnr; + char seat[8]; +}; + +/* + * Opens a session, taking control of the current virtual terminal. + * This should not be called if another program is already in control + * of the terminal (Xorg, another Wayland compositor, etc.). + * + * If logind support is not enabled, you must have CAP_SYS_ADMIN or be root. + * It is safe to drop priviledges after this is called. + * + * Returns NULL on error. + */ +struct wlr_session *wlr_session_start(struct wl_display *disp); + +/* + * Closes a previously opened session and restores the virtual terminal. + * You should call wlr_session_close_file on each files you opened + * with wlr_session_open_file before you call this. + */ +void wlr_session_finish(struct wlr_session *session); + +/* + * Opens the file at path. + * This can only be used to open DRM or evdev (input) devices. + * + * When the session becomes inactive: + * - DRM files lose their DRM master status + * - evdev files become invalid and should be closed + * + * Returns -errno on error. + */ +int wlr_session_open_file(struct wlr_session *session, const char *path); + +/* + * Closes a file previously opened with wlr_session_open_file. + */ +void wlr_session_close_file(struct wlr_session *session, int fd); + +/* + * Changes the virtual terminal. + */ +bool wlr_session_change_vt(struct wlr_session *session, unsigned vt); + +#endif diff --git a/include/wlr/backend/session/interface.h b/include/wlr/backend/session/interface.h new file mode 100644 index 00000000..4938110d --- /dev/null +++ b/include/wlr/backend/session/interface.h @@ -0,0 +1,14 @@ +#ifndef WLR_SESSION_INTERFACE_H +#define WLR_SESSION_INTERFACE_H + +#include + +struct session_impl { + struct wlr_session *(*start)(struct wl_display *disp); + void (*finish)(struct wlr_session *session); + int (*open)(struct wlr_session *session, const char *path); + void (*close)(struct wlr_session *session, int fd); + bool (*change_vt)(struct wlr_session *session, unsigned vt); +}; + +#endif diff --git a/include/wlr/session.h b/include/wlr/session.h deleted file mode 100644 index 7961e620..00000000 --- a/include/wlr/session.h +++ /dev/null @@ -1,65 +0,0 @@ -#ifndef WLR_SESSION_H -#define WLR_SESSION_H - -#include -#include -#include - -struct session_impl; - -struct wlr_session { - const struct session_impl *impl; - /* - * Signal for when the session becomes active/inactive. - * It's called when we swap virtual terminal. - */ - struct wl_signal session_signal; - bool active; - - int drm_fd; - unsigned vtnr; - char seat[8]; -}; - -/* - * Opens a session, taking control of the current virtual terminal. - * This should not be called if another program is already in control - * of the terminal (Xorg, another Wayland compositor, etc.). - * - * If logind support is not enabled, you must have CAP_SYS_ADMIN or be root. - * It is safe to drop priviledges after this is called. - * - * Returns NULL on error. - */ -struct wlr_session *wlr_session_start(struct wl_display *disp); - -/* - * Closes a previously opened session and restores the virtual terminal. - * You should call wlr_session_close_file on each files you opened - * with wlr_session_open_file before you call this. - */ -void wlr_session_finish(struct wlr_session *session); - -/* - * Opens the file at path. - * This can only be used to open DRM or evdev (input) devices. - * - * When the session becomes inactive: - * - DRM files lose their DRM master status - * - evdev files become invalid and should be closed - * - * Returns -errno on error. - */ -int wlr_session_open_file(struct wlr_session *session, const char *path); - -/* - * Closes a file previously opened with wlr_session_open_file. - */ -void wlr_session_close_file(struct wlr_session *session, int fd); - -/* - * Changes the virtual terminal. - */ -bool wlr_session_change_vt(struct wlr_session *session, unsigned vt); - -#endif diff --git a/include/wlr/session/interface.h b/include/wlr/session/interface.h deleted file mode 100644 index 4938110d..00000000 --- a/include/wlr/session/interface.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef WLR_SESSION_INTERFACE_H -#define WLR_SESSION_INTERFACE_H - -#include - -struct session_impl { - struct wlr_session *(*start)(struct wl_display *disp); - void (*finish)(struct wlr_session *session); - int (*open)(struct wlr_session *session, const char *path); - void (*close)(struct wlr_session *session, int fd); - bool (*change_vt)(struct wlr_session *session, unsigned vt); -}; - -#endif -- cgit v1.2.3