4 files changed, 23 insertions, 2 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 3bb497db..6aa66da0 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);
 
+struct sway_container *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
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h
index ad52bdb0..0a904c4b 100644
--- a/include/sway/tree/layout.h
+++ b/include/sway/tree/layout.h
@@ -39,6 +39,11 @@ struct sway_container *container_add_sibling(struct sway_container *parent,
 
 struct sway_container *container_remove_child(struct sway_container *child);
 
+struct sway_container *container_reap_empty(struct sway_container *container);
+
+void container_move_to(struct sway_container* container,
+		struct sway_container* destination);
+
 enum sway_container_layout container_get_default_layout(struct sway_container *output);
 
 void container_sort_workspaces(struct sway_container *output);
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index e5f53f4e..3965d2b7 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -15,6 +15,8 @@ struct sway_xdg_surface_v6 {
 	struct wl_listener request_move;
 	struct wl_listener request_resize;
 	struct wl_listener request_maximize;
+	struct wl_listener map;
+	struct wl_listener unmap;
 	struct wl_listener destroy;
 
 	int pending_width, pending_height;
@@ -28,8 +30,8 @@ struct sway_xwayland_surface {
 	struct wl_listener request_resize;
 	struct wl_listener request_maximize;
 	struct wl_listener request_configure;
-	struct wl_listener unmap_notify;
-	struct wl_listener map_notify;
+	struct wl_listener map;
+	struct wl_listener unmap;
 	struct wl_listener destroy;
 
 	int pending_width, pending_height;
@@ -113,4 +115,8 @@ void view_close(struct sway_view *view);
 
 void view_update_outputs(struct sway_view *view, const struct wlr_box *before);
 
+void view_damage_whole(struct sway_view *view);
+
+void view_damage_from(struct sway_view *view);
+
 #endif
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h
index d73b29c1..4e4c3450 100644
--- a/include/sway/tree/workspace.h
+++ b/include/sway/tree/workspace.h
@@ -23,4 +23,6 @@ struct sway_container *workspace_output_prev(struct sway_container *current);
 
 struct sway_container *workspace_prev(struct sway_container *current);
 
+bool workspace_is_visible(struct sway_container *ws);
+
 #endif