Merge lp:~dyams/unity-2d/centralized-hotkeys into lp:~dyams/unity-2d/Shell-MultiMonitor

[Lohith D Shivamurthy]

[shell][multimonitor] Move Hotkeys AltF1, AltF2 and Super[0..9] to shellmanager.cpp

[Albert Astals Cid (aacid)]

Why is this against lp:unity-2d instead of against lp:~dyams/unity-2d/Shell-MultiMonitor ?

[Albert Astals Cid (aacid)]

I'd prefer that "activeScreen" was called "cursorScreen" so it is clear it is returning the screen that contains the cursor

I don't like how we have the removeFocus and emitActivateShortcutPressed and emitNewInstanceShortcutPressed, this happens because you moved the logic of handling the keypress to ShellManager, for example ShellManager::onNumericHotkeyPressed does all the handling, i think you should change ShellManager::onNumericHotkeyPressed so it only does

void
ShellManager::onNumericHotkeyPressed()
{
    Hotkey* hotkey = qobject_cast<Hotkey*>(sender());
    if (hotkey) {
        d->m_activeShell = d->activeShell();
        if (d->m_activeShell) {
            d->m_activeShell->processNumericHotkey(hotkey);
       }
    }
}

and something similar for ShellManager::onAltF1Pressed(), this way you don't need to create functions in ShellDeclarativeView that the only thing they do is make some protected functions public.

review: Needs Fixing

[lp:~dyams/unity-2d/centralized-hotkeys]

919. By Lohith D Shivamurthy on 2012-02-14

process the numeric hotkeys in shelldeclarativeview.cpp

920. By Lohith D Shivamurthy on 2012-02-14

Rename activeScreen to cursorScreen

921. By Lohith D Shivamurthy on 2012-02-14

Remove ShellDeclarativeView::removeFocus, use toggleLauncher instead

[Albert Astals Cid (aacid)]

As discussed on irc, please rename m_activeShell to m_previousActiveShell

Also i found out that Alt+F1 toggling stops working after a while, this is what i do.
Kill unity-2d-shell
Start unity-2d-shell
Move cursor to primary screen
Press Alt+F1 -> launcher shows in primary screen
Move cursor to secondary screen
Press Alt+F1 -> launcher hides in primary screen and shows in secondary screen
Move cursor to primary screen
Press Alt+F1 -> launcher hides in secondary screen but DOES NOT show in primary screen

review: Needs Fixing

[lp:~dyams/unity-2d/centralized-hotkeys]

922. By Lohith D Shivamurthy on 2012-02-14

Rename m_activeShell to m_previousActiveShell

923. By Lohith D Shivamurthy on 2012-02-14

We don't need to remember previous active shell

[Albert Astals Cid (aacid)]

I still find a problem doing:
Kill unity-2d-shell
Start unity-2d-shell
Move cursor to primary screen
Press Alt+F1 -> launcher shows in primary screen
Quickly move cursor to secondary screen
Press Alt+F1 -> launcher hides in primary screen and shows in secondary screen
Quickly move cursor to primary screen
Press Alt+F1 -> launcher does not hide immediately in secondary screen (it hides after a while), it shows in primary screen but never hides

review: Needs Fixing

[Albert Astals Cid (aacid)]

Looks good. Please merge into lp:~dyams/unity-2d/Shell-MultiMonitor

review: Approve

=== modified file 'libunity-2d-private/src/screeninfo.cpp'
--- libunity-2d-private/src/screeninfo.cpp	2012-02-01 16:28:13 +0000
+++ libunity-2d-private/src/screeninfo.cpp	2012-02-14 12:30:20 +0000
@@ -198,6 +198,14 @@
     return m_corner;
 }
 
