aboutsummaryrefslogtreecommitdiff
path: root/include/backend/drm
diff options
context:
space:
mode:
authorScott Anderson <ascent12@hotmail.com>2017-05-03 16:23:07 +1200
committerScott Anderson <ascent12@hotmail.com>2017-05-03 16:23:07 +1200
commit81998fdc98231cb1b2e050da2fcec7c75d46320c (patch)
tree1ccf64d2df9a5942e8b497df9a5f766eaf92aac2 /include/backend/drm
parent762ac7f4c0168bf2ce536d94b3b44cb95939d769 (diff)
Removed old session code from DRM backend.
Diffstat (limited to 'include/backend/drm')
-rw-r--r--include/backend/drm/backend.h9
-rw-r--r--include/backend/drm/session.h24
-rw-r--r--include/backend/drm/udev.h2
3 files changed, 5 insertions, 30 deletions
diff --git a/include/backend/drm/backend.h b/include/backend/drm/backend.h
index 1ad8e479..32182d0c 100644
--- a/include/backend/drm/backend.h
+++ b/include/backend/drm/backend.h
@@ -8,10 +8,10 @@
#include <libudev.h>
#include <wayland-server.h>
+#include <wlr/session.h>
#include <wlr/common/list.h>
#include <wlr/backend/drm.h>
-#include "session.h"
#include "udev.h"
#include "event.h"
#include "drm.h"
@@ -38,13 +38,12 @@ struct wlr_drm_backend {
uint32_t taken_crtcs;
struct wlr_drm_renderer renderer;
- struct wlr_session session;
+ struct wlr_session *session;
struct wlr_udev udev;
};
-struct wlr_drm_backend *wlr_drm_backend_init(struct wl_listener *add,
- struct wl_listener *rem,
- struct wl_listener *render);
+struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session,
+ struct wl_listener *add, struct wl_listener *rem, struct wl_listener *render);
void wlr_drm_backend_free(struct wlr_drm_backend *backend);
#endif
diff --git a/include/backend/drm/session.h b/include/backend/drm/session.h
deleted file mode 100644
index 6936b19a..00000000
--- a/include/backend/drm/session.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef SESSION_H
-#define SESSION_H
-
-#include <systemd/sd-bus.h>
-#include <stdbool.h>
-
-struct wlr_session {
- sd_bus *bus;
-
- char *id;
- char *path;
- char *seat;
-};
-
-bool wlr_session_start(struct wlr_session *session);
-void wlr_session_end(struct wlr_session *session);
-
-int wlr_session_take_device(struct wlr_session *restrict session,
- const char *restrict path,
- bool *restrict paused_out);
-
-void wlr_session_release_device(struct wlr_session *session, int fd);
-
-#endif
diff --git a/include/backend/drm/udev.h b/include/backend/drm/udev.h
index 576b5d6e..a09ee218 100644
--- a/include/backend/drm/udev.h
+++ b/include/backend/drm/udev.h
@@ -3,7 +3,7 @@
#include <libudev.h>
-#include "backend/drm/session.h"
+#include <wlr/session.h>
struct wlr_udev {
struct udev *udev;