Changeset 35749 in vbox for trunk/src/VBox

Timestamp:

Jan 28, 2011 9:17:46 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Make the key handling more dynamic.

Location:

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

Files:

• UIHotKeyEditor.cpp (modified) (7 diffs)
• UIHotKeyEditor.h (modified) (1 diff)

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

@@ -56 +56 @@
 # include "VBoxUtils.h"
 # include <Carbon/Carbon.h>
+# include <QTimer>
 #endif /* Q_WS_MAC */
 
@@ -303 +304 @@
 
 #ifdef Q_WS_MAC
-    m_uDarwinKeyModifiers = GetCurrentEventKeyModifiers();
+    m_uDarwinKeyModifiers = 0;
     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 */
 }
@@ -515 +521 @@
             modifierMask = ::DarwinAdjustModifierMask(modifierMask, pvCocoaEvent);
             UInt32 changed = m_uDarwinKeyModifiers ^ modifierMask;
-            m_uDarwinKeyModifiers = modifierMask;
 
             /* Convert to keycode: */
@@ -526 +531 @@
             if (changed)
             {
+                /* 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)
+                    m_fStartNewSequence = true;
                 /* Key release: */
-                if (!(changed & modifierMask))
+                else if (!(changed & modifierMask))
                 {
-                    /* Remove pressed symbol: */
-                    m_pressedKeys.remove(iKeyCode);
-
-                    /* If pressed key map is empty => start new sequence: */
-                    if (m_pressedKeys.isEmpty())
-                        m_fStartNewSequence = true;
+                    /* Queue pressed symbol for removing: */
+                    m_removeKeys.insert(iKeyCode);
+                    m_pRemoveTimer->start();
                 }
                 /* Key press: */
@@ -542 +551 @@
                     if (m_fStartNewSequence)
                         m_shownKeys.clear();
-
+                    /* Make sure any keys pending for removal are removed. */
+                    removePendingKeys();
                     /* Check maximum combo size: */
                     if (m_shownKeys.size() < UIHotKeyCombination::m_iMaxComboSize)
@@ -555 +565 @@
                 }
             }
+            /* Save the new modifier mask state. */
+            m_uDarwinKeyModifiers = modifierMask;
 
             /* Update text: */
@@ -563 +575 @@
     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 */
 

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

@@ -90 +90 @@
     bool m_fStartNewSequence;
 
-#ifdef Q_WS_MAC
+#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;
-#endif /* Q_WS_MAC */
+private slots:
+    void removePendingKeys();
+#endif /* RT_OS_DARWIN */
 };