1 files changed, 43 insertions, 16 deletions

diff --git a/include/sway/output.h b/include/sway/output.h
index 651fdfe7..540ed8a0 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -6,14 +6,20 @@
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
 #include "config.h"
+#include "sway/tree/node.h"
 #include "sway/tree/view.h"
 
 struct sway_server;
 struct sway_container;
 
+struct sway_output_state {
+        list_t *workspaces;
+        struct sway_workspace *active_workspace;
+};
+
 struct sway_output {
+        struct sway_node node;
         struct wlr_output *wlr_output;
-        struct sway_container *swayc;
         struct sway_server *server;
 
         struct wl_list layers[4]; // sway_layer_surface::link
@@ -22,11 +28,15 @@ struct sway_output {
         struct timespec last_frame;
         struct wlr_output_damage *damage;
 
+        bool enabled;
+        list_t *workspaces;
+
+        struct sway_output_state current;
+
         struct wl_listener destroy;
         struct wl_listener mode;
         struct wl_listener transform;
         struct wl_listener scale;
-
         struct wl_listener damage_destroy;
         struct wl_listener damage_frame;
 
@@ -39,13 +49,19 @@ struct sway_output {
         } events;
 };
 
-struct sway_container *output_create(struct sway_output *sway_output);
+struct sway_output *output_create(struct wlr_output *wlr_output);
+
+void output_destroy(struct sway_output *output);
+
+void output_begin_destroy(struct sway_output *output);
 
-void output_destroy(struct sway_container *output);
+struct sway_output *output_from_wlr_output(struct wlr_output *output);
 
-void output_begin_destroy(struct sway_container *output);
+struct sway_output *output_get_in_direction(struct sway_output *reference,
+                enum movement_direction direction);
 
-struct sway_container *output_from_wlr_output(struct wlr_output *output);
+void output_add_workspace(struct sway_output *output,
+                struct sway_workspace *workspace);
 
 typedef void (*sway_surface_iterator_func_t)(struct sway_output *output,
         struct wlr_surface *surface, struct wlr_box *box, float rotation,
@@ -64,15 +80,19 @@ void output_damage_box(struct sway_output *output, struct wlr_box *box);
 void output_damage_whole_container(struct sway_output *output,
         struct sway_container *con);
 
-struct sway_container *output_by_name(const char *name);
+struct sway_output *output_by_name(const char *name);
 
-void output_sort_workspaces(struct sway_container *output);
+void output_sort_workspaces(struct sway_output *output);
 
-void output_enable(struct sway_output *output);
+struct output_config *output_find_config(struct sway_output *output);
+
+void output_enable(struct sway_output *output, struct output_config *oc);
+
+void output_disable(struct sway_output *output);
 
 bool output_has_opaque_overlay_layer_surface(struct sway_output *output);
 
-struct sway_container *output_get_active_workspace(struct sway_output *output);
+struct sway_workspace *output_get_active_workspace(struct sway_output *output);
 
 void output_render(struct sway_output *output, struct timespec *when,
         pixman_region32_t *damage);
@@ -103,16 +123,23 @@ void output_drag_icons_for_each_surface(struct sway_output *output,
         struct wl_list *drag_icons, sway_surface_iterator_func_t iterator,
         void *user_data);
 
-void output_for_each_workspace(struct sway_container *output,
-                void (*f)(struct sway_container *con, void *data), void *data);
+void output_for_each_workspace(struct sway_output *output,
+                void (*f)(struct sway_workspace *ws, void *data), void *data);
 
-void output_for_each_container(struct sway_container *output,
+void output_for_each_container(struct sway_output *output,
                 void (*f)(struct sway_container *con, void *data), void *data);
 
-struct sway_container *output_find_workspace(struct sway_container *output,
-                bool (*test)(struct sway_container *con, void *data), void *data);
+struct sway_workspace *output_find_workspace(struct sway_output *output,
+                bool (*test)(struct sway_workspace *ws, void *data), void *data);
 
-struct sway_container *output_find_container(struct sway_container *output,
+struct sway_container *output_find_container(struct sway_output *output,
                 bool (*test)(struct sway_container *con, void *data), void *data);
 
+void output_get_box(struct sway_output *output, struct wlr_box *box);
+
+enum sway_container_layout output_get_default_layout(
+                struct sway_output *output);
+
+void output_add_listeners(struct sway_output *output);
+
 #endif