Changeset 6767 in vbox

Timestamp:

Feb 3, 2008 5:39:44 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: 1) Release pressed keys even on focus loss in Paused state (for example when a warning about the ignored keyboard input is shown) to avoid stuck keys in the guest after resuming. 2) Show the keyboard input warning on key release (instead of key press) which is a kind of more expected by the user.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -1035 +1035 @@
                 else
                 {
-                    /* release the host key even when paused */
-                    mIsHostkeyPressed = false;
-                    emitKeyboardStateChanged();
+                    /* release the host key and all other pressed keys too even
+                     * when paused (otherwise, we will get stuck keys in the
+                     * guest when doing sendChangedKeyStates() on resume because
+                     * key presses were already recorded in mPressedKeys but key
+                     * releases will most likely not reach us but the new focus
+                     * window instead). */
+                    releaseAllPressedKeys (true /* aReleaseHostKey */);
                 }
                 break;
@@ -1279 +1283 @@
 
             case QEvent::KeyPress:
+            case QEvent::KeyRelease:
+            {
+                QKeyEvent *ke = (QKeyEvent *) e;
+
 #ifdef Q_WS_PM
-            case QEvent::KeyRelease:
-            {
                 /// @todo temporary solution to send Alt+Tab and friends to
                 //  the guest. The proper solution is to write a keyboard
@@ -1287 +1293 @@
                 //  impossible to do so using hooks on OS/2).
 
-                QKeyEvent *ke = (QKeyEvent *) e;
                 if (mIsHostkeyPressed)
                 {
@@ -1359 +1364 @@
                     }
                 }
-                if (e->type() == QEvent::KeyRelease)
-                    break;
-
-                /* fall through for normal processing of KeyPress */
-#else
-            {
-                QKeyEvent *ke = (QKeyEvent *) e;
-#endif
-                if (mIsHostkeyPressed)
+
+                /* fall through to normal processing */
+
+#endif /* Q_WS_PM */
+
+                if (mIsHostkeyPressed && e->type() == QEvent::KeyPress)
                 {
                     if (ke->key() >= Key_F1 && ke->key() <= Key_F12)
@@ -1409 +1411 @@
                     }
                 }
-                else
+                else if (!mIsHostkeyPressed && e->type() == QEvent::KeyRelease)
                 {
+                    /* Show a possible warning on key release which seems to
+                     * be more expected by the end user */
+
                     if (isPaused())
                     {
@@ -1420 +1425 @@
                     }
                 }
+
                 ke->accept();
                 return true;
@@ -2957 +2963 @@
 
 #ifdef Q_WS_MAC
-        ::DarwinUpdateDockPreview (DarwinQPixmapToCGImage (&mPausedShot), 
-                                   mVirtualBoxLogo, 
+        ::DarwinUpdateDockPreview (DarwinQPixmapToCGImage (&mPausedShot),
+                                   mVirtualBoxLogo,
                                    mMainWnd->dockImageState());
 #endif
@@ -3136 +3142 @@
  * @param aReleaseHostKey @c true to set the host key state to unpressed.
  */
-void VBoxConsoleView::releaseAllPressedKeys (bool aReleaseHostKey)
+void VBoxConsoleView::releaseAllPressedKeys (bool aReleaseHostKey /* = true*/)
 {
     AssertMsg (mAttached, ("Console must be attached"));