output-layout: remove wlr_output_layout_output_state

wlroots uses "// private state" comments to denote structure fields
which shouldn't be accessed by compositors, so let's drop
wlr_output_layout_output_state and inline its fields into
wlr_output_layout_output; this also simplifies layout output creation.

1 files changed, 11 insertions, 4 deletions

diff --git a/include/wlr/types/wlr_output_layout.h b/include/wlr/types/wlr_output_layout.h
index 7198c166..89066ae8 100644
--- a/include/wlr/types/wlr_output_layout.h
+++ b/include/wlr/types/wlr_output_layout.h
@@ -36,18 +36,25 @@ struct wlr_output_layout {
 	void *data;
 };
 
-struct wlr_output_layout_output_state;
-
 struct wlr_output_layout_output {
+	struct wlr_output_layout *layout;
+
 	struct wlr_output *output;
+
 	int x, y;
 	struct wl_list link;
-	struct wlr_output_layout_output_state *state;
 
-	struct wlr_addon addon;
+	bool auto_configured;
+
 	struct {
 		struct wl_signal destroy;
 	} events;
+
+	// private state
+
+	struct wlr_addon addon;
+
+	struct wl_listener commit;
 };
 
 struct wlr_output_layout *wlr_output_layout_create(void);