Preparations for overlays

src/config/handler.rs

@@ -28,7 +28,7 @@ use {
         tagged_acceptor::TaggedAcceptorError,
         theme::{ThemeColor, ThemeSized},
         tree::{
-            ContainerSplit, Node, OutputNode, OutputNodeOrPersistent, TearingMode, TileState,
+            ContainerSplit, OutputNode, OutputNodeOrPersistent, TearingMode, TileState,
             ToplevelData, ToplevelIdentifier, ToplevelNode, VrrMode, WorkspaceNode, WsMoveConfig,
             move_ws_to_output, toplevel_create_split, toplevel_parent_container,
             toplevel_set_floating, toplevel_set_workspace,
@@ -1155,7 +1155,7 @@ impl ConfigProxyHandler {
                 },
             );
             if let Some(seat) = &seat {
-                ws.node_do_focus(seat, crate::tree::Direction::Unspecified);
+                ws.do_focus(seat, crate::tree::Direction::Unspecified);
             }
         } else {
             self.state.show_workspace2(seat.as_ref(), &output, &ws);

src/ifs/jay_tree_query.rs

@@ -413,7 +413,10 @@ impl tree::NodeVisitorBase for Visitor<'_> {
         s.send_start(TREE_TY_WORKSPACE);
         s.send_node_position(&**node);
         s.send_workspace_name(&node.name);
-        s.send_output_name(&node.output.get().global.connector.name);
+        let o = node.output.get();
+        if !o.is_dummy {
+            s.send_output_name(&o.global.connector.name);
+        }
         for stacked in node.stacked.iter() {
             if stacked.stacked_is_xdg_popup() {
                 continue;

src/state.rs

@@ -1036,7 +1036,7 @@ impl State {
         }
         let did_change = output.show_workspace(&ws);
         if !pinned_is_focused && let Some(seat) = seat {
-            ws.clone().node_do_focus(seat, Direction::Unspecified);
+            ws.do_focus(seat, Direction::Unspecified);
         }
         if !did_change {
             return;

src/tree/container.rs

@@ -1102,7 +1102,7 @@ impl ContainerNode {
             }
             if move_foci {
                 for seat in foci {
-                    ws.clone().node_do_focus(&seat, Direction::Unspecified);
+                    ws.do_focus(&seat, Direction::Unspecified);
                 }
             }
         };

src/tree/output.rs

@@ -747,7 +747,7 @@ impl OutputNode {
         }
         ws.change_extents(&self.workspace_rect.get(), self);
         for seat in seats {
-            ws.clone().node_do_focus(&seat, Direction::Unspecified);
+            ws.do_focus(&seat, Direction::Unspecified);
         }
         if self.node_visible() {
             self.state.damage(self.global.pos.get());
@@ -1690,7 +1690,7 @@ impl Node for OutputNode {
             return;
         }
         if let Some(ws) = self.workspace() {
-            ws.node_do_focus(seat, direction);
+            ws.do_focus(seat, direction);
         }
     }
 

src/tree/toplevel.rs

@@ -1100,7 +1100,7 @@ pub fn toplevel_set_workspace(state: &Rc<State>, tl: Rc<dyn ToplevelNode>, ws: &
     cn.cnode_remove_child2(&*tl, true);
     if !ws.visible.get() {
         for focus in kb_foci {
-            old_ws.clone().node_do_focus(&focus, Direction::Unspecified);
+            old_ws.do_focus(&focus, Direction::Unspecified);
         }
     }
     if tl.tl_data().parent_is_float.get() {

src/tree/workspace.rs

@@ -114,6 +114,7 @@ impl WorkspaceNode {
     }
 
     pub fn clear(&self) {
+        self.seat_state.destroy_node(self);
         self.container.set(None);
         *self.output_link.borrow_mut() = None;
         self.fullscreen.set(None);
@@ -358,6 +359,27 @@ impl WorkspaceNode {
             collect_kb_foci2(node.deref().clone(), seats);
         }
     }
+
+    pub fn do_focus(self: &Rc<Self>, seat: &Rc<WlSeatGlobal>, direction: Direction) {
+        if let Some(fs) = self.fullscreen.get() {
+            fs.node_do_focus(seat, direction);
+        } else if self.stacked.is_not_empty()
+            && let Some(last) = seat.get_last_focus_on_workspace(&self)
+        {
+            seat.focus_node(last);
+        } else if let Some(container) = self.container.get() {
+            container.node_do_focus(seat, direction);
+        } else if let Some(child) = self
+            .stacked
+            .rev_iter()
+            .filter_map(|node| (*node).clone().node_into_float())
+            .find_map(|float| float.child.get())
+        {
+            child.node_do_focus(seat, direction);
+        } else {
+            seat.focus_node(self.clone());
+        }
+    }
 }
 
 impl Node for WorkspaceNode {
@@ -407,24 +429,7 @@ impl Node for WorkspaceNode {
     }
 
     fn node_do_focus(self: Rc<Self>, seat: &Rc<WlSeatGlobal>, direction: Direction) {
-        if let Some(fs) = self.fullscreen.get() {
-            fs.node_do_focus(seat, direction);
-        } else if self.stacked.is_not_empty()
-            && let Some(last) = seat.get_last_focus_on_workspace(&self)
-        {
-            seat.focus_node(last);
-        } else if let Some(container) = self.container.get() {
-            container.node_do_focus(seat, direction);
-        } else if let Some(child) = self
-            .stacked
-            .rev_iter()
-            .filter_map(|node| (*node).clone().node_into_float())
-            .find_map(|float| float.child.get())
-        {
-            child.node_do_focus(seat, direction);
-        } else {
-            seat.focus_node(self);
-        }
+        self.do_focus(seat, direction);
     }
 
     fn node_active_changed(&self, _active: bool) {