Changeset 53138 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 24, 2014 6:47:02 AM (10 years ago)

Author:

vboxsync

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

96671

Message:

FE/Qt: Do not try to grab the keyboard in full-screen mode if there are more focus events for the grabbing window in the queue.

Location:

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

Files:

• UIKeyboardHandler.cpp (modified) (2 diffs)
• UIKeyboardHandler.h (modified) (1 diff)

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

@@ -168 +168 @@
 }
 
+#ifdef Q_WS_X11
+struct CHECKFORX11FOCUSEVENTSDATA
+{
+    Window hWindow;
+    bool fEventFound;
+};
+
+static Bool checkForX11FocusEventsWorker(Display *pDisplay, XEvent *pEvent,
+                                         XPointer pArg)
+{
+    NOREF(pDisplay);
+    struct CHECKFORX11FOCUSEVENTSDATA *pStruct;
+    
+    pStruct = (struct CHECKFORX11FOCUSEVENTSDATA *)pArg;
+    if (   pEvent->xany.type == XFocusIn
+        || pEvent->xany.type == XFocusOut)
+        if (pEvent->xany.window == pStruct->hWindow)
+            pStruct->fEventFound = true;
+    return false;
+}
+
+bool UIKeyboardHandler::checkForX11FocusEvents(Window hWindow)
+{
+    XEvent dummy;
+    struct CHECKFORX11FOCUSEVENTSDATA data;
+
+    data.hWindow = hWindow;
+    data.fEventFound = false;
+    XCheckIfEvent(QX11Info::display(), &dummy, checkForX11FocusEventsWorker,
+                  (XPointer)&data);
+    return data.fEventFound;
+}
+#endif /* Q_WS_X11 */
+
 void UIKeyboardHandler::captureKeyboard(ulong uScreenId)
 {
@@ -208 +242 @@
                  * and after we will just ignore that issue: */
                 int cTriesLeft = 50;
-
-                if (m_cMonitors > 1)
-                {
-                    /* Do this hack only for multimonitor VMs. */
-                    XEvent dummy;
-
-                    /* If a grab succeeds, X11 will insert a FocusIn event for this
-                     * window into the event queue.  If there is already a FocusOut
-                     * event pending we do not want this to happen (this can
-                     * actually cause two machine windows to fight for the focus).
-                     * It would be nicer to put the event back to the right place
-                     * in the queue, but X11 doesn't help us there, and even Qt
-                     * does it like this. */
-                    if (XCheckTypedWindowEvent(QX11Info::display(),
-                                m_windows[m_iKeyboardCaptureViewIndex]->winId(),
-                                XFocusOut, &dummy))
-                    {
-                        XPutBackEvent(QX11Info::display(), &dummy);
-                        break;
-                    }
-                }
-
-                while (cTriesLeft && XGrabKeyboard(QX11Info::display(), m_windows[m_iKeyboardCaptureViewIndex]->winId(), False, GrabModeAsync, GrabModeAsync, CurrentTime)) { --cTriesLeft; }
+                Window hWindow;
+
+                /* Only do our keyboard grab if there are no other focus events
+                 * for this window on the queue.  This can prevent problems
+                 * including two windows fighting to grab the keyboard. */
+                hWindow = m_windows[m_iKeyboardCaptureViewIndex]->winId();
+                if (!checkForX11FocusEvents(hWindow))
+                    while (cTriesLeft && XGrabKeyboard(QX11Info::display(),
+                           hWindow, False, GrabModeAsync, GrabModeAsync,
+                           CurrentTime))
+                        --cTriesLeft;
                 break;
             }

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

@@ -67 +67 @@
 
     /* Commands to capture/release keyboard: */
+#ifdef Q_WS_X11
+    bool checkForX11FocusEvents(unsigned long hWindow);
+#endif
     void captureKeyboard(ulong uScreenId);
     void releaseKeyboard();