Merge lp:~dyams/unity-2d/super-plus-keypad-key-enabled into lp:unity-2d

[Lohith D Shivamurthy]

Qt won't distinguish between keys[0-9] below the Function-keys and keys[0-9] on the keypad.
X11 has separate keycodes for them.
You may be interested to check <X11/keysymdef.h>

[Florian Boucault (fboucault)]

The merge request misses a 'description'.

review: Needs Fixing

[Lohith D Shivamurthy (dyams)]

> The merge request misses a 'description'.

Description added

[Gerry Boland (gerboland)]

Hi Lohith
sorry about the delay. Can you please get clarification from Design for this?

We have a document which details all keyboard shortcuts, these are not mentioned. Would be good to confirm.

review: Needs Information

[Gerry Boland (gerboland)]

To update the info on this MR, Lohith consulted with Design about this and was told that this is incorrect. Marking this MR as Rejected.

review: Disapprove

Unmerged revisions

784. By Lohith D Shivamurthy on 2012-01-20

[launcher] Tests added

783. By Lohith D Shivamurthy on 2011-11-18

[launcher] {super-key + numbers on the keypad} combination is enabled to show/launch the window selected

=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-11-18 10:15:49 +0000
+++ launcher/app/launcherview.cpp	2011-11-18 10:44:35 +0000
@@ -91,6 +91,18 @@
         hotkey = HotkeyMonitor::instance().getHotkeyFor(key, Qt::MetaModifier | Qt::ShiftModifier);
         connect(hotkey, SIGNAL(pressed()), SLOT(forwardNumericHotkey()));
     }
+
+    /* Super+{n} for 0 ≤ n ≤ 9 activates the item with index (n + 9) % 10.*/
+    /* Qt won't distinguish between keys[0-9] below the Functionkeys and keypad keys[0-9] on the Keypad.
+       X11 has separate keycodes for them.
+       You may please also check <X11/keysymdef.h>
+    */
+    for (Qt::Key key = (Qt::Key)(0xffb0); key <= (Qt::Key)(0xffb9); key = (Qt::Key) (key + 1)) {
+        Hotkey* hotkey = HotkeyMonitor::instance().getHotkeyFor((Qt::Key)(key), Qt::MetaModifier, true);
+        connect(hotkey, SIGNAL(pressed()), SLOT(forwardNumericHotkey()));
+        hotkey = HotkeyMonitor::instance().getHotkeyFor((Qt::Key)(key), Qt::MetaModifier | Qt::ShiftModifier, true);
+        connect(hotkey, SIGNAL(pressed()), SLOT(forwardNumericHotkey()));
+    }
 }
 
 LauncherView::~LauncherView()
@@ -207,18 +219,38 @@
            In other words, the indexes are activated in the same order as
            the keys appear on a standard keyboard. */
         Qt::Key key = hotkey->key();
