From 874f009866abaf8ca43ed4cd88a69d22a3fbfc5a Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 12:15:31 -0400
Subject: move tree includes to their own directory

---
 include/sway/tree/container.h | 136 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100644 include/sway/tree/container.h

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
new file mode 100644
index 00000000..5a2ae349
--- /dev/null
+++ b/include/sway/tree/container.h
@@ -0,0 +1,136 @@
+#ifndef _SWAY_CONTAINER_H
+#define _SWAY_CONTAINER_H
+#include <stdint.h>
+#include <sys/types.h>
+#include <wlr/types/wlr_box.h>
+#include <wlr/types/wlr_surface.h>
+#include "list.h"
+
+typedef struct sway_container swayc_t;
+
+extern swayc_t root_container;
+
+struct sway_view;
+struct sway_seat;
+
+/**
+ * Different kinds of containers.
+ *
+ * This enum is in order. A container will never be inside of a container below
+ * it on this list.
+ */
+enum swayc_types {
+	C_ROOT,
+	C_OUTPUT,
+	C_WORKSPACE,
+	C_CONTAINER,
+	C_VIEW,
+
+	C_TYPES,
+};
+
+enum swayc_layouts {
+	L_NONE,
+	L_HORIZ,
+	L_VERT,
+	L_STACKED,
+	L_TABBED,
+	L_FLOATING,
+
+	// Keep last
+	L_LAYOUTS,
+};
+
+enum swayc_border_types {
+	B_NONE,
+	B_PIXEL,
+	B_NORMAL,
+};
+
+struct sway_root;
+struct sway_output;
+struct sway_view;
+
+struct sway_container {
+	union {
+		// TODO: Encapsulate state for other node types as well like C_CONTAINER
+		struct sway_root *sway_root;
+		struct sway_output *sway_output;
+		struct sway_view *sway_view;
+	};
+
+	/**
+	 * A unique ID to identify this container. Primarily used in the
+	 * get_tree JSON output.
+	 */
+	size_t id;
+
+	char *name;
+
+	enum swayc_types type;
+	enum swayc_layouts layout;
+	enum swayc_layouts prev_layout;
+	enum swayc_layouts workspace_layout;
+
+    // TODO convert to layout coordinates
+	double x, y;
+
+    // does not include borders or gaps.
+	double width, height;
+
+	list_t *children;
+
+	struct sway_container *parent;
+
+	list_t *marks; // list of char*
+
+	struct {
+		struct wl_signal destroy;
+	} events;
+};
+
+void swayc_descendants_of_type(swayc_t *root, enum swayc_types type,
+		void (*func)(swayc_t *item, void *data), void *data);
+
+// TODO only one container create function and pass the type?
+swayc_t *new_output(struct sway_output *sway_output);
+
+swayc_t *new_workspace(swayc_t *output, const char *name);
+
+swayc_t *new_view(swayc_t *sibling, struct sway_view *sway_view);
+
+swayc_t *destroy_output(swayc_t *output);
+swayc_t *destroy_view(swayc_t *view);
+
+swayc_t *next_view_sibling(struct sway_seat *seat);
+
+/**
+ * Finds a container based on test criteria. Returns the first container that
+ * passes the test.
+ */
+swayc_t *swayc_by_test(swayc_t *container,
+		bool (*test)(swayc_t *view, void *data), void *data);
+
+/**
+ * Finds a parent container with the given swayc_type.
+ */
+swayc_t *swayc_parent_by_type(swayc_t *container, enum swayc_types type);
+
+/**
+ * Maps a container's children over a function.
+ */
+void container_map(swayc_t *container,
+		void (*f)(swayc_t *view, void *data), void *data);
+
+swayc_t *swayc_at(swayc_t *parent, double lx, double ly,
+		struct wlr_surface **surface, double *sx, double *sy);
+
+/**
+ * Apply the function for each child of the container breadth first.
+ */
+void container_for_each_bfs(swayc_t *con, void (*f)(swayc_t *con, void *data),
+		void *data);
+
+swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout);
+
+#endif
-- 
cgit v1.2.3


From 83d09cf5945ba10a703dc5cc977a6d2814f0fd64 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 14:31:10 -0400
Subject: remove swayc_t typedef

---
 include/sway/tree/container.h | 45 +++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 5a2ae349..5def5e71 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -6,9 +6,7 @@
 #include <wlr/types/wlr_surface.h>
 #include "list.h"
 
-typedef struct sway_container swayc_t;
-
-extern swayc_t root_container;
+extern struct sway_container root_container;
 
 struct sway_view;
 struct sway_seat;
@@ -89,48 +87,53 @@ struct sway_container {
 	} events;
 };
 
-void swayc_descendants_of_type(swayc_t *root, enum swayc_types type,
-		void (*func)(swayc_t *item, void *data), void *data);
+void swayc_descendants_of_type(struct sway_container *root,
+		enum swayc_types type,
+		void (*func)(struct sway_container *item, void *data), void *data);
 
 // TODO only one container create function and pass the type?
-swayc_t *new_output(struct sway_output *sway_output);
+struct sway_container *new_output(struct sway_output *sway_output);
 
-swayc_t *new_workspace(swayc_t *output, const char *name);
+struct sway_container *new_workspace(struct sway_container *output,
+		const char *name);
 
-swayc_t *new_view(swayc_t *sibling, struct sway_view *sway_view);
+struct sway_container *new_view(struct sway_container *sibling,
+		struct sway_view *sway_view);
 
-swayc_t *destroy_output(swayc_t *output);
-swayc_t *destroy_view(swayc_t *view);
+struct sway_container *destroy_output(struct sway_container *output);
+struct sway_container *destroy_view(struct sway_container *view);
 
-swayc_t *next_view_sibling(struct sway_seat *seat);
+struct sway_container *next_view_sibling(struct sway_seat *seat);
 
 /**
  * Finds a container based on test criteria. Returns the first container that
  * passes the test.
  */
