diff --git a/src/compositor.rs b/src/compositor.rs index 37c2b001..3dd484f7 100644 --- a/src/compositor.rs +++ b/src/compositor.rs @@ -334,6 +334,7 @@ fn start_compositor2( tl_matcher_manager: TlMatcherManager::new(&crit_ids), caps_thread, toplevel_managers: Default::default(), + node_at_tree: Default::default(), }); state.tracker.register(ClientId::from_raw(0)); create_dummy_output(&state); diff --git a/src/ifs/wl_seat/pointer_owner.rs b/src/ifs/wl_seat/pointer_owner.rs index 3de37e08..53c0d440 100644 --- a/src/ifs/wl_seat/pointer_owner.rs +++ b/src/ifs/wl_seat/pointer_owner.rs @@ -547,21 +547,11 @@ impl PointerOwner for DndPointerOwner { fn apply_changes(&self, seat: &Rc) { let (x, y) = seat.pointer_cursor.position(); - let (x_int, y_int) = (x.round_down(), y.round_down()); - let (node, x_int, y_int) = { - let mut found_tree = seat.found_tree.borrow_mut(); - found_tree.push(FoundNode { - node: seat.state.root.clone(), - x: x_int, - y: y_int, - }); - seat.state - .root - .node_find_tree_at(x_int, y_int, &mut found_tree, FindTreeUsecase::None); - let FoundNode { node, x, y } = found_tree.pop().unwrap(); - found_tree.clear(); - (node, x, y) - }; + let FoundNode { + node, + x: x_int, + y: y_int, + } = seat.state.node_at(x.round_down(), y.round_down()); let (x, y) = (x.apply_fract(x_int), y.apply_fract(y_int)); let mut target = self.target.get(); if node.node_id() != target.node_id() { diff --git a/src/ifs/wl_seat/touch_owner.rs b/src/ifs/wl_seat/touch_owner.rs index c3d61205..5d7a04a7 100644 --- a/src/ifs/wl_seat/touch_owner.rs +++ b/src/ifs/wl_seat/touch_owner.rs @@ -2,7 +2,7 @@ use { crate::{ fixed::Fixed, ifs::wl_seat::WlSeatGlobal, - tree::{FindTreeUsecase, FoundNode, Node}, + tree::Node, utils::{clonecell::CloneCell, smallmap::SmallMap}, }, std::rc::Rc, @@ -69,29 +69,14 @@ trait TouchOwner { impl TouchOwner for DefaultTouchOwner { fn down(&self, seat: &Rc, time_usec: u64, id: i32, x: Fixed, y: Fixed) { - let mut found_tree = seat.found_tree.borrow_mut(); - let x_int = x.round_down(); - let y_int = y.round_down(); - found_tree.push(FoundNode { - node: seat.state.root.clone(), - x: x_int, - y: y_int, + let node = seat.state.node_at(x.round_down(), y.round_down()); + node.node.node_seat_state().touch_begin(seat); + let owner = Rc::new(GrabTouchOwner { + node: node.node, + down_ids: Default::default(), }); - seat.state - .root - .node_find_tree_at(x_int, y_int, &mut found_tree, FindTreeUsecase::None); - let node = found_tree.pop(); - found_tree.clear(); - drop(found_tree); - if let Some(node) = node { - node.node.node_seat_state().touch_begin(seat); - let owner = Rc::new(GrabTouchOwner { - node: node.node, - down_ids: Default::default(), - }); - seat.touch_owner.owner.set(owner.clone()); - owner.down(seat, time_usec, id, x, y); - } + seat.touch_owner.owner.set(owner.clone()); + owner.down(seat, time_usec, id, x, y); } fn up(&self, _seat: &Rc, _time_usec: u64, _id: i32) { diff --git a/src/state.rs b/src/state.rs index 8dc58b59..0b999627 100644 --- a/src/state.rs +++ b/src/state.rs @@ -83,9 +83,10 @@ use { theme::{Color, Theme}, time::Time, tree::{ - ContainerNode, ContainerSplit, Direction, DisplayNode, FloatNode, LatchListener, Node, - NodeIds, NodeVisitorBase, OutputNode, PlaceholderNode, TearingMode, ToplevelData, - ToplevelNode, ToplevelNodeBase, VrrMode, WorkspaceNode, generic_node_visitor, + ContainerNode, ContainerSplit, Direction, DisplayNode, FindTreeUsecase, FloatNode, + FoundNode, LatchListener, Node, NodeIds, NodeVisitorBase, OutputNode, PlaceholderNode, + TearingMode, ToplevelData, ToplevelNode, ToplevelNodeBase, VrrMode, WorkspaceNode, + generic_node_visitor, }, utils::{ activation_token::ActivationToken, asyncevent::AsyncEvent, bindings::Bindings, @@ -251,6 +252,7 @@ pub struct State { pub cl_matcher_manager: ClMatcherManager, pub tl_matcher_manager: TlMatcherManager, pub caps_thread: Option, + pub node_at_tree: RefCell>, } // impl Drop for State { @@ -975,6 +977,7 @@ impl State { self.workspace_managers.clear(); self.cl_matcher_manager.clear(); self.tl_matcher_manager.clear(); + self.node_at_tree.borrow_mut().clear(); } pub fn remove_toplevel_id(&self, id: ToplevelIdentifier) { @@ -1400,6 +1403,20 @@ impl State { pub fn initial_tile_state(&self, data: &ToplevelData) -> Option { self.config.get()?.initial_tile_state(data) } + + pub fn node_at(&self, x: i32, y: i32) -> FoundNode { + let mut found_tree = self.node_at_tree.borrow_mut(); + found_tree.push(FoundNode { + node: self.root.clone(), + x, + y, + }); + self.root + .node_find_tree_at(x, y, &mut found_tree, FindTreeUsecase::None); + let node = found_tree.pop().unwrap(); + found_tree.clear(); + node + } } #[derive(Debug, Error)]