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

Timestamp:

Aug 22, 2016 1:37:35 PM (9 years ago)

Author:

vboxsync

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

110318

Message:

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

Location:

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

Files:

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

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

@@ -39 +39 @@
 # ifdef VBOX_WS_X11
 #  include <QX11Info>
-#  if QT_VERSION >= 0x050000
+# endif
+# if !defined(VBOX_WS_MAC) && QT_VERSION >= 0x050000
 #   include <QTimer>
-#  endif
 # endif
 
@@ -281 +281 @@
          * 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. */
+         * 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_X11)
@@ -352 +360 @@
         m_iKeyboardCaptureViewIndex = uScreenId;
 
-#if !defined(VBOX_WS_X11) || QT_VERSION < 0x050000
+#if defined(VBOX_WS_MAC) || QT_VERSION < 0x050000
         /* Finalise keyboard capture: */
         finaliseCaptureKeyboard();
@@ -1509 +1517 @@
 }
 
-#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+#if !defined(VBOX_WS_MAC) && QT_VERSION >= 0x050000
 void UIKeyboardHandler::sltFinaliseCaptureKeyboard()
 {

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

@@ -133 +133 @@
     virtual void sltMachineStateChanged();
 
-#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+#if !defined(VBOX_WS_MAC) && QT_VERSION >= 0x050000
     /** Finalises keyboard capture. */
     void sltFinaliseCaptureKeyboard();