Merge pull request #18 from ascent12/session

Fix VT switching with libinput backend

3 files changed, 7 insertions, 10 deletions

diff --git a/include/backend/drm.h b/include/backend/drm.h
index 10850d1f..a4995fa9 100644
--- a/include/backend/drm.h
+++ b/include/backend/drm.h
@@ -34,8 +34,7 @@ struct wlr_backend_state {
 	struct wlr_backend *backend;
 	struct wl_event_source *drm_event;
 
-	struct wl_listener device_paused;
-	struct wl_listener device_resumed;
+	struct wl_listener session_signal;
 	struct wl_listener drm_invalidated;
 
 	uint32_t taken_crtcs;
@@ -90,5 +89,6 @@ void wlr_drm_scan_connectors(struct wlr_backend_state *state);
 int wlr_drm_event(int fd, uint32_t mask, void *data);
 
 void wlr_drm_output_start_renderer(struct wlr_output_state *output);
+void wlr_drm_output_pause_renderer(struct wlr_output_state *output);
 
 #endif
diff --git a/include/backend/libinput.h b/include/backend/libinput.h
index 89286ab8..1e8b9072 100644
--- a/include/backend/libinput.h
+++ b/include/backend/libinput.h
@@ -16,6 +16,8 @@ struct wlr_backend_state {
 	struct libinput *libinput;
 	struct wl_event_source *input_event;
 
+	struct wl_listener session_signal;
+
 	list_t *devices;
 };
 
diff --git a/include/wlr/session.h b/include/wlr/session.h
index 28ccb526..4a5b2174 100644
--- a/include/wlr/session.h
+++ b/include/wlr/session.h
@@ -1,22 +1,17 @@
 #ifndef WLR_SESSION_H
 #define WLR_SESSION_H
 
+#include <stdbool.h>
 #include <wayland-server.h>
 #include <sys/types.h>
 
 struct session_impl;
 
-// Passed to the listeners of device_paused/resumed
-struct device_arg {
-	dev_t dev;
-	int fd; // Only for device_resumed
-};
-
 struct wlr_session {
 	const struct session_impl *impl;
 
-	struct wl_signal device_paused;
-	struct wl_signal device_resumed;
+	bool active;
+	struct wl_signal session_signal;
 };
 
 struct wlr_session *wlr_session_start(struct wl_display *disp);