Changeset 62008 in vbox for trunk

Timestamp:

Jul 4, 2016 1:34:20 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8151: X11: Runtime UI: Avoid race conflict between grabbing and dragging machine-window by delaying keyboard grabbing until mouse button release.

Location:

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

Files:

• UIKeyboardHandler.cpp (modified) (4 diffs)
• UIMachineView.cpp (modified) (1 diff)

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

@@ -269 +269 @@
         return;
 
-#ifdef VBOX_WS_X11
-# if QT_VERSION >= 0x050000
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
     /* Due to X11 async nature we may have lost the focus already by the time we get the focus
      * notification, so we do a sanity check that we still have it. If we don't have the focus
@@ -287 +286 @@
     if (m_windows.value(uScreenId)->winId() != actualWinId)
         return;
-# endif /* QT_VERSION >= 0x050000 */
-#endif /* VBOX_WS_X11 */
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
 
     /* If such view exists: */
@@ -366 +364 @@
          * is trying to click outside of internal window geometry. */
 
-        /* Use the Qt5 keyboard grabbing: */
-        m_views[uScreenId]->grabKeyboard();
-        /* And grab the mouse button (if mouse is not captured),
+        /* Grab the mouse button (if mouse is not captured),
          * We do not check for failure as we do not currently implement a back-up plan. */
         if (!uisession()->isMouseCaptured())
             xcb_grab_button_checked(QX11Info::connection(), 0, QX11Info::appRootWindow(),
-                                    XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC,
-                                    XCB_NONE, XCB_NONE, XCB_BUTTON_INDEX_1, XCB_MOD_MASK_ANY);
+                                    XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE, XCB_GRAB_MODE_SYNC,
+                                    XCB_GRAB_MODE_ASYNC, XCB_NONE, XCB_NONE, XCB_BUTTON_INDEX_1, XCB_MOD_MASK_ANY);
+        /* Delay the actual keyboard grab request if the mouse button is held down and the mouse
+         * is not captured to work around window managers which transfer the focus when the user
+         * clicks in the title bar and then try to grab the keyboard and sulk if they fail. */
+        xcb_query_pointer_cookie_t xcbRequestCookie = xcb_query_pointer(QX11Info::connection(), QX11Info::appRootWindow());
+        xcb_query_pointer_reply_t *pReply = xcb_query_pointer_reply(QX11Info::connection(), xcbRequestCookie, NULL);
+        /* And use the Qt5 keyboard grabbing finally: */
+        if (uisession()->isMouseCaptured() || !pReply || !(pReply->mask & XCB_KEY_BUT_MASK_BUTTON_1))
+            m_views[uScreenId]->grabKeyboard();
+        free(pReply);
 
 # endif /* QT_VERSION >= 0x050000 */
@@ -1440 +1445 @@
             releaseKeyboard();
             xcb_allow_events_checked(QX11Info::connection(), XCB_ALLOW_REPLAY_POINTER, pButtonEvent->time);
+            break;
+        }
+        case XCB_BUTTON_RELEASE:
+        {
+            /* If the mouse button was pressed when we captured the keyboard then we
+             * will have delayed doing the grab. Do it now on button release.
+             * This will not hurt if it is already grabbed. */
+            if (m_iKeyboardCaptureViewIndex != -1)
+                m_views[m_iKeyboardCaptureViewIndex]->grabKeyboard();
             break;
         }

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

@@ -1910 +1910 @@
         case XCB_KEY_RELEASE:
         case XCB_BUTTON_PRESS:
+        case XCB_BUTTON_RELEASE:
         {
             /* Delegate key-event handling to the keyboard-handler and let it