Add restore_focus argument to PointerInnerHandle::unset_grab

anvil/src/shell/grabs.rs

@@ -64,7 +64,7 @@ impl<BackendData: Backend> PointerGrab<AnvilState<BackendData>> for MoveSurfaceG
         handle.button(data, event);
         if handle.current_pressed().is_empty() {
             // No more buttons are pressed, release the grab.
-            handle.unset_grab(data, event.serial, event.time);
+            handle.unset_grab(data, event.serial, event.time, true);
         }
     }
 
@@ -254,7 +254,7 @@ impl<BackendData: Backend> PointerGrab<AnvilState<BackendData>> for ResizeSurfac
 
         // It is impossible to get `min_size` and `max_size` of dead toplevel, so we return early.
         if !self.window.alive() {
-            handle.unset_grab(data, event.serial, event.time);
+            handle.unset_grab(data, event.serial, event.time, true);
             return;
         }
 
@@ -346,7 +346,7 @@ impl<BackendData: Backend> PointerGrab<AnvilState<BackendData>> for ResizeSurfac
         handle.button(data, event);
         if handle.current_pressed().is_empty() {
             // No more buttons are pressed, release the grab.
-            handle.unset_grab(data, event.serial, event.time);
+            handle.unset_grab(data, event.serial, event.time, true);
 
             // If toplevel is dead, we can't resize it, so we return early.
             if !self.window.alive() {

smallvil/src/grabs/move_grab.rs

@@ -58,7 +58,7 @@ impl PointerGrab<Smallvil> for MoveSurfaceGrab {
 
         if !handle.current_pressed().contains(&BTN_LEFT) {
             // No more buttons are pressed, release the grab.
-            handle.unset_grab(data, event.serial, event.time);
+            handle.unset_grab(data, event.serial, event.time, true);
         }
     }
 

smallvil/src/grabs/resize_grab.rs

@@ -152,7 +152,7 @@ impl PointerGrab<Smallvil> for ResizeSurfaceGrab {
 
         if !handle.current_pressed().contains(&BTN_LEFT) {
             // No more buttons are pressed, release the grab.
-            handle.unset_grab(data, event.serial, event.time);
+            handle.unset_grab(data, event.serial, event.time, true);
 
             let xdg = self.window.toplevel();
             xdg.with_pending_state(|state| {

src/desktop/wayland/popup/grab.rs

@@ -551,7 +551,7 @@ where
         event: &MotionEvent,
     ) {
         if self.popup_grab.has_ended() {
-            handle.unset_grab(data, event.serial, event.time);
+            handle.unset_grab(data, event.serial, event.time, true);
             self.popup_grab.unset_keyboard_grab(data, event.serial);
             return;
         }
@@ -591,7 +591,7 @@ where
         let state = event.state;
 
         if self.popup_grab.has_ended() {
-            handle.unset_grab(data, serial, time);
+            handle.unset_grab(data, serial, time, true);
             handle.button(data, event);
             self.popup_grab.unset_keyboard_grab(data, serial);
             return;
@@ -610,7 +610,7 @@ where
                 .unwrap_or(false)
         {
             let _ = self.popup_grab.ungrab(PopupUngrabStrategy::All);
-            handle.unset_grab(data, serial, time);
+            handle.unset_grab(data, serial, time, true);
             handle.button(data, event);
             self.popup_grab.unset_keyboard_grab(data, serial);
             return;

src/input/keyboard/mod.rs

@@ -145,24 +145,24 @@ impl<D: SeatHandler + 'static> KbdInternal<D> {
 
     fn with_grab<F>(&mut self, seat: &Seat<D>, f: F)
     where
-        F: FnOnce(KeyboardInnerHandle<'_, D>, &mut dyn KeyboardGrab<D>),
+        F: FnOnce(&mut KeyboardInnerHandle<'_, D>, &mut dyn KeyboardGrab<D>),
     {
-        let mut grab = ::std::mem::replace(&mut self.grab, GrabStatus::Borrowed);
+        let mut grab = std::mem::replace(&mut self.grab, GrabStatus::Borrowed);
         match grab {
             GrabStatus::Borrowed => panic!("Accessed a keyboard grab from within a keyboard grab access."),
             GrabStatus::Active(_, ref mut handler) => {
                 // If this grab is associated with a surface that is no longer alive, discard it
                 if let Some(ref surface) = handler.start_data().focus {
                     if !surface.alive() {
                         self.grab = GrabStatus::None;
-                        f(KeyboardInnerHandle { inner: self, seat }, &mut DefaultGrab);
+                        f(&mut KeyboardInnerHandle { inner: self, seat }, &mut DefaultGrab);
                         return;
                     }
                 }
-                f(KeyboardInnerHandle { inner: self, seat }, &mut **handler);
+                f(&mut KeyboardInnerHandle { inner: self, seat }, &mut **handler);
             }
             GrabStatus::None => {
-                f(KeyboardInnerHandle { inner: self, seat }, &mut DefaultGrab);
+                f(&mut KeyboardInnerHandle { inner: self, seat }, &mut DefaultGrab);
             }
         }
 
@@ -533,8 +533,8 @@ impl<D: SeatHandler + 'static> KeyboardHandle<D> {
         // forward to client if no keybinding is triggered
         let seat = self.get_seat(data);
         let modifiers = mods_changed.then_some(guard.mods_state);
-        guard.with_grab(&seat, move |mut handle, grab| {
-            grab.input(data, &mut handle, keycode, state, modifiers, serial, time);
+        guard.with_grab(&seat, |handle, grab| {
+            grab.input(data, handle, keycode, state, modifiers, serial, time);
         });
         if guard.focus.is_some() {
             trace!("Input forwarded to client");
@@ -556,8 +556,8 @@ impl<D: SeatHandler + 'static> KeyboardHandle<D> {
         let mut guard = self.arc.internal.lock().unwrap();
         guard.pending_focus = focus.clone();
         let seat = self.get_seat(data);
-        guard.with_grab(&seat, move |mut handle, grab| {
-            grab.set_focus(data, &mut handle, focus, serial);
+        guard.with_grab(&seat, |handle, grab| {
+            grab.set_focus(data, handle, focus, serial);
         });
     }
 

src/input/pointer/grab.rs

@@ -379,7 +379,7 @@ impl<D: SeatHandler + 'static> PointerGrab<D> for ClickGrab<D> {
         handle.button(data, event);
         if handle.current_pressed().is_empty() {
             // no more buttons are pressed, release the grab
-            handle.unset_grab(data, event.serial, event.time);
+            handle.unset_grab(data, event.serial, event.time, false);
         }
     }