Changeset 35864 in vbox

Timestamp:

Feb 7, 2011 11:35:09 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: 5245: GUI support for complex host-key combinations: Do NOT send the last key oh host-combination to the guest.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (modified) (4 diffs)

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

@@ -1112 +1112 @@
 
     /* Update the map of pressed host-combo keys: */
-    if (fFlags & KeyPressed)
-    {
-        if (allHostComboKeys.contains(iKey))
+    if (allHostComboKeys.contains(iKey))
+    {
+        if (fFlags & KeyPressed)
         {
             if (!m_pressedHostComboKeys.contains(iKey))
@@ -1121 +1121 @@
                 return true;
         }
-    }
-    else
-    {
-        if (allHostComboKeys.contains(iKey) && m_pressedHostComboKeys.contains(iKey))
-            m_pressedHostComboKeys.remove(iKey);
+        else
+        {
+            if (m_pressedHostComboKeys.contains(iKey))
+                m_pressedHostComboKeys.remove(iKey);
+        }
     }
     /* Check if we are currently holding FULL host-combo: */
@@ -1161 +1161 @@
     }
 
-    /* Prepare empty code-buffer: */
+    /* Preparing the press/release scan-codes array for sending to the guest:
+     * 1. if host-combo is NOT pressed, taking into account currently pressed key too,
+     * 2. if currently released key releases host-combo too.
+     * Using that rule, we are NOT sending to the guest:
+     * 1. the last key-press of host-combo,
+     * 2. all keys pressed while the host-combo being held. */
     LONG aCodesBuffer[16];
     LONG *pCodes = aCodesBuffer;
     uint uCodesCount = 0;
-    /* Processing usual key-presses/releases without host-key being held: */
-    if (!m_bIsHostComboPressed || isHostComboStateChanged)
+    if (!m_bIsHostComboPressed && !isHostComboStateChanged ||
+        m_bIsHostComboPressed && isHostComboStateChanged)
     {
         /* Special flags handling (KeyPrint): */
@@ -1341 +1346 @@
     emit keyboardStateChanged(keyboardState());
 
-    /* If the VM is NOT paused and there are scancodes to send: */
-    if (!uisession()->isPaused() && uCodesCount)
-    {
-        /* Get the  VM keyboard to pass key in there: */
+    /* If the VM is NOT paused: */
+    if (!uisession()->isPaused())
+    {
+        /* Get the VM keyboard: */
         CKeyboard keyboard = session().GetConsole().GetKeyboard();
         Assert(!keyboard.isNull());
 
-        /* Pass this key to the guest: */
-        std::vector<LONG> scancodes(pCodes, &pCodes[uCodesCount]);
-        keyboard.PutScancodes(QVector<LONG>::fromStdVector(scancodes));
-
-        /* If full host-key sequence was just finalized
-         * and the last key of host-combination was just sent to the guest =>
-         * we have to notify guest to make it release keys from the host-combination: */
+        /* If there are scan-codes to send: */
+        if (uCodesCount)
+        {
+            /* Send prepared scan-codes to the guest: */
+            std::vector<LONG> scancodes(pCodes, &pCodes[uCodesCount]);
+            keyboard.PutScancodes(QVector<LONG>::fromStdVector(scancodes));
+        }
+
+        /* If full host-key sequence was just finalized: */
         if (isHostComboStateChanged && m_bIsHostComboPressed)
         {
+            /* We have to make guest to release pressed keys from the host-combination: */
             QList<uint8_t> hostComboScans = m_pressedHostComboKeys.values();
             for (int i = 0 ; i < hostComboScans.size(); ++i)