Merge pull request #1702 from acrisci/split-containers2

properly close container containers

1 files changed, 6 insertions, 11 deletions

diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h
index 8badb244..784dcc9b 100644
--- a/include/sway/tree/layout.h
+++ b/include/sway/tree/layout.h
@@ -29,42 +29,37 @@ struct sway_root {
 
 void layout_init(void);
 
-// TODO move to tree.h
 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,
 		struct sway_container *child);
 
-// TODO move to tree.h
 struct sway_container *container_remove_child(struct sway_container *child);
 
-// TODO PRIVATE in tree.h
-struct sway_container *container_reap_empty(struct sway_container *container);
+struct sway_container *container_replace_child(struct sway_container *child,
+		struct sway_container *new_child);
+
+struct sway_container *container_set_layout(struct sway_container *container,
+		enum sway_container_layout layout);
 
-// TODO move to tree.h
 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);
+		struct sway_container *con);
 
-// TODO move to output.c
 void container_sort_workspaces(struct sway_container *output);
 
 void arrange_windows(struct sway_container *container,
 		double width, double height);
 
-// TODO move to container.h
 struct sway_container *container_get_in_direction(struct sway_container
 		*container, struct sway_seat *seat, enum movement_direction dir);
 
-// TODO move to tree.h
 struct sway_container *container_split(struct sway_container *child,
 		enum sway_container_layout layout);