From 771263380c3b3b4b412964b0fe53619aa7c580e2 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Thu, 4 Jan 2018 12:46:15 +0100
Subject: Add wlr_output::enabled

---
 include/wlr/interfaces/wlr_output.h |  7 ++-----
 include/wlr/types/wlr_output.h      | 10 ++++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'include/wlr')

diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h
index 6d71f9b6..d5837def 100644
--- a/include/wlr/interfaces/wlr_output.h
+++ b/include/wlr/interfaces/wlr_output.h
@@ -26,14 +26,11 @@ struct wlr_output_impl {
 };
 
 void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
-	const struct wlr_output_impl *impl);
-void wlr_output_free(struct wlr_output *output);
+	const struct wlr_output_impl *impl, struct wl_display *display);
 void wlr_output_update_mode(struct wlr_output *output,
 	struct wlr_output_mode *mode);
 void wlr_output_update_custom_mode(struct wlr_output *output, int32_t width,
 	int32_t height, int32_t refresh);
-struct wl_global *wlr_output_create_global(struct wlr_output *wlr_output,
-	struct wl_display *display);
-void wlr_output_destroy_global(struct wlr_output *wlr_output);
+void wlr_output_update_enabled(struct wlr_output *output, bool enabled);
 
 #endif
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index 6374ae9b..e7491704 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -36,19 +36,19 @@ struct wlr_output_impl;
 struct wlr_output {
 	const struct wlr_output_impl *impl;
 	struct wlr_backend *backend;
+	struct wl_display *display;
 
 	struct wl_global *wl_global;
 	struct wl_list wl_resources;
 
-	uint32_t flags;
 	char name[16];
 	char make[48];
 	char model[16];
 	char serial[16];
-	float scale;
-	int32_t width, height;
-	int32_t refresh; // mHz
 	int32_t phys_width, phys_height; // mm
+
+	bool enabled;
+	float scale;
 	enum wl_output_subpixel subpixel;
 	enum wl_output_transform transform;
 	bool needs_swap;
@@ -58,6 +58,8 @@ struct wlr_output {
 	// Note: some backends may have zero modes
 	struct wl_list modes;
 	struct wlr_output_mode *current_mode;
+	int32_t width, height;
+	int32_t refresh; // mHz
 
 	struct {
 		struct wl_signal frame;
-- 
cgit v1.2.3