Merge branch 'wlroots' into split-containers

2 files changed, 16 insertions, 5 deletions

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index f0e87fb5..fa22ea75 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -84,12 +84,21 @@ struct sway_container {
 
 	struct {
 		struct wl_signal destroy;
+		// Raised after the tree updates, but before arrange_windows
+		// Passed the previous parent
+		struct wl_signal reparent;
 	} events;
 };
 
 // TODO make private and use the container-specific create functions
 struct sway_container *container_create(enum sway_container_type type);
 
+const char *container_type_to_str(enum sway_container_type type);
+
+// TODO only one container create function and pass the type?
+struct sway_container *container_output_create(
+		struct sway_output *sway_output);
+
 /**
  * Create a new container container. A container container can be a a child of
  * a workspace container or another container container.
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h
index 53f72ec4..fbc3d6af 100644
--- a/include/sway/tree/layout.h
+++ b/include/sway/tree/layout.h
@@ -11,9 +11,6 @@ enum movement_direction {
 	MOVE_DOWN,
 	MOVE_PARENT,
 	MOVE_CHILD,
-	MOVE_NEXT,
-	MOVE_PREV,
-	MOVE_FIRST
 };
 
 struct sway_container;
@@ -33,7 +30,8 @@ struct sway_root {
 void layout_init(void);
 
 // TODO move to tree.h
-void container_add_child(struct sway_container *parent, struct sway_container *child);
+void container_add_child(struct sway_container *parent,
+		struct sway_container *child);
 
 // TODO move to tree.h
 struct sway_container *container_add_sibling(struct sway_container *parent,
@@ -49,8 +47,12 @@ struct sway_container *container_reap_empty(struct sway_container *container);
 void container_move_to(struct sway_container* container,
 		struct sway_container* destination);
 
+void container_move(struct sway_container *container,
+		enum movement_direction dir, int move_amt);
+
 // TODO move to output.c
-enum sway_container_layout container_get_default_layout(struct sway_container *output);
+enum sway_container_layout container_get_default_layout(
+		struct sway_container *output);
 
 // TODO move to output.c
 void container_sort_workspaces(struct sway_container *output);