-swayc_t *swayc_by_test(swayc_t *container,
-		bool (*test)(swayc_t *view, void *data), void *data);
+struct sway_container *swayc_by_test(struct sway_container *container,
+		bool (*test)(struct sway_container *view, void *data), void *data);
 
 /**
  * Finds a parent container with the given swayc_type.
  */
-swayc_t *swayc_parent_by_type(swayc_t *container, enum swayc_types type);
+struct sway_container *swayc_parent_by_type(struct sway_container *container,
+		enum swayc_types type);
 
 /**
  * Maps a container's children over a function.
  */
-void container_map(swayc_t *container,
-		void (*f)(swayc_t *view, void *data), void *data);
+void container_map(struct sway_container *container,
+		void (*f)(struct sway_container *view, void *data), void *data);
 
-swayc_t *swayc_at(swayc_t *parent, double lx, double ly,
-		struct wlr_surface **surface, double *sx, double *sy);
+struct sway_container *swayc_at(struct sway_container *parent, double lx,
+		double ly, struct wlr_surface **surface, double *sx, double *sy);
 
 /**
  * Apply the function for each child of the container breadth first.
  */
-void container_for_each_bfs(swayc_t *con, void (*f)(swayc_t *con, void *data),
-		void *data);
+void container_for_each_bfs(struct sway_container *con, void (*f)(struct
+			sway_container *con, void *data), void *data);
 
-swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout);
+struct sway_container *swayc_change_layout(struct sway_container *container,
+		enum swayc_layouts layout);
 
 #endif
-- 
cgit v1.2.3


From b90099b4b7df8068446c658ab99b58ff83648954 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 16:17:55 -0400
Subject: rename container functions

---
 include/sway/tree/container.h | 70 ++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 31 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 5def5e71..0dfed455 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -17,7 +17,7 @@ struct sway_seat;
  * This enum is in order. A container will never be inside of a container below
  * it on this list.
  */
