Merge lp:~gerboland/unity-2d/launcher_Alt+F1_fix into lp:unity-2d/3.0

[Gerry Boland]

[launcher] Fixed failure to appear on first Alt+F1 keypress.

This was because QDeclarative::activateWindow() not reliable. Dash & Spread use forceActivateWindow() instead.
Instead of having a third copy of this method for the Launcher, I've moved it to Unity2DDeclarativeView and removed the copies from Dash & Spread.

[lp:~gerboland/unity-2d/launcher_Alt+F1_fix]

655. By Gerry Boland on 2011-07-28

Closing LauncherItem's context menu actually closed Launcher. Fixed.

[Florian Boucault (fboucault)]

Just perfect!

review: Approve

=== modified file 'launcher/LauncherList.qml'
--- launcher/LauncherList.qml	2011-06-23 17:08:53 +0000
+++ launcher/LauncherList.qml	2011-07-28 12:28:29 +0000
@@ -201,7 +201,7 @@
             target: item.menu
             /* The menu had the keyboard focus because the launcher had
                activated it. Restore it. */
-            onDismissedByKeyEvent: launcherView.activateWindow()
+            onDismissedByKeyEvent: launcherView.forceActivateWindow()
         }
 
         Connections {

=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-07-14 14:36:53 +0000
+++ launcher/app/launcherview.cpp	2011-07-28 12:28:29 +0000
@@ -77,7 +77,7 @@
 
     /* Alt+F1 gives the keyboard focus to the launcher. */
     Hotkey* altF1 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F1, Qt::AltModifier);
-    connect(altF1, SIGNAL(pressed()), SLOT(activateWindow()));
+    connect(altF1, SIGNAL(pressed()), SLOT(forceActivateWindow()));
 
     /* Alt+F2 shows the dash with the commands place entry activated. */
     Hotkey* altF2 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F2, Qt::AltModifier);
@@ -96,12 +96,6 @@
 }
 
 void
-LauncherView::activateWindow()
-{
-    QDeclarativeView::activateWindow();
-}
-
-void
 LauncherView::focusInEvent(QFocusEvent* event)
 {
     QDeclarativeView::focusInEvent(event);

=== modified file 'launcher/app/launcherview.h'
--- launcher/app/launcherview.h	2011-07-14 14:36:53 +0000
+++ launcher/app/launcherview.h	2011-07-28 12:28:29 +0000
@@ -59,9 +59,6 @@
     void toggleDash();
     void showCommandsPlace();
 
-public Q_SLOTS:
-    void activateWindow();
-
 protected:
     void focusInEvent(QFocusEvent* event);
     void focusOutEvent(QFocusEvent* event);

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.cpp'
--- libunity-2d-private/src/unity2ddeclarativeview.cpp	2011-07-05 18:51:34 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.cpp	2011-07-28 12:28:29 +0000
@@ -1,5 +1,9 @@
 #include "unity2ddeclarativeview.h"
 #include <QGLWidget>
+#include <QX11Info>
+
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
 
 Unity2DDeclarativeView::Unity2DDeclarativeView(QWidget *parent) :
     QDeclarativeView(parent), m_useOpenGL(false), m_transparentBackground(false)
@@ -91,4 +95,32 @@
     }
 }
 
+void Unity2DDeclarativeView::forceActivateWindow()
+{
+    /* Workaround focus stealing prevention implemented by some window
+       managers such as Compiz. This is the exact same code you will find in
+       libwnck::wnck_window_activate().
+
+       ref.: http://permalink.gmane.org/gmane.comp.lib.qt.general/4733
+    */
+    Display* display = QX11Info::display();
+    Atom net_wm_active_window = XInternAtom(display, "_NET_ACTIVE_WINDOW",
+                                            False);
+    XEvent xev;
+    xev.xclient.type = ClientMessage;
+    xev.xclient.send_event = True;
+    xev.xclient.display = display;
+    xev.xclient.window = this->effectiveWinId();
+    xev.xclient.message_type = net_wm_active_window;
+    xev.xclient.format = 32;
+    xev.xclient.data.l[0] = 2;
+    xev.xclient.data.l[1] = CurrentTime;
+    xev.xclient.data.l[2] = 0;
+    xev.xclient.data.l[3] = 0;
+    xev.xclient.data.l[4] = 0;
+
+    XSendEvent(display, QX11Info::appRootWindow(), False,
+               SubstructureRedirectMask | SubstructureNotifyMask, &xev);
+}
+
 #include <unity2ddeclarativeview.moc>

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.h'
--- libunity-2d-private/src/unity2ddeclarativeview.h	2011-07-05 16:40:08 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.h	2011-07-28 12:28:29 +0000
@@ -28,6 +28,9 @@
 protected:
     void setupViewport();
 
