Ticket #3895: tab_simon.patch

src/jarabe/view/tabbinghandler.py

@@ -32 +32 @@
         self._tabbing = False
         self._modifier = modifier
         self._timeout = None
-
-    def _start_tabbing(self):
+        self._keyboard = None
+        self._mouse = None
+
+        display = Gdk.Display.get_default()
+        device_manager = display.get_device_manager()
+        devices = device_manager.list_devices(Gdk.DeviceType.MASTER)
+        for device in devices:
+            if device.get_source() == Gdk.InputSource.KEYBOARD:
+                self._keyboard = device
+            if device.get_source() == Gdk.InputSource.MOUSE:
+                self._mouse = device
+
+    def _start_tabbing(self, event_time):
         if not self._tabbing:
-            logging.debug('Grabing the input.')
+            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)
+            keyboard_grab_result = self._keyboard.grab(window, Gdk.GrabOwnership.WINDOW, False,
+                                                       Gdk.EventMask.ALL_EVENTS_MASK, None,
+                                                       event_time)
+            mouse_grab_result = self._mouse.grab(window, Gdk.GrabOwnership.WINDOW, False,
+                                                 Gdk.EventMask.ALL_EVENTS_MASK, None,
+                                                 event_time)
 
             self._tabbing = (keyboard_grab_result == Gdk.GrabStatus.SUCCESS and
-                             pointer_grab_result == Gdk.GrabStatus.SUCCESS)
+                             mouse_grab_result == Gdk.GrabStatus.SUCCESS)
 
             # 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]
-            if not self._tabbing or not (mask & self._modifier):
-                logging.debug('Releasing grabs again.')
+            _pointer = window.get_pointer()
+            # mask is in position 3 now
+            mask = _pointer[3]
+            logging.debug('==> pointer=%s mask=%s', _pointer, mask)
+            if not self._tabbing or (mask in (0, self._modifier)):
+                logging.debug('==> Releasing grabs again. mask=%s', mask)
 
                 # 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()
+                    self._keyboard.ungrab(event_time)
+                if mouse_grab_result == Gdk.GrabStatus.SUCCESS:
+                    self._mouse.ungrab(event_time)
 
                 self._tabbing = False
             else:
+                logging.debug('==> show frame')
                 self._frame.show()
 
     def __timeout_cb(self, event_time):
@@ -85 +104 @@
     def next_activity(self, event_time):
         if not self._tabbing:
             first_switch = True
-            self._start_tabbing()
+            self._start_tabbing(event_time)
         else:
             first_switch = False
 
@@ -108 +127 @@
     def previous_activity(self, event_time):
         if not self._tabbing:
             first_switch = True
-            self._start_tabbing()
+            self._start_tabbing(event_time)
         else:
             first_switch = False
 
@@ -134 +153 @@
             next_activity.get_window().activate(event_time)
 
     def stop(self, event_time):
-        Gdk.keyboard_ungrab()
-        Gdk.pointer_ungrab()
+        logging.debug('===> stop tabbing')
+        self._keyboard.ungrab(event_time)
+        self._mouse.ungrab(event_time)
         self._tabbing = False
 
         self._frame.hide()