Changeset 53119 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 22, 2014 3:08:07 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: UIKeyboardHandler: attempt to fix keyboard focus problem with Host-Home popup menu, restricted to multimonitor VMs

Location:

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

Files:

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

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

@@ -208 +208 @@
                  * and after we will just ignore that issue: */
                 int cTriesLeft = 50;
-                XEvent dummy;
+
+                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; }
-                /* If the grab succeeds, X will insert a FocusIn event for this
-                 * window into the event queue.  If we have two windows they can
-                 * end up in an endless cycle of passing the focus back and
-                 * forward as there is always a pending FocusIn for each, and we
-                 * drop and re-take the grab each time the focus changes.  So we
-                 * remove the event again before Qt can see it. */
-                if (cTriesLeft > 0)
-                    XCheckTypedWindowEvent(QX11Info::display(),
-                            m_windows[m_iKeyboardCaptureViewIndex]->winId(),
-                            XFocusIn, &dummy);
                 break;
             }
@@ -791 +802 @@
     , m_iKeyboardGrabViewIndex(-1)
 #endif
+    , m_cMonitors(1)
 {
     /* Prepare: */
@@ -816 +828 @@
     /* Pressed keys: */
     ::memset(m_pressedKeys, 0, sizeof(m_pressedKeys));
+
+    m_cMonitors = uisession()->machine().GetMonitorCount();
 }
 

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

@@ -196 +196 @@
     int m_iKeyboardGrabViewIndex;
 #endif
+
+    ULONG m_cMonitors;
 };