Changeset 35791 in vbox

Timestamp:

Jan 31, 2011 3:36:13 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: 5245: GUI support for complex host-key combinations: Better host-key snapshotting mechanism.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIHotKeyEditor.cpp (modified) (19 diffs)
• UIHotKeyEditor.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp

@@ -28 +28 @@
 #include <QStylePainter>
 #include <QKeyEvent>
+#include <QTimer>
 
 #ifdef Q_WS_WIN
@@ -56 +57 @@
 # include "VBoxUtils.h"
 # include <Carbon/Carbon.h>
-# include <QTimer>
 #endif /* Q_WS_MAC */
 
@@ -203 +203 @@
 
 #ifdef Q_WS_WIN
-int UIHotKey::distinguishModifierVKey(int wParam)
+int UIHotKey::distinguishModifierVKey(int wParam, int lParam)
 {
     int iKeyCode = wParam;
@@ -209 +209 @@
     {
         case VK_SHIFT:
-            if (::GetKeyState(VK_LSHIFT) & 0x8000) iKeyCode = VK_LSHIFT;
-            else if (::GetKeyState(VK_RSHIFT) & 0x8000) iKeyCode = VK_RSHIFT;
-            break;
+        {
+            UINT uCurrentScanCode = (lParam & 0x01FF0000) >> 16;
+            UINT uLeftScanCode = ::MapVirtualKey(iKeyCode, 0);
+            if (uCurrentScanCode == uLeftScanCode)
+                iKeyCode = VK_LSHIFT;
+            else
+                iKeyCode = VK_RSHIFT;
+            break;
+        }
         case VK_CONTROL:
-            if (::GetKeyState(VK_LCONTROL) & 0x8000) iKeyCode = VK_LCONTROL;
-            else if (::GetKeyState(VK_RCONTROL) & 0x8000) iKeyCode = VK_RCONTROL;
-            break;
+        {
+            UINT uCurrentScanCode = (lParam & 0x01FF0000) >> 16;
+            UINT uLeftScanCode = ::MapVirtualKey(iKeyCode, 0);
+            if (uCurrentScanCode == uLeftScanCode)
+                iKeyCode = VK_LCONTROL;
+            else
+                iKeyCode = VK_RCONTROL;
+            break;
+        }
         case VK_MENU:
-            if (::GetKeyState(VK_LMENU) & 0x8000) iKeyCode = VK_LMENU;
-            else if (::GetKeyState(VK_RMENU) & 0x8000) iKeyCode = VK_RMENU;
-            break;
+        {
+            UINT uCurrentScanCode = (lParam & 0x01FF0000) >> 16;
+            UINT uLeftScanCode = ::MapVirtualKey(iKeyCode, 0);
+            if (uCurrentScanCode == uLeftScanCode)
+                iKeyCode = VK_LMENU;
+            else
+                iKeyCode = VK_RMENU;
+            break;
+        }
     }
     return iKeyCode;
@@ -283 +301 @@
 UIHotKeyEditor::UIHotKeyEditor(QWidget *pParent)
     : QLabel(pParent)
+    , m_pReleaseTimer(0)
     , m_fStartNewSequence(true)
 {
@@ -298 +317 @@
     setPalette(p);
 
+    /* Setup release-pending-keys timer: */
+    m_pReleaseTimer = new QTimer(this);
+    m_pReleaseTimer->setInterval(200);
+    connect(m_pReleaseTimer, SIGNAL(timeout()), this, SLOT(sltReleasePendingKeys()));
+
 #ifdef Q_WS_X11
     /* Initialize the X keyboard subsystem: */
@@ -307 +331 @@
     UICocoaApplication::instance()->registerForNativeEvents(RT_BIT_32(10) | RT_BIT_32(11) | RT_BIT_32(12) /* NSKeyDown  | NSKeyUp | | NSFlagsChanged */, UIHotKeyEditor::darwinEventHandlerProc, this);
     ::DarwinGrabKeyboard(false /* just modifiers */);
-
-    m_pRemoveTimer = new QTimer(this);
-    m_pRemoveTimer->setInterval(200);
-    connect(m_pRemoveTimer, SIGNAL(timeout()),
-            this, SLOT(removePendingKeys()));
 #endif /* Q_WS_MAC */
 }
@@ -382 +401 @@
         {
             /* Get key-code: */
-            int iKeyCode = UIHotKey::distinguishModifierVKey((int)pMsg->wParam);
+            int iKeyCode = UIHotKey::distinguishModifierVKey((int)pMsg->wParam, (int)pMsg->lParam);
 
             /* Check if symbol is valid else pass it to Qt: */
             if (!UIHotKey::isValidKey(iKeyCode))
                 return false;
+
+            /* Stop the release-pending-keys timer: */
+            m_pReleaseTimer->stop();
 
             /* Key press: */
@@ -394 +416 @@
                 if (m_fStartNewSequence)
                     m_shownKeys.clear();
-
+                /* Make sure any keys pending for releasing are processed: */
+                sltReleasePendingKeys();
                 /* Check maximum combo size: */
                 if (m_shownKeys.size() < UIHotKeyCombination::m_iMaxComboSize)
                 {
                     /* Remember pressed symbol: */
-                    m_pressedKeys << pMsg->wParam;
+                    m_pressedKeys << iKeyCode;
                     m_shownKeys.insert(iKeyCode, UIHotKey::toString(iKeyCode));
 
@@ -409 +432 @@
             else if (pMsg->message == WM_KEYUP || pMsg->message == WM_SYSKEYUP)
             {
-                /* Remove pressed symbol: */
-                m_pressedKeys.remove(pMsg->wParam);
-
-                /* If pressed keys map is empty => start new sequence: */
-                if (m_pressedKeys.isEmpty())
+                /* Queue released symbol for processing: */
+                m_releasedKeys << iKeyCode;
+
+                /* If all pressed keys are now pending for releasing we should stop further handling.
+                 * Now we have the status the user want: */
+                if (m_pressedKeys == m_releasedKeys)
+                {
+                    m_pressedKeys.clear();
+                    m_releasedKeys.clear();
                     m_fStartNewSequence = true;
+                }
+                else
+                    m_pReleaseTimer->start();
             }
 
@@ -448 +478 @@
                 return false;
 
+            /* Stop the release-pending-keys timer: */
+            m_pReleaseTimer->stop();
+
             /* Key press: */
             if (pEvent->type == XKeyPress)
@@ -454 +487 @@
                 if (m_fStartNewSequence)
                     m_shownKeys.clear();
-
+                /* Make sure any keys pending for releasing are processed: */
+                sltReleasePendingKeys();
                 /* Check maximum combo size: */
                 if (m_shownKeys.size() < UIHotKeyCombination::m_iMaxComboSize)
@@ -469 +503 @@
             else if (pEvent->type == XKeyRelease)
             {
-                /* Remove pressed symbol: */
-                m_pressedKeys.remove(iKeySym);
-
-                /* If pressed keys map is empty => start new sequence: */
-                if (m_pressedKeys.isEmpty())
+                /* Queue released symbol for processing: */
+                m_releasedKeys << iKeySym;
+
+                /* If all pressed keys are now pending for releasing we should stop further handling.
+                 * Now we have the status the user want: */
+                if (m_pressedKeys == m_releasedKeys)
+                {
+                    m_pressedKeys.clear();
+                    m_releasedKeys.clear();
                     m_fStartNewSequence = true;
+                }
+                else
+                    m_pReleaseTimer->start();
             }
 
@@ -493 +534 @@
 bool UIHotKeyEditor::darwinEventHandlerProc(const void *pvCocoaEvent, const void *pvCarbonEvent, void *pvUser)
 {
-    UIHotKeyEditor *edit = (UIHotKeyEditor*)pvUser;
+    UIHotKeyEditor *pEditor = (UIHotKeyEditor*)pvUser;
     EventRef inEvent = (EventRef)pvCarbonEvent;
     UInt32 EventClass = ::GetEventClass(inEvent);
     if (EventClass == kEventClassKeyboard)
-        return edit->darwinKeyboardEvent(pvCocoaEvent, inEvent);
+        return pEditor->darwinKeyboardEvent(pvCocoaEvent, inEvent);
     return false;
 }
@@ -533 +574 @@
                 /* Stop the delete pending keys timer. */
                 m_pRemoveTimer->stop();
-                /* If modifierMask is empty, no key is pressed anymore. Stop
-                 * all key handling and the deletion of keys. This is the
-                 * status the user want. */
+                /* If modifierMask is empty, no key is pressed anymore.
+                 * Stop all key handling and the deletion of keys. This is the status the user want: */
                 if (!modifierMask)
                     m_fStartNewSequence = true;
@@ -541 +581 @@
                 else if (!(changed & modifierMask))
                 {
-                    /* Queue pressed symbol for removing: */
-                    m_removeKeys.insert(iKeyCode);
-                    m_pRemoveTimer->start();
+                    /* Queue released symbol for processing: */
+                    m_releasedKeys << iKeyCode;
+                    m_pReleaseTimer->start();
                 }
                 /* Key press: */
@@ -551 +591 @@
                     if (m_fStartNewSequence)
                         m_shownKeys.clear();
-                    /* Make sure any keys pending for removal are removed. */
-                    removePendingKeys();
+                    /* Make sure any keys pending for releasing are processed: */
+                    sltReleasePendingKeys();
                     /* Check maximum combo size: */
                     if (m_shownKeys.size() < UIHotKeyCombination::m_iMaxComboSize)
@@ -575 +615 @@
     return false;
 }
-
-void UIHotKeyEditor::removePendingKeys()
-{
-    /* Stop the timer, we process all pending keys at once. */
-    m_pRemoveTimer->stop();
-    /* Something to do? */
-    if (!m_removeKeys.isEmpty())
-    {
-        /* Remove every key. */
-        foreach(int v, m_removeKeys)
-        {
-            m_pressedKeys.remove(v);
-            m_shownKeys.remove(v);
-        }
-        m_removeKeys.clear();
-        if (m_pressedKeys.isEmpty())
-            m_fStartNewSequence = true;
-    }
-    /* Make sure the user see what happens. */
-    updateText();
-}
-
 #endif /* Q_WS_MAC */
 
@@ -648 +666 @@
 }
 
+void UIHotKeyEditor::sltReleasePendingKeys()
+{
+    /* Stop the timer, we process all pending keys at once: */
+    m_pReleaseTimer->stop();
+    /* Something to do? */
+    if (!m_releasedKeys.isEmpty())
+    {
+        /* Remove every key: */
+        QSetIterator<int> iterator(m_releasedKeys);
+        while (iterator.hasNext())
+        {
+            int iKeyCode = iterator.next();
+            m_pressedKeys.remove(iKeyCode);
+            m_shownKeys.remove(iKeyCode);
+        }
+        m_releasedKeys.clear();
+        if (m_pressedKeys.isEmpty())
+            m_fStartNewSequence = true;
+    }
+    /* Make sure the user see what happens: */
+    updateText();
+}
+
 void UIHotKeyEditor::updateText()
 {

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.h

@@ -32 +32 @@
     bool isValidKey(int iKeyCode);
 #ifdef Q_WS_WIN
-    int distinguishModifierVKey(int wParam);
+    int distinguishModifierVKey(int wParam, int lParam);
 #endif /* Q_WS_WIN */
 #ifdef Q_WS_X11
@@ -81 +81 @@
     void paintEvent(QPaintEvent *pEvent);
 
+private slots:
+
+    void sltReleasePendingKeys();
+
 private:
 
@@ -86 +90 @@
 
     QSet<int> m_pressedKeys;
+    QSet<int> m_releasedKeys;
     QMap<int, QString> m_shownKeys;
 
+    QTimer* m_pReleaseTimer;
     bool m_fStartNewSequence;
 
 #ifdef RT_OS_DARWIN
-    QSet<int> m_removeKeys;
-    QTimer* m_pRemoveTimer;
     /* The current modifier key mask. Used to figure out which modifier
      * key was pressed when we get a kEventRawKeyModifiersChanged event. */
     uint32_t m_uDarwinKeyModifiers;
-private slots:
-    void removePendingKeys();
 #endif /* RT_OS_DARWIN */
 };