Ticket #3895: tabbinghandler.patch

src/jarabe/view/tabbinghandler.py

@@ -33 +33 @@
         self._modifier = modifier
         self._timeout = None
 
+        display = Gdk.Display.get_default()
+        device_manager = display.get_device_manager()
+        self._devices = device_manager.list_devices(Gdk.DeviceType.MASTER)
+
     def _start_tabbing(self):
         if not self._tabbing:
             logging.debug('Grabing the input.')
 
             screen = Gdk.Screen.get_default()
             window = screen.get_root_window()
-            keyboard_grab_result = Gdk.keyboard_grab(window, False)
-            pointer_grab_result = Gdk.pointer_grab(window)
 
-            self._tabbing = (keyboard_grab_result == Gdk.GrabStatus.SUCCESS and
-                             pointer_grab_result == Gdk.GrabStatus.SUCCESS)
+            self._tabbing = True
+            for device in self._devices:
+                result = device.grab(window, Gdk.GrabOwnership.WINDOW, False,
+                                     Gdk.EventMask.ALL_EVENTS_MASK, None,
+                                     Gdk.CURRENT_TIME)
+                if result != Gdk.GrabStatus.SUCCESS:
+                    self._tabbing = False
+                    break
 
             # Now test that the modifier is still active to prevent race
             # conditions. We also test if one of the grabs failed.
-            mask = window.get_pointer()[2]
+            mask = window.get_pointer()[3]
             if not self._tabbing or not (mask & self._modifier):
                 logging.debug('Releasing grabs again.')
 
                 # ungrab keyboard/pointer if the grab was successfull.
-                if keyboard_grab_result == Gdk.GrabStatus.SUCCESS:
-                    Gdk.keyboard_ungrab()
-                if pointer_grab_result == Gdk.GrabStatus.SUCCESS:
-                    Gdk.pointer_ungrab()
+                for device in self._devices:
+                    device.ungrab(Gdk.CURRENT_TIME)
 
                 self._tabbing = False
             else:
@@ -134 +140 @@
             next_activity.get_window().activate(event_time)
 
     def stop(self, event_time):
-        Gdk.keyboard_ungrab()
-        Gdk.pointer_ungrab()
+        for device in self._devices:
+            device.ungrab(event_time)
         self._tabbing = False
 
         self._frame.hide()