1 files changed, 37 insertions, 21 deletions

diff --git a/sway/tree/container.c b/sway/tree/container.c
index 58852717..6d52c38c 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -159,14 +159,6 @@ void container_free(struct sway_container *cont) {
         wlr_texture_destroy(cont->title_focused_inactive);
         wlr_texture_destroy(cont->title_unfocused);
         wlr_texture_destroy(cont->title_urgent);
-
-        for (int i = 0; i < server.destroying_containers->length; ++i) {
-                if (server.destroying_containers->items[i] == cont) {
-                        list_del(server.destroying_containers, i);
-                        break;
-                }
-        }
-
         list_free(cont->instructions);
         list_free(cont->children);
         list_free(cont->current.children);
@@ -325,7 +317,7 @@ static struct sway_container *container_destroy_noreaping(
         }
 
         con->destroying = true;
-        list_add(server.destroying_containers, con);
+        container_set_dirty(con);
 
         if (!con->parent) {
                 return NULL;
@@ -682,16 +674,23 @@ struct sway_container *floating_container_at(double lx, double ly,
 void container_for_each_descendant_dfs(struct sway_container *container,
                 void (*f)(struct sway_container *container, void *data),
                 void *data) {
-        if (container) {
-                if (container->children)  {
-                        for (int i = 0; i < container->children->length; ++i) {
-                                struct sway_container *child =
-                                        container->children->items[i];
-                                container_for_each_descendant_dfs(child, f, data);
-                        }
+        if (!container) {
+                return;
+        }
+        if (container->children)  {
+                for (int i = 0; i < container->children->length; ++i) {
+                        struct sway_container *child = container->children->items[i];
+                        container_for_each_descendant_dfs(child, f, data);
+                }
+        }
+        if (container->type == C_WORKSPACE)  {
+                struct sway_container *floating = container->sway_workspace->floating;
+                for (int i = 0; i < floating->children->length; ++i) {
+                        struct sway_container *child = floating->children->items[i];
+                        container_for_each_descendant_dfs(child, f, data);
                 }
-                f(container, data);
         }
+        f(container, data);
 }
 
 void container_for_each_descendant_bfs(struct sway_container *con,
@@ -1069,9 +1068,26 @@ void container_floating_move_to(struct sway_container *con,
         if (old_workspace != new_workspace) {
                 container_remove_child(con);
                 container_add_child(new_workspace->sway_workspace->floating, con);
-                struct sway_transaction *transaction = transaction_create();
-                arrange_windows(old_workspace, transaction);
-                arrange_windows(new_workspace, transaction);
-                transaction_commit(transaction);
+                arrange_windows(old_workspace);
+                arrange_windows(new_workspace);
+                workspace_detect_urgent(old_workspace);
+                workspace_detect_urgent(new_workspace);
         }
 }
+
+void container_set_dirty(struct sway_container *container) {
+        if (container->dirty) {
+                return;
+        }
+        container->dirty = true;
+        list_add(server.dirty_containers, container);
+}
+
+static bool find_urgent_iterator(struct sway_container *con,
+                void *data) {
+        return con->type == C_VIEW && view_is_urgent(con->sway_view);
+}
+
+bool container_has_urgent_child(struct sway_container *container) {
+        return container_find(container, find_urgent_iterator, NULL);
+}