kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

tree: add Node::node_layer

Browse source
This commit is contained in:
Julian Orth 2025-07-19 21:57:47 +02:00
parent a5e8b39e4f
commit dbc954dded
19 changed files with 294 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/ifs/wl_surface.rs
View file

@ -76,8 +76,8 @@ use {
renderer::Renderer,
tree::{
BeforeLatchListener, BeforeLatchResult, ContainerNode, FindTreeResult, FoundNode,
LatchListener, Node, NodeId, NodeLocation, NodeVisitor, NodeVisitorBase, OutputNode,
PlaceholderNode, PresentationListener, ToplevelNode, VblankListener,
LatchListener, Node, NodeId, NodeLayerLink, NodeLocation, NodeVisitor, NodeVisitorBase,
OutputNode, PlaceholderNode, PresentationListener, ToplevelNode, VblankListener,
},
utils::{
cell_ext::CellExt, clonecell::CloneCell, copyhashmap::CopyHashMap,
@ -372,6 +372,8 @@ enum CommitAction {
}
trait SurfaceExt {
fn node_layer(&self) -> NodeLayerLink;
fn commit_requested(self: Rc<Self>, pending: &mut Box<PendingState>) -> CommitAction {
let _ = pending;
CommitAction::ContinueCommit
@ -444,6 +446,10 @@ trait SurfaceExt {
pub struct NoneSurfaceExt;
impl SurfaceExt for NoneSurfaceExt {
fn node_layer(&self) -> NodeLayerLink {
NodeLayerLink::Display
}
fn is_some(&self) -> bool {
false
}
@ -1796,6 +1802,10 @@ impl Node for WlSurface {
Some(self.location.get())
}
fn node_layer(&self) -> NodeLayerLink {
self.ext.get().node_layer()
}
fn node_active_changed(&self, active: bool) {
if let Some(tl) = self.toplevel.get() {
tl.tl_surface_active_changed(active);

12
src/ifs/wl_surface/ext_session_lock_surface_v1.rs
View file

@ -11,8 +11,8 @@ use {
object::{Object, Version},
rect::Rect,
tree::{
FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, NodeLocation, NodeVisitor,
OutputNode,
FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, NodeLayerLink, NodeLocation,
NodeVisitor, OutputNode,
},
utils::numcell::NumCell,
wire::{ExtSessionLockSurfaceV1Id, WlSurfaceId, ext_session_lock_surface_v1::*},
@ -95,6 +95,10 @@ impl ExtSessionLockSurfaceV1 {
}
impl SurfaceExt for ExtSessionLockSurfaceV1 {
fn node_layer(&self) -> NodeLayerLink {
NodeLayerLink::Lock
}
fn extents_changed(&self) {
self.client.state.tree_changed();
}
@ -138,6 +142,10 @@ impl Node for ExtSessionLockSurfaceV1 {
self.surface.node_location()
}
fn node_layer(&self) -> NodeLayerLink {
NodeLayerLink::Lock
}
fn node_find_tree_at(
&self,
x: i32,

21
src/ifs/wl_surface/tray.rs
View file

@ -11,8 +11,8 @@ use {
},
rect::Rect,
tree::{
FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, NodeLocation, NodeVisitor,
OutputNode, StackedNode,
FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, NodeLayerLink, NodeLocation,
NodeVisitor, OutputNode, StackedNode,
},
utils::{
copyhashmap::CopyHashMap,
@ -216,6 +216,13 @@ impl<T: TrayItem> XdgPopupParent for Popup<T> {
// nothing
}
fn node_layer(&self) -> NodeLayerLink {
let Some(link) = self.stack_link.borrow().as_ref().map(|w| w.to_ref()) else {
return NodeLayerLink::Display;
};
NodeLayerLink::Stacked(link)
}
fn tray_item(&self) -> Option<TrayItemId> {
Some(self.parent.data().tray_item_id)
}
@ -230,6 +237,10 @@ impl<T: TrayItem> XdgPopupParent for Popup<T> {
}
impl<T: TrayItem> SurfaceExt for T {
fn node_layer(&self) -> NodeLayerLink {
NodeLayerLink::Output
}
fn before_apply_commit(
self: Rc<Self>,
pending: &mut PendingState,
@ -308,6 +319,10 @@ impl<T: TrayItem> Node for T {
self.data().surface.node_location()
}
fn node_layer(&self) -> NodeLayerLink {
NodeLayerLink::Output
}
fn node_find_tree_at(
&self,
x: i32,
@ -384,7 +399,7 @@ fn get_popup<T: TrayItem>(
};
seat.add_tray_item_popup(item, &popup);
let stack = data.client.state.root.stacked.clone();
popup.xdg.set_popup_stack(&stack);
popup.xdg.set_popup_stack(&stack, false);
popup.xdg.set_output(&node);
let user = Rc::new(Popup {
parent: item.clone(),

6
src/ifs/wl_surface/wl_subsurface.rs
View file

@ -7,7 +7,7 @@ use {
},
leaks::Tracker,
object::{Object, Version},
tree::Node,
tree::{Node, NodeLayerLink},
utils::{
clonecell::CloneCell,
linkedlist::{LinkedNode, NodeRef},
@ -361,6 +361,10 @@ impl Object for WlSubsurface {
simple_add_obj!(WlSubsurface);
impl SurfaceExt for WlSubsurface {
fn node_layer(&self) -> NodeLayerLink {
self.parent.node_layer()
}
fn commit_requested(self: Rc<Self>, pending: &mut Box<PendingState>) -> CommitAction {
if self.sync() {
let mut parent_pending = self.pending();

9
src/ifs/wl_surface/x_surface.rs
View file

@ -5,7 +5,7 @@ use {
x_surface::{xwayland_surface_v1::XwaylandSurfaceV1, xwindow::Xwindow},
},
leaks::Tracker,
tree::{Node, ToplevelNode, ToplevelNodeBase},
tree::{Node, NodeLayerLink, ToplevelNode, ToplevelNodeBase},
utils::clonecell::CloneCell,
xwayland::XWaylandEvent,
},
@ -23,6 +23,13 @@ pub struct XSurface {
}
impl SurfaceExt for XSurface {
fn node_layer(&self) -> NodeLayerLink {
let Some(win) = self.xwindow.get() else {
return NodeLayerLink::Display;
};
win.node_layer()
}
fn after_apply_commit(self: Rc<Self>) {
if let Some(xwindow) = self.xwindow.get() {
xwindow.map_status_changed();

11
src/ifs/wl_surface/x_surface/xwindow.rs
View file

@ -12,8 +12,8 @@ use {
state::State,
tree::{
ContainerSplit, Direction, FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId,
NodeLocation, NodeVisitor, OutputNode, StackedNode, TileDragDestination, ToplevelData,
ToplevelNode, ToplevelNodeBase, ToplevelType, WorkspaceNode,
NodeLayerLink, NodeLocation, NodeVisitor, OutputNode, StackedNode, TileDragDestination,
ToplevelData, ToplevelNode, ToplevelNodeBase, ToplevelType, WorkspaceNode,
default_tile_drag_destination,
},
utils::{clonecell::CloneCell, copyhashmap::CopyHashMap, linkedlist::LinkedNode},
@ -375,6 +375,13 @@ impl Node for Xwindow {
self.x.surface.node_location()
}
fn node_layer(&self) -> NodeLayerLink {
if let Some(link) = self.display_link.borrow().as_ref() {
return NodeLayerLink::Stacked(link.to_ref());
}
self.toplevel_data.node_layer()
}
fn node_do_focus(self: Rc<Self>, seat: &Rc<WlSeatGlobal>, _direction: Direction) {
seat.focus_toplevel(self.clone());
}

38
src/ifs/wl_surface/xdg_surface.rs
View file

@ -19,7 +19,8 @@ use {
object::Object,
rect::Rect,
tree::{
FindTreeResult, FoundNode, Node, NodeLocation, OutputNode, StackedNode, WorkspaceNode,
FindTreeResult, FoundNode, Node, NodeLayerLink, NodeLocation, OutputNode, StackedNode,
WorkspaceNode,
},
utils::{
clonecell::CloneCell,
@ -75,6 +76,7 @@ pub struct XdgSurface {
pub absolute_desired_extents: Cell<Rect>,
ext: CloneCell<Option<Rc<dyn XdgSurfaceExt>>>,
popup_display_stack: CloneCell<Rc<LinkedList<Rc<dyn StackedNode>>>>,
is_above_layers: Cell<bool>,
popups: CopyHashMap<XdgPopupId, Rc<Popup>>,
pub workspace: CloneCell<Option<Rc<WorkspaceNode>>>,
pub tracker: Tracker<Self>,
@ -152,6 +154,16 @@ impl XdgPopupParent for Popup {
}
}
fn node_layer(&self) -> NodeLayerLink {
let Some(link) = self.display_link.borrow().as_ref().map(|w| w.to_ref()) else {
return NodeLayerLink::Display;
};
match self.popup.xdg.is_above_layers.get() {
true => NodeLayerLink::StackedAboveLayers(link),
false => NodeLayerLink::Stacked(link),
}
}
fn tray_item(&self) -> Option<TrayItemId> {
self.parent.clone().tray_item()
}
@ -201,6 +213,8 @@ pub trait XdgSurfaceExt: Debug {
}
fn make_visible(self: Rc<Self>);
fn node_layer(&self) -> NodeLayerLink;
}
impl XdgSurface {
@ -217,6 +231,7 @@ impl XdgSurface {
absolute_desired_extents: Cell::new(Default::default()),
ext: Default::default(),
popup_display_stack: CloneCell::new(surface.client.state.root.stacked.clone()),
is_above_layers: Cell::new(false),
popups: Default::default(),
workspace: Default::default(),
tracker: Default::default(),
@ -331,7 +346,12 @@ impl XdgSurface {
})
}
pub fn set_popup_stack(&self, stack: &Rc<LinkedList<Rc<dyn StackedNode>>>) {
pub fn set_popup_stack(
&self,
stack: &Rc<LinkedList<Rc<dyn StackedNode>>>,
is_above_layers: bool,
) {
self.is_above_layers.set(is_above_layers);
let prev = self.popup_display_stack.set(stack.clone());
if rc_eq(&prev, stack) {
return;
@ -340,7 +360,7 @@ impl XdgSurface {
if let Some(dl) = &*popup.display_link.borrow() {
stack.add_last_existing(dl);
}
popup.popup.xdg.set_popup_stack(stack);
popup.popup.xdg.set_popup_stack(stack, is_above_layers);
}
}
@ -423,7 +443,10 @@ impl XdgSurfaceRequestHandler for XdgSurface {
workspace_link: Default::default(),
});
popup.parent.set(Some(user.clone()));
popup.xdg.set_popup_stack(&parent.popup_display_stack.get());
popup.xdg.set_popup_stack(
&parent.popup_display_stack.get(),
parent.is_above_layers.get(),
);
popup.xdg.set_output(&parent.surface.output.get());
parent.popups.set(req.id, user);
}
@ -526,6 +549,13 @@ impl Object for XdgSurface {
dedicated_add_obj!(XdgSurface, XdgSurfaceId, xdg_surfaces);
impl SurfaceExt for XdgSurface {
fn node_layer(&self) -> NodeLayerLink {
let Some(ext) = self.ext.get() else {
return NodeLayerLink::Display;
};
ext.node_layer()
}
fn before_apply_commit(
self: Rc<Self>,
pending: &mut PendingState,

16
src/ifs/wl_surface/xdg_surface/xdg_popup.rs
View file

@ -19,8 +19,8 @@ use {
rect::Rect,
renderer::Renderer,
tree::{
FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, NodeLocation, NodeVisitor,
OutputNode, StackedNode,
FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, NodeLayerLink, NodeLocation,
NodeVisitor, OutputNode, StackedNode,
},
utils::clonecell::CloneCell,
wire::{XdgPopupId, xdg_popup::*},
@ -46,6 +46,7 @@ pub trait XdgPopupParent {
fn post_commit(&self);
fn visible(&self) -> bool;
fn make_visible(self: Rc<Self>);
fn node_layer(&self) -> NodeLayerLink;
fn tray_item(&self) -> Option<TrayItemId> {
None
}
@ -324,6 +325,10 @@ impl Node for XdgPopup {
self.xdg.surface.node_location()
}
fn node_layer(&self) -> NodeLayerLink {
XdgSurfaceExt::node_layer(self)
}
fn node_find_tree_at(
&self,
x: i32,
@ -441,6 +446,13 @@ impl XdgSurfaceExt for XdgPopup {
fn make_visible(self: Rc<Self>) {
self.node_make_visible();
}
fn node_layer(&self) -> NodeLayerLink {
let Some(parent) = self.parent.get() else {
return NodeLayerLink::Display;
};
parent.node_layer()
}
}
#[derive(Debug, Error)]

14
src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs
View file

@ -27,9 +27,9 @@ use {
state::State,
tree::{
ContainerSplit, Direction, FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId,
NodeLocation, NodeVisitor, OutputNode, TileDragDestination, ToplevelData, ToplevelNode,
ToplevelNodeBase, ToplevelNodeId, ToplevelType, WorkspaceNode,
default_tile_drag_destination,
NodeLayerLink, NodeLocation, NodeVisitor, OutputNode, TileDragDestination,
ToplevelData, ToplevelNode, ToplevelNodeBase, ToplevelNodeId, ToplevelType,
WorkspaceNode, default_tile_drag_destination,
},
utils::{clonecell::CloneCell, hash_map_ext::HashMapExt},
wire::{XdgToplevelId, xdg_toplevel::*},
@ -577,6 +577,10 @@ impl Node for XdgToplevel {
self.xdg.surface.node_location()
}
fn node_layer(&self) -> NodeLayerLink {
self.toplevel_data.node_layer()
}
fn node_do_focus(self: Rc<Self>, seat: &Rc<WlSeatGlobal>, _direction: Direction) {
seat.focus_toplevel(self.clone());
}
@ -788,6 +792,10 @@ impl XdgSurfaceExt for XdgToplevel {
fn make_visible(self: Rc<Self>) {
self.node_make_visible();
}
fn node_layer(&self) -> NodeLayerLink {
self.toplevel_data.node_layer()
}
}
#[derive(Debug, Error)]

39
src/ifs/wl_surface/zwlr_layer_surface_v1.rs
View file

@ -15,8 +15,8 @@ use {
rect::Rect,
renderer::Renderer,
tree::{
FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, NodeLocation, NodeVisitor,
OutputNode, StackedNode,
FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, NodeLayerLink, NodeLocation,
NodeVisitor, OutputNode, StackedNode,
},
utils::{
bitflags::BitflagsExt,
@ -65,7 +65,7 @@ pub struct ZwlrLayerSurfaceV1 {
exclusive_zone: Cell<ExclusiveZone>,
margin: Cell<(i32, i32, i32, i32)>,
keyboard_interactivity: Cell<u32>,
link: Cell<Option<LinkedNode<Rc<Self>>>>,
link: RefCell<Option<LinkedNode<Rc<Self>>>>,
seat_state: NodeSeatState,
last_configure: Cell<(i32, i32)>,
exclusive_edge: Cell<Option<u32>>,
@ -171,7 +171,7 @@ impl ZwlrLayerSurfaceV1 {
exclusive_zone: Cell::new(ExclusiveZone::MoveSelf),
margin: Cell::new((0, 0, 0, 0)),
keyboard_interactivity: Cell::new(0),
link: Cell::new(None),
link: Default::default(),
seat_state: Default::default(),
last_configure: Default::default(),
exclusive_edge: Default::default(),
@ -291,7 +291,7 @@ impl ZwlrLayerSurfaceV1RequestHandler for ZwlrLayerSurfaceV1 {
return Err(ZwlrLayerSurfaceV1Error::PopupHasParent);
}
let stack = self.client.state.root.stacked_above_layers.clone();
popup.xdg.set_popup_stack(&stack);
popup.xdg.set_popup_stack(&stack, true);
let user = Rc::new(Popup {
parent: slf.clone(),
popup: popup.clone(),
@ -534,7 +534,7 @@ impl ZwlrLayerSurfaceV1 {
}
pub fn destroy_node(&self) {
self.link.set(None);
self.link.borrow_mut().take();
self.mapped.set(false);
self.surface.destroy_node();
self.seat_state.destroy_node(self);
@ -562,6 +562,18 @@ impl ZwlrLayerSurfaceV1 {
}
impl SurfaceExt for ZwlrLayerSurfaceV1 {
fn node_layer(&self) -> NodeLayerLink {
let Some(link) = self.link.borrow().as_ref().map(|l| l.to_ref()) else {
return NodeLayerLink::Display;
};
match self.layer.get() {
0 => NodeLayerLink::Layer0(link),
1 => NodeLayerLink::Layer1(link),
2 => NodeLayerLink::Layer2(link),
_ => NodeLayerLink::Layer3(link),
}
}
fn before_apply_commit(
self: Rc<Self>,
pending: &mut PendingState,
@ -587,7 +599,7 @@ impl SurfaceExt for ZwlrLayerSurfaceV1 {
}
} else if buffer_is_some {
let layer = &output.layers[self.layer.get() as usize];
self.link.set(Some(layer.add_last(self.clone())));
*self.link.borrow_mut() = Some(layer.add_last(self.clone()));
self.mapped.set(true);
self.compute_position();
self.update_exclusive_size();
@ -663,6 +675,10 @@ impl Node for ZwlrLayerSurfaceV1 {
self.surface.node_location()
}
fn node_layer(&self) -> NodeLayerLink {
SurfaceExt::node_layer(self)
}
fn node_find_tree_at(
&self,
x: i32,
@ -728,6 +744,13 @@ impl XdgPopupParent for Popup {
fn make_visible(self: Rc<Self>) {
// nothing
}
fn node_layer(&self) -> NodeLayerLink {
let Some(link) = self.stack_link.borrow().as_ref().map(|w| w.to_ref()) else {
return NodeLayerLink::Display;
};
NodeLayerLink::StackedAboveLayers(link)
}
}
object_base! {
@ -738,7 +761,7 @@ object_base! {
impl Object for ZwlrLayerSurfaceV1 {
fn break_loops(&self) {
self.destroy_node();
self.link.set(None);
self.link.borrow_mut().take();
}
}

5
src/ifs/wl_surface/zwp_input_popup_surface_v2.rs
View file

@ -9,6 +9,7 @@ use {
object::{Object, Version},
rect::Rect,
state::State,
tree::NodeLayerLink,
wire::{WlSurfaceId, ZwpInputPopupSurfaceV2Id, zwp_input_popup_surface_v2::*},
},
std::{cell::Cell, rc::Rc},
@ -27,6 +28,10 @@ pub struct ZwpInputPopupSurfaceV2 {
}
impl SurfaceExt for ZwpInputPopupSurfaceV2 {
fn node_layer(&self) -> NodeLayerLink {
NodeLayerLink::InputMethod
}
fn after_apply_commit(self: Rc<Self>) {
self.update_visible();
if self.surface.visible.get() {