aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/input.rs4
-rw-r--r--src/niri.rs6
2 files changed, 4 insertions, 6 deletions
diff --git a/src/input.rs b/src/input.rs
index b7b1959b..c10f3e15 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -69,7 +69,7 @@ impl Niri {
pointer_location.x = pointer_location.x.clamp(0., output_geo.size.w as f64);
pointer_location.y = pointer_location.y.clamp(0., output_geo.size.h as f64);
- let under = self.surface_under_pointer(&pointer);
+ let under = self.surface_under(pointer_location);
pointer.motion(
self,
under.clone(),
@@ -101,7 +101,7 @@ impl Niri {
let pointer = self.seat.get_pointer().unwrap();
- let under = self.surface_under_pointer(&pointer);
+ let under = self.surface_under(pos);
pointer.motion(
self,
diff --git a/src/niri.rs b/src/niri.rs
index 1750ed3d..6318fd95 100644
--- a/src/niri.rs
+++ b/src/niri.rs
@@ -5,7 +5,6 @@ use std::time::Duration;
use smithay::desktop::space::space_render_elements;
use smithay::desktop::{Space, Window, WindowSurfaceType};
use smithay::input::keyboard::XkbConfig;
-use smithay::input::pointer::PointerHandle;
use smithay::input::{Seat, SeatState};
use smithay::output::Output;
use smithay::reexports::calloop::generic::Generic;
@@ -119,11 +118,10 @@ impl Niri {
}
}
- pub fn surface_under_pointer(
+ pub fn surface_under(
&self,
- pointer: &PointerHandle<Self>,
+ pos: Point<f64, Logical>,
) -> Option<(WlSurface, Point<i32, Logical>)> {
- let pos = pointer.current_location();
self.space
.element_under(pos)
.and_then(|(window, location)| {