-        if (key >= Qt::Key_1 && key <= Qt::Key_9) {
-            int index = key - Qt::Key_0;
-            if (hotkey->modifiers() & Qt::ShiftModifier) {
-                Q_EMIT newInstanceShortcutPressed(index);
-            } else {
-                Q_EMIT activateShortcutPressed(index);
+
+        if (hotkey->isX11Keysym()) {
+            if (key >= 0xffb1 && key <= 0xffb9) {
+                int index = key - 0xffb0;
+                if (hotkey->modifiers() & Qt::ShiftModifier) {
+                    Q_EMIT newInstanceShortcutPressed(index);
+                } else {
+                    Q_EMIT activateShortcutPressed(index);
+                }
+            } else if (key == 0xffb0) {
+                if (hotkey->modifiers() & Qt::ShiftModifier) {
+                    Q_EMIT newInstanceShortcutPressed(10);
+                } else {
+                    Q_EMIT activateShortcutPressed(10);
+                }
             }
-        } else if (key == Qt::Key_0) {
-            if (hotkey->modifiers() & Qt::ShiftModifier) {
-                Q_EMIT newInstanceShortcutPressed(10);
-            } else {
-                Q_EMIT activateShortcutPressed(10);
+        }
+
+        else {
+            if (key >= Qt::Key_1 && key <= Qt::Key_9) {
+                int index = key - Qt::Key_0;
+                if (hotkey->modifiers() & Qt::ShiftModifier) {
+                    Q_EMIT newInstanceShortcutPressed(index);
+                } else {
+                    Q_EMIT activateShortcutPressed(index);
+                }
+            } else if (key == Qt::Key_0) {
+                if (hotkey->modifiers() & Qt::ShiftModifier) {
+                    Q_EMIT newInstanceShortcutPressed(10);
+                } else {
+                    Q_EMIT activateShortcutPressed(10);
+                }
             }
         }
     }

=== modified file 'libunity-2d-private/src/hotkey.cpp'
--- libunity-2d-private/src/hotkey.cpp	2011-05-03 15:28:49 +0000
+++ libunity-2d-private/src/hotkey.cpp	2011-11-18 10:44:35 +0000
@@ -45,9 +45,9 @@
     return 0;
 }
 
-Hotkey::Hotkey(Qt::Key key, Qt::KeyboardModifiers modifiers, QObject *parent) :
+Hotkey::Hotkey(Qt::Key key, Qt::KeyboardModifiers modifiers, QObject *parent, bool isX11keysym) :
     QObject(parent), m_connections(0),
-    m_key(key), m_modifiers(modifiers),
+    m_key(key), m_modifiers(modifiers), m_isX11keysym(isX11keysym),
     m_x11key(0), m_x11modifiers(0)
 {
     /* Translate the QT modifiers to X11 modifiers */
@@ -65,23 +65,29 @@
         m_x11modifiers |= Mod4Mask;
     }
 
-    /* Translate the QT key to X11 keycode */
-
-    /* QKeySequence can be used to translate a Qt::Key in a format that is
-       understood by XStringToKeysym if the sequence is composed only by the key */
-    QString keyString = QKeySequence(key).toString();
-    KeySym keysym = XStringToKeysym(keyString.toLatin1().data());
-    if (keysym == NoSymbol) {
-        /* XStringToKeysym doesn’t work well with exotic characters (such as
-          'É'). Note that this fallback code path looks much simpler but doesn’t
-          work for special keys such as the function keys (e.g. F1), which is
-          why the translation with XStringToKeysym is attempted first. */
-        keysym = (ushort) key;
+    if (isX11keysym) {
+        m_x11key = XKeysymToKeycode(QX11Info::display(), key);
     }
-    m_x11key = XKeysymToKeycode(QX11Info::display(), keysym);
-    if (m_x11key == 0) {
-        UQ_WARNING << "Could not get keycode for keysym" << keysym
-                   << "(" << keyString << ")";
+    else  {
+        /* Translate the QT key to X11 keycode */
+
+        /* QKeySequence can be used to translate a Qt::Key in a format that is
+           understood by XStringToKeysym if the sequence is composed only by the key */
+        QString keyString = QKeySequence(key).toString();
+        KeySym keysym = XStringToKeysym(keyString.toLatin1().data());
+
+        if (keysym == NoSymbol) {
+            /* XStringToKeysym doesn’t work well with exotic characters (such as
+              'É'). Note that this fallback code path looks much simpler but doesn’t
+              work for special keys such as the function keys (e.g. F1), which is
+              why the translation with XStringToKeysym is attempted first. */
+            keysym = (ushort) key;
+        }
+        m_x11key = XKeysymToKeycode(QX11Info::display(), keysym);
+        if (m_x11key == 0) {
+            UQ_WARNING << "Could not get keycode for keysym" << keysym
+                       << "(" << keyString << ")";
+        }
     }
 }
 

=== modified file 'libunity-2d-private/src/hotkey.h'
--- libunity-2d-private/src/hotkey.h	2011-02-23 17:03:50 +0000
+++ libunity-2d-private/src/hotkey.h	2011-11-18 10:44:35 +0000
@@ -22,6 +22,8 @@
 
 #include <QObject>
 
+typedef unsigned long KeySym;
+
 class Hotkey : public QObject
 {
     friend class HotkeyMonitor;
@@ -33,6 +35,7 @@
 public:
     Qt::Key key() const { return m_key; }
     Qt::KeyboardModifiers modifiers() const { return m_modifiers; }
+    bool isX11Keysym() const { return m_isX11keysym; }
 
 Q_SIGNALS:
     void keyChanged(Qt::Key key);
@@ -45,13 +48,14 @@
     virtual void disconnectNotify(const char * signal);
 
 private:
-    Hotkey(Qt::Key key, Qt::KeyboardModifiers modifiers, QObject *parent);
+    Hotkey(Qt::Key key, Qt::KeyboardModifiers modifiers, QObject *parent, bool isX11keysym = false);
     bool processNativeEvent(uint x11Keycode, uint x11Modifiers, bool isPressEvent);
 
 private:
     uint m_connections;
     Qt::Key m_key;
     Qt::KeyboardModifiers m_modifiers;
+    bool m_isX11keysym;
     uint m_x11key;
     uint m_x11modifiers;
 };

=== modified file 'libunity-2d-private/src/hotkeymonitor.cpp'
--- libunity-2d-private/src/hotkeymonitor.cpp	2011-10-14 07:07:09 +0000
+++ libunity-2d-private/src/hotkeymonitor.cpp	2011-11-18 10:44:35 +0000
@@ -64,7 +64,7 @@
 
 
 Hotkey*
-HotkeyMonitor::getHotkeyFor(Qt::Key key, Qt::KeyboardModifiers modifiers)
+HotkeyMonitor::getHotkeyFor(Qt::Key key, Qt::KeyboardModifiers modifiers, bool isX11keysym)
 {
     Q_FOREACH(Hotkey* currentHotkey, m_hotkeys) {
         if (currentHotkey->key() == key &&
@@ -73,7 +73,7 @@
         }
     }
 
-    Hotkey *hotkey = new Hotkey(key, modifiers, this);
+    Hotkey *hotkey = new Hotkey(key, modifiers, this, isX11keysym);
     m_hotkeys.append(hotkey);
     return hotkey;
 }

=== modified file 'libunity-2d-private/src/hotkeymonitor.h'
--- libunity-2d-private/src/hotkeymonitor.h	2011-10-14 07:07:09 +0000
+++ libunity-2d-private/src/hotkeymonitor.h	2011-11-18 10:44:35 +0000
@@ -33,7 +33,7 @@
     static HotkeyMonitor& instance();
     ~HotkeyMonitor();
 
-    Hotkey* getHotkeyFor(Qt::Key key, Qt::KeyboardModifiers modifiers);
+    Hotkey* getHotkeyFor(Qt::Key key, Qt::KeyboardModifiers modifiers, bool isX11keysym = false);
 
     void disableModifiers(Qt::KeyboardModifiers modifiers);
     void enableModifiers(Qt::KeyboardModifiers modifiers);