+protected Q_SLOTS:
+    void forceActivateWindow();
+
 private:
     bool m_useOpenGL;
     bool m_transparentBackground;

=== modified file 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp	2011-06-13 00:31:52 +0000
+++ places/app/dashdeclarativeview.cpp	2011-07-28 12:28:29 +0000
@@ -235,35 +235,6 @@
 }
 
 void
-DashDeclarativeView::forceActivateWindow()
-{
-    /* Workaround focus stealing prevention implemented by some window
-       managers such as Compiz. This is the exact same code you will find in
-       libwnck::wnck_window_activate().
-
-       ref.: http://permalink.gmane.org/gmane.comp.lib.qt.general/4733
-    */
-    Display* display = QX11Info::display();
-    Atom net_wm_active_window = XInternAtom(display, "_NET_ACTIVE_WINDOW",
-                                            False);
-    XEvent xev;
-    xev.xclient.type = ClientMessage;
-    xev.xclient.send_event = True;
-    xev.xclient.display = display;
-    xev.xclient.window = this->effectiveWinId();
-    xev.xclient.message_type = net_wm_active_window;
-    xev.xclient.format = 32;
-    xev.xclient.data.l[0] = 2;
-    xev.xclient.data.l[1] = CurrentTime;
-    xev.xclient.data.l[2] = 0;
-    xev.xclient.data.l[3] = 0;
-    xev.xclient.data.l[4] = 0;
-
-    XSendEvent(display, QX11Info::appRootWindow(), False,
-               SubstructureRedirectMask | SubstructureNotifyMask, &xev);
-}
-
-void
 DashDeclarativeView::activatePlaceEntry(const QString& file, const QString& entry, const int section)
 {
     QGraphicsObject* dash = rootObject();

=== modified file 'places/app/dashdeclarativeview.h'
--- places/app/dashdeclarativeview.h	2011-05-23 17:23:38 +0000
+++ places/app/dashdeclarativeview.h	2011-07-28 12:28:29 +0000
@@ -76,7 +76,6 @@
 
 private Q_SLOTS:
     void onWorkAreaResized(int screen);
-    void forceActivateWindow();
 
 private:
     void fitToAvailableSpace();

=== modified file 'spread/app/spreadview.cpp'
--- spread/app/spreadview.cpp	2011-04-29 16:26:25 +0000
+++ spread/app/spreadview.cpp	2011-07-28 12:28:29 +0000
@@ -22,10 +22,6 @@
 #include <QDesktopWidget>
 #include <QApplication>
 #include <QMouseEvent>
-#include <QX11Info>
-
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
 
 #include "launcherclient.h"
 
@@ -48,38 +44,6 @@
     }
 }
 
-/* Since we are a dock window, the WM never gives us keyboard focus.
-   The workaround below, copied from places, will fix this */
-/* FIXME: copied from places/app/dashdeclarativeview.cpp */
-void
-SpreadView::forceActivateWindow()
-{
-    /* Workaround focus stealing prevention implemented by some window
-       managers such as Compiz. This is the exact same code you will find in
-       libwnck::wnck_window_activate().
-
-       ref.: http://permalink.gmane.org/gmane.comp.lib.qt.general/4733
-    */
-    Display* display = QX11Info::display();
-    Atom net_wm_active_window = XInternAtom(display, "_NET_ACTIVE_WINDOW",
-                                            False);
-    XEvent xev;
-    xev.xclient.type = ClientMessage;
-    xev.xclient.send_event = True;
-    xev.xclient.display = display;
-    xev.xclient.window = this->effectiveWinId();
-    xev.xclient.message_type = net_wm_active_window;
-    xev.xclient.format = 32;
-    xev.xclient.data.l[0] = 2;
-    xev.xclient.data.l[1] = CurrentTime;
-    xev.xclient.data.l[2] = 0;
-    xev.xclient.data.l[3] = 0;
-    xev.xclient.data.l[4] = 0;
-
-    XSendEvent(display, QX11Info::appRootWindow(), False,
-               SubstructureRedirectMask | SubstructureNotifyMask, &xev);
-}
-
 /* To be able to call grabMouse() we need to be 100% sure that X11 did
    already map the window. Otherwise grabMouse() will silently fail (and
    confusingly incorrectly reports the widget to be the mouseGrabber())

=== modified file 'spread/app/spreadview.h'
--- spread/app/spreadview.h	2011-04-29 16:26:25 +0000
+++ spread/app/spreadview.h	2011-07-28 12:28:29 +0000
@@ -36,9 +36,6 @@
     /* FIXME: copied from places/app/dashdeclarativeview.h */
     void fitToAvailableSpace(int screen);
 
-    /* FIXME: copied from places/app/dashdeclarativeview.h */
-    void forceActivateWindow();
-
 protected:
     virtual void focusInEvent( QFocusEvent * event );
     virtual void focusOutEvent( QFocusEvent * event );