+int
+ScreenInfo::cursorScreen()
+{
+    QDesktopWidget* desktop = QApplication::desktop();
+    QPoint cursorPos(QCursor::pos());
+    return desktop->screenNumber(cursorPos);
+}
+
 void
 ScreenInfo::setCorner(Corner corner)
 {

=== modified file 'libunity-2d-private/src/screeninfo.h'
--- libunity-2d-private/src/screeninfo.h	2012-02-01 15:01:21 +0000
+++ libunity-2d-private/src/screeninfo.h	2012-02-14 12:30:20 +0000
@@ -39,6 +39,7 @@
     int screen() const;
     QWidget* widget() const;
     Corner corner() const;
+    static int cursorScreen();
 
     /* Setters */
     void setScreen(int screen);

=== modified file 'shell/app/shelldeclarativeview.cpp'
--- shell/app/shelldeclarativeview.cpp	2012-02-14 07:13:39 +0000
+++ shell/app/shelldeclarativeview.cpp	2012-02-14 12:30:20 +0000
@@ -74,22 +74,6 @@
     connect(&launcher2dConfiguration(), SIGNAL(superKeyEnableChanged(bool)), SLOT(updateSuperKeyMonitoring()));
     updateSuperKeyMonitoring();
 
-    /* Alt+F1 reveal the launcher and gives the keyboard focus to the Dash Button. */
-    Hotkey* altF1 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F1, Qt::AltModifier);
-    connect(altF1, SIGNAL(pressed()), SLOT(onAltF1Pressed()));
-
-    /* Alt+F2 shows the dash with the commands lens activated. */
-    Hotkey* altF2 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F2, Qt::AltModifier);
-    connect(altF2, SIGNAL(pressed()), SLOT(showCommandsLens()));
-
-    /* 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()));
-        hotkey = HotkeyMonitor::instance().getHotkeyFor(key, Qt::MetaModifier | Qt::ShiftModifier);
-        connect(hotkey, SIGNAL(pressed()), SLOT(forwardNumericHotkey()));
-    }
-
     connect(m_screenInfo, SIGNAL(availableGeometryChanged(QRect)), SLOT(updateShellPosition()));
     updateShellPosition();
 }
@@ -267,7 +251,7 @@
 }
 
 void
-ShellDeclarativeView::onAltF1Pressed()
+ShellDeclarativeView::toggleLauncher()
 {
     if (!isActiveWindow()) {
         forceActivateWindow();
@@ -372,29 +356,26 @@
 }
 
 void
-ShellDeclarativeView::forwardNumericHotkey()
+ShellDeclarativeView::processNumericHotkey(Hotkey* hotkey)
 {
-    Hotkey* hotkey = qobject_cast<Hotkey*>(sender());
-    if (hotkey != NULL) {
-        /* Shortcuts from 1 to 9 should activate the items with index
-           from 1 to 9 (index 0 being the so-called "BFB" or Dash launcher).
-           Shortcut for 0 should activate item with index 10.
-           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);
-            }
-        } else if (key == Qt::Key_0) {
-            if (hotkey->modifiers() & Qt::ShiftModifier) {
-                Q_EMIT newInstanceShortcutPressed(10);
-            } else {
-                Q_EMIT activateShortcutPressed(10);
-            }
+    /* Shortcuts from 1 to 9 should activate the items with index
+       from 1 to 9 (index 0 being the so-called "BFB" or Dash launcher).
+       Shortcut for 0 should activate item with index 10.
+       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);
+        }
+    } else if (key == Qt::Key_0) {
+        if (hotkey->modifiers() & Qt::ShiftModifier) {
+            Q_EMIT newInstanceShortcutPressed(10);
+        } else {
+            Q_EMIT activateShortcutPressed(10);
         }
     }
 }

=== modified file 'shell/app/shelldeclarativeview.h'
--- shell/app/shelldeclarativeview.h	2012-02-14 07:13:39 +0000
+++ shell/app/shelldeclarativeview.h	2012-02-14 12:30:20 +0000
@@ -27,6 +27,7 @@
 class LauncherClient;
 class DashDBus;
 class ScreenInfo;
+class Hotkey;
 
 class ShellDeclarativeView : public Unity2DDeclarativeView, public AbstractX11EventFilter
 {
@@ -82,6 +83,11 @@
 
     virtual bool x11EventFilter(XEvent* event);
 
+    void toggleLauncher();
+    void showCommandsLens();
+
+    void processNumericHotkey(Hotkey*);
+
 Q_SIGNALS:
     void dashActiveChanged(bool);
     void dashModeChanged(DashMode);
@@ -105,12 +111,9 @@
     void updateSuperKeyMonitoring();
     void updateSuperKeyHoldState();
     void setHotkeysForModifiers(Qt::KeyboardModifiers modifiers);
-    void forwardNumericHotkey();
     void ignoreSuperPress();
 
     void toggleDash();
-    void showCommandsLens();
-    void onAltF1Pressed();
 
 protected:
     virtual void showEvent(QShowEvent *event);

=== modified file 'shell/app/shellmanager.cpp'
--- shell/app/shellmanager.cpp	2012-02-14 07:22:49 +0000
+++ shell/app/shellmanager.cpp	2012-02-14 12:30:20 +0000
@@ -30,6 +30,11 @@
 #include <QDeclarativeContext>
 #include <QAbstractEventDispatcher>
 
+// libunity-2d-private
+#include <hotkeymonitor.h>
+#include <hotkey.h>
+#include <screeninfo.h>
+
 // Local
 #include "shelldeclarativeview.h"
 #include "dashclient.h"
@@ -53,6 +58,7 @@
 
     ShellDeclarativeView* initShell(bool isTopLeft, int screen);
     void updateScreenCount(int newCount);
+    ShellDeclarativeView* activeShell() const;
 
     ShellManager *q;
     QList<ShellDeclarativeView *> m_viewList;
@@ -61,7 +67,9 @@
     QUrl m_sourceFileUrl;
 };
 
-ShellDeclarativeView* ShellManagerPrivate::initShell(bool isTopLeft, int screen)
+
+ShellDeclarativeView *
+ShellManagerPrivate::initShell(bool isTopLeft, int screen)
 {
     const QStringList arguments = qApp->arguments();
     ShellDeclarativeView * view = new ShellDeclarativeView(m_sourceFileUrl, isTopLeft, screen);
@@ -107,7 +115,20 @@
     return view;
 }
 
-void ShellManagerPrivate::updateScreenCount(int newCount)
+ShellDeclarativeView *
+ShellManagerPrivate::activeShell() const
+{
+    int cursorScreen = ScreenInfo::cursorScreen();
+    Q_FOREACH(ShellDeclarativeView * shell, m_viewList) {
+        if (shell->screenNumber() == cursorScreen) {
+            return shell;
+        }
+    }
+    return 0;
+}
+
+void
+ShellManagerPrivate::updateScreenCount(int newCount)
 {
     if (newCount > 0) {
         QDesktopWidget* desktop = QApplication::desktop();
@@ -168,6 +189,22 @@
     d->updateScreenCount(desktop->screenCount());
 
     connect(desktop, SIGNAL(screenCountChanged(int)), SLOT(onScreenCountChanged(int)));
+
+    /* Alt+F1 reveal the launcher and gives the keyboard focus to the Dash Button. */
+    Hotkey* altF1 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F1, Qt::AltModifier);
+    connect(altF1, SIGNAL(pressed()), SLOT(onAltF1Pressed()));
+
+    /* Alt+F2 shows the dash with the commands lens activated. */
+    Hotkey* altF2 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F2, Qt::AltModifier);
+    connect(altF2, SIGNAL(pressed()), SLOT(onAltF2Pressed()));
+
+    /* 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(onNumericHotkeyPressed()));
+        hotkey = HotkeyMonitor::instance().getHotkeyFor(key, Qt::MetaModifier | Qt::ShiftModifier);
+        connect(hotkey, SIGNAL(pressed()), SLOT(onNumericHotkeyPressed()));
+    }
 }
 
 ShellManager::~ShellManager()
@@ -181,3 +218,35 @@
 {
     d->updateScreenCount(newCount);
 }
+
+/*------------------ Hotkeys Handling -----------------------*/
+
+void
+ShellManager::onAltF1Pressed()
+{
+    ShellDeclarativeView * activeShell = d->activeShell();
+    if (activeShell) {
+        activeShell->toggleLauncher();
+    }
+}
+
+void
+ShellManager::onAltF2Pressed()
+{
+    ShellDeclarativeView * activeShell = d->activeShell();
+    if (activeShell) {
+        activeShell->showCommandsLens();
+    }
+}
+
+void
+ShellManager::onNumericHotkeyPressed()
+{
+    Hotkey* hotkey = qobject_cast<Hotkey*>(sender());
+    if (hotkey) {
+        ShellDeclarativeView * activeShell = d->activeShell();
+        if (activeShell) {
+            activeShell->processNumericHotkey(hotkey);
+        }
+    }
+}

=== modified file 'shell/app/shellmanager.h'
--- shell/app/shellmanager.h	2012-02-14 07:22:49 +0000
+++ shell/app/shellmanager.h	2012-02-14 12:30:20 +0000
@@ -32,6 +32,9 @@
 
 private Q_SLOTS:
     void onScreenCountChanged(int);
+    void onAltF1Pressed();
+    void onAltF2Pressed();
+    void onNumericHotkeyPressed();
 
 private:
     Q_DISABLE_COPY(ShellManager)