diff --git a/src/ifs/wl_seat.rs b/src/ifs/wl_seat.rs index 995cf94d..57a57305 100644 --- a/src/ifs/wl_seat.rs +++ b/src/ifs/wl_seat.rs @@ -67,8 +67,8 @@ use { state::{DeviceHandlerData, State}, time::now_usec, tree::{ - generic_node_visitor, ContainerNode, ContainerSplit, Direction, FloatNode, FoundNode, - Node, OutputNode, ToplevelNode, WorkspaceNode, + generic_node_visitor, ContainerNode, ContainerSplit, Direction, FoundNode, Node, + OutputNode, ToplevelNode, WorkspaceNode, }, utils::{ asyncevent::AsyncEvent, bindings::PerClientBindings, clonecell::CloneCell, @@ -140,9 +140,6 @@ pub struct WlSeatGlobal { name: GlobalName, state: Rc, seat_name: String, - move_: Cell, - move_start_pos: Cell<(Fixed, Fixed)>, - extents_start_pos: Cell<(i32, i32)>, pos_time_usec: Cell, pos: Cell<(Fixed, Fixed)>, pointer_stack: RefCell>>, @@ -220,9 +217,6 @@ impl WlSeatGlobal { name, state: state.clone(), seat_name: seat_name.to_string(), - move_: Cell::new(false), - move_start_pos: Cell::new((Fixed(0), Fixed(0))), - extents_start_pos: Cell::new((0, 0)), pos_time_usec: Cell::new(0), pos: Cell::new((Fixed(0), Fixed(0))), pointer_stack: RefCell::new(vec![]), @@ -1235,10 +1229,6 @@ impl WlSeat { }) } - pub fn move_(&self, node: &Rc) { - self.global.move_(node); - } - pub fn keymap_fd(&self, state: &KeyboardState) -> Result, WlKeyboardError> { if self.version >= READ_ONLY_KEYMAP_SINCE { return Ok(state.map.clone()); diff --git a/src/ifs/wl_seat/event_handling.rs b/src/ifs/wl_seat/event_handling.rs index 0244838a..a314af1f 100644 --- a/src/ifs/wl_seat/event_handling.rs +++ b/src/ifs/wl_seat/event_handling.rs @@ -31,7 +31,7 @@ use { }, object::Version, state::DeviceHandlerData, - tree::{Direction, FloatNode, Node, ToplevelNode}, + tree::{Direction, Node, ToplevelNode}, utils::{bitflags::BitflagsExt, smallmap::SmallMap}, wire::WlDataOfferId, xkbcommon::{KeyboardState, XkbState, XKB_KEY_DOWN, XKB_KEY_UP}, @@ -631,13 +631,6 @@ impl WlSeatGlobal { self.pointer_stack.borrow().last().cloned() } - pub fn move_(&self, node: &Rc) { - self.move_.set(true); - self.move_start_pos.set(self.pos.get()); - let ex = node.position.get(); - self.extents_start_pos.set((ex.x1(), ex.y1())); - } - pub fn focus_toplevel(self: &Rc, n: Rc) { let node = match n.tl_focus_child(self.id) { Some(n) => n, diff --git a/src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs b/src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs index 31ab0432..185060dc 100644 --- a/src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs +++ b/src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs @@ -260,13 +260,7 @@ impl XdgToplevelRequestHandler for XdgToplevel { Ok(()) } - fn move_(&self, req: Move, _slf: &Rc) -> Result<(), Self::Error> { - let seat = self.xdg.surface.client.lookup(req.seat)?; - if let Some(parent) = self.toplevel_data.parent.get() { - if let Some(float) = parent.node_into_float() { - seat.move_(&float); - } - } + fn move_(&self, _req: Move, _slf: &Rc) -> Result<(), Self::Error> { Ok(()) } diff --git a/src/tree.rs b/src/tree.rs index 394cb636..89b6160c 100644 --- a/src/tree.rs +++ b/src/tree.rs @@ -346,6 +346,7 @@ pub trait Node: 'static { // TYPE CONVERTERS + #[cfg_attr(not(feature = "it"), allow(dead_code))] fn node_into_float(self: Rc) -> Option> { None }