Merge branch 'master' into modifier-fixes

2 files changed, 3 insertions, 0 deletions

diff --git a/include/rootston/config.h b/include/rootston/config.h
index bd24e577..05f23b75 100644
--- a/include/rootston/config.h
+++ b/include/rootston/config.h
@@ -7,6 +7,7 @@
 
 struct roots_output_config {
 	char *name;
+	bool enable;
 	enum wl_output_transform transform;
 	int x, y;
 	float scale;
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index 8d706b65..9dfd7b10 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -13,6 +13,7 @@
 #include <wlr/types/wlr_primary_selection.h>
 #include <wlr/types/wlr_screenshooter.h>
 #include <wlr/types/wlr_list.h>
+#include <wlr/types/wlr_idle.h>
 #include "rootston/view.h"
 #include "rootston/config.h"
 
@@ -44,6 +45,7 @@ struct roots_desktop {
 	struct wlr_screenshooter *screenshooter;
 	struct wlr_server_decoration_manager *server_decoration_manager;
 	struct wlr_primary_selection_device_manager *primary_selection_device_manager;
+	struct wlr_idle *idle;
 
 	struct wl_listener output_add;
 	struct wl_listener output_remove;