儲存庫 vbox 的更動 37239

時間撮記:

2011-5-27 下午03:20:05 (13 年 以前)

作者:

vboxsync

訊息:

FE/Qt: factor some bits out of the keyboard event handler

位置:

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

檔案:

• UIKeyboardHandler.cpp (修改) (3 筆差異)
• UIKeyboardHandler.h (修改) (1 筆差異)

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

@@ -1110 +1110 @@
 #endif
 
-bool UIKeyboardHandler::keyEvent(int iKey, uint8_t uScan, int fFlags, ulong uScreenId, wchar_t *pUniKey /* = 0 */)
-{
-    /* Get host-combo key list: */
-    QSet<int> allHostComboKeys = UIHotKeyCombination::toKeyCodeList(m_globalSettings.hostCombo()).toSet();
-
-    /* Update the map of pressed host-combo keys: */
-    if (allHostComboKeys.contains(iKey))
-    {
-        if (fFlags & KeyPressed)
-        {
-            if (!m_pressedHostComboKeys.contains(iKey))
-                m_pressedHostComboKeys.insert(iKey, uScan);
-            else if (m_bIsHostComboPressed)
-                return true;
-        }
-        else
-        {
-            if (m_pressedHostComboKeys.contains(iKey))
-                m_pressedHostComboKeys.remove(iKey);
-        }
-    }
-    /* Check if we are currently holding FULL host-combo: */
-    bool fIsFullHostComboPresent = !allHostComboKeys.isEmpty() && allHostComboKeys == m_pressedHostComboKeys.keys().toSet();
-    /* Check if currently pressed/released key had changed host-combo state: */
-    const bool isHostComboStateChanged = (!m_bIsHostComboPressed &&  fIsFullHostComboPresent) ||
-                                         ( m_bIsHostComboPressed && !fIsFullHostComboPresent);
-
-#ifdef Q_WS_WIN
-    if (m_bIsHostComboPressed || isHostComboStateChanged)
-    {
-        /* Currently this is used in winLowKeyboardEvent() only: */
-        m_bIsHostkeyInCapture = m_fIsKeyboardCaptured;
-    }
-#endif /* Q_WS_WIN */
-
+/**
+ * If the user has just completed a control-alt-del combination then handle
+ * that.
+ * @returns true if handling should stop here, false otherwise
+ */
+bool UIKeyboardHandler::keyEventHandleCAD(uint8_t uScan)
+{
     /* Check if it's C-A-D and GUI/PassCAD is not true: */
     if (!m_fPassCAD &&
@@ -1164 +1136 @@
         return true;
     }
+    return false;
+}
+
+/**
+ * Handle a non-special (C-A-D, pause, print) key press or release
+ * @returns true if handling should stop here, false otherwise
+ */
+bool UIKeyboardHandler::keyEventHandleNormal(int iKey, uint8_t uScan, int fFlags, LONG *pCodes, uint *puCodesCount)
+{
+    /* Get host-combo key list: */
+    QSet<int> allHostComboKeys = UIHotKeyCombination::toKeyCodeList(m_globalSettings.hostCombo()).toSet();
+    /* Get the type of key - simple or extended: */
+    uint8_t uWhatPressed = fFlags & KeyExtended ? IsExtKeyPressed : IsKeyPressed;
+
+    /* If some key was pressed or some previously pressed key was released =>
+     * we are updating the list of pressed keys and preparing scancodes: */
+    if ((fFlags & KeyPressed) || (m_pressedKeys[uScan] & uWhatPressed))
+    {
+        /* Check if the guest has the same view on the modifier keys
+         * (NumLock, CapsLock, ScrollLock) as the X server.
+         * If not, send KeyPress events to synchronize the state: */
+        if (fFlags & KeyPressed)
+            fixModifierState(pCodes, puCodesCount);
+
+        /* Prepend 'extended' scancode if needed: */
+        if (fFlags & KeyExtended)
+            pCodes[(*puCodesCount)++] = 0xE0;
+
+        /* Process key-press: */
+        if (fFlags & KeyPressed)
+        {
+            /* Append scancode: */
+            pCodes[(*puCodesCount)++] = uScan;
+            m_pressedKeys[uScan] |= uWhatPressed;
+        }
+        /* Process key-release if that key was pressed before: */
+        else if (m_pressedKeys[uScan] & uWhatPressed)
+        {
+            /* Append scancode: */
+            pCodes[(*puCodesCount)++] = uScan | 0x80;
+            m_pressedKeys[uScan] &= ~uWhatPressed;
+        }
+
+        /* Update keyboard-captured flag: */
+        if (m_fIsKeyboardCaptured)
+            m_pressedKeys[uScan] |= IsKbdCaptured;
+        else
+            m_pressedKeys[uScan] &= ~IsKbdCaptured;
+    }
+    /* Ignore key-release if that key was NOT pressed before,
+     * but only if thats not one of the host-combination keys: */
+    else if (!allHostComboKeys.contains(iKey))
+        return true;
+    return false;
+}
+
+bool UIKeyboardHandler::keyEvent(int iKey, uint8_t uScan, int fFlags, ulong uScreenId, wchar_t *pUniKey /* = 0 */)
+{
+    /* Get host-combo key list: */
+    QSet<int> allHostComboKeys = UIHotKeyCombination::toKeyCodeList(m_globalSettings.hostCombo()).toSet();
+
+    /* Update the map of pressed host-combo keys: */
+    if (allHostComboKeys.contains(iKey))
+    {
+        if (fFlags & KeyPressed)
+        {
+            if (!m_pressedHostComboKeys.contains(iKey))
+                m_pressedHostComboKeys.insert(iKey, uScan);
+            else if (m_bIsHostComboPressed)
+                return true;
+        }
+        else
+        {
+            if (m_pressedHostComboKeys.contains(iKey))
+                m_pressedHostComboKeys.remove(iKey);
+        }
+    }
+    /* Check if we are currently holding FULL host-combo: */
+    bool fIsFullHostComboPresent = !allHostComboKeys.isEmpty() && allHostComboKeys == m_pressedHostComboKeys.keys().toSet();
+    /* Check if currently pressed/released key had changed host-combo state: */
+    const bool isHostComboStateChanged = (!m_bIsHostComboPressed &&  fIsFullHostComboPresent) ||
+                                         ( m_bIsHostComboPressed && !fIsFullHostComboPresent);
+
+#ifdef Q_WS_WIN
+    if (m_bIsHostComboPressed || isHostComboStateChanged)
+    {
+        /* Currently this is used in winLowKeyboardEvent() only: */
+        m_bIsHostkeyInCapture = m_fIsKeyboardCaptured;
+    }
+#endif /* Q_WS_WIN */
+
+    if (keyEventHandleCAD(uScan))
+        return true;
 
     /* Preparing the press/release scan-codes array for sending to the guest:
@@ -1210 +1275 @@
         /* Common flags handling: */
         else
-        {
-            /* Get the type of key - simple or extended: */
-            uint8_t uWhatPressed = fFlags & KeyExtended ? IsExtKeyPressed : IsKeyPressed;
-
-            /* If some key was pressed or some previously pressed key was released =>
-             * we are updating the list of pressed keys and preparing scancodes: */
-            if ((fFlags & KeyPressed) || (m_pressedKeys[uScan] & uWhatPressed))
-            {
-                /* Check if the guest has the same view on the modifier keys
-                 * (NumLock, CapsLock, ScrollLock) as the X server.
-                 * If not, send KeyPress events to synchronize the state: */
-                if (fFlags & KeyPressed)
-                    fixModifierState(pCodes, &uCodesCount);
-
-                /* Prepend 'extended' scancode if needed: */
-                if (fFlags & KeyExtended)
-                    pCodes[uCodesCount++] = 0xE0;
-
-                /* Process key-press: */
-                if (fFlags & KeyPressed)
-                {
-                    /* Append scancode: */
-                    pCodes[uCodesCount++] = uScan;
-                    m_pressedKeys[uScan] |= uWhatPressed;
-                }
-                /* Process key-release if that key was pressed before: */
-                else if (m_pressedKeys[uScan] & uWhatPressed)
-                {
-                    /* Append scancode: */
-                    pCodes[uCodesCount++] = uScan | 0x80;
-                    m_pressedKeys[uScan] &= ~uWhatPressed;
-                }
-
-                /* Update keyboard-captured flag: */
-                if (m_fIsKeyboardCaptured)
-                    m_pressedKeys[uScan] |= IsKbdCaptured;
-                else
-                    m_pressedKeys[uScan] &= ~IsKbdCaptured;
-            }
-            /* Ignore key-release if that key was NOT pressed before,
-             * but only if thats not one of the host-combination keys: */
-            else if (!allHostComboKeys.contains(iKey))
+            if (keyEventHandleNormal(iKey, uScan, fFlags, pCodes, &uCodesCount))
                 return true;
-        }
     }
 

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

@@ -124 +124 @@
 #endif
 
+    bool keyEventHandleCAD(uint8_t uScan);
+    bool keyEventHandleNormal(int iKey, uint8_t uScan, int fFlags, LONG *pCodes, uint *puCodesCount);
     /* Separate function to handle most of existing keyboard-events: */
     bool keyEvent(int iKey, uint8_t uScan, int fFlags, ulong uScreenId, wchar_t *pUniKey = 0);