Changeset 79640 in vbox

Timestamp:

Jul 9, 2019 11:22:28 AM (6 years ago)

Author:

vboxsync

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

131942

Message:

FE/Qt: X11 hosts: ask the X server if we have the focus before grabbing.
bugref:9506: FE/Qt: SUSE report GUI problem with Qt 5.13.
Changes in Qt 5.13 which delay reporting focus out events on X11 upset our
keyboard grabbing code, which waits for a short delay after receiving focus
to grab the keyboard and checks if we still have it. The delay in reporting
focus out defeats this check, so with this change, on Qt 5.13 and later we ask
the X server directly, not via Qt.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (modified) (1 diff)

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

@@ -269 +269 @@
          * the keyboard before the target window sees the click. (GNOME Shell's hot corner has
          * the same problem. At present we just let that problem be.) */
+
+# if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
+        /* Make sure we really do still have the focus.  Qt as of version 5.13 started
+         * reporting it with delay, so ask the X server directly.  We could remove the
+         * version check some time in the future.  If we do, remove the comment above
+         * about the focus notification dance, as it will no longer be relevant. */
+        xcb_get_input_focus_cookie_t xcbFocusCookie = xcb_get_input_focus(QX11Info::connection());
+        xcb_get_input_focus_reply_t *pFocusReply = xcb_get_input_focus_reply(QX11Info::connection(), xcbFocusCookie, 0);
+        xcb_window_t xcbFocusWindow = pFocusReply->focus;
+        free(pFocusReply);
+        if (xcbFocusWindow != m_windows[m_iKeyboardCaptureViewIndex]->winId())
+            return true;
+# endif
 
         /* Grab the mouse button.