-enum swayc_types {
+enum sway_container_type {
 	C_ROOT,
 	C_OUTPUT,
 	C_WORKSPACE,
@@ -27,7 +27,7 @@ enum swayc_types {
 	C_TYPES,
 };
 
-enum swayc_layouts {
+enum sway_container_layout {
 	L_NONE,
 	L_HORIZ,
 	L_VERT,
@@ -39,7 +39,7 @@ enum swayc_layouts {
 	L_LAYOUTS,
 };
 
-enum swayc_border_types {
+enum sway_container_border {
 	B_NONE,
 	B_PIXEL,
 	B_NORMAL,
@@ -65,10 +65,10 @@ struct sway_container {
 
 	char *name;
 
-	enum swayc_types type;
-	enum swayc_layouts layout;
-	enum swayc_layouts prev_layout;
-	enum swayc_layouts workspace_layout;
+	enum sway_container_type type;
+	enum sway_container_layout layout;
+	enum sway_container_layout prev_layout;
+	enum sway_container_layout workspace_layout;
 
     // TODO convert to layout coordinates
 	double x, y;
@@ -87,53 +87,61 @@ struct sway_container {
 	} events;
 };
 
-void swayc_descendants_of_type(struct sway_container *root,
-		enum swayc_types type,
-		void (*func)(struct sway_container *item, void *data), void *data);
-
 // TODO only one container create function and pass the type?
-struct sway_container *new_output(struct sway_output *sway_output);
+struct sway_container *sway_container_output_create(
+		struct sway_output *sway_output);
+
+struct sway_container *sway_container_workspace_create(
+		struct sway_container *output, const char *name);
 
-struct sway_container *new_workspace(struct sway_container *output,
-		const char *name);
+struct sway_container *sway_container_view_create(
+		struct sway_container *sibling, struct sway_view *sway_view);
 
-struct sway_container *new_view(struct sway_container *sibling,
-		struct sway_view *sway_view);
+struct sway_container *sway_container_output_destroy(
+		struct sway_container *output);
 
-struct sway_container *destroy_output(struct sway_container *output);
-struct sway_container *destroy_view(struct sway_container *view);
+struct sway_container *sway_container_view_destroy(struct sway_container *view);
 
+struct sway_container *sway_container_set_layout(
+		struct sway_container *container, enum sway_container_layout layout);
+
+void sway_container_descendents(struct sway_container *root,
+		enum sway_container_type type,
+		void (*func)(struct sway_container *item, void *data), void *data);
+
+// XXX: what is this?
 struct sway_container *next_view_sibling(struct sway_seat *seat);
 
 /**
  * Finds a container based on test criteria. Returns the first container that
  * passes the test.
  */
-struct sway_container *swayc_by_test(struct sway_container *container,
+struct sway_container *sway_container_find(struct sway_container *container,
 		bool (*test)(struct sway_container *view, void *data), void *data);
 
 /**
- * Finds a parent container with the given swayc_type.
+ * Finds a parent container with the given struct sway_containerype.
  */
-struct sway_container *swayc_parent_by_type(struct sway_container *container,
-		enum swayc_types type);
+struct sway_container *sway_container_parent(struct sway_container *container,
+		enum sway_container_type type);
 
 /**
- * Maps a container's children over a function.
+ * Run a function for each child.
  */
-void container_map(struct sway_container *container,
+void sway_container_for_each(struct sway_container *container,
 		void (*f)(struct sway_container *view, void *data), void *data);
 
-struct sway_container *swayc_at(struct sway_container *parent, double lx,
-		double ly, struct wlr_surface **surface, double *sx, double *sy);
+/**
+ * Find a container at the given coordinates.
+ */
+struct sway_container *sway_container_at(struct sway_container *parent,
+		double lx, double ly, struct wlr_surface **surface,
+		double *sx, double *sy);
 
 /**
  * Apply the function for each child of the container breadth first.
  */
-void container_for_each_bfs(struct sway_container *con, void (*f)(struct
-			sway_container *con, void *data), void *data);
-
-struct sway_container *swayc_change_layout(struct sway_container *container,
-		enum swayc_layouts layout);
+void sway_container_for_each_bfs(struct sway_container *container,
+		void (*f)(struct sway_container *container, void *data), void *data);
 
 #endif
-- 
cgit v1.2.3


From eca029f218fbb54ddf7316845be5d296e834358e Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 17:06:29 -0400
Subject: more renaming things

---
 include/sway/tree/container.h | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 0dfed455..572dd8e3 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -88,41 +88,38 @@ struct sway_container {
 };
 
 // TODO only one container create function and pass the type?
-struct sway_container *sway_container_output_create(
+struct sway_container *container_output_create(
 		struct sway_output *sway_output);
 
-struct sway_container *sway_container_workspace_create(
+struct sway_container *container_workspace_create(
 		struct sway_container *output, const char *name);
 
-struct sway_container *sway_container_view_create(
+struct sway_container *container_view_create(
 		struct sway_container *sibling, struct sway_view *sway_view);
 
-struct sway_container *sway_container_output_destroy(
+struct sway_container *container_output_destroy(
 		struct sway_container *output);
 
-struct sway_container *sway_container_view_destroy(struct sway_container *view);
+struct sway_container *container_view_destroy(struct sway_container *view);
 
-struct sway_container *sway_container_set_layout(
+struct sway_container *container_set_layout(
 		struct sway_container *container, enum sway_container_layout layout);
 
-void sway_container_descendents(struct sway_container *root,
+void container_descendents(struct sway_container *root,
 		enum sway_container_type type,
 		void (*func)(struct sway_container *item, void *data), void *data);
 
-// XXX: what is this?
-struct sway_container *next_view_sibling(struct sway_seat *seat);
-
 /**
  * Finds a container based on test criteria. Returns the first container that
  * passes the test.
  */
-struct sway_container *sway_container_find(struct sway_container *container,
+struct sway_container *container_find(struct sway_container *container,
 		bool (*test)(struct sway_container *view, void *data), void *data);
 
 /**
  * Finds a parent container with the given struct sway_containerype.
  */
-struct sway_container *sway_container_parent(struct sway_container *container,
+struct sway_container *container_parent(struct sway_container *container,
 		enum sway_container_type type);
 
 /**
-- 
cgit v1.2.3


From 62d1b4cb96f87274d695a9c11a041c42cf59ddc1 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 18:17:31 -0400
Subject: fix container_get_in_direction name

---
 include/sway/tree/container.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 572dd8e3..3548afc1 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -97,13 +97,12 @@ struct sway_container *container_workspace_create(
 struct sway_container *container_view_create(
 		struct sway_container *sibling, struct sway_view *sway_view);
 
-struct sway_container *container_output_destroy(
-		struct sway_container *output);
+struct sway_container *container_output_destroy(struct sway_container *output);
 
 struct sway_container *container_view_destroy(struct sway_container *view);
 
-struct sway_container *container_set_layout(
-		struct sway_container *container, enum sway_container_layout layout);
+struct sway_container *container_set_layout(struct sway_container *container,
+		enum sway_container_layout layout);
 
 void container_descendents(struct sway_container *root,
 		enum sway_container_type type,
-- 
cgit v1.2.3


From 4c394a0e9ee04b46ed349f7b3ddf67c53719b3b6 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 21:19:57 -0400
Subject: address feedback

---
 include/sway/tree/container.h | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 3548afc1..92ff2b67 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -70,10 +70,10 @@ struct sway_container {
 	enum sway_container_layout prev_layout;
 	enum sway_container_layout workspace_layout;
 
-    // TODO convert to layout coordinates
+	// TODO convert to layout coordinates
 	double x, y;
 
-    // does not include borders or gaps.
+	// does not include borders or gaps.
 	double width, height;
 
 	list_t *children;
@@ -121,23 +121,17 @@ struct sway_container *container_find(struct sway_container *container,
 struct sway_container *container_parent(struct sway_container *container,
 		enum sway_container_type type);
 
-/**
- * Run a function for each child.
- */
-void sway_container_for_each(struct sway_container *container,
-		void (*f)(struct sway_container *view, void *data), void *data);
-
 /**
  * Find a container at the given coordinates.
  */
-struct sway_container *sway_container_at(struct sway_container *parent,
+struct sway_container *container_at(struct sway_container *parent,
 		double lx, double ly, struct wlr_surface **surface,
 		double *sx, double *sy);
 
 /**
  * Apply the function for each child of the container breadth first.
  */
-void sway_container_for_each_bfs(struct sway_container *container,
+void container_for_each(struct sway_container *container,
 		void (*f)(struct sway_container *container, void *data), void *data);
 
 #endif
-- 
cgit v1.2.3


From 92c58b1e63d41d48cfb487b04a2cb105c990bc4c Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 23:08:59 -0400
Subject: rename container_for_each_descendent

---
 include/sway/tree/container.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 92ff2b67..16df3ee7 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -131,7 +131,7 @@ struct sway_container *container_at(struct sway_container *parent,
 /**
  * Apply the function for each child of the container breadth first.
  */
-void container_for_each(struct sway_container *container,
+void container_for_each_descendent(struct sway_container *container,
 		void (*f)(struct sway_container *container, void *data), void *data);
 
 #endif
-- 
cgit v1.2.3


From d0c7f66e950689b70196a890b62b82ff3c66e103 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Mar 2018 23:29:29 -0400
Subject: Revert "Refactor tree"

---
 include/sway/tree/container.h | 137 ------------------------------------------
 1 file changed, 137 deletions(-)
 delete mode 100644 include/sway/tree/container.h

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
deleted file mode 100644
index 16df3ee7..00000000
--- a/include/sway/tree/container.h
+++ /dev/null
@@ -1,137 +0,0 @@
-#ifndef _SWAY_CONTAINER_H
-#define _SWAY_CONTAINER_H
-#include <stdint.h>
-#include <sys/types.h>
-#include <wlr/types/wlr_box.h>
-#include <wlr/types/wlr_surface.h>
-#include "list.h"
-
-extern struct sway_container root_container;
-
-struct sway_view;
-struct sway_seat;
-
-/**
- * Different kinds of containers.
- *
- * This enum is in order. A container will never be inside of a container below
- * it on this list.
- */
-enum sway_container_type {
-	C_ROOT,
-	C_OUTPUT,
-	C_WORKSPACE,
-	C_CONTAINER,
-	C_VIEW,
-
-	C_TYPES,
-};
-
-enum sway_container_layout {
-	L_NONE,
-	L_HORIZ,
-	L_VERT,
-	L_STACKED,
-	L_TABBED,
-	L_FLOATING,
-
-	// Keep last
-	L_LAYOUTS,
-};
-
-enum sway_container_border {
-	B_NONE,
-	B_PIXEL,
-	B_NORMAL,
-};
-
-struct sway_root;
-struct sway_output;
-struct sway_view;
-
-struct sway_container {
-	union {
-		// TODO: Encapsulate state for other node types as well like C_CONTAINER
-		struct sway_root *sway_root;
-		struct sway_output *sway_output;
-		struct sway_view *sway_view;
-	};
-
-	/**
-	 * A unique ID to identify this container. Primarily used in the
-	 * get_tree JSON output.
-	 */
-	size_t id;
-
-	char *name;
-
-	enum sway_container_type type;
-	enum sway_container_layout layout;
-	enum sway_container_layout prev_layout;
-	enum sway_container_layout workspace_layout;
-
-	// TODO convert to layout coordinates
-	double x, y;
-
-	// does not include borders or gaps.
-	double width, height;
-
-	list_t *children;
-
-	struct sway_container *parent;
-
-	list_t *marks; // list of char*
-
-	struct {
-		struct wl_signal destroy;
-	} events;
-};
-
-// TODO only one container create function and pass the type?
-struct sway_container *container_output_create(
-		struct sway_output *sway_output);
-
-struct sway_container *container_workspace_create(
-		struct sway_container *output, const char *name);
-
-struct sway_container *container_view_create(
-		struct sway_container *sibling, struct sway_view *sway_view);
-
-struct sway_container *container_output_destroy(struct sway_container *output);
-
-struct sway_container *container_view_destroy(struct sway_container *view);
-
-struct sway_container *container_set_layout(struct sway_container *container,
-		enum sway_container_layout layout);
-
-void container_descendents(struct sway_container *root,
-		enum sway_container_type type,
-		void (*func)(struct sway_container *item, void *data), void *data);
-
-/**
- * Finds a container based on test criteria. Returns the first container that
- * passes the test.
- */
-struct sway_container *container_find(struct sway_container *container,
-		bool (*test)(struct sway_container *view, void *data), void *data);
-
-/**
- * Finds a parent container with the given struct sway_containerype.
- */
-struct sway_container *container_parent(struct sway_container *container,
-		enum sway_container_type type);
-
-/**
- * Find a container at the given coordinates.
- */
-struct sway_container *container_at(struct sway_container *parent,
-		double lx, double ly, struct wlr_surface **surface,
-		double *sx, double *sy);
-
-/**
- * Apply the function for each child of the container breadth first.
- */
-void container_for_each_descendent(struct sway_container *container,
-		void (*f)(struct sway_container *container, void *data), void *data);
-
-#endif
-- 
cgit v1.2.3


From dc8c9fbeb664518c76066cc28ee29452c6c30128 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 23:41:33 -0400
Subject: Revert "Merge pull request #1653 from
 swaywm/revert-1647-refactor-tree"

This reverts commit 472e81f35d689d67cda241acafda91c688d61046, reversing
changes made to 6b7841b11ff4cd35f54d69dc92029855893e5ce0.
---
 include/sway/tree/container.h | 137 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 include/sway/tree/container.h

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
new file mode 100644
index 00000000..16df3ee7
--- /dev/null
+++ b/include/sway/tree/container.h
@@ -0,0 +1,137 @@
+#ifndef _SWAY_CONTAINER_H
+#define _SWAY_CONTAINER_H
+#include <stdint.h>
+#include <sys/types.h>
+#include <wlr/types/wlr_box.h>
+#include <wlr/types/wlr_surface.h>
+#include "list.h"
+
+extern struct sway_container root_container;
+
+struct sway_view;
+struct sway_seat;
+
+/**
+ * Different kinds of containers.
+ *
+ * This enum is in order. A container will never be inside of a container below
+ * it on this list.
+ */
+enum sway_container_type {
+	C_ROOT,
+	C_OUTPUT,
+	C_WORKSPACE,
+	C_CONTAINER,
+	C_VIEW,
+
+	C_TYPES,
+};
+
+enum sway_container_layout {
+	L_NONE,
+	L_HORIZ,
+	L_VERT,
+	L_STACKED,
+	L_TABBED,
+	L_FLOATING,
+
+	// Keep last
+	L_LAYOUTS,
+};
+
+enum sway_container_border {
+	B_NONE,
+	B_PIXEL,
+	B_NORMAL,
+};
+
+struct sway_root;
+struct sway_output;
+struct sway_view;
+
+struct sway_container {
+	union {
+		// TODO: Encapsulate state for other node types as well like C_CONTAINER
+		struct sway_root *sway_root;
+		struct sway_output *sway_output;
+		struct sway_view *sway_view;
+	};
+
+	/**
+	 * A unique ID to identify this container. Primarily used in the
+	 * get_tree JSON output.
+	 */
+	size_t id;
+
+	char *name;
+
+	enum sway_container_type type;
+	enum sway_container_layout layout;
+	enum sway_container_layout prev_layout;
+	enum sway_container_layout workspace_layout;
+
+	// TODO convert to layout coordinates
+	double x, y;
+
+	// does not include borders or gaps.
+	double width, height;
+
+	list_t *children;
+
+	struct sway_container *parent;
+
+	list_t *marks; // list of char*
+
+	struct {
+		struct wl_signal destroy;
+	} events;
+};
+
+// TODO only one container create function and pass the type?
+struct sway_container *container_output_create(
+		struct sway_output *sway_output);
+
+struct sway_container *container_workspace_create(
+		struct sway_container *output, const char *name);
+
+struct sway_container *container_view_create(
+		struct sway_container *sibling, struct sway_view *sway_view);
+
+struct sway_container *container_output_destroy(struct sway_container *output);
+
+struct sway_container *container_view_destroy(struct sway_container *view);
+
+struct sway_container *container_set_layout(struct sway_container *container,
+		enum sway_container_layout layout);
+
+void container_descendents(struct sway_container *root,
+		enum sway_container_type type,
+		void (*func)(struct sway_container *item, void *data), void *data);
+
+/**
+ * Finds a container based on test criteria. Returns the first container that
+ * passes the test.
+ */
+struct sway_container *container_find(struct sway_container *container,
+		bool (*test)(struct sway_container *view, void *data), void *data);
+
+/**
+ * Finds a parent container with the given struct sway_containerype.
+ */
+struct sway_container *container_parent(struct sway_container *container,
+		enum sway_container_type type);
+
+/**
+ * Find a container at the given coordinates.
+ */
+struct sway_container *container_at(struct sway_container *parent,
+		double lx, double ly, struct wlr_surface **surface,
+		double *sx, double *sy);
+
+/**
+ * Apply the function for each child of the container breadth first.
+ */
+void container_for_each_descendent(struct sway_container *container,
+		void (*f)(struct sway_container *container, void *data), void *data);
+
+#endif
-- 
cgit v1.2.3


From 8f490d7d2dbadfe85dcf3dcd972471e86671442a Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Thu, 29 Mar 2018 23:53:38 -0400
Subject: Fix oversights from previous pull request

---
 include/sway/tree/container.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 16df3ee7..3bb497db 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -104,7 +104,7 @@ struct sway_container *container_view_destroy(struct sway_container *view);
 struct sway_container *container_set_layout(struct sway_container *container,
 		enum sway_container_layout layout);
 
-void container_descendents(struct sway_container *root,
+void container_descendants(struct sway_container *root,
 		enum sway_container_type type,
 		void (*func)(struct sway_container *item, void *data), void *data);
 
@@ -131,7 +131,13 @@ struct sway_container *container_at(struct sway_container *parent,
 /**
  * Apply the function for each child of the container breadth first.
  */
-void container_for_each_descendent(struct sway_container *container,
+void container_for_each_descendant_bfs(struct sway_container *container,
+		void (*f)(struct sway_container *container, void *data), void *data);
+
+/**
+ * Apply the function for each child of the container depth first.
+ */
+void container_for_each_descendant_dfs(struct sway_container *container,
 		void (*f)(struct sway_container *container, void *data), void *data);
 
 #endif
-- 
cgit v1.2.3


From 01af34391267e91461a4ab7a1234dd58f45d2c93 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Fri, 30 Mar 2018 10:31:21 -0400
Subject: Destroy empty workspaces when moving away

---
 include/sway/tree/container.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 3bb497db..24e8468e 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -99,8 +99,13 @@ struct sway_container *container_view_create(
 
 struct sway_container *container_output_destroy(struct sway_container *output);
 
+struct sway_container *container_workspace_destroy(
+		struct sway_container *workspace);
+
 struct sway_container *container_view_destroy(struct sway_container *view);
 
+void container_destroy(struct sway_container *cont);
+
 struct sway_container *container_set_layout(struct sway_container *container,
 		enum sway_container_layout layout);
 
@@ -140,4 +145,7 @@ void container_for_each_descendant_bfs(struct sway_container *container,
 void container_for_each_descendant_dfs(struct sway_container *container,
 		void (*f)(struct sway_container *container, void *data), void *data);
 
+bool container_has_anscestor(struct sway_container *descendant,
+		struct sway_container *anscestor);
+
 #endif
-- 
cgit v1.2.3


From 49379dd0fc0758f89d7f4fa4fb5b08c7f4c26ae6 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Fri, 30 Mar 2018 11:58:17 -0400
Subject: Fix workspace deletion edge cases

---
 include/sway/tree/container.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 24e8468e..6aa66da0 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -104,7 +104,7 @@ struct sway_container *container_workspace_destroy(
 
 struct sway_container *container_view_destroy(struct sway_container *view);
 
-void container_destroy(struct sway_container *cont);
+struct sway_container *container_destroy(struct sway_container *cont);
 
 struct sway_container *container_set_layout(struct sway_container *container,
 		enum sway_container_layout layout);
-- 
cgit v1.2.3


From 7706d83160267be61accb1b6f7bdc2f43299cae7 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sat, 31 Mar 2018 00:44:17 -0400
Subject: basic split containers

---
 include/sway/tree/container.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 6aa66da0..46f1c5ab 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -87,6 +87,8 @@ struct sway_container {
 	} events;
 };
 
+struct sway_container *container_create(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);
-- 
cgit v1.2.3


From 6f7b33e6919b2a8467ea1638ee56ac0232408793 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sat, 31 Mar 2018 15:22:10 -0400
Subject: handle container destroy in the seat

---
 include/sway/tree/container.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 46f1c5ab..285f1011 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -150,4 +150,7 @@ void container_for_each_descendant_dfs(struct sway_container *container,
 bool container_has_anscestor(struct sway_container *descendant,
 		struct sway_container *anscestor);
 
+bool container_has_child(struct sway_container *con,
+		struct sway_container *child);
+
 #endif
-- 
cgit v1.2.3


From b2c2ee693b6f1cdaeb204a1469c0fa1b775a498c Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Sat, 31 Mar 2018 17:49:40 -0400
Subject: Introduce common functions to create, map, unmap, destroy views

---
 include/sway/tree/container.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 6aa66da0..d707df17 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -70,9 +70,8 @@ struct sway_container {
 	enum sway_container_layout prev_layout;
 	enum sway_container_layout workspace_layout;
 
-	// TODO convert to layout coordinates
+	// in output-local coordinates
 	double x, y;
-
 	// does not include borders or gaps.
 	double width, height;
 
-- 
cgit v1.2.3


From 81556f4b2aad49c21058d9cc9695195a12f0239b Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sat, 31 Mar 2018 20:52:34 -0400
Subject: add docstrings and todos

---
 include/sway/tree/container.h | 63 ++++++++++++++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 18 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 285f1011..f0e87fb5 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -87,37 +87,55 @@ struct sway_container {
 	} events;
 };
 
+// TODO make private and use the container-specific create functions
 struct sway_container *container_create(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.
+ */
+struct sway_container *container_container_create();
 
-struct sway_container *container_workspace_create(
-		struct sway_container *output, const char *name);
+/**
+ * Create a new output. Outputs are children of the root container and have no
+ * order in the tree structure.
+ */
+struct sway_container *container_output_create(struct sway_output *sway_output);
+
+/**
+ * Create a new workspace container. Workspaces are children of an output
+ * container and are ordered alphabetically by name.
+ */
+struct sway_container *container_workspace_create(struct sway_container *output, const char *name);
 
+/*
+ * Create a new view container. A view can be a child of a workspace container
+ * or a container container and are rendered in the order and structure of
+ * how they are attached to the tree.
+ */
+// TODO view containers should be created in a detached state.
 struct sway_container *container_view_create(
 		struct sway_container *sibling, struct sway_view *sway_view);
 
-struct sway_container *container_output_destroy(struct sway_container *output);
-
-struct sway_container *container_workspace_destroy(
-		struct sway_container *workspace);
+// TODO don't return the parent on destroy
+struct sway_container *container_destroy(struct sway_container *container);
 
-struct sway_container *container_view_destroy(struct sway_container *view);
-
-struct sway_container *container_destroy(struct sway_container *cont);
+struct sway_container *container_workspace_destroy(struct sway_container *container);
+struct sway_container *container_output_destroy(struct sway_container *container);
+struct sway_container *container_view_destroy(struct sway_container *container);
 
+// TODO move to layout.c
 struct sway_container *container_set_layout(struct sway_container *container,
 		enum sway_container_layout layout);
 
+// TODO rename to container_descendants_for_each()
 void container_descendants(struct sway_container *root,
 		enum sway_container_type type,
 		void (*func)(struct sway_container *item, void *data), void *data);
 
 /**
- * Finds a container based on test criteria. Returns the first container that
- * passes the test.
+ * Search a container's descendants a container based on test criteria. Returns
+ * the first container that passes the test.
  */
 struct sway_container *container_find(struct sway_container *container,
 		bool (*test)(struct sway_container *view, void *data), void *data);
@@ -125,18 +143,21 @@ struct sway_container *container_find(struct sway_container *container,
 /**
  * Finds a parent container with the given struct sway_containerype.
  */
+// TODO rename to container_parent_of_type()
 struct sway_container *container_parent(struct sway_container *container,
 		enum sway_container_type type);
 
 /**
- * Find a container at the given coordinates.
+ * Find a container at the given coordinates. Returns the the surface and
+ * surface-local coordinates of the given layout coordinates if the container
+ * is a view and the view contains a surface at those coordinates.
  */
-struct sway_container *container_at(struct sway_container *parent,
+struct sway_container *container_at(struct sway_container *container,
 		double lx, double ly, struct wlr_surface **surface,
 		double *sx, double *sy);
 
 /**
- * Apply the function for each child of the container breadth first.
+ * Apply the function for each descendant of the container breadth first.
  */
 void container_for_each_descendant_bfs(struct sway_container *container,
 		void (*f)(struct sway_container *container, void *data), void *data);
@@ -147,9 +168,15 @@ void container_for_each_descendant_bfs(struct sway_container *container,
 void container_for_each_descendant_dfs(struct sway_container *container,
 		void (*f)(struct sway_container *container, void *data), void *data);
 
-bool container_has_anscestor(struct sway_container *descendant,
+/**
+ * Returns true if the given container is an ancestor of this container.
+ */
+bool container_has_anscestor(struct sway_container *container,
 		struct sway_container *anscestor);
 
+/**
+ * Returns true if the given container is a child descendant of this container.
+ */
 bool container_has_child(struct sway_container *con,
 		struct sway_container *child);
 
-- 
cgit v1.2.3


From b2d871cfe215a82266d01847f4787bbcf8c721c9 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sat, 31 Mar 2018 21:21:26 -0400
Subject: Partially implement move command

Works:

- move [container|window] to workspace <name>
    - Note, this should be able to move C_CONTAINER but this is untested
- move [workspace] to output [left|right|up|down|<name>]

Not implemented yet:

- move [left|right|up|down]
- move scratchpad
- move position
---
 include/sway/tree/container.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 6aa66da0..aff2e58e 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -84,9 +84,14 @@ 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;
 };
 
+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);
-- 
cgit v1.2.3


From 2f64ce86c47efb2ee4c0e3a3c2b31307d21404d9 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Mon, 2 Apr 2018 14:35:43 -0400
Subject: Xwayland unmanaged views aren't views anymore

---
 include/sway/tree/container.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index d707df17..423c0a22 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -70,7 +70,9 @@ struct sway_container {
 	enum sway_container_layout prev_layout;
 	enum sway_container_layout workspace_layout;
 
-	// in output-local coordinates
+	// For C_ROOT, this has no meaning
+	// For C_OUTPUT, this is the output position in layout coordinates
+	// For other types, this is the position in output-local coordinates
 	double x, y;
 	// does not include borders or gaps.
 	double width, height;
-- 
cgit v1.2.3


From 2c165e1288cbb60f5e677595e35f58a9c56c7010 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Mon, 2 Apr 2018 21:01:33 -0400
Subject: fix more close segfaults

---
 include/sway/tree/container.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 464f80c4..5d15f12b 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -134,6 +134,8 @@ struct sway_container *container_workspace_destroy(struct sway_container *contai
 struct sway_container *container_output_destroy(struct sway_container *container);
 struct sway_container *container_view_destroy(struct sway_container *container);
 
+struct sway_container *container_close(struct sway_container *container);
+
 // TODO move to layout.c
 struct sway_container *container_set_layout(struct sway_container *container,
 		enum sway_container_layout layout);
-- 
cgit v1.2.3


From 2992b72d61933568476e2bf4baf573e714f9ed40 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Mon, 2 Apr 2018 22:37:21 -0400
Subject: change reap container approach

---
 include/sway/tree/container.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 5d15f12b..1286316a 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -128,11 +128,11 @@ struct sway_container *container_view_create(
 		struct sway_container *sibling, struct sway_view *sway_view);
 
 // TODO don't return the parent on destroy
-struct sway_container *container_destroy(struct sway_container *container);
+void container_destroy(struct sway_container *container);
 
 struct sway_container *container_workspace_destroy(struct sway_container *container);
 struct sway_container *container_output_destroy(struct sway_container *container);
-struct sway_container *container_view_destroy(struct sway_container *container);
+void container_view_destroy(struct sway_container *container);
 
 struct sway_container *container_close(struct sway_container *container);
 
-- 
cgit v1.2.3


From b4c5f79725142c78a398a22981392d645bc9d2e9 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Tue, 3 Apr 2018 12:25:19 -0400
Subject: move view and workspace destructors to container.c

---
 include/sway/tree/container.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 1286316a..278505ce 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -128,11 +128,12 @@ struct sway_container *container_view_create(
 		struct sway_container *sibling, struct sway_view *sway_view);
 
 // TODO don't return the parent on destroy
-void container_destroy(struct sway_container *container);
+struct sway_container *container_destroy(struct sway_container *container);
+
+// TODO make me private
+struct sway_container *container_finish(struct sway_container *cont);
 
-struct sway_container *container_workspace_destroy(struct sway_container *container);
 struct sway_container *container_output_destroy(struct sway_container *container);
-void container_view_destroy(struct sway_container *container);
 
 struct sway_container *container_close(struct sway_container *container);
 
-- 
cgit v1.2.3


From 09d448ea2df60b7e4504b1ec4728e7f1df0244b7 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Tue, 3 Apr 2018 12:34:01 -0400
Subject: unify container destroy functions

---
 include/sway/tree/container.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 278505ce..c6393dc0 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -133,8 +133,6 @@ struct sway_container *container_destroy(struct sway_container *container);
 // TODO make me private
 struct sway_container *container_finish(struct sway_container *cont);
 
-struct sway_container *container_output_destroy(struct sway_container *container);
-
 struct sway_container *container_close(struct sway_container *container);
 
 // TODO move to layout.c
-- 
cgit v1.2.3


From fcbcbf34adbcfbfc4107c5e0050639828265e122 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Tue, 3 Apr 2018 13:10:51 -0400
Subject: make container_finish private

---
 include/sway/tree/container.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index c6393dc0..88ca67e9 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -130,9 +130,6 @@ struct sway_container *container_view_create(
 // TODO don't return the parent on destroy
 struct sway_container *container_destroy(struct sway_container *container);
 
-// TODO make me private
-struct sway_container *container_finish(struct sway_container *cont);
-
 struct sway_container *container_close(struct sway_container *container);
 
 // TODO move to layout.c
-- 
cgit v1.2.3


From 065887bb7b25c1cf7d39459c79387a24e600085f Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Tue, 3 Apr 2018 13:16:23 -0400
Subject: move container_set_layout to layout.h

---
 include/sway/tree/container.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 88ca67e9..23014dbe 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -132,10 +132,6 @@ struct sway_container *container_destroy(struct sway_container *container);
 
 struct sway_container *container_close(struct sway_container *container);
 
-// TODO move to layout.c
-struct sway_container *container_set_layout(struct sway_container *container,
-		enum sway_container_layout layout);
-
 // TODO rename to container_descendants_for_each()
 void container_descendants(struct sway_container *root,
 		enum sway_container_type type,
-- 
cgit v1.2.3


From eca4468c2cacd87677f7f5831d8a74f8d811d318 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Tue, 3 Apr 2018 17:06:57 -0400
Subject: fix old todos

---
 include/sway/tree/container.h | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 23014dbe..f36b4bd1 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -91,12 +91,10 @@ struct sway_container {
 	} 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);
 
@@ -123,16 +121,13 @@ struct sway_container *container_workspace_create(struct sway_container *output,
  * or a container container and are rendered in the order and structure of
  * how they are attached to the tree.
  */
-// TODO view containers should be created in a detached state.
 struct sway_container *container_view_create(
 		struct sway_container *sibling, struct sway_view *sway_view);
 
-// TODO don't return the parent on destroy
 struct sway_container *container_destroy(struct sway_container *container);
 
 struct sway_container *container_close(struct sway_container *container);
 
-// TODO rename to container_descendants_for_each()
 void container_descendants(struct sway_container *root,
 		enum sway_container_type type,
 		void (*func)(struct sway_container *item, void *data), void *data);
@@ -147,7 +142,6 @@ struct sway_container *container_find(struct sway_container *container,
 /**
  * Finds a parent container with the given struct sway_containerype.
  */
-// TODO rename to container_parent_of_type()
 struct sway_container *container_parent(struct sway_container *container,
 		enum sway_container_type type);
 
-- 
cgit v1.2.3


From a001890fb8a9fc8c7f0b8eac03ca5912be2de479 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Tue, 3 Apr 2018 19:52:17 -0400
Subject: move workspace create to workspace.c

---
 include/sway/tree/container.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index f36b4bd1..277165ea 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -95,7 +95,7 @@ struct sway_container *container_create(enum sway_container_type type);
 
 const char *container_type_to_str(enum sway_container_type type);
 
-struct sway_container *container_output_create(
+struct sway_container *output_create(
 		struct sway_output *sway_output);
 
 /**
@@ -108,13 +108,13 @@ struct sway_container *container_container_create();
  * Create a new output. Outputs are children of the root container and have no
  * order in the tree structure.
  */
-struct sway_container *container_output_create(struct sway_output *sway_output);
+struct sway_container *output_create(struct sway_output *sway_output);
 
 /**
  * Create a new workspace container. Workspaces are children of an output
  * container and are ordered alphabetically by name.
  */
-struct sway_container *container_workspace_create(struct sway_container *output, const char *name);
+struct sway_container *workspace_create(struct sway_container *output, const char *name);
 
 /*
  * Create a new view container. A view can be a child of a workspace container
@@ -178,4 +178,6 @@ bool container_has_anscestor(struct sway_container *container,
 bool container_has_child(struct sway_container *con,
 		struct sway_container *child);
 
+void container_create_notify(struct sway_container *container);
+
 #endif
-- 
cgit v1.2.3


From fc9398a42e1dfc15bbb8490c049981034abb4926 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Tue, 3 Apr 2018 00:47:45 -0400
Subject: Implement opacity command

---
 include/sway/tree/container.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 277165ea..3a3a9429 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -83,6 +83,8 @@ struct sway_container {
 
 	list_t *marks; // list of char*
 
+	float alpha;
+
 	struct {
 		struct wl_signal destroy;
 		// Raised after the tree updates, but before arrange_windows
-- 
cgit v1.2.3


From 076bedb85eface4a6c41a0e99059c89186bdb275 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Thu, 5 Apr 2018 18:31:19 -0400
Subject: Add container_damage_whole

---
 include/sway/tree/container.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 3a3a9429..7acb607b 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -97,8 +97,7 @@ struct sway_container *container_create(enum sway_container_type type);
 
 const char *container_type_to_str(enum sway_container_type type);
 
-struct sway_container *output_create(
-		struct sway_output *sway_output);
+struct sway_container *output_create(struct sway_output *sway_output);
 
 /**
  * Create a new container container. A container container can be a a child of
@@ -116,7 +115,8 @@ struct sway_container *output_create(struct sway_output *sway_output);
  * Create a new workspace container. Workspaces are children of an output
  * container and are ordered alphabetically by name.
  */
-struct sway_container *workspace_create(struct sway_container *output, const char *name);
+struct sway_container *workspace_create(struct sway_container *output,
+		const char *name);
 
 /*
  * Create a new view container. A view can be a child of a workspace container
@@ -182,4 +182,6 @@ bool container_has_child(struct sway_container *con,
 
 void container_create_notify(struct sway_container *container);
 
+void container_damage_whole(struct sway_container *container);
+
 #endif
-- 
cgit v1.2.3


From c2b1beef153828514707ff6e40269dc1ed7fb790 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Thu, 5 Apr 2018 23:22:08 -0400
Subject: Remove L_TYPES

---
 include/sway/tree/container.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 7acb607b..4c60530f 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -24,6 +24,7 @@ enum sway_container_type {
 	C_CONTAINER,
 	C_VIEW,
 
+	// Keep last
 	C_TYPES,
 };
 
@@ -34,9 +35,6 @@ enum sway_container_layout {
 	L_STACKED,
 	L_TABBED,
 	L_FLOATING,
-
-	// Keep last
-	L_LAYOUTS,
 };
 
 enum sway_container_border {
-- 
cgit v1.2.3


From 57954a2b24f1e211c3b8811fb898ef4e076cb098 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Mon, 2 Apr 2018 13:49:37 -0400
Subject: Implement move [left|right|up|down]

The exact semantics of this command are complicated. I'll describe each
test scenario as s-expressions. Everything assumes L_HORIZ if not
specified, but if you rotate everything 90 degrees the same test cases
hold.

```
(container (view a) (view b focus) (view c))
-> move left
(container (view b focus) (view a) (view c))

(container (view a) (view b focus) (view c))
-> move right
(container (view a) (view c) (view b focus))

(container L_VERT (view a))
(container L_HORIZ
  (view b) (view c focus))
-> move up
(container L_VERT
  (view a) (view c focus))
(container L_HORIZ (view b))

(workspace
  (view a) (view b focus) (view c))
-> move up
(workspace [split direction flipped]
  (view b focus)
  (container (view a) (view c)))

(workspace
  (view a) (view b focus) (view c))
-> move down
(workspace [split direction flipped]
  (container (view a) (view c))
  (view b focus)))

Note: outputs use wlr_output_layout instead of assuming that i+/-1 is
the next output in the move direction.

(root
  (output X11-1
    (workspace 1))
  (output X11-2
    (workspace 1 (view a focus) (view b)))))
-> move left
(root
  (output X11-1
    (workspace 1 (view a focus)))
  (output X11-2
    (workspace 1 (view b)))))

(root
  (output X11-1
    (workspace 1
      (container (view a) (view b)))
  (output X11-2
    (workspace 1 (view c focus)))))
-> move left
(root
  (output X11-1
    (workspace 1
      (container (view a) (view b))
      (view c focus)))
  (output X11-2
    (workspace 1)))
```
---
 include/sway/tree/container.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'include/sway/tree/container.h')

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 4c60530f..2a8b8aba 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -182,4 +182,11 @@ void container_create_notify(struct sway_container *container);
 
 void container_damage_whole(struct sway_container *container);
 
+bool container_reap_empty(struct sway_container *con);
+
+struct sway_container *container_reap_empty_recursive(
+		struct sway_container *con);
+
+struct sway_container *container_flatten(struct sway_container *container);
+
 #endif
-- 
cgit v1.2.3