From e0ebf1bdff06c38ae3cc9e3114b41572cb792dc0 Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Sun, 3 Nov 2024 10:14:24 +0300
Subject: Remove pointer_grab_ongoing in favor of checking the actual grab

---
 src/niri.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/niri.rs')

diff --git a/src/niri.rs b/src/niri.rs
index c3f267c2..dae46938 100644
--- a/src/niri.rs
+++ b/src/niri.rs
@@ -282,8 +282,6 @@ pub struct Niri {
     /// various tooltips from sticking around.
     pub pointer_hidden: bool,
     pub pointer_inactivity_timer: Option<RegistrationToken>,
-    // FIXME: this should be able to be removed once PointerFocus takes grabs into account.
-    pub pointer_grab_ongoing: bool,
     pub tablet_cursor_location: Option<Point<f64, Logical>>,
     pub gesture_swipe_3f_cumulative: Option<(f64, f64)>,
     pub vertical_wheel_tracker: ScrollTracker,
@@ -1877,7 +1875,6 @@ impl Niri {
             pointer_contents: PointContents::default(),
             pointer_hidden: false,
             pointer_inactivity_timer: None,
-            pointer_grab_ongoing: false,
             tablet_cursor_location: None,
             gesture_swipe_3f_cumulative: None,
             vertical_wheel_tracker: ScrollTracker::new(120),
@@ -4526,8 +4523,7 @@ impl Niri {
         let Some((surface, surface_loc)) = &self.pointer_contents.surface else {
             return;
         };
-
-        if self.pointer_grab_ongoing {
+        if Some(surface) != pointer.current_focus().as_ref() {
             return;
         }
 
-- 
cgit