Changeset 63609 in vbox

Timestamp:

Aug 22, 2016 2:10:44 PM (9 years ago)

Author:

vboxsync

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

110319

Message:

FE/Qt: bugref:8151: Runtime UI: Use the 'delayed keyboard capture' approach on Mac OS X.

Location:

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

Files:

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

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

@@ -40 +40 @@
 #  include <QX11Info>
 # endif
-# if !defined(VBOX_WS_MAC) && QT_VERSION >= 0x050000
+# if QT_VERSION >= 0x050000
 #   include <QTimer>
 # endif
@@ -266 +266 @@
          * a low-level keyboard-hook is used instead.
          * It is being installed on focus-in event and uninstalled on focus-out.
-         * S.a. UIKeyboardHandler::eventFilter for more information. */
-
-        /* On Mac, we also
-         * use the Qt method to grab the keyboard,
-         * disable global hot keys and
-         * enable watching modifiers (for right/left separation). */
-        /// @todo Is that really needed?
-        ::DarwinDisableGlobalHotKeys(true);
-        m_views[uScreenId]->grabKeyboard();
+         * S.a. UIKeyboardHandler::eventFilter for more information.
+         *
+         * Besides that, we do not grab the keyboard as soon as it is captured,
+         * but delay it for 300 milliseconds after the formal capture.
+         * We do it mainly to have the common behavior under all
+         * hosts and X11 is forced to behave that way. */
+
+        /* Delay finalising capture for 300 milliseconds: */
+        QTimer::singleShot(300, this, SLOT(sltFinaliseCaptureKeyboard()));
 
 #elif defined(VBOX_WS_WIN)
@@ -360 +360 @@
         m_iKeyboardCaptureViewIndex = uScreenId;
 
-#if defined(VBOX_WS_MAC) || QT_VERSION < 0x050000
+#if QT_VERSION < 0x050000
         /* Finalise keyboard capture: */
         finaliseCaptureKeyboard();
@@ -380 +380 @@
     if (m_views.contains(m_iKeyboardCaptureViewIndex))
     {
-#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+#if defined(VBOX_WS_MAC)
+
+        /* On Mac, we are not just using the Qt stuff to grab the keyboard,
+         * we also disable global hot keys and enable watching
+         * modifiers (for right/left separation). */
+
+        /// @todo Is that really needed?
+        ::DarwinDisableGlobalHotKeys(true);
+        m_views[m_iKeyboardCaptureViewIndex]->grabKeyboard();
+
+#elif defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
 
         /* On X11, we are using XCB stuff to grab the keyboard.
@@ -1517 +1527 @@
 }
 
-#if !defined(VBOX_WS_MAC) && QT_VERSION >= 0x050000
+#if QT_VERSION >= 0x050000
 void UIKeyboardHandler::sltFinaliseCaptureKeyboard()
 {

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

@@ -20 +20 @@
 
 /* Qt includes: */
+#include <QtGlobal>
 #include <QMap>
 #include <QObject>
@@ -133 +134 @@
     virtual void sltMachineStateChanged();
 
-#if !defined(VBOX_WS_MAC) && QT_VERSION >= 0x050000
+#if QT_VERSION >= 0x050000
     /** Finalises keyboard capture. */
     void sltFinaliseCaptureKeyboard();