autocommit 2022-02-24 18:24:14 CET

src/tree/mod.rs

@@ -3,6 +3,7 @@ use crate::client::{Client, ClientId};
 use crate::cursor::KnownCursor;
 use crate::fixed::Fixed;
 use crate::ifs::wl_seat::{Dnd, NodeSeatState, WlSeatGlobal};
+use crate::ifs::wl_surface::xwindow::Xwindow;
 use crate::ifs::wl_surface::WlSurface;
 use crate::rect::Rect;
 use crate::render::Renderer;
@@ -23,9 +24,9 @@ pub use workspace::*;
 mod container;
 mod float;
 mod output;
+pub mod toplevel;
 pub mod walker;
 mod workspace;
-pub mod toplevel;
 
 pub struct NodeIds {
     next: NumCell<u32>,
@@ -337,6 +338,7 @@ pub struct DisplayNode {
     pub id: NodeId,
     pub outputs: CopyHashMap<OutputId, Rc<OutputNode>>,
     pub stacked: LinkedList<Rc<dyn Node>>,
+    pub xstacked: LinkedList<Rc<Xwindow>>,
     pub seat_state: NodeSeatState,
 }
 
@@ -346,6 +348,7 @@ impl DisplayNode {
             id,
             outputs: Default::default(),
             stacked: Default::default(),
+            xstacked: Default::default(),
             seat_state: Default::default(),
         }
     }

src/tree/toplevel.rs

@@ -1,8 +1,8 @@
-use std::rc::Rc;
 use crate::ifs::wl_seat::WlSeatGlobal;
 use crate::ifs::wl_surface::WlSurface;
 use crate::tree::Node;
 use crate::utils::linkedlist::LinkedNode;
+use std::rc::Rc;
 
 pub trait ToplevelNode: Node {
     fn parent(&self) -> Option<Rc<dyn Node>>;

src/tree/walker.rs

@@ -1,11 +1,11 @@
 use crate::ifs::wl_surface::xdg_surface::xdg_popup::XdgPopup;
 use crate::ifs::wl_surface::xdg_surface::xdg_toplevel::XdgToplevel;
+use crate::ifs::wl_surface::xwindow::Xwindow;
 use crate::ifs::wl_surface::zwlr_layer_surface_v1::ZwlrLayerSurfaceV1;
 use crate::ifs::wl_surface::WlSurface;
 use crate::tree::{ContainerNode, FloatNode, Node, OutputNode, WorkspaceNode};
 use crate::DisplayNode;
 use std::rc::Rc;
-use crate::ifs::wl_surface::xwindow::Xwindow;
 
 pub trait NodeVisitorBase: Sized {
     fn visit_surface(&mut self, node: &Rc<WlSurface>) {