Changeset 66389 in vbox

Timestamp:

Mar 31, 2017 7:20:00 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

114341

Message:

bugref:8151: FE/Qt: improve X11 keyboard capturing: when we grab mouse buttons, make sure we always release them relative to the same X11 window. Possibly fixes public ticket 16562.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIKeyboardHandler.cpp (modified) (4 diffs)
• UIKeyboardHandler.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp

@@ -373 +373 @@
          /* Grab the mouse button.
           * We do not check for failure as we do not currently implement a back-up plan. */
-         xcb_grab_button_checked(QX11Info::connection(), 0, QX11Info::appRootWindow(),
+         m_hButtonGrabWindow = QX11Info::appRootWindow();
+         xcb_grab_button_checked(QX11Info::connection(), 0, m_hButtonGrabWindow,
                                  XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC,
                                  XCB_NONE, XCB_NONE, XCB_BUTTON_INDEX_ANY, XCB_MOD_MASK_ANY);
@@ -385 +386 @@
              * We do not check for failure as we do not currently implement a back-up plan. */
             xcb_ungrab_button_checked(QX11Info::connection(), XCB_BUTTON_INDEX_ANY,
-                                      QX11Info::appRootWindow(), XCB_MOD_MASK_ANY);
+                                      m_hButtonGrabWindow, XCB_MOD_MASK_ANY);
             /* Try again later: */
             free(pGrabReply);
@@ -487 +488 @@
          * We do not check for failure as we do not currently implement a back-up plan. */
         xcb_ungrab_button_checked(QX11Info::connection(), XCB_BUTTON_INDEX_ANY,
-                                  QX11Info::appRootWindow(), XCB_MOD_MASK_ANY);
+                                  m_hButtonGrabWindow, XCB_MOD_MASK_ANY);
 
 # endif /* QT_VERSION >= 0x050000 */
@@ -1552 +1553 @@
     , m_keyboardHook(NULL)
     , m_pAltGrMonitor(0)
-#endif /* VBOX_WS_WIN */
+#elif defined(VBOX_WS_X11)
+# if QT_VERSION >= 0x050000
+    , m_hButtonGrabWindow(0)
+# endif
+#endif /* VBOX_WS_X11 */
     , m_cMonitors(1)
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h

@@ -50 +50 @@
 # if QT_VERSION < 0x050000
 typedef union _XEvent XEvent;
-# endif /* QT_VERSION < 0x050000 */
+#else
+#  include <xcb/xcb.h>
+# endif /* QT_VERSION >= 0x050000 */
 #endif /* VBOX_WS_X11 */
 
@@ -243 +245 @@
     /** Win: Holds the keyboard handler reference to be accessible from the keyboard hook. */
     static UIKeyboardHandler *m_spKeyboardHandler;
-#endif /* VBOX_WS_WIN */
+#elif defined(VBOX_WS_X11)
+# if QT_VERSION >= 0x050000
+    /** The root window at the time we grab the mouse buttons. */
+    xcb_window_t m_hButtonGrabWindow;
+# endif
+#endif /* VBOX_WS_X11 */
 
     ULONG m_cMonitors;