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/backend | |
| 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/backend')
| -rw-r--r-- | include/backend/drm.h | 2 | ||||
| -rw-r--r-- | include/backend/multi.h | 4 | ||||
| -rw-r--r-- | include/backend/session/direct-ipc.h | 12 | ||||
| -rw-r--r-- | include/backend/udev.h | 2 |
4 files changed, 18 insertions, 2 deletions
diff --git a/include/backend/drm.h b/include/backend/drm.h index dc12c258..ecdd945b 100644 --- a/include/backend/drm.h +++ b/include/backend/drm.h @@ -10,7 +10,7 @@ #include <libudev.h> #include <gbm.h> -#include <wlr/session.h> +#include <wlr/backend/session.h> #include <wlr/backend/drm.h> #include <wlr/util/list.h> diff --git a/include/backend/multi.h b/include/backend/multi.h index efaf61b9..5ac9cc1d 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/backend/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/backend/session/direct-ipc.h b/include/backend/session/direct-ipc.h new file mode 100644 index 00000000..96504f04 --- /dev/null +++ b/include/backend/session/direct-ipc.h @@ -0,0 +1,12 @@ +#ifndef SESSION_DIRECT_IPC +#define SESSION_DIRECT_IPC + +#include <sys/types.h> + +int direct_ipc_open(int sock, const char *path); +void direct_ipc_setmaster(int sock, int fd); +void direct_ipc_dropmaster(int sock, int fd); +void direct_ipc_finish(int sock, pid_t pid); +int direct_ipc_start(pid_t *pid_out); + +#endif diff --git a/include/backend/udev.h b/include/backend/udev.h index a2834063..080422c0 100644 --- a/include/backend/udev.h +++ b/include/backend/udev.h @@ -3,7 +3,7 @@ #include <sys/types.h> #include <libudev.h> -#include <wlr/session.h> +#include <wlr/backend/session.h> #include <wayland-server.h> #include <wlr/backend/udev.h> |