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

tree: don't attach container node to parent during construction

Browse source
This commit is contained in:
Julian Orth 2024-02-21 13:31:54 +01:00
parent 7f37e107af
commit 0ab9ec3b75
4 changed files with 31 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ifs/wl_seat.rs
View file

@ -574,7 +574,7 @@ impl WlSeatGlobal {
_ => return, _ => return,
}; };
if let Some(pn) = pn.node_into_containing_node() { if let Some(pn) = pn.node_into_containing_node() {
let cn = ContainerNode::new(&self.state, &ws, pn.clone(), tl.clone(), axis); let cn = ContainerNode::new(&self.state, &ws, tl.clone(), axis);
pn.cnode_replace_child(tl.tl_as_node(), cn); pn.cnode_replace_child(tl.tl_as_node(), cn);
} }
} }

3
src/state.rs
View file

@ -507,8 +507,7 @@ impl State {
c.append_child(node); c.append_child(node);
} }
} else { } else {
let container = let container = ContainerNode::new(self, ws, node, ContainerSplit::Horizontal);
ContainerNode::new(self, ws, ws.clone(), node, ContainerSplit::Horizontal);
ws.set_container(&container); ws.set_container(&container);
} }
} }

56
src/tree/container.rs
View file

@ -93,7 +93,6 @@ pub struct ContainerRenderData {
pub struct ContainerNode { pub struct ContainerNode {
pub id: ContainerNodeId, pub id: ContainerNodeId,
pub parent: CloneCell<Rc<dyn ContainingNode>>,
pub split: Cell<ContainerSplit>, pub split: Cell<ContainerSplit>,
pub mono_child: CloneCell<Option<NodeRef<ContainerChild>>>, pub mono_child: CloneCell<Option<NodeRef<ContainerChild>>>,
pub mono_body: Cell<Rect>, pub mono_body: Cell<Rect>,
@ -170,7 +169,6 @@ impl ContainerNode {
pub fn new( pub fn new(
state: &Rc<State>, state: &Rc<State>,
workspace: &Rc<WorkspaceNode>, workspace: &Rc<WorkspaceNode>,
parent: Rc<dyn ContainingNode>,
child: Rc<dyn ToplevelNode>, child: Rc<dyn ToplevelNode>,
split: ContainerSplit, split: ContainerSplit,
) -> Rc<Self> { ) -> Rc<Self> {
@ -193,7 +191,6 @@ impl ContainerNode {
child_nodes.insert(child.node_id(), child_node); child_nodes.insert(child.node_id(), child_node);
let slf = Rc::new(Self { let slf = Rc::new(Self {
id: state.node_ids.next(), id: state.node_ids.next(),
parent: CloneCell::new(parent.clone()),
split: Cell::new(split), split: Cell::new(split),
mono_child: CloneCell::new(None), mono_child: CloneCell::new(None),
mono_body: Cell::new(Default::default()), mono_body: Cell::new(Default::default()),
@ -219,7 +216,6 @@ impl ContainerNode {
toplevel_data: ToplevelData::new(state, Default::default(), None), toplevel_data: ToplevelData::new(state, Default::default(), None),
attention_requests: Default::default(), attention_requests: Default::default(),
}); });
slf.tl_set_parent(parent);
child.tl_set_parent(slf.clone()); child.tl_set_parent(slf.clone());
slf.apply_child_flags(&child_node_ref); slf.apply_child_flags(&child_node_ref);
slf slf
@ -821,6 +817,13 @@ impl ContainerNode {
} }
} }
fn parent_container(&self) -> Option<Rc<ContainerNode>> {
self.toplevel_data
.parent
.get()
.and_then(|p| p.node_into_container())
}
pub fn move_focus_from_child( pub fn move_focus_from_child(
self: Rc<Self>, self: Rc<Self>,
seat: &Rc<WlSeatGlobal>, seat: &Rc<WlSeatGlobal>,
@ -843,7 +846,7 @@ impl ContainerNode {
} }
}; };
if !in_line { if !in_line {
if let Some(c) = self.parent.get().node_into_container() { if let Some(c) = self.parent_container() {
c.move_focus_from_child(seat, self.deref(), direction); c.move_focus_from_child(seat, self.deref(), direction);
} }
return; return;
@ -862,7 +865,7 @@ impl ContainerNode {
let sibling = match sibling { let sibling = match sibling {
Some(s) => s, Some(s) => s,
None => { None => {
if let Some(c) = self.parent.get().node_into_container() { if let Some(c) = self.parent_container() {
c.move_focus_from_child(seat, self.deref(), direction); c.move_focus_from_child(seat, self.deref(), direction);
} }
return; return;
@ -879,11 +882,12 @@ impl ContainerNode {
pub fn move_child(self: Rc<Self>, child: Rc<dyn ToplevelNode>, direction: Direction) { pub fn move_child(self: Rc<Self>, child: Rc<dyn ToplevelNode>, direction: Direction) {
// CASE 1: This is the only child of the container. Replace the container by the child. // CASE 1: This is the only child of the container. Replace the container by the child.
if self.num_children.get() == 1 { if self.num_children.get() == 1 {
let parent = self.parent.get(); if let Some(parent) = self.toplevel_data.parent.get() {
if !self.toplevel_data.is_fullscreen.get() if !self.toplevel_data.is_fullscreen.get()
&& parent.cnode_accepts_child(child.tl_as_node()) && parent.cnode_accepts_child(child.tl_as_node())
{ {
parent.cnode_replace_child(self.deref(), child.clone()); parent.cnode_replace_child(self.deref(), child.clone());
}
} }
return; return;
} }
@ -919,13 +923,13 @@ impl ContainerNode {
} }
// CASE 3: We're moving the child out of the container. // CASE 3: We're moving the child out of the container.
let mut neighbor = self.clone(); let mut neighbor = self.clone();
let mut parent_opt = self.parent.get().node_into_container(); let mut parent_opt = self.parent_container();
while let Some(parent) = &parent_opt { while let Some(parent) = &parent_opt {
if parent.split.get() == split { if parent.split.get() == split {
break; break;
} }
neighbor = parent.clone(); neighbor = parent.clone();
parent_opt = parent.parent.get().node_into_container(); parent_opt = parent.parent_container();
} }
let parent = match parent_opt { let parent = match parent_opt {
Some(p) => p, Some(p) => p,
@ -968,9 +972,9 @@ impl ContainerNode {
self.toplevel_data.wants_attention.set(set); self.toplevel_data.wants_attention.set(set);
} }
if propagate { if propagate {
self.parent if let Some(parent) = self.toplevel_data.parent.get() {
.get() parent.cnode_child_attention_request_changed(self, set);
.cnode_child_attention_request_changed(self, set); }
} }
} }
} }
@ -1078,7 +1082,9 @@ impl Node for ContainerNode {
fn node_active_changed(&self, active: bool) { fn node_active_changed(&self, active: bool) {
self.toplevel_data.active.set(active); self.toplevel_data.active.set(active);
self.parent.get().node_child_active_changed(self, active, 1); if let Some(parent) = self.toplevel_data.parent.get() {
parent.node_child_active_changed(self, active, 1);
}
} }
fn node_find_tree_at(&self, x: i32, y: i32, tree: &mut Vec<FoundNode>) -> FindTreeResult { fn node_find_tree_at(&self, x: i32, y: i32, tree: &mut Vec<FoundNode>) -> FindTreeResult {
@ -1135,9 +1141,9 @@ impl Node for ContainerNode {
} }
// log::info!("node_child_active_changed"); // log::info!("node_child_active_changed");
self.schedule_compute_render_data(); self.schedule_compute_render_data();
self.parent if let Some(parent) = self.toplevel_data.parent.get() {
.get() parent.node_child_active_changed(self.deref(), active, depth + 1);
.node_child_active_changed(self.deref(), active, depth + 1); }
} }
fn node_render(&self, renderer: &mut Renderer, x: i32, y: i32, _bounds: Option<&Rect>) { fn node_render(&self, renderer: &mut Renderer, x: i32, y: i32, _bounds: Option<&Rect>) {
@ -1430,10 +1436,6 @@ impl ToplevelNode for ContainerNode {
.map(|tl| tl.tl_into_node()) .map(|tl| tl.tl_into_node())
} }
fn tl_after_parent_set(&self, parent: Rc<dyn ContainingNode>) {
self.parent.set(parent);
}
fn tl_set_workspace_ext(self: Rc<Self>, ws: &Rc<WorkspaceNode>) { fn tl_set_workspace_ext(self: Rc<Self>, ws: &Rc<WorkspaceNode>) {
for child in self.children.iter() { for child in self.children.iter() {
child.node.clone().tl_set_workspace(ws); child.node.clone().tl_set_workspace(ws);
@ -1452,9 +1454,9 @@ impl ToplevelNode for ContainerNode {
// log::info!("tl_change_extents"); // log::info!("tl_change_extents");
self.perform_layout(); self.perform_layout();
self.cancel_seat_ops(); self.cancel_seat_ops();
self.parent if let Some(parent) = self.toplevel_data.parent.get() {
.get() parent.node_child_size_changed(self.deref(), rect.width(), rect.height());
.node_child_size_changed(self.deref(), rect.width(), rect.height()); }
} else { } else {
if let Some(c) = self.mono_child.get() { if let Some(c) = self.mono_child.get() {
let body = self let body = self

5
src/tree/toplevel.rs
View file

@ -107,11 +107,6 @@ pub trait ToplevelNode: Node {
self.tl_extents_changed(); self.tl_extents_changed();
self.tl_title_changed(); self.tl_title_changed();
self.tl_active_changed(); self.tl_active_changed();
self.tl_after_parent_set(parent);
}
fn tl_after_parent_set(&self, parent: Rc<dyn ContainingNode>) {
let _ = parent;
} }
fn tl_active_changed(&self) { fn tl_active_changed(&self) {