4 files changed, 21 insertions, 4 deletions

diff --git a/include/container.h b/include/container.h
index aadba5de..798a31a2 100644
--- a/include/container.h
+++ b/include/container.h
@@ -56,6 +56,10 @@ struct sway_container {
         struct sway_container *focused;
 };
 
+enum visibility_mask {
+        VISIBLE = 1
+};
+
 // Container Creation
 
 swayc_t *new_output(wlc_handle handle);
@@ -106,4 +110,7 @@ void container_map(swayc_t *, void (*f)(swayc_t *, void *), void *);
 void set_view_visibility(swayc_t *view, void *data);
 void reset_gaps(swayc_t *view, void *data);
 
+
+void update_visibility(swayc_t *container);
+
 #endif
diff --git a/include/layout.h b/include/layout.h
index 11bf1a28..8cc26ba8 100644
--- a/include/layout.h
+++ b/include/layout.h
@@ -22,6 +22,7 @@ swayc_t *remove_child(swayc_t *child);
 void swap_container(swayc_t *a, swayc_t *b);
 
 void move_container(swayc_t* container,swayc_t* root,enum movement_direction direction);
+void move_container_to(swayc_t* container, swayc_t* destination);
 
 // Layout
 void update_geometry(swayc_t *view);
diff --git a/include/util.h b/include/util.h
new file mode 100644
index 00000000..8e65e6d6
--- /dev/null
+++ b/include/util.h
@@ -0,0 +1,9 @@
+#ifndef _SWAY_UTIL_H
+#define _SWAY_UTIL_H
+
+/**
+ * Wrap i into the range [0, max[
+ */
+int wrap(int i, int max);
+
+#endif
diff --git a/include/workspace.h b/include/workspace.h
index d447ac2d..a731068d 100644
--- a/include/workspace.h
+++ b/include/workspace.h
@@ -9,9 +9,9 @@ char *workspace_next_name(void);
 swayc_t *workspace_create(const char*);
 swayc_t *workspace_by_name(const char*);
 void workspace_switch(swayc_t*);
-void workspace_output_next();
-void workspace_next();
-void workspace_output_prev();
-void workspace_prev();
+swayc_t *workspace_output_next();
+swayc_t *workspace_next();
+swayc_t *workspace_output_prev();
+swayc_t *workspace_prev();
 
 #endif