Handle ungrabbing correctly

pop-os · Jan 8, 2025 · 095bbf9 · 095bbf9
1 parent 3c5ec70
commit 095bbf9
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/src/input/mod.rs b/src/input/mod.rs
@@ -16,7 +16,7 @@ use crate::{
             target::{KeyboardFocusTarget, PointerFocusTarget},
             Stage,
         },
-        grabs::{ReleaseMode, ResizeEdge},
+        grabs::{ReleaseMode, ResizeEdge, UngrabOnPointerUp},
         layout::{
             floating::ResizeGrabMarker,
             tiling::{NodeDesc, TilingLayout},
@@ -75,7 +75,7 @@ use xkbcommon::xkb::{Keycode, Keysym};
 use std::{
     any::Any,
     borrow::Cow,
-    cell::RefCell,
+    cell::{Cell, RefCell},
     collections::HashSet,
     ops::ControlFlow,
     time::{Duration, Instant},
@@ -757,7 +757,13 @@ impl State {
                                                             &state.common.xdg_activation_state,
                                                             false,
                                                         );
+
                                                         drop(shell);
+
+                                                        seat_clone
+                                                            .user_data()
+                                                            .get_or_insert(UngrabOnPointerUp::new)
+                                                            .set(true);
                                                         dispatch_grab(
                                                             res, seat_clone, serial, state,
                                                         );
@@ -835,6 +841,13 @@ impl State {
                                                                 false,
                                                             );
                                                             drop(shell);
+
+                                                            seat_clone
+                                                                .user_data()
+                                                                .get_or_insert(
+                                                                    UngrabOnPointerUp::new,
+                                                                )
+                                                                .set(true);
                                                             dispatch_grab(
                                                                 res, seat_clone, serial, state,
                                                             );
@@ -875,6 +888,13 @@ impl State {
                         },
                     );
                     ptr.frame(self);
+                } else if event.state() == ButtonState::Released {
+                    if let Some(ungrab) = seat.user_data().get::<UngrabOnPointerUp>() {
+                        if ungrab.get() {
+                            ungrab.set(false);
+                            ptr.unset_grab(self, serial, event.time_msec())
+                        }
+                    }
                 }
             }
             InputEvent::PointerAxis { event, .. } => {

diff --git a/src/shell/grabs/mod.rs b/src/shell/grabs/mod.rs
@@ -1,3 +1,5 @@
+use std::cell::Cell;
+
 use cosmic_settings_config::shortcuts;
 use smithay::{
     input::{
@@ -67,6 +69,22 @@ pub enum ReleaseMode {
     NoMouseButtons,
 }
 
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct UngrabOnPointerUp(Cell<bool>);
+impl UngrabOnPointerUp {
+    pub fn new() -> Self {
+        Self(Cell::new(false))
+    }
+
+    pub fn get(&self) -> bool {
+        self.0.get()
+    }
+
+    pub fn set(&self, ungrab: bool) {
+        self.0.set(ungrab);
+    }
+}
+
 mod menu;
 pub use self::menu::*;
 mod moving;