Merge lp:~osomon/unity-2d/grab-shortcut-keys-once into lp:unity-2d/3.0

[Olivier Tilloy]

[launcher] Grab the Meta+n (for 0 ≤ n ≤ 9) hotkeys at startup, and release them only when exiting.

[Ugo Riboni (uriboni)]

Good job at simplifying lots of parts of the code.

review: Approve

=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-04-29 16:26:25 +0000
+++ launcher/app/launcherview.cpp	2011-05-03 18:41:22 +0000
@@ -65,7 +65,6 @@
     m_superKeyHoldTimer.setInterval(KEY_HOLD_THRESHOLD);
     connect(&m_superKeyHoldTimer, SIGNAL(timeout()), SLOT(updateSuperKeyHoldState()));
     connect(this, SIGNAL(superKeyTapped()), SLOT(toggleDash()));
-    connect(this, SIGNAL(superKeyHeldChanged(bool)), SLOT(changeKeyboardShortcutsState(bool)));
 
     m_enableSuperKey.setKey("/desktop/unity-2d/launcher/super_key_enable");
     connect(&m_enableSuperKey, SIGNAL(valueChanged()), SLOT(updateSuperKeyMonitoring()));
@@ -79,9 +78,15 @@
     Hotkey* altF2 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F2, Qt::AltModifier);
     connect(altF2, SIGNAL(pressed()), SLOT(showCommandsPlace()));
 
-    /* Super+s activated the workspaces switcher. */
+    /* Super+s activates the workspaces switcher. */
     Hotkey* superS = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_S, Qt::MetaModifier);
     connect(superS, SIGNAL(pressed()), SLOT(showWorkspaceSwitcher()));
+
+    /* Super+{n} for 0 ≤ n ≤ 9 activates the item with index (n + 9) % 10. */
+    for (Qt::Key key = Qt::Key_0; key <= Qt::Key_9; key = (Qt::Key) (key + 1)) {
+        Hotkey* hotkey = HotkeyMonitor::instance().getHotkeyFor(key, Qt::MetaModifier);
+        connect(hotkey, SIGNAL(pressed()), SLOT(forwardNumericHotkey()));
+    }
 }
 
 void
@@ -168,43 +173,18 @@
 }
 
 void
-LauncherView::changeKeyboardShortcutsState(bool enabled)
-{
-    /* We are going to connect 10 Hotkeys, but to make things simpler on the QML
-       side we want to have only one signal with the number of the item that needs to
-       be activated in response to the hotkey press.
-       So we connect all of them to a single slot where we emit a single signal with
-       an index based on which Hotkey was the sender. */
-    Qt::Key key = Qt::Key_0;
-    while (key <= Qt::Key_9) {
-        Hotkey *hotkey = HotkeyMonitor::instance().getHotkeyFor(key, Qt::MetaModifier);
-
-        if (enabled) {
-            QObject::connect(hotkey, SIGNAL(pressed()), this, SLOT(forwardHotkey()));
-        } else {
-            QObject::disconnect(hotkey, SIGNAL(pressed()), this, SLOT(forwardHotkey()));
-        }
-        key = (Qt::Key) (key + 1);
-    }
-}
-
-void
-LauncherView::forwardHotkey()
-{
-    Hotkey *hotkey = qobject_cast<Hotkey*>(sender());
+LauncherView::forwardNumericHotkey()
+{
+    Hotkey* hotkey = qobject_cast<Hotkey*>(sender());
     if (hotkey != NULL) {
         /* Shortcuts from 1 to 9 should activate the items with index
-           from 0 to 8. Shortcut for 0 should activate item with index 10.
+           from 0 to 8. Shortcut for 0 should activate item with index 9.
            In other words, the indexes are activated in the same order as
            the keys appear on a standard keyboard. */
-        if (hotkey->key() < Qt::Key_0 || hotkey->key() > Qt::Key_9) {
-            return;
-        }
-        int itemIndex = hotkey->key() - Qt::Key_0;
-        itemIndex = (itemIndex == 0) ? 9 : itemIndex - 1;
-
-        if (itemIndex >= 0 && itemIndex <= 10) {
-            Q_EMIT keyboardShortcutPressed(itemIndex);
+        Qt::Key key = hotkey->key();
+        if (key >= Qt::Key_0 && key <= Qt::Key_9) {
+            int index = (key - Qt::Key_0 + 9) % 10;
+            Q_EMIT keyboardShortcutPressed(index);
         }
     }
 }
 
=== modified file 'launcher/app/launcherview.h'
--- launcher/app/launcherview.h	2011-04-29 16:26:25 +0000
+++ launcher/app/launcherview.h	2011-05-03 18:41:22 +0000
@@ -57,11 +57,10 @@
 
 private Q_SLOTS:
     void setHotkeysForModifiers(Qt::KeyboardModifiers modifiers);
-    void forwardHotkey();
+    void forwardNumericHotkey();
     void updateSuperKeyMonitoring();
     void updateSuperKeyHoldState();
     void toggleDash();
-    void changeKeyboardShortcutsState(bool enabled);
     void showCommandsPlace();
     void showWorkspaceSwitcher();