diff --git a/src/ifs/wl_seat/pointer_owner.rs b/src/ifs/wl_seat/pointer_owner.rs index 86cd5229..234a3b67 100644 --- a/src/ifs/wl_seat/pointer_owner.rs +++ b/src/ifs/wl_seat/pointer_owner.rs @@ -200,13 +200,31 @@ trait PointerOwner { source: Option>, icon: Option>, serial: u32, - ) -> Result<(), WlSeatError>; - fn cancel_dnd(&self, seat: &Rc); + ) -> Result<(), WlSeatError> { + let _ = origin; + let _ = icon; + let _ = serial; + if let Some(src) = source { + src.send_cancelled(seat); + } + Ok(()) + } + fn cancel_dnd(&self, seat: &Rc) { + seat.dropped_dnd.borrow_mut().take(); + } fn revert_to_default(&self, seat: &Rc); - fn dnd_target_removed(&self, seat: &Rc); - fn dnd_icon(&self) -> Option>; - fn toplevel_drag(&self) -> Option>; - fn remove_dnd_icon(&self); + fn dnd_target_removed(&self, seat: &Rc) { + self.cancel_dnd(seat); + } + fn dnd_icon(&self) -> Option> { + None + } + fn toplevel_drag(&self) -> Option> { + None + } + fn remove_dnd_icon(&self) { + // nothing + } } struct SimplePointerOwner { @@ -338,24 +356,6 @@ impl PointerOwner for SimplePointerOwner { found_tree.clear(); } - fn start_drag( - &self, - seat: &Rc, - _origin: &Rc, - source: Option>, - _icon: Option>, - _serial: u32, - ) -> Result<(), WlSeatError> { - if let Some(src) = source { - src.send_cancelled(seat); - } - Ok(()) - } - - fn cancel_dnd(&self, seat: &Rc) { - seat.dropped_dnd.borrow_mut().take(); - } - fn revert_to_default(&self, seat: &Rc) { if !T::IS_DEFAULT { seat.pointer_owner.set_default_pointer_owner(seat); @@ -363,22 +363,6 @@ impl PointerOwner for SimplePointerOwner { seat.state.damage(); } } - - fn dnd_target_removed(&self, seat: &Rc) { - self.cancel_dnd(seat); - } - - fn dnd_icon(&self) -> Option> { - None - } - - fn toplevel_drag(&self) -> Option> { - None - } - - fn remove_dnd_icon(&self) { - // nothing - } } impl PointerOwner for SimpleGrabPointerOwner { @@ -429,30 +413,10 @@ impl PointerOwner for SimpleGrabPointerOwner { .start_drag(self, seat, origin, src, icon, serial) } - fn cancel_dnd(&self, seat: &Rc) { - seat.dropped_dnd.borrow_mut().take(); - } - fn revert_to_default(&self, seat: &Rc) { self.node.node_seat_state().remove_pointer_grab(seat); seat.pointer_owner.set_default_pointer_owner(seat); } - - fn dnd_target_removed(&self, seat: &Rc) { - self.cancel_dnd(seat) - } - - fn dnd_icon(&self) -> Option> { - None - } - - fn toplevel_drag(&self) -> Option> { - None - } - - fn remove_dnd_icon(&self) { - // nothing - } } impl PointerOwner for DndPointerOwner { @@ -530,20 +494,6 @@ impl PointerOwner for DndPointerOwner { self.pos_y.set(y); } - fn start_drag( - &self, - seat: &Rc, - _origin: &Rc, - source: Option>, - _icon: Option>, - _serial: u32, - ) -> Result<(), WlSeatError> { - if let Some(src) = source { - src.send_cancelled(seat); - } - Ok(()) - } - fn cancel_dnd(&self, seat: &Rc) { let target = self.target.get(); target.node_on_dnd_leave(&self.dnd); @@ -605,11 +555,23 @@ trait SimplePointerOwnerUsecase: Sized + Clone + 'static { src: Option>, icon: Option>, serial: u32, - ) -> Result<(), WlSeatError>; + ) -> Result<(), WlSeatError> { + let _ = grab; + let _ = origin; + let _ = icon; + let _ = serial; + if let Some(src) = src { + src.send_cancelled(seat); + } + Ok(()) + } fn release_grab(&self, seat: &Rc); - fn node_focus(&self, seat: &Rc, node: &Rc); + fn node_focus(&self, seat: &Rc, node: &Rc) { + let _ = seat; + let _ = node; + } } impl SimplePointerOwnerUsecase for DefaultPointerUsecase { @@ -691,10 +653,6 @@ impl SimplePointerOwnerUsecase for DefaultPointerUsecase { fn release_grab(&self, seat: &Rc) { seat.pointer_owner.set_default_pointer_owner(seat); } - - fn node_focus(&self, _seat: &Rc, _node: &Rc) { - // nothing - } } trait NodeSelectorUsecase: Sized + 'static { @@ -725,21 +683,6 @@ impl SimplePointerOwnerUsecase for Rc { ::default_button(self, spo, seat, button, pn) } - fn start_drag( - &self, - _grab: &SimpleGrabPointerOwner, - seat: &Rc, - _origin: &Rc, - src: Option>, - _icon: Option>, - _serial: u32, - ) -> Result<(), WlSeatError> { - if let Some(src) = src { - src.send_cancelled(seat); - } - Ok(()) - } - fn release_grab(&self, seat: &Rc) { seat.pointer_owner.owner.set(Rc::new(SimplePointerOwner { usecase: self.clone(),