Merge lp:~unity-2d-team/unity-2d/Shell-MultiMonitor into lp:unity-2d

[Albert Astals Cid]

[all] implement multimonitor support in the shell

* allow launcher-per-screen configuration
* HUD and Dash follow mouse cursor
* panel per-screen, also on non-top screens
* spread per-screen
* support the switch to a single launcher on primary monitor

Multimonitor support for the shell

[lp:~unity-2d-team/unity-2d/Shell-MultiMonitor]

1035. By Albert Astals Cid on 2012-03-15

Minor fix for RTL dash placement in MM with screens of different size

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'data/com.canonical.Unity2d.gschema.xml'
--- data/com.canonical.Unity2d.gschema.xml	2012-02-28 15:29:24 +0000
+++ data/com.canonical.Unity2d.gschema.xml	2012-03-15 09:01:33 +0000
@@ -15,6 +15,11 @@
         Unity will adapt its shape and form to the device it is running on.
       </description>
     </key>
+    <key type="b" name="sticky-edges">
+      <default>true</default>
+      <summary>Sticky edges.</summary>
+      <description>Whether the edges in a multi-monitor setup should be sticky or not (Edges with autohide launchers are always sticky).</description>
+    </key>
   </schema>
   <schema path="/com/canonical/unity-2d/launcher/" id="com.canonical.Unity2d.Launcher" gettext-domain="unity-2d">
     <key type="b" name="super-key-enable">
@@ -69,6 +74,11 @@
         Only relevant for multi-monitor setups
       </description>
     </key>
+    <key type="b" name="only-one-launcher">
+      <default>true</default>
+      <summary>Show only one launcher.</summary>
+      <description>Whether in a multi-monitor setup there should be just one launcher in the primary screen or one in each.</description>
+    </key>
   </schema>
   <schema path="/com/canonical/unity-2d/panel/" id="com.canonical.Unity2d.Panel" gettext-domain="unity-2d">
     <key type="as" name="applets">

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2012-03-13 18:54:14 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2012-03-15 09:01:33 +0000
@@ -45,6 +45,7 @@
     application.cpp
     applicationslist.cpp
     applicationslistdbus.cpp
+    applicationslistmanager.cpp
     launcherdevice.cpp
     launcherdeviceslist.cpp
     launcherutility.cpp

=== modified file 'libunity-2d-private/src/application.cpp'
--- libunity-2d-private/src/application.cpp	2012-03-13 19:23:49 +0000
+++ libunity-2d-private/src/application.cpp	2012-03-15 09:01:33 +0000
@@ -69,6 +69,16 @@
 
 const char* SHORTCUT_NICK_PROPERTY = "nick";
 
+static int windowScreen(WnckWindow *window)
+{
+    // Check the window screen
+    int x, y, width, height;
+    wnck_window_get_geometry(window, &x, &y, &width, &height);
+    const QRect windowRect(x, y, width, height);
+    const QPoint pos = windowRect.center();
+    return QApplication::desktop()->screenNumber(pos);
+}
+
 Application::Application()
     : m_application(NULL)
     , m_desktopFileWatcher(NULL)
@@ -78,6 +88,7 @@
     , m_counter(0), m_counterVisible(false)
     , m_emblem(QString()), m_emblemVisible(false)
     , m_forceUrgent(false)
+    , m_previousActiveScreen(-1)
     , m_dynamicQuicklistServiceWatcher(NULL)
 {
     m_launching_timer.setSingleShot(true);
@@ -93,6 +104,7 @@
     m_geometryChangedTimer.setSingleShot(true);
     m_geometryChangedTimer.setInterval(50);
     connect(&m_geometryChangedTimer, SIGNAL(timeout()), this, SIGNAL(windowGeometryChanged()));
+    connect(&m_geometryChangedTimer, SIGNAL(timeout()), this, SLOT(announceActiveScreenChangedIfNeeded()));
 }
 
 Application::Application(const Application& other)
@@ -460,6 +472,15 @@
 }
 
 void
+Application::announceActiveScreenChangedIfNeeded()
+{
+    if (m_previousActiveScreen != activeScreen()) {
+        m_previousActiveScreen = activeScreen();
+        Q_EMIT activeScreenChanged(m_previousActiveScreen);
+    }
+}
+
+void
 Application::onBamfApplicationClosed(bool running)
 {
     if(running)
@@ -493,7 +514,7 @@
 }
 
 void
-Application::setIconGeometry(int x, int y, int width, int height, uint xid)
+Application::setIconGeometry(int x, int y, int width, int height, int screen, uint xid)
 {
     if (m_application == NULL) {
         return;
@@ -512,12 +533,13 @@
         return;
     }
 
-    WnckScreen* screen = wnck_screen_get_default();
-    wnck_screen_force_update(screen);
+    wnck_screen_force_update(wnck_screen_get_default());
 
     for (int i = 0; i < size; ++i) {
         WnckWindow* window = wnck_window_get(xids->at(i));
-        wnck_window_set_icon_geometry(window, x, y, width, height);
+        if (screen == -1 || windowScreen(window) == screen) {
+            wnck_window_set_icon_geometry(window, x, y, width, height);
+        }
     }
 }
 
@@ -528,8 +550,8 @@
         return;
     }
 
-    QScopedPointer<BamfUintList> xids(m_application->xids());
-    int size = xids->size();
+    QScopedPointer<BamfWindowList> windows(m_application->windows());
+    const int size = windows->size();
     if (size < 1) {
         return;
     }
@@ -538,10 +560,8 @@
     wnck_screen_force_update(screen);
 
     for (int i = 0; i < size; ++i) {
-        WnckWindow* window = wnck_window_get(xids->at(i));
-        m_gConnector.connect(G_OBJECT(window), "workspace-changed",
-            G_CALLBACK(Application::onWindowWorkspaceChanged), this);
-        m_gConnector.connect(G_OBJECT(window), "geometry-changed", G_CALLBACK(geometryChangedCB), this);
+        BamfWindow *window = windows->at(i);
+        onWindowAdded(window);
     }
 }
 
@@ -554,6 +574,7 @@
         m_gConnector.connect(G_OBJECT(wnck_window), "workspace-changed",
              G_CALLBACK(Application::onWindowWorkspaceChanged), this);
         m_gConnector.connect(G_OBJECT(wnck_window), "geometry-changed", G_CALLBACK(geometryChangedCB), this);
+        connect(window, SIGNAL(ActiveChanged(bool)), this, SLOT(announceActiveScreenChangedIfNeeded()));
     }
 }
 
@@ -682,6 +703,26 @@
     return windowCount;
 }
 
+int
+Application::activeScreen() const
+{
+    if (!active()) {
+        return -1;
+    }
+
+    BamfWindow *bamfWindow = BamfMatcher::get_default().active_window();
+    if (bamfWindow == NULL) {
+        return -1;
+    }
+
+    WnckWindow *wnckWindow = wnck_window_get(bamfWindow->xid());
+    if (wnckWindow == NULL) {
+        return -1;
+    }
+
+    return windowScreen(wnckWindow);
+}
+
 void
 Application::activate()
 {
@@ -991,28 +1032,15 @@
     } 
 }
 
-bool
-Application::belongsToDifferentWorkspace()
-{
-    int totalWindows = windowCount();
-    int windowsInCurrentWorkspace = windowCountOnCurrentWorkspace();
-    if (totalWindows > 0 && windowsInCurrentWorkspace == 0) {
-        return true;
-    }
-
-    return false;
-}
-
-bool
-Application::belongsToDifferentScreen(int screen)
+int
+Application::windowsOnCurrentWorkspaceScreen(int screen)
 {
     if (!m_application) {
-        return false;
+        return 0;
     }
 
-    if (QApplication::desktop()->screenCount() == 1) {
-        return false;
-    }
+    int windowCount = 0;
+    WnckWorkspace *current = wnck_screen_get_active_workspace(wnck_screen_get_default());
 
     QScopedPointer<BamfUintList> xids(m_application->xids());
     for (int i = 0; i < xids->size(); i++) {
@@ -1028,17 +1056,21 @@
             }
         }
 
-        // Check the window screen
-        int x, y, width, height;
-        wnck_window_get_geometry(window, &x, &y, &width, &height);
-        const QRect windowRect(x, y, width, height);
-        const QPoint pos = windowRect.center();
-        if (QApplication::desktop()->screenNumber(pos) == screen) {
-            return false;
+        if (wnck_window_is_pinned(window)) {
+            windowCount++;
+        } else {
+            WnckWorkspace *workspace = wnck_window_get_workspace(window);
+            if (workspace == current) {
+                if (screen == -1) {
+                    windowCount++;
+                } else if (windowScreen(window) == screen) {
+                    windowCount++;
+                }
+            }
         }
     }
 
-    return true;
+    return windowCount;
 }
 
 void

=== modified file 'libunity-2d-private/src/application.h'
--- libunity-2d-private/src/application.h	2012-03-12 12:46:39 +0000
+++ libunity-2d-private/src/application.h	2012-03-15 09:01:33 +0000
@@ -72,6 +72,7 @@
 
     /* getters */
     virtual bool active() const;
+    virtual int activeScreen() const;
     virtual bool running() const;
     virtual int windowCount() const;
     virtual bool urgent() const;
@@ -101,12 +102,11 @@
     Q_INVOKABLE virtual void activate();
     Q_INVOKABLE void close();
     Q_INVOKABLE void spread(bool showAllWorkspaces = false);
-    Q_INVOKABLE void setIconGeometry(int x, int y, int width, int height, uint xid=0);
+    Q_INVOKABLE void setIconGeometry(int x, int y, int width, int height, int screen, uint xid=0);
     Q_INVOKABLE virtual void launchNewInstance();
 
     Q_INVOKABLE virtual void createMenuActions();
-    Q_INVOKABLE virtual bool belongsToDifferentWorkspace();
-    Q_INVOKABLE virtual bool belongsToDifferentScreen(int screen);
+    Q_INVOKABLE virtual int windowsOnCurrentWorkspaceScreen(int screen);
     Q_INVOKABLE void connectWindowSignals();
 
     void updateOverlaysState(const QString& sender, const QMap<QString, QVariant>& properties);
@@ -128,6 +128,7 @@
     void updateHasVisibleWindow();
     void updateWindowCount();
     void updateCounterVisible();
+    void announceActiveScreenChangedIfNeeded();
 
     bool launch();
     void show();
@@ -172,6 +173,7 @@
     QString m_emblem;
     bool m_emblemVisible;
     bool m_forceUrgent;
+    int m_previousActiveScreen;
 
     void updateBamfApplicationDependentProperties();
     void monitorDesktopFile(const QString&);

=== modified file 'libunity-2d-private/src/applicationslist.cpp'
--- libunity-2d-private/src/applicationslist.cpp	2012-02-16 11:24:19 +0000
+++ libunity-2d-private/src/applicationslist.cpp	2012-03-15 09:01:33 +0000
@@ -16,8 +16,8 @@
 
 #include "application.h"
 #include "applicationslist.h"
+#include "applicationslistmanager.h"
 #include "webfavorite.h"
-#include "applicationslistdbus.h"
 
 #include "bamf-matcher.h"
 #include "bamf-application.h"
@@ -29,8 +29,6 @@
 
 #include <QStringList>
 #include <QDir>
-#include <QDBusConnection>
-#include <QDBusMessage>
 #include <QFileInfo>
 #include <QProcess>
 #include <QX11Info>
@@ -41,12 +39,6 @@
 #include <libsn/sn.h>
 }
 
-
-#define DBUS_SERVICE_UNITY "com.canonical.Unity"
-#define DBUS_SERVICE_LAUNCHER_ENTRY "com.canonical.Unity.LauncherEntry"
-#define DBUS_SERVICE_LAUNCHER "com.canonical.Unity.Launcher"
-#define DBUS_OBJECT_LAUNCHER "/com/canonical/Unity/Launcher"
-
 /* List of executables that are too generic to be matched against a single application. */
 static const QStringList EXECUTABLES_BLACKLIST = (QStringList() << "xdg-open");
 static const QByteArray LATEST_SETTINGS_MIGRATION = "3.2.10";
@@ -54,34 +46,6 @@
 ApplicationsList::ApplicationsList(QObject *parent) :
     QAbstractListModel(parent)
 {
-    QDBusConnection session = QDBusConnection::sessionBus();
-    /* FIXME: libunity will send out the Update signal for LauncherEntries
-       only if it finds com.canonical.Unity on the bus, so let's just quickly
-       register ourselves as Unity here. Should be moved somewhere else more proper */
-    if (!session.registerService(DBUS_SERVICE_UNITY)) {
-        UQ_WARNING << "The name" << DBUS_SERVICE_UNITY << "is already taken on DBUS";
-    } else {
-        /* Set ourselves up to receive any Update signal coming from any
-           LauncherEntry */
-        session.connect(QString(), QString(),
-                        DBUS_SERVICE_LAUNCHER_ENTRY, "Update",
-                        this, SLOT(onRemoteEntryUpdated(QString,QMap<QString,QVariant>)));
-    }
-
-    if (!session.registerService(DBUS_SERVICE_LAUNCHER)) {
-        UQ_WARNING << "The name" << DBUS_SERVICE_LAUNCHER << "is already taken on DBUS";
-    } else {
-        /* Set ourselves up to receive a method call from Software Center asking us to add
-           to favorites an application that is being installed and that the user requested
-           to be added. */
-        ApplicationsListDBUS *dbusAdapter = new ApplicationsListDBUS(this);
-        if (!session.registerObject(DBUS_OBJECT_LAUNCHER, dbusAdapter,
-                                    QDBusConnection::ExportAllSlots)) {
-            UQ_WARNING << "The object" << DBUS_OBJECT_LAUNCHER << "on" << DBUS_SERVICE_LAUNCHER
-                       << "is already present on DBUS.";
-        }
-    }
-
     /* Register the display to receive startup notifications */
     Display *xdisplay = QX11Info::display();
     m_snDisplay = sn_display_new(xdisplay, NULL, NULL);
@@ -108,6 +72,8 @@
     }
 
     load();
+
+    ApplicationsListManager::instance()->addList(this);
 }
 
 void
@@ -151,19 +117,8 @@
     return false;
 }
 
-void
-ApplicationsList::onRemoteEntryUpdated(QString applicationURI, QMap<QString, QVariant> properties)
+void ApplicationsList::remoteEntryUpdated(const QString& desktopFile, const QString& sender, const QString& applicationURI, const QMap<QString, QVariant>& properties)
 {
-    UQ_RETURN_IF_FAIL(calledFromDBus());
-    QString sender = message().service();
-    QString desktopFile;
-    if (applicationURI.indexOf("application://") == 0) {
-        desktopFile = applicationURI.mid(14);
-    } else {
-        UQ_WARNING << "Ignoring update that didn't come from an application:// URI but from:" << applicationURI;
-        return;
-    }
-
     Q_FOREACH(Application *application, m_applications) {
         if (QFileInfo(application->desktop_file()).fileName() == desktopFile) {
             application->updateOverlaysState(sender, properties);
@@ -176,6 +131,8 @@
 
 ApplicationsList::~ApplicationsList()
 {
+    ApplicationsListManager::instance()->removeList(this);
+
     sn_monitor_context_unref(m_snContext);
     sn_display_unref(m_snDisplay);
 
@@ -502,7 +459,17 @@
 }
 
 void
-ApplicationsList::move(int from, int to)
+ApplicationsList::moveFinished(int from, int to)
+{
+    Q_FOREACH(ApplicationsList *other, ApplicationsListManager::instance()->m_lists) {
+        if (other != this) {
+            other->doMove(from, to);
+        }
+    }
+}
+
+void
+ApplicationsList::doMove(int from, int to)
 {
     QModelIndex parent;
     /* When moving an item down, the destination index needs to be incremented
@@ -511,6 +478,12 @@
     beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
     m_applications.move(from, to);
     endMoveRows();
+}
+
+void
+ApplicationsList::move(int from, int to)
+{
+    doMove(from, to);
 
     if (m_applications[from]->sticky() || m_applications[to]->sticky()) {
         /* Update favorites only if at least one of the applications is a favorite */

=== modified file 'libunity-2d-private/src/applicationslist.h'
--- libunity-2d-private/src/applicationslist.h	2012-02-16 11:24:19 +0000
+++ libunity-2d-private/src/applicationslist.h	2012-03-15 09:01:33 +0000
@@ -21,6 +21,7 @@
 #include <QList>
 #include <QVariant>
 #include <QString>
+#include <QStringList>
 #include <QUrl>
 #include <QObject>
 #include <QtDeclarative/qdeclarative.h>
@@ -37,10 +38,11 @@
 class BamfApplication;
 class BamfView;
 
-class ApplicationsList : public QAbstractListModel, protected AbstractX11EventFilter, protected QDBusContext
+class ApplicationsList : public QAbstractListModel, protected AbstractX11EventFilter
 {
     Q_OBJECT
     friend class ApplicationsListDBUS;
+    friend class ApplicationsListManager;
 
 public:
     ApplicationsList(QObject *parent = 0);
@@ -54,6 +56,7 @@
 
 public Q_SLOTS:
     void move(int from, int to);
+    void moveFinished(int from, int to);
 
 Q_SIGNALS:
     void applicationBecameUrgent(int index);
@@ -73,6 +76,10 @@
 
     void writeFavoritesToGConf();
 
+    void remoteEntryUpdated(const QString& desktopFile, const QString& sender, const QString& applicationURI, const QMap<QString, QVariant>& properties);
+
+    void doMove(int from, int to);
+
     /* List of Application displayed in the launcher. */
     QList<Application*> m_applications;
     /* Hash of desktop file names to Application used to reduce
@@ -102,8 +109,6 @@
     void onApplicationLaunchingChanged(bool launching);
     void onApplicationUrgentChanged(bool urgent);
     void onApplicationUserVisibleChanged(bool user_visible);
-    void onRemoteEntryUpdated(QString applicationURI,
-                              QMap<QString, QVariant> properties);
 };
 
 QML_DECLARE_TYPE(ApplicationsList)

=== modified file 'libunity-2d-private/src/applicationslistdbus.cpp'
--- libunity-2d-private/src/applicationslistdbus.cpp	2012-02-16 11:24:19 +0000
+++ libunity-2d-private/src/applicationslistdbus.cpp	2012-03-15 09:01:33 +0000
@@ -1,6 +1,7 @@
 #include "application.h"
 #include "applicationslistdbus.h"
 #include "applicationslist.h"
+#include "applicationslistmanager.h"
 
 ApplicationsListDBUS::ApplicationsListDBUS(QObject *parent) :
     QDBusAbstractAdaptor(parent)
@@ -19,12 +20,14 @@
     Q_UNUSED(icon_size)
     Q_UNUSED(aptdaemon_task)
 
-    ApplicationsList* applicationsList = qobject_cast<ApplicationsList*>(parent());
-    if (applicationsList != NULL && !desktop_file.isEmpty()) {
-        applicationsList->insertFavoriteApplication(desktop_file);
-        Application *application = applicationsList->m_applicationForDesktopFile.value(desktop_file, NULL);
-        if (application != NULL) {
-            application->beginForceUrgent(1500);
+    ApplicationsListManager* applicationsListManager = qobject_cast<ApplicationsListManager*>(parent());
+    if (applicationsListManager != NULL && !desktop_file.isEmpty()) {
+        Q_FOREACH(ApplicationsList *applicationsList, applicationsListManager->m_lists) {
+            applicationsList->insertFavoriteApplication(desktop_file);
+            Application *application = applicationsList->m_applicationForDesktopFile.value(desktop_file, NULL);
+            if (application != NULL) {
+                application->beginForceUrgent(1500);
+            }
         }
     }
 }

=== added file 'libunity-2d-private/src/applicationslistmanager.cpp'
--- libunity-2d-private/src/applicationslistmanager.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/applicationslistmanager.cpp	2012-03-15 09:01:33 +0000
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "applicationslistmanager.h"
+
+// unity-2d
+#include "applicationslist.h"
+#include "applicationslistdbus.h"
+#include "debug_p.h"
+
+// Qt
+#include <QDBusConnection>
+#include <QDBusMessage>
+
+#define DBUS_SERVICE_UNITY "com.canonical.Unity"
+#define DBUS_SERVICE_LAUNCHER_ENTRY "com.canonical.Unity.LauncherEntry"
+#define DBUS_SERVICE_LAUNCHER "com.canonical.Unity.Launcher"
+#define DBUS_OBJECT_LAUNCHER "/com/canonical/Unity/Launcher"
+
+ApplicationsListManager::ApplicationsListManager()
+{
+    QDBusConnection session = QDBusConnection::sessionBus();
+    /* FIXME: libunity will send out the Update signal for LauncherEntries
+       only if it finds com.canonical.Unity on the bus, so let's just quickly
+       register ourselves as Unity here. Should be moved somewhere else more proper */
+    if (!session.registerService(DBUS_SERVICE_UNITY)) {
+        UQ_WARNING << "The name" << DBUS_SERVICE_UNITY << "is already taken on DBUS";
+    } else {
+        /* Set ourselves up to receive any Update signal coming from any
+           LauncherEntry */
+        session.connect(QString(), QString(),
+                        DBUS_SERVICE_LAUNCHER_ENTRY, "Update",
+                        this, SLOT(onRemoteEntryUpdated(QString,QMap<QString,QVariant>)));
+    }
+
+    if (!session.registerService(DBUS_SERVICE_LAUNCHER)) {
+        UQ_WARNING << "The name" << DBUS_SERVICE_LAUNCHER << "is already taken on DBUS";
+    } else {
+        /* Set ourselves up to receive a method call from Software Center asking us to add
+           to favorites an application that is being installed and that the user requested
+           to be added. */
+        ApplicationsListDBUS *dbusAdapter = new ApplicationsListDBUS(this);
+        if (!session.registerObject(DBUS_OBJECT_LAUNCHER, dbusAdapter,
+                                    QDBusConnection::ExportAllSlots)) {
+            UQ_WARNING << "The object" << DBUS_OBJECT_LAUNCHER << "on" << DBUS_SERVICE_LAUNCHER
+                       << "is already present on DBUS.";
+        }
+    }
+}
+
+ApplicationsListManager *ApplicationsListManager::instance()
+{
+    static ApplicationsListManager manager;
+    return &manager;
+}
+
+void ApplicationsListManager::addList(ApplicationsList *list)
+{
+    m_lists += list;
+}
+
+void ApplicationsListManager::removeList(ApplicationsList *list)
+{
+    m_lists -= list;
+}
+
+void
+ApplicationsListManager::onRemoteEntryUpdated(QString applicationURI, QMap<QString, QVariant> properties)
+{
+    UQ_RETURN_IF_FAIL(calledFromDBus());
+    QString sender = message().service();
+    QString desktopFile;
+    if (applicationURI.indexOf("application://") == 0) {
+        desktopFile = applicationURI.mid(14);
+    } else {
+        UQ_WARNING << "Ignoring update that didn't come from an application:// URI but from:" << applicationURI;
+        return;
+    }
+
+    Q_FOREACH(ApplicationsList *list, m_lists) {
+        list->remoteEntryUpdated(desktopFile, sender, applicationURI, properties);
+    }
+}
+
+#include "applicationslistmanager.moc"
\ No newline at end of file

=== added file 'libunity-2d-private/src/applicationslistmanager.h'
--- libunity-2d-private/src/applicationslistmanager.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/applicationslistmanager.h	2012-03-15 09:01:33 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef APPLICATIONSLISTMODEL_H
+#define APPLICATIONSLISTMODEL_H
+
+#include <QObject>
+#include <QDBusContext>
+
+#include <QSet>
+
+class ApplicationsList;
+
+class ApplicationsListManager : public QObject, protected QDBusContext
+{
+    Q_OBJECT
+    friend class ApplicationsListDBUS;
+    friend class ApplicationsList;
+
+public:
+    static ApplicationsListManager *instance();
+
+    void addList(ApplicationsList *list);
+    void removeList(ApplicationsList *list);
+
+private Q_SLOTS:
+    void onRemoteEntryUpdated(QString applicationURI,
+                              QMap<QString, QVariant> properties);
+
+private:
+    ApplicationsListManager();
+
+    QSet<ApplicationsList*> m_lists;
+};
+
+#endif // APPLICATIONSLISTMODEL_H

=== modified file 'libunity-2d-private/src/bfb.cpp'
--- libunity-2d-private/src/bfb.cpp	2012-01-19 14:22:10 +0000
+++ libunity-2d-private/src/bfb.cpp	2012-03-15 09:01:33 +0000
@@ -27,7 +27,7 @@
 // Qt
 
 BfbItem::BfbItem()
-: m_active(false), m_view(NULL)
+: m_active(false), m_activeScreen(-1), m_manager(NULL)
 {
 }
 
@@ -40,6 +40,15 @@
     return m_active;
 }
 
+int BfbItem::activeScreen() const
+{
+    if (active()) {
+        return m_activeScreen;
+    } else {
+        return -1;
+    }
+}
+
 bool BfbItem::running() const
 {
     return false;
@@ -70,27 +79,28 @@
     return false;
 }
 
-QObject* BfbItem::dashView() const
+QObject* BfbItem::dashManager() const
 {
-    return m_view;
+    return m_manager;
 }
 
-void BfbItem::setDashView(QObject* view)
+void BfbItem::setDashManager(QObject* manager)
 {
-    if (m_view != NULL) {
-        disconnect(view);
+    if (m_manager != NULL) {
+        disconnect(m_manager);
     }
-    m_view = view;
-    if (m_view != NULL) {
-        connect(view, SIGNAL(dashActiveChanged(bool)), this, SLOT(slotDashActiveChanged(bool)));
+    m_manager = manager;
+    if (m_manager != NULL) {
+        connect(manager, SIGNAL(dashActiveChanged(bool)), this, SLOT(slotDashActiveChanged(bool)));
+        connect(manager, SIGNAL(dashScreenChanged(int)), this, SLOT(slotDashScreenChanged(int)));
     }
 }
 
 void BfbItem::activate()
 {
-    Q_ASSERT(m_view != NULL);
-    if (m_view != NULL) {
-        QMetaObject::invokeMethod(m_view, "toggleDash");
+    Q_ASSERT(m_manager != NULL);
+    if (m_manager != NULL) {
+        QMetaObject::invokeMethod(m_manager, "toggleDashRequested");
     }
 }
 
@@ -103,6 +113,19 @@
     if (m_active != active) {
         m_active = active;
         Q_EMIT activeChanged(m_active);
+        if (m_active) {
+            Q_EMIT activeScreenChanged(m_activeScreen);
+        }
+    }
+}
+
+void BfbItem::slotDashScreenChanged(int activeScreen)
+{
+    if (m_activeScreen != activeScreen) {
+        m_activeScreen = activeScreen;
+        if (m_active) {
+            Q_EMIT activeScreenChanged(m_activeScreen);
+        }
     }
 }
 
@@ -132,14 +155,14 @@
     return QVariant::fromValue(m_bfbItem);
 }
 
-QObject* BfbModel::dashView() const
+QObject* BfbModel::dashManager() const
 {
-    return m_bfbItem->dashView();
+    return m_bfbItem->dashManager();
 }
 
-void BfbModel::setDashView(QObject* view)
+void BfbModel::setDashManager(QObject* manager)
 {
-    m_bfbItem->setDashView(view);
+    m_bfbItem->setDashManager(manager);
 }
 
 #include <bfb.moc>

=== modified file 'libunity-2d-private/src/bfb.h'
--- libunity-2d-private/src/bfb.h	2012-01-19 14:22:10 +0000
+++ libunity-2d-private/src/bfb.h	2012-03-15 09:01:33 +0000
@@ -35,6 +35,7 @@
 
     /* getters */
     virtual bool active() const;
+    virtual int activeScreen() const;
     virtual bool running() const;
     virtual int windowCount() const;
     virtual bool urgent() const;
@@ -42,8 +43,8 @@
     virtual QString icon() const;
     virtual bool launching() const;
 
-    QObject* dashView() const;
-    void setDashView(QObject* view);
+    QObject* dashManager() const;
+    void setDashManager(QObject* manager);
 
     /* methods */
     Q_INVOKABLE virtual void activate();
@@ -51,11 +52,13 @@
 
 private Q_SLOTS:
     void slotDashActiveChanged(bool active);
+    void slotDashScreenChanged(int screen);
 
 private:
     Q_DISABLE_COPY(BfbItem)
     bool m_active;
-    QObject* m_view;
+    int m_activeScreen;
+    QObject* m_manager;
 };
 
 Q_DECLARE_METATYPE(BfbItem*)
@@ -64,7 +67,7 @@
 class BfbModel : public QAbstractListModel
 {
     Q_OBJECT
-    Q_PROPERTY(QObject* dashView READ dashView WRITE setDashView)
+    Q_PROPERTY(QObject* dashManager READ dashManager WRITE setDashManager)
 public:
     BfbModel(QObject* parent = 0);
     ~BfbModel();
@@ -72,8 +75,8 @@
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
     int rowCount(const QModelIndex& parent = QModelIndex()) const;
 
-    QObject* dashView() const;
-    void setDashView(QObject* view);
+    QObject* dashManager() const;
+    void setDashManager(QObject* manager);
 
 private:
     Q_DISABLE_COPY(BfbModel)

=== modified file 'libunity-2d-private/src/dashclient.cpp'
--- libunity-2d-private/src/dashclient.cpp	2012-03-06 11:16:00 +0000
+++ libunity-2d-private/src/dashclient.cpp	2012-03-15 09:01:33 +0000
@@ -75,6 +75,8 @@
             SLOT(slotActiveChanged(bool)));
     connect(m_dashDbusIface, SIGNAL(alwaysFullScreenChanged(bool)),
             SLOT(slotAlwaysFullScreenChanged(bool)));
+    connect(m_dashDbusIface, SIGNAL(screenChanged(int)),
+            SLOT(slotScreenChanged(int)));
 
     QVariant value = m_dashDbusIface->property("active");
     if (value.isValid()) {
@@ -89,6 +91,13 @@
     } else {
         UQ_WARNING << "Fetching Dash.alwaysFullScreen property failed";
     }
+
+    value = m_dashDbusIface->property("screen");
+    if (value.isValid()) {
+        m_screen = value.toInt();
+    } else {
+        UQ_WARNING << "Fetching Dash.screen property failed";
+    }
 }
 
 DashClient* DashClient::instance()
@@ -136,4 +145,22 @@
     return m_alwaysFullScreen;
 }
 
+void DashClient::slotScreenChanged(int screen)
+{
+    if (screen != m_screen) {
+        m_screen = screen;
+        Q_EMIT screenChanged(screen);
+    }
+}
+
+int DashClient::screen() const
+{
+    return m_screen;
+}
+
+bool DashClient::activeInScreen(int screen) const
+{
+    return active() && m_screen == screen;
+}
+
 #include "dashclient.moc"

=== modified file 'libunity-2d-private/src/dashclient.h'
--- libunity-2d-private/src/dashclient.h	2012-03-06 10:06:05 +0000
+++ libunity-2d-private/src/dashclient.h	2012-03-15 09:01:33 +0000
@@ -37,6 +37,7 @@
     Q_OBJECT
     Q_PROPERTY(bool alwaysFullScreen READ alwaysFullScreen NOTIFY alwaysFullScreenChanged)
     Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+    Q_PROPERTY(int screen READ screen NOTIFY screenChanged)
 
 public:
     static DashClient* instance();
@@ -46,14 +47,20 @@
 
     bool alwaysFullScreen() const;
 
+    int screen() const;
+
+    bool activeInScreen(int screen) const;
+
 Q_SIGNALS:
     void activeChanged(bool);
     void alwaysFullScreenChanged();
+    void screenChanged(int);
 
 private Q_SLOTS:
     void connectToDash();
     void slotActiveChanged(bool);
     void slotAlwaysFullScreenChanged(bool);
+    void slotScreenChanged(int);
 
 private:
     DashClient(QObject* parent = 0);
@@ -61,6 +68,7 @@
     QDBusInterface* m_dashDbusIface;
     bool m_active;
     bool m_alwaysFullScreen;
+    int m_screen;
 };
 
 #endif /* DASHCLIENT_H */

=== modified file 'libunity-2d-private/src/hudclient.cpp'
--- libunity-2d-private/src/hudclient.cpp	2012-03-06 11:16:00 +0000
+++ libunity-2d-private/src/hudclient.cpp	2012-03-15 09:01:33 +0000
@@ -72,6 +72,8 @@
                                          QDBusConnection::sessionBus(), this);
     connect(m_hudDbusIface, SIGNAL(activeChanged(bool)),
             SLOT(slotActiveChanged(bool)));
+    connect(m_hudDbusIface, SIGNAL(screenChanged(int)),
+            SLOT(slotScreenChanged(int)));
 
     QVariant value = m_hudDbusIface->property("active");
     if (value.isValid()) {
@@ -79,6 +81,14 @@
     } else {
         UQ_WARNING << "Fetching HUD.active property failed";
     }
+
+    value = m_hudDbusIface->property("screen");
+    if (value.isValid()) {
+        m_screen = value.toInt();
+    } else {
+        UQ_WARNING << "Fetching Hud.screen property failed";
+    }
+
 }
 
 HUDClient* HUDClient::instance()
@@ -113,4 +123,22 @@
     }
 }
 
+void HUDClient::slotScreenChanged(int screen)
+{
+    if (screen != m_screen) {
+        m_screen = screen;
+        Q_EMIT screenChanged(screen);
+    }
+}
+
+int HUDClient::screen() const
+{
+    return m_screen;
+}
+
+bool HUDClient::activeInScreen(int screen) const
+{
+    return active() && m_screen == screen;
+}
+
 #include "hudclient.moc"

=== modified file 'libunity-2d-private/src/hudclient.h'
--- libunity-2d-private/src/hudclient.h	2012-03-06 10:06:05 +0000
+++ libunity-2d-private/src/hudclient.h	2012-03-15 09:01:33 +0000
@@ -36,6 +36,7 @@
 {
     Q_OBJECT
     Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+    Q_PROPERTY(int screen READ screen NOTIFY screenChanged)
 
 public:
     static HUDClient* instance();
@@ -43,18 +44,25 @@
     bool active() const;
     void setActive(bool active);
 
+    int screen() const;
+
+    bool activeInScreen(int screen) const;
+
 Q_SIGNALS:
     void activeChanged(bool);
+    void screenChanged(int);
 
 private Q_SLOTS:
     void connectToHud();
     void slotActiveChanged(bool);
+    void slotScreenChanged(int);
 
 private:
     HUDClient(QObject* parent = 0);
 
     QDBusInterface* m_hudDbusIface;
     bool m_active;
+    int m_screen;
 };
 
 #endif /* HUDCLIENT_H */

=== modified file 'libunity-2d-private/src/indicatorentrywidget.cpp'
--- libunity-2d-private/src/indicatorentrywidget.cpp	2012-02-12 15:10:03 +0000
+++ libunity-2d-private/src/indicatorentrywidget.cpp	2012-03-15 09:01:33 +0000
@@ -50,6 +50,7 @@
 , m_padding(PADDING)
 , m_hasIcon(false)
 , m_hasLabel(false)
+, m_activatedByThisEntry(false)
 , m_gtkWidgetPath(gtk_widget_path_new())
 {
     gtk_widget_path_append_type(m_gtkWidgetPath, GTK_TYPE_WINDOW);
@@ -59,6 +60,7 @@
 
     setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
     m_entry->updated.connect(sigc::mem_fun(this, &IndicatorEntryWidget::updatePix));
+    m_entry->active_changed.connect(sigc::mem_fun(this, &IndicatorEntryWidget::onActiveChanged));
 }
 
 IndicatorEntryWidget::~IndicatorEntryWidget()
@@ -166,7 +168,7 @@
         img.fill(Qt::transparent);
         QPainter painter(&img);
         painter.initFrom(this);
-        if (m_entry->active()) {
+        if (m_activatedByThisEntry) {
             paintActiveBackground(&img);
         }
         if (m_hasIcon) {
@@ -200,6 +202,13 @@
     }
 }
 
+void IndicatorEntryWidget::onActiveChanged(bool active)
+{
+    if (!active) {
+        m_activatedByThisEntry = false;
+    }
+}
+
 PangoLayout* IndicatorEntryWidget::createPangoLayout()
 {
     // Parse
@@ -266,7 +275,7 @@
     gtk_style_context_add_class(styleContext, GTK_STYLE_CLASS_MENUBAR);
     gtk_style_context_add_class(styleContext, GTK_STYLE_CLASS_MENUITEM);
 
-    if (m_entry->active()) {
+    if (m_activatedByThisEntry) {
         gtk_style_context_set_state(styleContext, GTK_STATE_FLAG_PRELIGHT);
     }
 
@@ -332,7 +341,7 @@
 
 void IndicatorEntryWidget::showMenu(Qt::MouseButton qtButton)
 {
-    if (m_entry->active()) {
+    if (m_activatedByThisEntry) {
         return;
     }
     int nuxButton = qtButton == Qt::NoButton ? 0 : 1;
@@ -341,6 +350,7 @@
         time(NULL),
         nuxButton
         );
+    m_activatedByThisEntry = true;
 }
 
 void IndicatorEntryWidget::setPadding(int padding)

=== modified file 'libunity-2d-private/src/indicatorentrywidget.h'
--- libunity-2d-private/src/indicatorentrywidget.h	2011-08-22 09:17:03 +0000
+++ libunity-2d-private/src/indicatorentrywidget.h	2012-03-15 09:01:33 +0000
@@ -78,8 +78,10 @@
     int m_padding;
     bool m_hasIcon;
     bool m_hasLabel;
+    bool m_activatedByThisEntry;
     struct _GtkWidgetPath* m_gtkWidgetPath;
     void updatePix();
+    void onActiveChanged(bool active);
     QPixmap decodeIcon();
     void paintActiveBackground(QImage*);
 

=== modified file 'libunity-2d-private/src/launcherdevice.cpp'
--- libunity-2d-private/src/launcherdevice.cpp	2012-01-13 17:29:37 +0000
+++ libunity-2d-private/src/launcherdevice.cpp	2012-03-15 09:01:33 +0000
@@ -59,6 +59,12 @@
     return false;
 }
 
+int
+LauncherDevice::activeScreen() const
+{
+    return -1;
+}
+
 bool
 LauncherDevice::running() const
 {

=== modified file 'libunity-2d-private/src/launcherdevice.h'
--- libunity-2d-private/src/launcherdevice.h	2011-08-02 19:01:35 +0000
+++ libunity-2d-private/src/launcherdevice.h	2012-03-15 09:01:33 +0000
@@ -39,6 +39,7 @@
 
     /* getters */
     virtual bool active() const;
+    virtual int activeScreen() const;
     virtual bool running() const;
     virtual int windowCount() const;
     virtual bool urgent() const;

=== modified file 'libunity-2d-private/src/launcheritem.cpp'
--- libunity-2d-private/src/launcheritem.cpp	2012-03-01 14:26:38 +0000
+++ libunity-2d-private/src/launcheritem.cpp	2012-03-15 09:01:33 +0000
@@ -86,16 +86,10 @@
     /* Default to doing nothing. */
 }
 
-bool
-LauncherItem::belongsToDifferentWorkspace()
-{
-    return false;
-}
-
-bool
-LauncherItem::belongsToDifferentScreen(int)
-{
-    return false;
+int
+LauncherItem::windowsOnCurrentWorkspaceScreen(int screen)
+{
+    return 0;
 }
 
 bool

=== modified file 'libunity-2d-private/src/launcheritem.h'
--- libunity-2d-private/src/launcheritem.h	2012-03-01 14:26:38 +0000
+++ libunity-2d-private/src/launcheritem.h	2012-03-15 09:01:33 +0000
@@ -33,6 +33,7 @@
     Q_OBJECT
 
     Q_PROPERTY(bool active READ active NOTIFY activeChanged)
+    Q_PROPERTY(int activeScreen READ activeScreen NOTIFY activeScreenChanged)
     Q_PROPERTY(bool running READ running NOTIFY runningChanged)
     Q_PROPERTY(int windowCount READ windowCount NOTIFY windowCountChanged)
     Q_PROPERTY(bool urgent READ urgent NOTIFY urgentChanged)
@@ -56,6 +57,7 @@
 
     /* getters */
     virtual bool active() const = 0;
+    virtual int activeScreen() const = 0;
     virtual bool running() const = 0;
     virtual int windowCount() const = 0;
     virtual bool urgent() const = 0;
@@ -79,14 +81,14 @@
     Q_INVOKABLE virtual void activate() = 0;
     Q_INVOKABLE virtual void createMenuActions() = 0;
     Q_INVOKABLE virtual void launchNewInstance();
-    Q_INVOKABLE virtual bool belongsToDifferentWorkspace();
-    Q_INVOKABLE virtual bool belongsToDifferentScreen(int screen);
+    Q_INVOKABLE virtual int windowsOnCurrentWorkspaceScreen(int screen);
 
 protected:
     LauncherContextualMenu* m_menu;
 
 Q_SIGNALS:
     void activeChanged(bool);
+    void activeScreenChanged(int);
     void runningChanged(bool);
     void windowCountChanged(int);
     void urgentChanged(bool);

=== modified file 'libunity-2d-private/src/listaggregatormodel.cpp'
--- libunity-2d-private/src/listaggregatormodel.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/listaggregatormodel.cpp	2012-03-15 09:01:33 +0000
@@ -130,6 +130,27 @@
                               Q_ARG(int, to - offset));
 }
 
+void
+ListAggregatorModel::moveFinished(int from, int to)
+{
+    QAbstractItemModel* model = modelAtIndex(from);
+    if (modelAtIndex(to) != model) {
+        UQ_WARNING << "cannot move an item from one model to another";
+        return;
+    }
+
+    if (qobject_cast<QSortFilterProxyModel*>(model) != NULL) {
+        UQ_WARNING << "cannot move the items of a QSortFilterProxyModel";
+        return;
+    }
+
+    int offset = computeOffset(model);
+    // "moveFinished" is not a member of QAbstractItemModel, cannot be invoked directly
+    QMetaObject::invokeMethod(model, "moveFinished",
+                              Q_ARG(int, from - offset),
+                              Q_ARG(int, to - offset));
+}
+
 int
 ListAggregatorModel::computeOffset(QAbstractItemModel* model) const
 {

=== modified file 'libunity-2d-private/src/listaggregatormodel.h'
--- libunity-2d-private/src/listaggregatormodel.h	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/listaggregatormodel.h	2012-03-15 09:01:33 +0000
@@ -62,6 +62,8 @@
        The item must remain in the same model. */
     void move(int from, int to);
 
+    void moveFinished(int from, int to);
+
 protected:
     QList<QAbstractItemModel*> m_models;
 

=== modified file 'libunity-2d-private/src/panelpalettemanager.cpp'
--- libunity-2d-private/src/panelpalettemanager.cpp	2012-03-13 18:54:14 +0000
+++ libunity-2d-private/src/panelpalettemanager.cpp	2012-03-15 09:01:33 +0000
@@ -42,10 +42,12 @@
 }
 
 PanelPaletteManager::PanelPaletteManager(Unity2dPanel* panel)
- : m_panel(panel)
+ : QObject(panel), m_panel(panel)
 {
     connect(DashClient::instance(), SIGNAL(activeChanged(bool)), this, SLOT(updatePalette()));
     connect(HUDClient::instance(), SIGNAL(activeChanged(bool)), this, SLOT(updatePalette()));
+    connect(DashClient::instance(), SIGNAL(screenChanged(int)), this, SLOT(updatePalette()));
+    connect(HUDClient::instance(), SIGNAL(screenChanged(int)), this, SLOT(updatePalette()));
 
     m_gConnector.connect(gtk_settings_get_default(), "notify::gtk-theme-name", G_CALLBACK(onThemeChanged), this);
     updatePalette();
@@ -74,7 +76,7 @@
     gtk_style_context_get(context, GTK_STATE_FLAG_NORMAL, NULL);
 
     QPalette pal;
-    if (DashClient::instance()->active() || HUDClient::instance()->active()) {
+    if (DashClient::instance()->activeInScreen(m_panel->screen()) || HUDClient::instance()->activeInScreen(m_panel->screen())) {
         pal.setBrush(QPalette::Window, QColor(0, 0, 0, 168));
     } else {
         pal.setBrush(QPalette::Window, generateBackgroundBrush());

=== 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-03-15 09:01:33 +0000
@@ -4,6 +4,7 @@
 
 #include <QApplication>
 #include <QDesktopWidget>
+#include <QVariant>
 #include <QX11Info>
 
 ScreenInfo::ScreenInfo(QObject *parent) :
@@ -16,6 +17,7 @@
                                      SLOT(updateGeometry(int)));
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)),
                                      SLOT(updateAvailableGeometry(int)));
+    connect(&launcher2dConfiguration(), SIGNAL(onlyOneLauncherChanged(bool)), SLOT(updatePanelsFreeGeometry()));
 }
 
 ScreenInfo::ScreenInfo(int screen, QObject *parent) :
@@ -28,6 +30,7 @@
                                      SLOT(updateGeometry(int)));
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)),
                                      SLOT(updateAvailableGeometry(int)));
+    connect(&launcher2dConfiguration(), SIGNAL(onlyOneLauncherChanged(bool)), SLOT(updatePanelsFreeGeometry()));
 }
 
 ScreenInfo::ScreenInfo(QWidget *widget, QObject *parent) :
@@ -41,6 +44,7 @@
                                      SLOT(updateGeometry(int)));
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)),
                                      SLOT(updateAvailableGeometry(int)));
+    connect(&launcher2dConfiguration(), SIGNAL(onlyOneLauncherChanged(bool)), SLOT(updatePanelsFreeGeometry()));
 }
 
 ScreenInfo::ScreenInfo(Corner corner, QObject *parent) :
@@ -53,6 +57,7 @@
                                      SLOT(updateGeometry(int)));
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)),
                                      SLOT(updateAvailableGeometry(int)));
+    connect(&launcher2dConfiguration(), SIGNAL(onlyOneLauncherChanged(bool)), SLOT(updatePanelsFreeGeometry()));
 }
 
 ScreenInfo::~ScreenInfo()
@@ -74,14 +79,16 @@
     QRect screenRect = QApplication::desktop()->screenGeometry(m_screen);
     QRect availableRect = QApplication::desktop()->availableGeometry(m_screen);
 
+    const bool accountForLauncher = !launcher2dConfiguration().property("onlyOneLauncher").toBool() || m_screen == 0;
+
     QRect availableGeometry(
-        LauncherClient::MaximumWidth,
+        screenRect.left() + (accountForLauncher ? LauncherClient::MaximumWidth : 0),
         availableRect.top(),
-        screenRect.width() - LauncherClient::MaximumWidth,
+        screenRect.width() - (accountForLauncher ? LauncherClient::MaximumWidth : 0),
         availableRect.height()
         );
     if (QApplication::isRightToLeft()) {
-        availableGeometry.moveLeft(0);
+        availableGeometry.moveLeft(screenRect.left());
     }
     return availableGeometry;
 }
@@ -113,6 +120,13 @@
     }
 }
 
+void ScreenInfo::updatePanelsFreeGeometry()
+{
+    if (m_screen != 0) {
+        Q_EMIT panelsFreeGeometryChanged(panelsFreeGeometry());
+    }
+}
+
 void ScreenInfo::updateScreen()
 {
     int screen;
@@ -126,7 +140,7 @@
 }
 
 int
-ScreenInfo::cornerScreen(Corner corner)
+ScreenInfo::cornerScreen(Corner corner) const
 {
     QDesktopWidget* desktop = QApplication::desktop();
     switch(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-03-15 09:01:33 +0000
@@ -60,10 +60,11 @@
 private Q_SLOTS:
     void updateGeometry(int screen);
     void updateAvailableGeometry(int screen);
+    void updatePanelsFreeGeometry();
 
 private:
     void updateScreen();
-    int cornerScreen(Corner corner);
+    int cornerScreen(Corner corner) const;
     int m_screen;
     QWidget* m_widget;
     Corner m_corner;

=== modified file 'libunity-2d-private/src/strutmanager.cpp'
--- libunity-2d-private/src/strutmanager.cpp	2012-02-09 09:27:03 +0000
+++ libunity-2d-private/src/strutmanager.cpp	2012-03-15 09:01:33 +0000
@@ -181,17 +181,22 @@
     switch (m_edge) {
     case Unity2dPanel::LeftEdge:
         if (QApplication::isLeftToRight()) {
-            struts[0] = realWidth();
+            struts[0] = screen.x() + realWidth();
             struts[4] = available.top();
             struts[5] = available.y() + available.height();
         } else {
-            struts[1] = realWidth();
+            // Find the right-most X
+            int rightMostX = 0;
+            for (int i = 0; i < desktop->screenCount(); ++i) {
+              rightMostX = qMax(rightMostX, desktop->screenGeometry(i).right());
+            }
+            struts[1] = (rightMostX - screen.right()) + realWidth();
             struts[6] = available.top();
             struts[7] = available.y() + available.height();
         }
         break;
     case Unity2dPanel::TopEdge:
-        struts[2] = realHeight();
+        struts[2] = screen.y() + realHeight();
         struts[8] = screen.left();
         struts[9] = screen.x() + screen.width();
         break;

=== modified file 'libunity-2d-private/src/trash.cpp'
--- libunity-2d-private/src/trash.cpp	2011-11-24 08:45:18 +0000
+++ libunity-2d-private/src/trash.cpp	2012-03-15 09:01:33 +0000
@@ -62,6 +62,12 @@
     return false;
 }
 
+int
+Trash::activeScreen() const
+{
+    return -1;
+}
+
 bool
 Trash::isTrashWindow(WnckWindow* window) const
 {

=== modified file 'libunity-2d-private/src/trash.h'
--- libunity-2d-private/src/trash.h	2011-09-03 20:10:01 +0000
+++ libunity-2d-private/src/trash.h	2012-03-15 09:01:33 +0000
@@ -45,6 +45,7 @@
 
     /* getters */
     virtual bool active() const;
+    virtual int activeScreen() const;
     virtual bool running() const;
     virtual int windowCount() const;
     virtual bool urgent() const;

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.cpp'
--- libunity-2d-private/src/unity2ddeclarativeview.cpp	2012-03-12 11:56:39 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.cpp	2012-03-15 09:01:33 +0000
@@ -20,9 +20,11 @@
 #include <config.h>
 
 #include "screeninfo.h"
-#include "gobjectcallback.h"
 
+#include <QApplication>
 #include <QDebug>
+#include <QDeclarativeEngine>
+#include <QDeclarativeItem>
 #include <QGLWidget>
 #include <QVariant>
 #include <QX11Info>
@@ -32,39 +34,88 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
-#include "bamf-window.h"
-#include "bamf-matcher.h"
-
-// libwnck
-extern "C" {
-#include <libwnck/libwnck.h>
-}
-
-GOBJECT_CALLBACK1(activeWorkspaceChangedCB, "onActiveWorkspaceChanged");
-
 Unity2DDeclarativeView::Unity2DDeclarativeView(QWidget *parent) :
-    QDeclarativeView(parent),
+    QGraphicsView(parent),
     m_screenInfo(NULL),
     m_useOpenGL(false),
     m_transparentBackground(false),
-    m_last_focused_window(None)
+    m_rootItem(NULL)
 {
+    setScene(&m_scene);
+
+    setOptimizationFlags(QGraphicsView::DontSavePainterState);
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setFrameStyle(NoFrame);
+
+    setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
+    scene()->setItemIndexMethod(QGraphicsScene::NoIndex);
+    viewport()->setFocusPolicy(Qt::NoFocus);
+    setFocusPolicy(Qt::StrongFocus);
+
+    scene()->setStickyFocus(true);
+
     if (!QFileInfo(UNITY_2D_SCHEMA_FILE).exists()) {
         m_useOpenGL = false;
     } else {
         m_useOpenGL = unity2dConfiguration().property("useOpengl").toBool();
     }
 
-    WnckScreen* screen = wnck_screen_get_default();
-    g_signal_connect(G_OBJECT(screen), "active_workspace_changed", G_CALLBACK(activeWorkspaceChangedCB), this);
-
     setupViewport();
 }
 
 Unity2DDeclarativeView::~Unity2DDeclarativeView()
 {
-    WnckScreen* screen = wnck_screen_get_default();
-    g_signal_handlers_disconnect_by_func(G_OBJECT(screen), gpointer(activeWorkspaceChangedCB), this);
+}
+
+QDeclarativeEngine* Unity2DDeclarativeView::engine()
+{
+    static QDeclarativeEngine* engine = new QDeclarativeEngine();
+    return engine;
+}
+
+QDeclarativeContext* Unity2DDeclarativeView::rootContext() const
+{
+    return engine()->rootContext();
+}
+
+QDeclarativeItem* Unity2DDeclarativeView::rootObject() const
+{
+    return m_rootItem;
+}
+
+void Unity2DDeclarativeView::forceActivateWindow()
+{
+    forceActivateWindow(effectiveWinId(), this);
+}
+
+void Unity2DDeclarativeView::setSource(const QUrl &source, const QMap<const char*, QVariant> &rootObjectProperties)
+{
+    QDeclarativeComponent* component = new QDeclarativeComponent(engine(), source, this);
+    QObject *instance = component->beginCreate(rootContext());
+    if (component->isError()) {
+        qDebug() << component->errors();
+    }
+    QMap<const char*, QVariant>::const_iterator it = rootObjectProperties.begin();
+    QMap<const char*, QVariant>::const_iterator itEnd = rootObjectProperties.end();
+    for ( ; it != itEnd; ++it) {
+        instance->setProperty(it.key(), it.value());
+    }
+    component->completeCreate();
+    m_rootItem = qobject_cast<QDeclarativeItem *>(instance);
+    connect(m_rootItem, SIGNAL(widthChanged()), SLOT(resizeToRootObject()));
+    connect(m_rootItem, SIGNAL(heightChanged()), SLOT(resizeToRootObject()));
+    resizeToRootObject();
+    m_scene.addItem(m_rootItem);
+    m_source = source;
+}
+
+void Unity2DDeclarativeView::resizeToRootObject()
+{
+    QSize size(m_rootItem->width(), m_rootItem->height());
+    resize(size);
+    setSceneRect(QRectF(0, 0, size.width(), size.height()));
+    Q_EMIT sceneResized(size);
 }
 
 bool Unity2DDeclarativeView::useOpenGL() const
@@ -89,6 +140,11 @@
     return m_transparentBackground;
 }
 
+QUrl Unity2DDeclarativeView::source() const
+{
+    return m_source;
+}
+
 void Unity2DDeclarativeView::setTransparentBackground(bool transparentBackground)
 {
     if (transparentBackground == m_transparentBackground) {
@@ -103,7 +159,12 @@
 
 QPoint Unity2DDeclarativeView::globalPosition() const
 {
-    return mapToGlobal(QPoint(0,0));
+    // FIXME This used to be mapToGlobal(QPoint(0,0)) that is the correct
+    // thing for all kind of widgets, but seems to fail sometimes if we
+    // call it just after a moveEvent, which is bad
+    // Since all our Unity2DDeclarativeView are toplevel windows we
+    // are workarounding it by just returning pos()
+    return pos();
 }
 
 void Unity2DDeclarativeView::setupViewport()
@@ -163,74 +224,27 @@
 
 void Unity2DDeclarativeView::showEvent(QShowEvent* event)
 {
-    QDeclarativeView::showEvent(event);
+    QGraphicsView::showEvent(event);
     Q_EMIT visibleChanged(true);
 }
 
 void Unity2DDeclarativeView::hideEvent(QHideEvent* event)
 {
-    QDeclarativeView::hideEvent(event);
+    QGraphicsView::hideEvent(event);
     Q_EMIT visibleChanged(false);
 }
 
-/* Obtaining & Discarding Keyboard Focus for Window on Demand
- *
- * In the X world, activating a window means to give it the input (keyboard)
- * focus. When a new window opens, X usually makes it active immediately.
- * Clicking on a window makes it active too.
- *
- * Qt does not have the capability to explicitly ask the window manager to
- * make an existing window active - setFocus() only forwards input focus to
- * whatever QWidget you specify.
- *
- * De-Activating a window is not possible with X (and hence with Qt). So
- * we work-around this by remembering which application is active prior to
- * stealing focus, and then Re-Activating it when we're finished. This is
- * not guaranteed to succeed, as previous window may have closed.
- *
- * The following methods deal with these tasks. Note that when the window
- * has been activated (deactivated), Qt will realise it has obtained (lost)
- * focus and act appropriately.
- */
-
-/* Ask Window Manager to activate this window and hence get keyboard focus */
-void Unity2DDeclarativeView::forceActivateWindow()
-{
-    // Save reference to window with current keyboard focus
-    if( m_last_focused_window == None ){
-        saveActiveWindow();
-    }
-
-    // Show this window by giving it keyboard focus
-    forceActivateThisWindow(this->effectiveWinId());
-}
-
-/* Ask Window Manager to deactivate this window - not guaranteed to succeed. */
-void Unity2DDeclarativeView::forceDeactivateWindow()
-{
-    if( m_last_focused_window == None ){
-        UQ_WARNING << "No previously focused window found, use mouse to select window.";
-        return;
-    }
-
-    // What if previously focused window closed while we we had focus? Check if window
-    // exists by seeing if it has attributes.
-    int status;
-    XWindowAttributes attributes;
-    status = XGetWindowAttributes(QX11Info::display(), m_last_focused_window, &attributes);
-    if ( status == BadWindow ){
-        UQ_WARNING << "Previously focused window has gone, use mouse to select window.";
-        return;
-    }
-
-    // Show this window by giving it keyboard focus
-    forceActivateThisWindow(m_last_focused_window);
-
-    m_last_focused_window = None;
-    Q_EMIT lastFocusedWindowChanged(m_last_focused_window);
-}
-
-void Unity2DDeclarativeView::forceActivateThisWindow(WId window)
+void Unity2DDeclarativeView::keyPressEvent(QKeyEvent* event)
+{
+    QApplication::sendEvent(scene(), event);
+}
+
+void Unity2DDeclarativeView::keyReleaseEvent(QKeyEvent* event)
+{
+    QApplication::sendEvent(scene(), event);
+}
+
+void Unity2DDeclarativeView::forceActivateWindow(WId window, QWidget *w)
 {
     /* Workaround focus stealing prevention implemented by some window
        managers such as Compiz. This is the exact same code you will find in
@@ -262,35 +276,8 @@
     XFlush(display);
 
     /* Use Qt's setFocus mechanism as a safety guard in case the above failed */
-    setFocus();
-}
-
-/* Save WId of window with keyboard focus to m_last_focused_window */
-void Unity2DDeclarativeView::saveActiveWindow()
-{
-    /* Using Bamf here, 'cause XGetFocusInputFocus returned a XId
-       different by 1, which then could not be used with Bamf to
-       get the application. The change does not result in any functional
-       differences, though. */
-    WId active_window = None;
-    BamfWindow* bamf_active_window = BamfMatcher::get_default().active_window();
-
-    /* Bamf can return a null active window - example case is just after 
-       login when no application has been yet been started. */
-    if (bamf_active_window != NULL) {
-        active_window = bamf_active_window->xid();
-    }
-
-    if (active_window != this->effectiveWinId() && active_window != m_last_focused_window) {
-        m_last_focused_window = active_window;
-        Q_EMIT lastFocusedWindowChanged(m_last_focused_window);
-    }
-}
-
-void Unity2DDeclarativeView::onActiveWorkspaceChanged() 
-{
-    m_last_focused_window = None;
-    Q_EMIT activeWorkspaceChanged();
+    if (w != NULL)
+        w->setFocus();
 }
 
 ScreenInfo*
@@ -299,10 +286,4 @@
     return m_screenInfo;
 }
 
-unsigned int
-Unity2DDeclarativeView::lastFocusedWindow() const
-{
-    return m_last_focused_window;
-}
-
 #include <unity2ddeclarativeview.moc>

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.h'
--- libunity-2d-private/src/unity2ddeclarativeview.h	2012-02-16 15:00:08 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.h	2012-03-15 09:01:33 +0000
@@ -17,11 +17,20 @@
 #ifndef UNITY2DDECLARATIVEVIEW_H
 #define UNITY2DDECLARATIVEVIEW_H
 
-#include <QDeclarativeView>
+#include <QGraphicsView>
+
+#include <QMap>
+#include <QUrl>
+#include <QVariant>
 
 class ScreenInfo;
 
-class Unity2DDeclarativeView : public QDeclarativeView
+class QDeclarativeContext;
+class QDeclarativeEngine;
+class QDeclarativeItem;
+class QGraphicsObject;
+
+class Unity2DDeclarativeView : public QGraphicsView
 {
     Q_OBJECT
 
@@ -30,7 +39,6 @@
     Q_PROPERTY(QPoint globalPosition READ globalPosition NOTIFY globalPositionChanged)
     Q_PROPERTY(ScreenInfo* screen READ screen NOTIFY screenChanged)
     Q_PROPERTY(bool visible READ isVisible NOTIFY visibleChanged)
-    Q_PROPERTY(unsigned int lastFocusedWindow READ lastFocusedWindow NOTIFY lastFocusedWindowChanged)
 
 public:
     Unity2DDeclarativeView(QWidget *parent = 0);
@@ -39,13 +47,20 @@
     // getters
     bool useOpenGL() const;
     bool transparentBackground() const;
+    QUrl source() const;
     QPoint globalPosition() const;
     ScreenInfo* screen() const;
-    unsigned int lastFocusedWindow() const;
 
     // setters
     void setUseOpenGL(bool);
     void setTransparentBackground(bool);
+    void setSource(const QUrl& source, const QMap<const char*, QVariant> &rootObjectProperties = QMap<const char*, QVariant>());
+
+    static QDeclarativeEngine *engine();
+    QDeclarativeContext* rootContext() const;
+    QDeclarativeItem* rootObject() const;
+
+    Q_INVOKABLE virtual void forceActivateWindow();
 
 Q_SIGNALS:
     void useOpenGLChanged(bool);
@@ -53,31 +68,30 @@
     void globalPositionChanged(QPoint);
     void screenChanged(ScreenInfo*);
     void visibleChanged(bool);
-    void activeWorkspaceChanged();
-    void lastFocusedWindowChanged(unsigned int);
+    void sceneResized(QSize size);
 
 protected:
     void setupViewport();
     virtual void moveEvent(QMoveEvent* event);
     virtual void showEvent(QShowEvent *event);
     virtual void hideEvent(QHideEvent* event);
+    virtual void keyPressEvent(QKeyEvent* event);
+    virtual void keyReleaseEvent(QKeyEvent* event);
+
+    static void forceActivateWindow(WId window, QWidget *w = NULL);
 
     ScreenInfo* m_screenInfo;
 
-protected Q_SLOTS:
-    void forceActivateWindow();
-    void forceDeactivateWindow();
-
 private Q_SLOTS:
-    void onActiveWorkspaceChanged();
+    void resizeToRootObject();
 
 private:
-    void saveActiveWindow();
-    void forceActivateThisWindow(WId);
-
     bool m_useOpenGL;
     bool m_transparentBackground;
-    WId m_last_focused_window;
+    QUrl m_source;
+
+    QGraphicsScene m_scene;
+    QDeclarativeItem* m_rootItem;
 };
 
 Q_DECLARE_METATYPE(Unity2DDeclarativeView*)

=== modified file 'libunity-2d-private/src/unity2dpanel.cpp'
--- libunity-2d-private/src/unity2dpanel.cpp	2012-03-12 11:21:15 +0000
+++ libunity-2d-private/src/unity2dpanel.cpp	2012-03-15 09:01:33 +0000
@@ -45,8 +45,6 @@
     Unity2dPanel::Edge m_edge;
     mutable IndicatorsManager* m_indicatorsManager;
     QHBoxLayout* m_layout;
-    int m_delta;
-    bool m_manualSliding;
     StrutManager m_strutManager;
     ScreenInfo* m_screenInfo;
 
@@ -60,15 +58,12 @@
         case Unity2dPanel::LeftEdge:
             if (QApplication::isLeftToRight()) {
                 rect = QRect(screen.left(), available.top(), q->width(), available.height());
-                rect.moveLeft(m_delta);
             } else {
                 rect = QRect(screen.right() - q->width(), available.top(), q->width(), available.height());
-                rect.moveRight(screen.right() - m_delta);
             }
             break;
         case Unity2dPanel::TopEdge:
             rect = QRect(screen.left(), screen.top(), screen.width(), q->height());
-            rect.moveTop(m_delta);
             break;
         }
 
@@ -105,8 +100,6 @@
     d->q = this;
     d->m_edge = Unity2dPanel::TopEdge;
     d->m_indicatorsManager = 0;
-    d->m_delta = 0;
-    d->m_manualSliding = false;
     d->m_layout = new QHBoxLayout(this);
     d->m_layout->setMargin(0);
     d->m_layout->setSpacing(0);
@@ -214,39 +207,11 @@
     d->m_strutManager.setEnabled(value);
 }
 
-int Unity2dPanel::delta() const
-{
-    return d->m_delta;
-}
-
-void Unity2dPanel::setDelta(int delta)
-{
-    /* Clamp delta to be between 0 and minus its size */
-    int minDelta = -panelSize();
-    int maxDelta = 0;
-
-    d->m_delta = qMax(qMin(delta, maxDelta), minDelta);
-    d->updateGeometry();
-}
-
 int Unity2dPanel::panelSize() const
 {
     return (d->m_edge == Unity2dPanel::TopEdge) ? height() : width();
 }
 
-bool Unity2dPanel::manualSliding() const
-{
-    return d->m_manualSliding;
-}
-
-void Unity2dPanel::setManualSliding(bool manualSliding)
-{
-    if (d->m_manualSliding != manualSliding) {
-        d->m_manualSliding = manualSliding;
-        Q_EMIT manualSlidingChanged(d->m_manualSliding);
-    }
-}
-
 QString Unity2dPanel::id() const
 {
     int screen = QApplication::desktop()->screenNumber(this);

=== modified file 'libunity-2d-private/src/unity2dpanel.h'
--- libunity-2d-private/src/unity2dpanel.h	2012-03-07 14:34:03 +0000
+++ libunity-2d-private/src/unity2dpanel.h	2012-03-15 09:01:33 +0000
@@ -35,17 +35,6 @@
 class Unity2dPanel : public QWidget
 {
     Q_OBJECT
-    /**
-     * The amount of pixels the panel is moved from its edge. Useful for
-     * animations.
-     */
-    Q_PROPERTY(int delta READ delta WRITE setDelta)
-    /**
-     * Whether the delta property is being set by an external client. Setting
-     * this property to true stops any animation of the delta property triggered
-       by slideIn() or slideOut().
-     */
-    Q_PROPERTY(int manualSliding READ manualSliding WRITE setManualSliding NOTIFY manualSlidingChanged)
     Q_PROPERTY(bool useStrut READ useStrut WRITE setUseStrut NOTIFY useStrutChanged)
     Q_ENUMS(Edge)
 
@@ -80,18 +69,11 @@
     bool useStrut() const;
     void setUseStrut(bool);
 
-    int delta() const;
-    void setDelta(int);
-
     int panelSize() const;
 
-    bool manualSliding() const;
-    void setManualSliding(bool);
-
     QString id() const;
 
 Q_SIGNALS:
-    void manualSlidingChanged(bool);
     void useStrutChanged(bool);
 
 protected:

=== modified file 'libunity-2d-private/src/windowinfo.cpp'
--- libunity-2d-private/src/windowinfo.cpp	2012-03-12 17:40:31 +0000
+++ libunity-2d-private/src/windowinfo.cpp	2012-03-15 09:01:33 +0000
@@ -23,6 +23,11 @@
 #include "bamf-window.h"
 
 #include "windowinfo.h"
+
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QRect>
+
 #include <X11/Xlib.h>
 #include <QX11Info>
 
@@ -264,6 +269,21 @@
     return -1;
 }
 
+int WindowInfo::screen() const
+{
+    if (m_wnckWindow != NULL) {
+        // Check the window screen
+        int x, y, width, height;
+        wnck_window_get_geometry(m_wnckWindow, &x, &y, &width, &height);
+
+        const QRect windowRect(x, y, width, height);
+        const QPoint pos = windowRect.center();
+        return QApplication::desktop()->screenNumber(pos);
+    }
+
+    return -1;
+}
+
 void WindowInfo::activate()
 {
     showWindow(m_wnckWindow);

=== modified file 'libunity-2d-private/src/windowinfo.h'
--- libunity-2d-private/src/windowinfo.h	2012-03-09 13:19:00 +0000
+++ libunity-2d-private/src/windowinfo.h	2012-03-15 09:01:33 +0000
@@ -77,6 +77,7 @@
     QString icon() const;
     QString desktopFile() const;
     int workspace() const;
+    int screen() const;
 
     /* setters */
     void setContentXid(unsigned int contentXid);
@@ -89,7 +90,8 @@
     enum RoleNames {
         RoleWindowInfo,
         RoleDesktopFile,
-        RoleWorkspace
+        RoleWorkspace,
+        RoleScreen
     };
 
 Q_SIGNALS:

=== modified file 'libunity-2d-private/src/windowslist.cpp'
--- libunity-2d-private/src/windowslist.cpp	2012-01-02 15:31:23 +0000
+++ libunity-2d-private/src/windowslist.cpp	2012-03-15 09:01:33 +0000
@@ -63,6 +63,8 @@
         return QVariant::fromValue(info->desktopFile());
     case WindowInfo::RoleWorkspace:
         return QVariant::fromValue(info->workspace());
+    case WindowInfo::RoleScreen:
+        return QVariant::fromValue(info->screen());
     default:
         UQ_DEBUG << "Requested invalid role (index" << role << ")";
         return QVariant();

=== modified file 'libunity-2d-private/src/workspaces.cpp'
--- libunity-2d-private/src/workspaces.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/workspaces.cpp	2012-03-15 09:01:33 +0000
@@ -49,6 +49,12 @@
     return false;
 }
 
+int
+Workspaces::activeScreen() const
+{
+    return -1;
+}
+
 bool
 Workspaces::running() const
 {

=== modified file 'libunity-2d-private/src/workspaces.h'
--- libunity-2d-private/src/workspaces.h	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/workspaces.h	2012-03-15 09:01:33 +0000
@@ -38,6 +38,7 @@
 
     /* getters */
     virtual bool active() const;
+    virtual int activeScreen() const;
     virtual bool running() const;
     virtual int windowCount() const;
     virtual bool urgent() const;

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2012-03-06 17:30:05 +0000
+++ panel/applets/appname/appnameapplet.cpp	2012-03-15 09:01:33 +0000
@@ -253,7 +253,7 @@
 
     void setupWindowHelper()
     {
-        m_windowHelper = new WindowHelper(q);
+        m_windowHelper = new WindowHelper(q->panel()->screen(), q);
         QObject::connect(m_windowHelper, SIGNAL(stateChanged()),
             q, SLOT(updateWidgets()));
         QObject::connect(m_windowHelper, SIGNAL(nameChanged()),
@@ -316,7 +316,7 @@
 
     bool isMaximized = d->m_windowHelper->isMaximized();
     bool isUserVisibleApp = app ? app->user_visible() : false;
-    bool isOnSameScreen = d->m_windowHelper->isMostlyOnScreen(QApplication::desktop()->screenNumber(this));
+    bool isOnSameScreen = d->m_windowHelper->isMostlyOnScreen(panel()->screen());
     bool isUnderMouse = rect().contains(mapFromGlobal(QCursor::pos()));
     bool isOpened = isOnSameScreen &&
         (isUnderMouse
@@ -325,8 +325,8 @@
         );
     bool showMenu = isOpened && !d->m_menuBarWidget->isEmpty() && isUserVisibleApp;
     bool dashCanResize = !DashClient::instance()->alwaysFullScreen();
-    bool dashIsVisible = DashClient::instance()->active();
-    bool hudIsVisible = HUDClient::instance()->active();
+    bool dashIsVisible = DashClient::instance()->activeInScreen(panel()->screen());
+    bool hudIsVisible = HUDClient::instance()->activeInScreen(panel()->screen());
     bool showWindowButtons = (isOpened && isMaximized) || dashIsVisible || hudIsVisible;
     bool showAppLabel = !(isMaximized && showMenu) && isUserVisibleApp && isOnSameScreen;
     bool showDesktopLabel = !app;

=== modified file 'panel/applets/appname/windowhelper.cpp'
--- panel/applets/appname/windowhelper.cpp	2012-03-05 16:38:47 +0000
+++ panel/applets/appname/windowhelper.cpp	2012-03-15 09:01:33 +0000
@@ -57,16 +57,17 @@
 {
     WnckWindow* m_window;
     GConnector m_connector;
+    int m_screen;
 };
 
-WindowHelper::WindowHelper(QObject* parent)
+WindowHelper::WindowHelper(int screen, QObject* parent)
 : QObject(parent)
 , d(new WindowHelperPrivate)
 {
     d->m_window = 0;
+    d->m_screen = screen;
 
-    WnckScreen* screen = wnck_screen_get_default();
-    wnck_screen_force_update(screen);
+    wnck_screen_force_update(wnck_screen_get_default());
 
     update();
 
@@ -84,6 +85,8 @@
 
     connect(DashClient::instance(), SIGNAL(activeChanged(bool)), SLOT(update()));
     connect(HUDClient::instance(), SIGNAL(activeChanged(bool)), SLOT(update()));
+    connect(DashClient::instance(), SIGNAL(screenChanged(int)), SLOT(update()));
+    connect(HUDClient::instance(), SIGNAL(screenChanged(int)), SLOT(update()));
     // FIXME: the queued connection should not be needed, however if it's not used when
     // (un)maximizing the dash, the panel will deadlock for some reason.
     connect(&dash2dConfiguration(), SIGNAL(fullScreenChanged(bool)), SLOT(update()),
@@ -130,7 +133,7 @@
 
 bool WindowHelper::isMaximized() const
 {
-    if (DashClient::instance()->active()) {
+    if (DashClient::instance()->activeInScreen(d->m_screen)) {
         return dash2dConfiguration().property("fullScreen").toBool();
     } else {
         if (d->m_window) {
@@ -166,9 +169,9 @@
 
 void WindowHelper::close()
 {
-    if (DashClient::instance()->active()) {
+    if (DashClient::instance()->activeInScreen(d->m_screen)) {
         DashClient::instance()->setActive(false);
-    } else if (HUDClient::instance()->active()) {
+    } else if (HUDClient::instance()->activeInScreen(d->m_screen)) {
         HUDClient::instance()->setActive(false);
     } else {
         guint32 timestamp = QDateTime::currentDateTime().toTime_t();
@@ -178,14 +181,14 @@
 
 void WindowHelper::minimize()
 {
-    if (!DashClient::instance()->active()) {
+    if (!DashClient::instance()->activeInScreen(d->m_screen)) {
         wnck_window_minimize(d->m_window);
     }
 }
 
 void WindowHelper::maximize()
 {
-    if (DashClient::instance()->active()) {
+    if (DashClient::instance()->activeInScreen(d->m_screen)) {
         dash2dConfiguration().setProperty("fullScreen", QVariant(true));
     } else {
         /* This currently cannot happen, because the window buttons are not
@@ -197,7 +200,7 @@
 
 void WindowHelper::unmaximize()
 {
-    if (DashClient::instance()->active()) {
+    if (DashClient::instance()->activeInScreen(d->m_screen)) {
         dash2dConfiguration().setProperty("fullScreen", QVariant(false));
     } else {
         wnck_window_unmaximize(d->m_window);

=== modified file 'panel/applets/appname/windowhelper.h'
--- panel/applets/appname/windowhelper.h	2012-02-07 16:48:45 +0000
+++ panel/applets/appname/windowhelper.h	2012-03-15 09:01:33 +0000
@@ -34,7 +34,7 @@
 {
 Q_OBJECT
 public:
-    WindowHelper(QObject* parent);
+    WindowHelper(int screen, QObject* parent);
     ~WindowHelper();
 
     void setXid(uint);

=== added file 'shell/DashLoader.qml'
--- shell/DashLoader.qml	1970-01-01 00:00:00 +0000
+++ shell/DashLoader.qml	2012-03-15 09:01:33 +0000
@@ -0,0 +1,36 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 1.1
+import "common/utils.js" as Utils
+
+Loader {
+    id: dashLoader
+    source: "dash/Dash.qml"
+    anchors.top: parent != undefined ? parent.top : undefined
+    x: Utils.isLeftToRight() ? launcherLoader.width : (parent != undefined ? parent.width - width - launcherLoader.width : 0)
+    onLoaded: item.focus = true
+    opacity: item.active ? 1.0 : 0.0
+    focus: item.active
+
+    Binding {
+        target: dashLoader.item
+        property: "fullscreenWidth"
+        value: shell.width - launcherLoader.width
+    }
+}

=== added file 'shell/HudLoader.qml'
--- shell/HudLoader.qml	1970-01-01 00:00:00 +0000
+++ shell/HudLoader.qml	2012-03-15 09:01:33 +0000
@@ -0,0 +1,35 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 1.1
+import "common/utils.js" as Utils
+
+Loader {
+    id: hudLoader
+    property bool animating: item.animating
+    property bool active: item.active
+    onActiveChanged: item.active = active
+
+    source: "hud/Hud.qml"
+    anchors.top: parent != undefined ? parent.top : undefined
+    x: Utils.isLeftToRight() ? 0 : shell.width - width
+    onLoaded: item.focus = true
+    visible: item.active
+    focus: item.active
+    width: Math.min(shell.width, 1061)
+}

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-03-13 18:54:14 +0000
+++ shell/Shell.qml	2012-03-15 09:01:33 +0000
@@ -23,6 +23,11 @@
 
 Item {
     id: shell
+
+    property variant declarativeView
+    property variant dashLoader
+    property variant hudLoader
+
     /* Space reserved by strutManager is taken off screen.availableGeometry but
        we want the shell to take all the available space, including the one we
        reserved ourselves via strutManager. */
@@ -34,12 +39,32 @@
 
     Accessible.name: "shell"
 
-    property alias hudActive: hudLoader.active
-
     GestureHandler {
         id: gestureHandler
     }
 
+    onDashLoaderChanged: {
+        if (shellManager.dashActive) {
+            if (dashLoader == undefined)
+            {
+                launcherLoader.visibilityController.endForceVisible("dash")
+            } else {
+                launcherLoader.visibilityController.beginForceVisible("dash")
+            }
+        }
+    }
+
+    onHudLoaderChanged: {
+        if (shellManager.hudActive) {
+            if (hudLoader == undefined)
+            {
+                launcherLoader.visibilityController.endForceHidden("hud")
+            } else {
+                launcherLoader.visibilityController.beginForceHidden("hud")
+            }
+        }
+    }
+
     LauncherLoader {
         id: launcherLoader
         anchors.top: parent.top
@@ -72,36 +97,14 @@
             }
         }
 
-        KeyNavigation.right: dashLoader
-
         Binding {
             target: launcherLoader.item
             property: "showMenus"
-            value: !dashLoader.item.active && !hudLoader.item.active
+            value: (dashLoader == undefined || !dashLoader.item.active) && (hudLoader == undefined || !hudLoader.item.active)
         }
 
         Behavior on x { NumberAnimation { id: launcherLoaderXAnimation; duration: 125 } }
 
-        Connections {
-            target: declarativeView
-            onDashActiveChanged: {
-                if (declarativeView.dashActive) {
-                    if (hudLoader.item.active) hudLoader.item.active = false
-                    launcherLoader.visibilityController.beginForceVisible("dash")
-                } else {
-                    launcherLoader.visibilityController.endForceVisible("dash")
-                    if (dashLoader.status == Loader.Ready) dashLoader.item.deactivateAllLenses()
-                }
-            }
-            onGlobalPositionChanged: {
-                var x = declarativeView.globalPosition.x + (Utils.isLeftToRight() ? 0 : shell.width)
-                launcherLoader.item.barrierP1 = Qt.point(x, 0)
-                launcherLoader.item.barrierP2 = Qt.point(x, declarativeView.screen.geometry.height)
-                launcherLoader.item.barrierTriggerZoneP1 = Qt.point(x, declarativeView.globalPosition.y)
-                launcherLoader.item.barrierTriggerZoneP2 = Qt.point(x, declarativeView.globalPosition.y + launcherLoader.height)
-            }
-        }
-
         SpreadMonitor {
             id: spread
             onShownChanged: if (shown) {
@@ -114,46 +117,37 @@
         }
     }
 
-
-    Loader {
-        id: dashLoader
-        source: "dash/Dash.qml"
-        anchors.top: parent.top
-        x: Utils.isLeftToRight() ? launcherLoader.width : shell.width - width - launcherLoader.width
-        onLoaded: item.focus = true
-        opacity: item.active ? 1.0 : 0.0
-        focus: item.active
-
-        Binding {
-            target: dashLoader.item
-            property: "fullscreenWidth"
-            value: shell.width - launcherLoader.width
+    Connections {
+        target: shellManager
+
+        onDashActiveChanged: {
+            if (shellManager.dashActive) {
+                if (hudLoader != undefined && hudLoader.item.active) {
+                    hudLoader.item.active = false
+                }
+                if (dashLoader != undefined) {
+                    launcherLoader.visibilityController.beginForceVisible("dash")
+                }
+            } else {
+                if (dashLoader != undefined) {
+                    launcherLoader.visibilityController.endForceVisible("dash")
+                    if (dashLoader.status == Loader.Ready) dashLoader.item.deactivateAllLenses()
+                }
+            }
         }
-    }
-
-    Loader {
-        id: hudLoader
-        property bool animating: item.animating
-        property bool active: item.active
-        onActiveChanged: item.active = active
-
-        source: "hud/Hud.qml"
-        anchors.top: parent.top
-        x: Utils.isLeftToRight() ? 0 : shell.width - width
-        onLoaded: item.focus = true
-        visible: item.active
-        focus: item.active
-        width: Math.min(shell.width, 1061)
-    }
-
-    Connections {
-        target: hudLoader.item
-        onActiveChanged: {
-            if (hudLoader.item.active) {
-                if (dashLoader.item.active) dashLoader.item.active = false
-                launcherLoader.visibilityController.beginForceHidden("hud")
+
+        onHudActiveChanged: {
+            if (shellManager.hudActive) {
+                if (dashLoader != undefined && dashLoader.item.active) {
+                    dashLoader.item.active = false
+                }
+                if (hudLoader != undefined) {
+                    launcherLoader.visibilityController.beginForceHidden("hud")
+                }
             } else {
-                launcherLoader.visibilityController.endForceHidden("hud")
+                if (hudLoader != undefined) {
+                    launcherLoader.visibilityController.endForceHidden("hud")
+                }
             }
         }
     }
@@ -165,7 +159,7 @@
             launcherLoader.item.focusBFB()
         }
         onFocusChanged: {
-            if (!declarativeView.focus && hudLoader.item.active) hudLoader.item.active = false
+            if (!declarativeView.focus && hudLoader!= undefined && hudLoader.item.active) hudLoader.item.active = false
 
             /* FIXME: The launcher is forceVisible while it has activeFocus. However even though
                the documentation says that setting focus=false will make an item lose activeFocus
@@ -177,7 +171,16 @@
         }
     }
 
-    Component.onCompleted: declarativeView.show()
+    Component.onCompleted: {
+        if (declarativeView.screen.screen == 0) {
+            var loaderComponent = Qt.createComponent("DashLoader.qml");
+            dashLoader = loaderComponent.createObject(shell, {});
+
+            var loaderComponent = Qt.createComponent("HudLoader.qml");
+            hudLoader = loaderComponent.createObject(shell, {});
+        }
+        declarativeView.show()
+    }
 
     Keys.onPressed: {
         if (event.key == Qt.Key_Escape || (event.key == Qt.Key_F4 && event.modifiers == Qt.AltModifier )) {
@@ -194,31 +197,37 @@
         }
 
         InputShapeRectangle {
-            rectangle: if (desktop.isCompositingManagerRunning) {
-                Qt.rect(dashLoader.x, dashLoader.y, dashLoader.width, dashLoader.height)
-            } else {
-                Qt.rect(dashLoader.x, dashLoader.y, dashLoader.width - 7, dashLoader.height - 9)
+            rectangle: {
+                if (dashLoader != undefined) {
+                    if (desktop.isCompositingManagerRunning) {
+                        return Qt.rect(dashLoader.x, dashLoader.y, dashLoader.width, dashLoader.height)
+                    } else {
+                        return Qt.rect(dashLoader.x, dashLoader.y, dashLoader.width - 7, dashLoader.height - 9)
+                    }
+                } else {
+                    return Qt.rect(0, 0, 0, 0)
+                }
             }
-            enabled: dashLoader.status == Loader.Ready && dashLoader.item.active
+            enabled: dashLoader != undefined && dashLoader.status == Loader.Ready && dashLoader.item.active
             mirrorHorizontally: Utils.isRightToLeft()
 
             InputShapeMask {
                 id: shape1
                 source: "shell/common/artwork/desktop_dash_background_no_transparency.png"
                 color: "red"
-                position: Qt.point(dashLoader.width - 50, dashLoader.height - 49)
-                enabled: declarativeView.dashMode == ShellDeclarativeView.DesktopMode
+                position: dashLoader != undefined ? Qt.point(dashLoader.width - 50, dashLoader.height - 49) : Qt.point(0, 0)
+                enabled: shellManager.dashMode == ShellManager.DesktopMode
             }
         }
 
         InputShapeRectangle {
             id: hudInputShape
-            enabled: hudLoader.status == Loader.Ready && hudLoader.item.active
+            enabled: hudLoader != undefined && hudLoader.status == Loader.Ready && hudLoader.item.active
 
             InputShapeMask {
                 source: "shell/common/artwork/desktop_dash_background_no_transparency.png"
                 color: "red"
-                position: Qt.point(hudLoader.width - 50, hudLoader.height - 49)
+                position: hudLoader != undefined ? Qt.point(hudLoader.width - 50, hudLoader.height - 49) : Qt.point(0, 0)
             }
         }
     }
@@ -237,13 +246,17 @@
         target: hudInputShape
         property: "rectangle"
         value: {
-            if (desktop.isCompositingManagerRunning) {
-                return Qt.rect(hudLoader.x, hudLoader.y, hudLoader.width, hudLoader.height)
+            if (hudLoader != undefined) {
+                if (desktop.isCompositingManagerRunning) {
+                    return Qt.rect(hudLoader.x, hudLoader.y, hudLoader.width, hudLoader.height)
+                } else {
+                    return Qt.rect(hudLoader.x, hudLoader.y, hudLoader.width - 7, hudLoader.height - 9)
+                }
             } else {
-                return Qt.rect(hudLoader.x, hudLoader.y, hudLoader.width - 7, hudLoader.height - 9)
+                return Qt.rect(0, 0, 0, 0)
             }
         }
-        when: !hudLoader.animating
+        when: hudLoader != undefined && !hudLoader.animating
     }
 
     StrutManager {
@@ -254,4 +267,23 @@
         width: launcherLoader.width
         enabled: Utils.clamp(launcher2dConfiguration.hideMode, 0, 2) == 0
     }
+
+    PointerBarrier {
+        property int x: declarativeView.globalPosition.x + (Utils.isLeftToRight() ? 0 : shell.width)
+
+        id: leftBarrier
+        triggerDirection: Utils.isLeftToRight() ? PointerBarrier.TriggerFromRight : PointerBarrier.TriggerFromLeft
+        triggerZoneEnabled: !launcherLoader.visibilityController.shown
+        p1: Qt.point(x, declarativeView.screen.geometry.y)
+        p2: Qt.point(x, declarativeView.screen.geometry.y + declarativeView.screen.geometry.height)
+        triggerZoneP1: Qt.point(x, declarativeView.globalPosition.y)
+        triggerZoneP2: Qt.point(x, declarativeView.globalPosition.y + launcherLoader.height)
+        threshold: launcherLoader.launcherInHideMode && launcherLoader.loadLauncher ? launcher2dConfiguration.edgeStopVelocity : -1
+        maxVelocityMultiplier: launcher2dConfiguration.edgeResponsiveness
+        decayRate: launcher2dConfiguration.edgeDecayrate
+        triggerPressure: launcher2dConfiguration.edgeRevealPressure
+        breakPressure: launcher2dConfiguration.edgeOvercomePressure
+
+        onTriggered: launcherLoader.item.barrierTriggered()
+    }
 }

=== modified file 'shell/app/CMakeLists.txt'
--- shell/app/CMakeLists.txt	2012-03-05 16:38:47 +0000
+++ shell/app/CMakeLists.txt	2012-03-15 09:01:33 +0000
@@ -9,6 +9,7 @@
     dashdbus.cpp
     huddbus.cpp
     shelldeclarativeview.cpp
+    shellmanager.cpp
     )
 
 set(shell_MOC_HDRS
@@ -16,6 +17,7 @@
     dashdbus.h
     huddbus.h
     shelldeclarativeview.h
+    shellmanager.h
     )
 
 qt4_wrap_cpp(shell_MOC_SRCS ${shell_MOC_HDRS})
@@ -33,6 +35,8 @@
     ${QTGCONF_INCLUDE_DIRS}
     ${DCONFQT_INCLUDE_DIRS}
     ${GTK_INCLUDE_DIRS}
+    ${QTBAMF_INCLUDE_DIRS}
+    ${WNCK_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
 
@@ -44,6 +48,8 @@
     ${QTGCONF_LDFLAGS}
     ${DCONFQT_LDFLAGS}
     ${GTK_LDFLAGS}
+    ${WNCK_LDFLAGS}
+    ${QTBAMF_LDFLAGS}
     ${X11_Xext_LIB}
     ${X11_X11_LIB}
     unity-2d-private

=== modified file 'shell/app/dash.xml'
--- shell/app/dash.xml	2012-03-05 16:38:47 +0000
+++ shell/app/dash.xml	2012-03-15 09:01:33 +0000
@@ -27,6 +27,9 @@
         <property name="activeLens" type="s" access="readwrite">
             <dox:d>The currently active lens</dox:d>
         </property>
+        <property name="screen" type="i" access="read">
+            <dox:d>The screen with the dash</dox:d>
+        </property>
         <signal name="activeChanged">
                 <dox:d>Signals when the active status of the Dash changes</dox:d>
                 <arg name="active" type="b" direction="out">
@@ -45,6 +48,12 @@
                         <dox:d>The currently active lens</dox:d>
                 </arg>
         </signal>
+        <signal name="screenChanged">
+                <dox:d>Signals when the screen changes</dox:d>
+                <arg name="active" type="i" direction="out">
+                        <dox:d>The screen with the dash</dox:d>
+                </arg>
+        </signal>
     </interface>
 </node>
 

=== modified file 'shell/app/dashdbus.cpp'
--- shell/app/dashdbus.cpp	2012-03-05 16:38:47 +0000
+++ shell/app/dashdbus.cpp	2012-03-15 09:01:33 +0000
@@ -21,19 +21,21 @@
 #include "dashadaptor.h"
 
 // Local
-#include <shelldeclarativeview.h>
+#include <shellmanager.h>
 
 // Qt
 #include <QtDBus/QDBusConnection>
 #include <QGraphicsObject>
 
-DashDBus::DashDBus(ShellDeclarativeView* view, QObject* parent)
+DashDBus::DashDBus(ShellManager* manager, QObject* parent)
 : QObject(parent)
-, m_view(view)
+, m_manager(manager)
 {
-    connect(m_view, SIGNAL(dashActiveChanged(bool)), SIGNAL(activeChanged(bool)));
-    connect(m_view, SIGNAL(dashAlwaysFullScreenChanged(bool)), SIGNAL(alwaysFullScreenChanged(bool)));
-    connect(m_view, SIGNAL(activeLensChanged(QString)), SIGNAL(activeLensChanged(QString)));
+    connect(m_manager, SIGNAL(dashActiveChanged(bool)), SIGNAL(activeChanged(bool)));
+    connect(m_manager, SIGNAL(dashAlwaysFullScreenChanged(bool)), SIGNAL(alwaysFullScreenChanged(bool)));
+    connect(m_manager, SIGNAL(dashActiveLensChanged(QString)), SIGNAL(activeLensChanged(QString)));
+
+    connect(m_manager, SIGNAL(dashScreenChanged(int)), SIGNAL(screenChanged(int)));
 
     new DashAdaptor(this);
 }
@@ -41,41 +43,47 @@
 void
 DashDBus::activateHome()
 {
-    Q_EMIT m_view->activateHome();
+    Q_EMIT m_manager->dashActivateHome();
 }
 
 void
 DashDBus::activateLens(const QString& lensId)
 {
-    Q_EMIT m_view->activateLens(lensId);
+    Q_EMIT m_manager->dashActivateLens(lensId);
 }
 
 bool
 DashDBus::active() const
 {
-    return m_view->dashActive();
+    return m_manager->dashActive();
 }
 
 void
 DashDBus::setActive(bool active)
 {
-    m_view->setDashActive(active);
+    m_manager->setDashActive(active);
 }
 
 bool
 DashDBus::alwaysFullScreen() const
 {
-    return m_view->dashAlwaysFullScreen();
+    return m_manager->dashAlwaysFullScreen();
 }
 
 QString
 DashDBus::activeLens() const
 {
-    return m_view->activeLens();
+    return m_manager->dashActiveLens();
 }
 
 void
 DashDBus::setActiveLens(QString activeLens)
 {
-    m_view->setActiveLens(activeLens);
+    m_manager->setDashActiveLens(activeLens);
+}
+
+int
+DashDBus::screen() const
+{
+    return m_manager->dashScreen();
 }

=== modified file 'shell/app/dashdbus.h'
--- shell/app/dashdbus.h	2012-03-05 16:38:47 +0000
+++ shell/app/dashdbus.h	2012-03-15 09:01:33 +0000
@@ -23,7 +23,7 @@
 #include <QtCore/QObject>
 #include <QtDBus/QDBusContext>
 
-class ShellDeclarativeView;
+class ShellManager;
 
 /**
  * DBus interface for the dash.
@@ -37,15 +37,17 @@
     Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
     Q_PROPERTY(bool alwaysFullScreen READ alwaysFullScreen NOTIFY alwaysFullScreenChanged)
     Q_PROPERTY(QString activeLens READ activeLens WRITE setActiveLens NOTIFY activeLensChanged)
+    Q_PROPERTY(int screen READ screen NOTIFY screenChanged)
 
 public:
-    DashDBus(ShellDeclarativeView* view, QObject* parent=0);
+    DashDBus(ShellManager* manager, QObject* parent=0);
 
     bool active() const;
     void setActive(bool active);
     bool alwaysFullScreen() const;
     QString activeLens() const;
     void setActiveLens(QString activeLens);
+    int screen() const;
 
 public Q_SLOTS:
     Q_NOREPLY void activateHome();
@@ -55,9 +57,10 @@
     void activeChanged(bool);
     void alwaysFullScreenChanged(bool);
     void activeLensChanged(QString);
+    void screenChanged(int);
 
 private:
-    ShellDeclarativeView* m_view;
+    ShellManager* m_manager;
 };
 
 #endif // DashDBus_H

=== modified file 'shell/app/hud.xml'
--- shell/app/hud.xml	2012-03-05 16:38:47 +0000
+++ shell/app/hud.xml	2012-03-15 09:01:33 +0000
@@ -12,12 +12,21 @@
         <property name="active" type="b" access="readwrite">
             <dox:d>True if the HUD is active</dox:d>
         </property>
+        <property name="screen" type="i" access="read">
+            <dox:d>The screen with the HUD</dox:d>
+        </property>
         <signal name="activeChanged">
                 <dox:d>Signals when the active status of the HUD changes</dox:d>
                 <arg name="active" type="b" direction="out">
                         <dox:d>True if the HUD is active</dox:d>
                 </arg>
         </signal>
+        <signal name="screenChanged">
+                <dox:d>Signals when the screen changes</dox:d>
+                <arg name="active" type="i" direction="out">
+                        <dox:d>The screen with the HUD</dox:d>
+                </arg>
+        </signal>
     </interface>
 </node>
 

=== modified file 'shell/app/huddbus.cpp'
--- shell/app/huddbus.cpp	2012-03-05 16:38:47 +0000
+++ shell/app/huddbus.cpp	2012-03-15 09:01:33 +0000
@@ -21,18 +21,18 @@
 #include "hudadaptor.h"
 
 // Local
-#include <shelldeclarativeview.h>
+#include <shellmanager.h>
 
 // Qt
 #include <QtDBus/QDBusConnection>
 #include <QGraphicsObject>
 
-HUDDBus::HUDDBus(ShellDeclarativeView* view, QObject* parent)
+HUDDBus::HUDDBus(ShellManager* manager, QObject* parent)
 : QObject(parent)
-, m_view(view)
+, m_manager(manager)
 {
-    /* QML's propertyChanged signals are simple, they don't pass the property value */
-    connect(m_view->rootObject(), SIGNAL(hudActiveChanged()), SLOT(onHudActiveChanged()));
+    connect(m_manager, SIGNAL(hudActiveChanged()), SLOT(onHudActiveChanged()));
+    connect(m_manager, SIGNAL(hudScreenChanged(int)), SIGNAL(screenChanged(int)));
 
     new HUDAdaptor(this);
 }
@@ -40,7 +40,7 @@
 bool
 HUDDBus::active() const
 {
-    return m_view->rootObject()->property("hudActive").toBool();
+    return m_manager->hudActive();
 }
 
 void
@@ -53,7 +53,13 @@
 HUDDBus::setActive(bool hudActive)
 {
     if (hudActive != active()) {
-        m_view->rootObject()->setProperty("hudActive", hudActive);
+        m_manager->setHudActive(hudActive);
         Q_EMIT activeChanged(hudActive);
     }
 }
+
+int
+HUDDBus::screen() const
+{
+    return m_manager->hudScreen();
+}

=== modified file 'shell/app/huddbus.h'
--- shell/app/huddbus.h	2012-03-05 16:38:47 +0000
+++ shell/app/huddbus.h	2012-03-15 09:01:33 +0000
@@ -23,7 +23,7 @@
 #include <QtCore/QObject>
 #include <QtDBus/QDBusContext>
 
-class ShellDeclarativeView;
+class ShellManager;
 
 /**
  * DBus interface for the HUD.
@@ -32,21 +32,24 @@
 {
     Q_OBJECT
     Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+    Q_PROPERTY(int screen READ screen NOTIFY screenChanged)
 
 public:
-    HUDDBus(ShellDeclarativeView* view, QObject* parent=0);
+    HUDDBus(ShellManager* manager, QObject* parent=0);
 
     bool active() const;
     void setActive(bool active);
+    int screen() const;
 
 Q_SIGNALS:
     void activeChanged(bool);
+    void screenChanged(int);
 
 private Q_SLOTS:
     void onHudActiveChanged();
 
 private:
-    ShellDeclarativeView* m_view;
+    ShellManager* m_manager;
 };
 
 #endif // HudDBus_H

=== modified file 'shell/app/shell.cpp'
--- shell/app/shell.cpp	2012-03-06 18:06:03 +0000
+++ shell/app/shell.cpp	2012-03-15 09:01:33 +0000
@@ -21,27 +21,16 @@
 // QT
 #include <QApplication>
 #include <QDebug>
-#include <QtDeclarative>
-#include <QDeclarativeEngine>
-#include <QDeclarativeView>
-#include <QDesktopWidget>
-#include <QDBusConnection>
-#include <QDBusConnectionInterface>
-#include <QDeclarativeContext>
-#include <QAbstractEventDispatcher>
 #include <QDir>
-
-// X11
-#include <X11/Xlib.h>
+#include <QUrl>
 
 // unity-2d
 #include <gnomesessionclient.h>
 #include <unity2dapplication.h>
-#include <unity2ddebug.h>
 
 // Local
 #include "config.h"
-#include "shelldeclarativeview.h"
+#include "shellmanager.h"
 #include "shelldbus.h"
 
 int main(int argc, char *argv[])
@@ -69,22 +58,7 @@
     GnomeSessionClient client(INSTALL_PREFIX "/share/applications/unity-2d-shell.desktop");
     client.connectToSessionManager();
 
-    qmlRegisterType<ShellDeclarativeView>("Unity2d", 1, 0, "ShellDeclarativeView");
-    ShellDeclarativeView view;
-    view.setAccessibleName("Shell");
-    if (arguments.contains("-opengl")) {
-        view.setUseOpenGL(true);
-    }
-
-    application.installX11EventFilter(&view);
-
-    view.engine()->addImportPath(unity2dImportPath());
-    view.engine()->setBaseUrl(QUrl::fromLocalFile(unity2dDirectory() + "/shell/"));
-
-    /* Load the QML UI, focus and show the window */
-    view.setResizeMode(QDeclarativeView::SizeViewToRootObject);
-    view.rootContext()->setContextProperty("declarativeView", &view);
-    view.setSource(rootFileUrl);
+    ShellManager shells(rootFileUrl);
 
     /* Unset DESKTOP_AUTOSTART_ID in order to avoid child processes (launched
        applications) to use the same client id.
@@ -101,7 +75,7 @@
        (see e.g. https://bugs.launchpad.net/bugs/684471). */
     QDir::setCurrent(QDir::homePath());
 
-    ShellDBus shellDBus(&view);
+    ShellDBus shellDBus(&shells);
     if (!shellDBus.connectToBus()) {
         qCritical() << "Another instance of the Shell already exists. Quitting.";
         return -1;

=== modified file 'shell/app/shelldbus.cpp'
--- shell/app/shelldbus.cpp	2012-03-05 16:38:47 +0000
+++ shell/app/shelldbus.cpp	2012-03-15 09:01:33 +0000
@@ -32,9 +32,9 @@
 static const char* DASH_DBUS_OBJECT_PATH = "/Dash";
 static const char* HUD_DBUS_OBJECT_PATH = "/HUD";
 
-ShellDBus::ShellDBus(ShellDeclarativeView* view, QObject* parent)
+ShellDBus::ShellDBus(ShellManager* manager, QObject* parent)
 : QObject(parent)
-, m_view(view)
+, m_manager(manager)
 {
 }
 
@@ -51,10 +51,10 @@
         return false;
     }
 
-    DashDBus *dashDBus = new DashDBus(m_view, this);
+    DashDBus *dashDBus = new DashDBus(m_manager, this);
     QDBusConnection::sessionBus().registerObject(DASH_DBUS_OBJECT_PATH, dashDBus);
 
-    HUDDBus *hudDBus = new HUDDBus(m_view, this);
+    HUDDBus *hudDBus = new HUDDBus(m_manager, this);
     QDBusConnection::sessionBus().registerObject(HUD_DBUS_OBJECT_PATH, hudDBus);
 
     return true;

=== modified file 'shell/app/shelldbus.h'
--- shell/app/shelldbus.h	2012-03-06 11:09:04 +0000
+++ shell/app/shelldbus.h	2012-03-15 09:01:33 +0000
@@ -24,7 +24,7 @@
 #include <QtCore/QObject>
 #include <QtDBus/QDBusContext>
 
-class ShellDeclarativeView;
+class ShellManager;
 
 /**
  * DBus interface for the shell.
@@ -34,13 +34,13 @@
     Q_OBJECT
 
 public:
-    ShellDBus(ShellDeclarativeView* view, QObject* parent=0);
+    ShellDBus(ShellManager* manager, QObject* parent=0);
     ~ShellDBus();
 
     bool connectToBus();
 
 private:
-    ShellDeclarativeView* m_view;
+    ShellManager* m_manager;
 };
 
 #endif // ShellDBus_H

=== modified file 'shell/app/shelldeclarativeview.cpp'
--- shell/app/shelldeclarativeview.cpp	2012-03-05 14:04:05 +0000
+++ shell/app/shelldeclarativeview.cpp	2012-03-15 09:01:33 +0000
@@ -17,17 +17,12 @@
 // Local
 #include <config.h>
 #include "shelldeclarativeview.h"
+#include "shellmanager.h"
 #include "dashdbus.h"
 
 // libunity-2d-private
 #include <debug_p.h>
 #include <hotkey.h>
-#include <hotkeymonitor.h>
-#include <hotmodifier.h>
-#include <keyboardmodifiersmonitor.h>
-#include <keymonitor.h>
-#include <dashclient.h>
-#include <launcherclient.h>
 #include <screeninfo.h>
 #include <strutmanager.h>
 
@@ -41,69 +36,25 @@
 #include <QtDBus/QDBusConnectionInterface>
 #include <QtDBus/QDBusInterface>
 #include <QX11Info>
-#include <QGraphicsObject>
+#include <QDeclarativeItem>
 #include <QFileInfo>
 
 // X11
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
-static const char* COMMANDS_LENS_ID = "commands.lens";
-
-static const int DASH_MIN_SCREEN_WIDTH = 1280;
-static const int DASH_MIN_SCREEN_HEIGHT = 1084;
-
-ShellDeclarativeView::ShellDeclarativeView()
+ShellDeclarativeView::ShellDeclarativeView(ShellManager *manager, const QUrl &sourceFileUrl, int screen)
     : Unity2DDeclarativeView()
-    , m_mode(DesktopMode)
-    , m_expanded(true)
-    , m_active(false)
-    , m_dashAlwaysFullScreen(false)
+    , m_sourceFileUrl(sourceFileUrl)
+    , m_manager(manager)
 {
     setAttribute(Qt::WA_X11NetWmWindowTypeDock, true);
     setTransparentBackground(QX11Info::isCompositingManagerRunning());
 
-    m_screenInfo = new ScreenInfo(ScreenInfo::TopLeft, this);
-
-    connect(&launcher2dConfiguration(), SIGNAL(superKeyEnableChanged(bool)), SLOT(updateSuperKeyMonitoring()));
-    updateSuperKeyMonitoring();
-
-    /* Super tap shows the dash, super held shows the launcher hints */
-    m_superHotModifier = KeyboardModifiersMonitor::instance()->getHotModifierFor(Qt::MetaModifier);
-    connect(m_superHotModifier, SIGNAL(tapped()), SLOT(toggleDash()));
-    connect(m_superHotModifier, SIGNAL(heldChanged(bool)), SIGNAL(superKeyHeldChanged(bool)));
-
-    /* Alt tap shows the HUD */
-    m_altHotModifier = KeyboardModifiersMonitor::instance()->getHotModifierFor(Qt::AltModifier);
-    connect(m_altHotModifier, SIGNAL(tapped()), SIGNAL(toggleHud()));
-
-    /* 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()));
-    }
+    m_screenInfo = new ScreenInfo(screen, this);
 
     connect(m_screenInfo, SIGNAL(availableGeometryChanged(QRect)), SLOT(updateShellPosition()));
     updateShellPosition();
-
-    // FIXME: we need to use a queued connection here otherwise QConf will deadlock for some reason
-    // when we read any property from the slot (which we need to do). We need to check why this
-    // happens and report a bug to dconf-qt to get it fixed.
-    connect(&unity2dConfiguration(), SIGNAL(formFactorChanged(QString)),
-                                     SLOT(updateDashAlwaysFullScreen()), Qt::QueuedConnection);
-    connect(QApplication::desktop(), SIGNAL(resized(int)), SLOT(updateDashAlwaysFullScreen()));
-
-    updateDashAlwaysFullScreen();
 }
 
 void
@@ -147,7 +98,6 @@
 ShellDeclarativeView::focusOutEvent(QFocusEvent* event)
 {
     Unity2DDeclarativeView::focusOutEvent(event);
-    setDashActive(false);
     Q_EMIT focusChanged();
 }
 
@@ -177,6 +127,17 @@
     Unity2DDeclarativeView::resizeEvent(event);
 }
 
+
+void ShellDeclarativeView::forceActivateWindow()
+{
+    m_manager->forceActivateShell(this);
+}
+
+void ShellDeclarativeView::forceDeactivateWindow()
+{
+    m_manager->forceDeactivateShell(this);
+}
+
 void
 ShellDeclarativeView::setWMFlags()
 {
@@ -200,181 +161,21 @@
     /* Note that this has to be called everytime the window is shown, as the WM
        will remove the flags when the window is hidden */
     setWMFlags();
-}
-
-void
-ShellDeclarativeView::setDashActive(bool value)
-{
-    if (value != m_active) {
-        m_active = value;
-        Q_EMIT dashActiveChanged(m_active);
-    }
-}
-
-bool
-ShellDeclarativeView::dashActive() const
-{
-    return m_active;
-}
-
-bool
-ShellDeclarativeView::haveCustomHomeShortcuts() const
-{
-    return QFileInfo(unity2dDirectory() + "/shell/dash/HomeShortcutsCustomized.qml").exists();
-}
-
-void
-ShellDeclarativeView::setDashMode(ShellDeclarativeView::DashMode mode)
-{
-    if (m_mode == mode) {
-        return;
-    }
-
-    m_mode = mode;
-    dashModeChanged(m_mode);
-}
-
-ShellDeclarativeView::DashMode
-ShellDeclarativeView::dashMode() const
-{
-    return m_mode;
-}
-
-void
-ShellDeclarativeView::setExpanded(bool value)
-{
-    if (m_expanded == value) {
-        return;
-    }
-
-    m_expanded = value;
-    expandedChanged(m_expanded);
-}
-
-bool
-ShellDeclarativeView::expanded() const
-{
-    return m_expanded;
-}
-
-bool ShellDeclarativeView::dashAlwaysFullScreen() const
-{
-    return m_dashAlwaysFullScreen;
-}
-
-void
-ShellDeclarativeView::setActiveLens(const QString& activeLens)
-{
-    if (activeLens != m_activeLens) {
-        m_activeLens = activeLens;
-        Q_EMIT activeLensChanged(activeLens);
-    }
-}
-
-const QString&
-ShellDeclarativeView::activeLens() const
-{
-    return m_activeLens;
-}
-
-void
-ShellDeclarativeView::toggleDash()
-{
-    if (dashActive()) {
-        setDashActive(false);
-        forceDeactivateWindow();
-    } else {
-        Q_EMIT activateHome();
-    }
-}
-
-void
-ShellDeclarativeView::showCommandsLens()
-{
-    Q_EMIT activateLens(COMMANDS_LENS_ID);
-}
-
-void
-ShellDeclarativeView::onAltF1Pressed()
+    if (source().isEmpty()) {
+        QMap<const char*, QVariant> rootObjectProperties;
+        rootObjectProperties.insert("declarativeView", QVariant::fromValue(this));
+        setSource(m_sourceFileUrl, rootObjectProperties);
+    }
+}
+
+void
+ShellDeclarativeView::toggleLauncher()
 {
     if (!isActiveWindow()) {
         forceActivateWindow();
         Q_EMIT launcherFocusRequested();
     } else {
-        if (dashActive()) {
-            // focus the launcher instead of the dash
-            setDashActive(false);
-            Q_EMIT launcherFocusRequested();
-        } else {
-            // we assume that the launcher is focused; unfocus it by deactivating the shell window
-            forceDeactivateWindow();
-        }
-    }
-}
-
-static QSize minimumSizeForDesktop()
-{
-    return QSize(DASH_MIN_SCREEN_WIDTH, DASH_MIN_SCREEN_HEIGHT);
-}
-
-void ShellDeclarativeView::updateDashAlwaysFullScreen()
-{
-    bool dashAlwaysFullScreen;
-    if (unity2dConfiguration().property("formFactor").toString() != "desktop") {
-        dashAlwaysFullScreen = true;
-    } else {
-        const QRect rect = m_screenInfo->geometry();
-        const QSize minSize = minimumSizeForDesktop();
-        dashAlwaysFullScreen = rect.width() < minSize.width() && rect.height() < minSize.height();
-    }
-
-    if (m_dashAlwaysFullScreen != dashAlwaysFullScreen) {
-        m_dashAlwaysFullScreen = dashAlwaysFullScreen;
-        Q_EMIT dashAlwaysFullScreenChanged(dashAlwaysFullScreen);
-    }
-}
-
-void
-ShellDeclarativeView::updateSuperKeyMonitoring()
-{
-    KeyboardModifiersMonitor *modifiersMonitor = KeyboardModifiersMonitor::instance();
-    HotkeyMonitor& hotkeyMonitor = HotkeyMonitor::instance();
-
-    QVariant value = launcher2dConfiguration().property("superKeyEnable");
-    if (!value.isValid() || value.toBool() == true) {
-        hotkeyMonitor.enableModifiers(Qt::MetaModifier);
-        modifiersMonitor->enableModifiers(Qt::MetaModifier);
-    } else {
-        hotkeyMonitor.disableModifiers(Qt::MetaModifier);
-        modifiersMonitor->disableModifiers(Qt::MetaModifier);
-    }
-}
-
-void
-ShellDeclarativeView::forwardNumericHotkey()
-{
-    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);
-            }
-        }
+        forceDeactivateWindow();
     }
 }
 
@@ -450,9 +251,3 @@
 {
     return m_monitoredAreaContainsMouse;
 }
-
-bool
-ShellDeclarativeView::superKeyHeld() const
-{
-    return m_superHotModifier->held();
-}

=== modified file 'shell/app/shelldeclarativeview.h'
--- shell/app/shelldeclarativeview.h	2012-03-05 13:59:50 +0000
+++ shell/app/shelldeclarativeview.h	2012-03-15 09:01:33 +0000
@@ -27,21 +27,14 @@
 class LauncherClient;
 class ShellDBus;
 class ScreenInfo;
-class HotModifier;
+class Hotkey;
+class ShellManager;
 
 class ShellDeclarativeView : public Unity2DDeclarativeView, public AbstractX11EventFilter
 {
     Q_OBJECT
-    Q_ENUMS(DashMode)
 
-    Q_PROPERTY(bool dashActive READ dashActive WRITE setDashActive NOTIFY dashActiveChanged)
-    Q_PROPERTY(bool expanded READ expanded WRITE setExpanded NOTIFY expandedChanged)
-    Q_PROPERTY(DashMode dashMode READ dashMode WRITE setDashMode NOTIFY dashModeChanged)
-    Q_PROPERTY(QString activeLens READ activeLens WRITE setActiveLens NOTIFY activeLensChanged)
     Q_PROPERTY(bool focus READ hasFocus NOTIFY focusChanged) // overridden to add notify
-    Q_PROPERTY(bool dashAlwaysFullScreen READ dashAlwaysFullScreen NOTIFY dashAlwaysFullScreenChanged)
-    Q_PROPERTY(bool superKeyHeld READ superKeyHeld NOTIFY superKeyHeldChanged)
-    Q_PROPERTY(bool haveCustomHomeShortcuts READ haveCustomHomeShortcuts)
 
     /* These two properties and mouse movement tracking on the widget are added here only because
        we need to detect when the mouse is inside the area occupied by the lancher. This should
@@ -54,60 +47,31 @@
                                                NOTIFY monitoredAreaContainsMouseChanged)
 
 public:
-    enum DashMode {
-        DesktopMode,
-        FullScreenMode
-    };
-    explicit ShellDeclarativeView();
+    ShellDeclarativeView(ShellManager *manager, const QUrl &sourceFileUrl, int screen);
 
     /* getters */
-    bool dashActive() const;
-    bool haveCustomHomeShortcuts() const;
-    DashMode dashMode() const;
-    const QString& activeLens() const;
-    bool expanded() const;
-    bool superKeyHeld() const;
-    bool dashAlwaysFullScreen() const;
     QRect monitoredArea() const;
     bool monitoredAreaContainsMouse() const;
 
     /* setters */
-    Q_SLOT void setDashActive(bool active);
-    Q_INVOKABLE void setDashMode(DashMode);
-    Q_INVOKABLE void setActiveLens(const QString& activeLens);
-    Q_INVOKABLE void setExpanded(bool);
     void setMonitoredArea(QRect monitoredArea);
 
     virtual bool x11EventFilter(XEvent* event);
 
+    void toggleLauncher();
+
+    Q_INVOKABLE void forceActivateWindow();
+    Q_INVOKABLE void forceDeactivateWindow();
+
 Q_SIGNALS:
-    void dashActiveChanged(bool);
-    void dashModeChanged(DashMode);
-    void expandedChanged(bool);
-    void activeLensChanged(const QString&);
-    void activateLens(const QString& lensId);
-    void activateHome();
-    void toggleHud();
     void focusChanged();
     void monitoredAreaChanged();
     void monitoredAreaContainsMouseChanged();
 
-    void dashAlwaysFullScreenChanged(bool dashAlwaysFullScreen);
-    void superKeyHeldChanged(bool superKeyHeld);
     void activateShortcutPressed(int itemIndex);
     void newInstanceShortcutPressed(int itemIndex);
     void launcherFocusRequested();
 
-private Q_SLOTS:
-    void updateSuperKeyMonitoring();
-    void forwardNumericHotkey();
-
-    void toggleDash();
-    void showCommandsLens();
-    void onAltF1Pressed();
-
-    void updateDashAlwaysFullScreen();
-
 protected:
     virtual void showEvent(QShowEvent *event);
     virtual void mouseMoveEvent(QMouseEvent *event);
@@ -123,19 +87,12 @@
     void setWMFlags();
     void updateInputShape();
 
-    DashMode m_mode;
-    bool m_expanded;
-    QString m_activeLens; /* Lens id of the active lens */
-    bool m_active;
-
-    bool m_dashAlwaysFullScreen;
     QRect m_monitoredArea;
     bool m_monitoredAreaContainsMouse;
-
-    HotModifier* m_superHotModifier;
-    HotModifier* m_altHotModifier;
-
-    friend class DashDBus;
+    QUrl m_sourceFileUrl;
+    ShellManager *m_manager;
+
+    friend class ShellManager;
 };
 
 Q_DECLARE_METATYPE(ShellDeclarativeView*)

=== added file 'shell/app/shellmanager.cpp'
--- shell/app/shellmanager.cpp	1970-01-01 00:00:00 +0000
+++ shell/app/shellmanager.cpp	2012-03-15 09:01:33 +0000
@@ -0,0 +1,683 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#include "shellmanager.h"
+
+// Qt
+#include <QApplication>
+#include <QDebug>
+#include <QtDeclarative>
+#include <QDesktopWidget>
+#include <QX11Info>
+
+// libunity-2d-private
+#include <debug_p.h>
+#include <hotmodifier.h>
+#include <hotkeymonitor.h>
+#include <hotkey.h>
+#include <keyboardmodifiersmonitor.h>
+#include <keymonitor.h>
+#include <screeninfo.h>
+
+// Local
+#include "shelldeclarativeview.h"
+#include "config.h"
+
+// unity-2d
+#include <unity2ddebug.h>
+#include <gobjectcallback.h>
+
+// bamf
+#include "bamf-window.h"
+#include "bamf-matcher.h"
+
+// libwnck
+extern "C" {
+#define WNCK_I_KNOW_THIS_IS_UNSTABLE
+#include <libwnck/libwnck.h>
+}
+
+static const char* COMMANDS_LENS_ID = "commands.lens";
+static const int DASH_MIN_SCREEN_WIDTH = 1280;
+static const int DASH_MIN_SCREEN_HEIGHT = 1084;
+
+GOBJECT_CALLBACK1(activeWorkspaceChangedCB, "onActiveWorkspaceChanged");
+
+struct ShellManagerPrivate
+{
+    ShellManagerPrivate()
+        : q(NULL)
+        , m_shellWithDash(NULL)
+        , m_shellWithHud(NULL)
+        , m_hudLoader(NULL)
+        , m_dashAlwaysFullScreen(false)
+        , m_dashActive(false)
+        , m_dashMode(ShellManager::DesktopMode)
+        , m_superHotModifier(NULL)
+        , m_last_focused_window(None)
+    {}
+
+    enum ActiveShellUsage {
+        ActiveShellGeneralUse,
+        ActiveShellLauncherRelatedUse
+    };
+
+    ShellDeclarativeView* initShell(int screen);
+    void updateScreenCount(int newCount);
+    ShellDeclarativeView* activeShell(ActiveShellUsage usage) const;
+    void moveDashToShell(ShellDeclarativeView* newShell);
+    void moveHudToShell(ShellDeclarativeView* newShell);
+    void saveActiveWindow();
+
+    ShellManager *q;
+    QList<ShellDeclarativeView *> m_viewList;
+    ShellDeclarativeView * m_shellWithDash;
+    ShellDeclarativeView * m_shellWithHud;
+    QDeclarativeItem* m_hudLoader;
+    bool m_dashAlwaysFullScreen;
+    QUrl m_sourceFileUrl;
+    bool m_dashActive;
+    ShellManager::DashMode m_dashMode;
+    QString m_dashActiveLens; /* Lens id of the active lens */
+
+    HotModifier* m_superHotModifier;
+    HotModifier* m_altHotModifier;
+
+    WId m_last_focused_window;
+};
+
+
+ShellDeclarativeView *
+ShellManagerPrivate::initShell(int screen)
+{
+    const QStringList arguments = qApp->arguments();
+    ShellDeclarativeView * view = new ShellDeclarativeView(q, m_sourceFileUrl, screen);
+    view->setAccessibleName("Shell");
+    if (arguments.contains("-opengl")) {
+        view->setUseOpenGL(true);
+    }
+
+    Unity2dApplication::instance()->installX11EventFilter(view);
+
+    view->engine()->addImportPath(unity2dImportPath());
+    view->engine()->setBaseUrl(QUrl::fromLocalFile(unity2dDirectory() + "/shell/"));
+
+    view->rootContext()->setContextProperty("shellManager", q);
+
+    view->show();
+
+    return view;
+}
+
+ShellDeclarativeView *
+ShellManagerPrivate::activeShell(ActiveShellUsage usage) const
+{
+    bool launcherOnlyInOneScreen = launcher2dConfiguration().property("onlyOneLauncher").toBool();
+    if (usage == ActiveShellLauncherRelatedUse && launcherOnlyInOneScreen) {
+        return m_viewList.isEmpty() ? NULL : m_viewList[0];
+    }
+
+    int cursorScreen = QApplication::desktop()->screenNumber(QCursor::pos());
+    Q_FOREACH(ShellDeclarativeView * shell, m_viewList) {
+        if (shell->screen()->screen() == cursorScreen) {
+            return shell;
+        }
+    }
+    return 0;
+}
+
+void
+ShellManagerPrivate::updateScreenCount(int newCount)
+{
+    const int previousCount = m_viewList.size();
+
+    /* Instantiate new Shells as needed. */
+    for (int screen = previousCount; screen < newCount; ++screen) {
+        ShellDeclarativeView *shell = initShell(screen);
+        m_viewList.append(shell);
+
+        if (screen == 0) {
+            m_shellWithDash = m_viewList[0];
+            Q_EMIT q->dashShellChanged(m_shellWithDash);
+            Q_EMIT q->dashScreenChanged(q->dashScreen());
+
+            m_shellWithHud = m_viewList[0];
+            Q_EMIT q->hudShellChanged(m_shellWithHud);
+            Q_EMIT q->hudScreenChanged(q->hudScreen());
+
+            m_hudLoader = qobject_cast<QDeclarativeItem*>(m_shellWithHud->rootObject()->property("hudLoader").value<QObject *>());
+            if (m_hudLoader != NULL) {
+                QObject::connect(m_hudLoader, SIGNAL(activeChanged()), q, SIGNAL(hudActiveChanged()));
+            } else {
+                qWarning() << "Could not find the hudLoader";
+            }
+        }
+    }
+
+    /* Remove extra Shells if any. */
+    while (m_viewList.size() > newCount) {
+        ShellDeclarativeView *shell = m_viewList.takeLast();
+        if (shell == m_shellWithDash) {
+            if (newCount > 0) {
+                moveDashToShell(m_viewList[0]);
+            } else {
+                m_shellWithDash = NULL;
+                Q_EMIT q->dashShellChanged(NULL);
+                Q_EMIT q->dashScreenChanged(-1);
+            }
+        }
+        if (shell == m_shellWithHud) {
+            if (newCount > 0) {
+                moveHudToShell(m_viewList[0]);
+            } else {
+                m_shellWithHud = NULL;
+                Q_EMIT q->hudShellChanged(NULL);
+                Q_EMIT q->hudScreenChanged(-1);
+            }
+        }
+        shell->deleteLater();
+    }
+
+}
+
+static QList<QDeclarativeItem *> dumpFocusedItems(QObject *obj) {
+    QList<QDeclarativeItem *> res;
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(obj);
+    if (item && item->hasFocus()) {
+        res << item;
+    }
+    Q_FOREACH (QObject *childObj, obj->children()) {
+        res += dumpFocusedItems(childObj);
+    }
+    return res;
+}
+
+static bool moveRootChildItemToShell(const char *itemName, ShellDeclarativeView* newShell, ShellDeclarativeView* oldShell)
+{
+    bool itemMoved = false;
+
+    if (newShell != oldShell) {
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(oldShell->rootObject()->property(itemName).value<QObject *>());
+        if (item) {
+            const QGraphicsView::ViewportUpdateMode oldShellViewportUpdateMode = oldShell->viewportUpdateMode();
+            const QGraphicsView::ViewportUpdateMode newShellViewportUpdateMode = newShell->viewportUpdateMode();
+            oldShell->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+            newShell->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+
+            // Moving the item around makes it lose its focus values, remember them and set them later
+            const QList<QDeclarativeItem *> itemChildrenFocusedItems = dumpFocusedItems(item);
+
+            oldShell->rootObject()->setProperty(itemName, QVariant());
+            oldShell->scene()->removeItem(item);
+
+            item->setParentItem(qobject_cast<QDeclarativeItem*>(newShell->rootObject()));
+            newShell->rootObject()->setProperty(itemName, QVariant::fromValue<QObject*>(item));
+
+            Q_FOREACH(QDeclarativeItem *childrenItem, itemChildrenFocusedItems) {
+                childrenItem->setFocus(true);
+            }
+
+            oldShell->setViewportUpdateMode(oldShellViewportUpdateMode);
+            newShell->setViewportUpdateMode(newShellViewportUpdateMode);
+
+            itemMoved = true;
+        } else {
+            qWarning() << "moveRootChildItemToShell: Could not find the item" << itemName;
+        }
+    }
+
+    return itemMoved;
+}
+
+void ShellManagerPrivate::moveDashToShell(ShellDeclarativeView* newShell)
+{
+    if (moveRootChildItemToShell("dashLoader", newShell, m_shellWithDash)) {
+        m_shellWithDash = newShell;
+        Q_EMIT q->dashShellChanged(newShell);
+        Q_EMIT q->dashScreenChanged(q->dashScreen());
+    }
+}
+
+void ShellManagerPrivate::moveHudToShell(ShellDeclarativeView* newShell)
+{
+    if (moveRootChildItemToShell("hudLoader", newShell, m_shellWithHud)) {
+        m_shellWithHud = newShell;
+        Q_EMIT q->hudShellChanged(newShell);
+        Q_EMIT q->hudScreenChanged(q->hudScreen());
+    }
+}
+
+/* -------------------------- ShellManager -----------------------------*/
+
+ShellManager::ShellManager(const QUrl &sourceFileUrl, QObject* parent) :
+    QObject(parent)
+    ,d(new ShellManagerPrivate)
+{
+    d->q = this;
+    d->m_sourceFileUrl = sourceFileUrl;
+
+    qmlRegisterUncreatableType<ShellDeclarativeView>("Unity2d", 1, 0, "ShellDeclarativeView", "This can only be created from C++");
+    qmlRegisterUncreatableType<ShellManager>("Unity2d", 1, 0, "ShellManager", "This can only be created from C++");
+
+    QDesktopWidget* desktop = QApplication::desktop();
+
+    d->updateScreenCount(desktop->screenCount());
+
+    connect(desktop, SIGNAL(screenCountChanged(int)), SLOT(onScreenCountChanged(int)));
+
+    connect(&launcher2dConfiguration(), SIGNAL(superKeyEnableChanged(bool)), SLOT(updateSuperKeyMonitoring()));
+    updateSuperKeyMonitoring();
+
+    /* Super tap shows the dash, super held shows the launcher hints */
+    d->m_superHotModifier = KeyboardModifiersMonitor::instance()->getHotModifierFor(Qt::MetaModifier);
+    connect(d->m_superHotModifier, SIGNAL(tapped()), SLOT(toggleDashRequested()));
+    connect(d->m_superHotModifier, SIGNAL(heldChanged(bool)), SIGNAL(superKeyHeldChanged(bool)));
+
+    /* Alt tap shows the HUD */
+    d->m_altHotModifier = KeyboardModifiersMonitor::instance()->getHotModifierFor(Qt::AltModifier);
+    connect(d->m_altHotModifier, SIGNAL(tapped()), SLOT(toggleHudRequested()));
+
+    /* Alt+F1 reveals 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()));
+    }
+
+    // FIXME: we need to use a queued connection here otherwise QConf will deadlock for some reason
+    // when we read any property from the slot (which we need to do). We need to check why this
+    // happens and report a bug to dconf-qt to get it fixed.
+    connect(&unity2dConfiguration(), SIGNAL(formFactorChanged(QString)),
+                                     SLOT(updateDashAlwaysFullScreen()), Qt::QueuedConnection);
+    connect(this, SIGNAL(dashShellChanged(QObject *)), this, SLOT(updateDashAlwaysFullScreen()));
+    connect(QApplication::desktop(), SIGNAL(resized(int)), SLOT(updateDashAlwaysFullScreen()));
+
+    updateDashAlwaysFullScreen();
+
+    g_signal_connect(G_OBJECT(wnck_screen_get_default()), "active_workspace_changed", G_CALLBACK(activeWorkspaceChangedCB), this);
+}
+
+ShellManager::~ShellManager()
+{
+    g_signal_handlers_disconnect_by_func(G_OBJECT(wnck_screen_get_default()), gpointer(activeWorkspaceChangedCB), this);
+
+    qDeleteAll(d->m_viewList);
+    delete d;
+}
+
+void
+ShellManager::setDashActive(bool value)
+{
+    if (value != d->m_dashActive) {
+        d->m_dashActive = value;
+        Q_EMIT dashActiveChanged(d->m_dashActive);
+    }
+}
+
+bool
+ShellManager::dashActive() const
+{
+    return d->m_dashActive;
+}
+
+void
+ShellManager::setDashMode(DashMode mode)
+{
+    if (d->m_dashMode == mode) {
+        return;
+    }
+
+    d->m_dashMode = mode;
+    dashModeChanged(d->m_dashMode);
+}
+
+ShellManager::DashMode
+ShellManager::dashMode() const
+{
+    return d->m_dashMode;
+}
+
+void
+ShellManager::setDashActiveLens(const QString& activeLens)
+{
+    if (activeLens != d->m_dashActiveLens) {
+        d->m_dashActiveLens = activeLens;
+        Q_EMIT dashActiveLensChanged(activeLens);
+    }
+}
+
+const QString&
+ShellManager::dashActiveLens() const
+{
+    return d->m_dashActiveLens;
+}
+
+bool
+ShellManager::dashHaveCustomHomeShortcuts() const
+{
+    return QFileInfo(unity2dDirectory() + "/shell/dash/HomeShortcutsCustomized.qml").exists();
+}
+
+QObject *
+ShellManager::dashShell() const
+{
+    return d->m_shellWithDash;
+}
+
+int
+ShellManager::dashScreen() const
+{
+    if (d->m_shellWithDash != NULL) {
+        return d->m_shellWithDash->screen()->screen();
+    } else {
+        return -1;
+    }
+}
+
+bool
+ShellManager::dashAlwaysFullScreen() const
+{
+    return d->m_dashAlwaysFullScreen;
+}
+
+void
+ShellManager::onScreenCountChanged(int newCount)
+{
+    d->updateScreenCount(newCount);
+}
+
+void
+ShellManager::toggleDashRequested()
+{
+    ShellDeclarativeView * activeShell = d->activeShell(ShellManagerPrivate::ActiveShellLauncherRelatedUse);
+    if (activeShell) {
+        const bool differentShell = d->m_shellWithDash != activeShell;
+
+        if (dashActive() && !differentShell) {
+            setDashActive(false);
+            forceDeactivateShell(d->m_shellWithDash);
+        } else {
+            d->moveDashToShell(activeShell);
+            Q_EMIT dashActivateHome();
+        }
+    }
+}
+
+void
+ShellManager::toggleHudRequested()
+{
+    ShellDeclarativeView * activeShell = d->activeShell(ShellManagerPrivate::ActiveShellGeneralUse);
+    if (activeShell) {
+        const bool differentShell = d->m_shellWithHud != activeShell;
+
+        if (differentShell) {
+            d->moveHudToShell(activeShell);
+
+            if (!hudActive()) {
+                Q_EMIT toggleHud();
+            } else {
+                forceActivateShell(activeShell);
+            }
+        } else {
+            Q_EMIT toggleHud();
+        }
+    }
+}
+
+static QSize minimumSizeForDesktop()
+{
+    return QSize(DASH_MIN_SCREEN_WIDTH, DASH_MIN_SCREEN_HEIGHT);
+}
+
+void ShellManager::updateDashAlwaysFullScreen()
+{
+    bool dashAlwaysFullScreen;
+    if (unity2dConfiguration().property("formFactor").toString() != "desktop") {
+        dashAlwaysFullScreen = true;
+    } else {
+        const QRect rect = QApplication::desktop()->screenGeometry(d->m_shellWithDash);
+        const QSize minSize = minimumSizeForDesktop();
+        dashAlwaysFullScreen = rect.width() < minSize.width() && rect.height() < minSize.height();
+    }
+
+    if (d->m_dashAlwaysFullScreen != dashAlwaysFullScreen) {
+        d->m_dashAlwaysFullScreen = dashAlwaysFullScreen;
+        Q_EMIT dashAlwaysFullScreenChanged(dashAlwaysFullScreen);
+    }
+}
+
+void ShellManager::onActiveWorkspaceChanged()
+{
+    Q_EMIT activeWorkspaceChanged();
+    d->m_last_focused_window = None;
+    Q_EMIT lastFocusedWindowChanged(d->m_last_focused_window);
+}
+
+/* ----------------- super key handling ---------------- */
+
+void
+ShellManager::updateSuperKeyMonitoring()
+{
+    KeyboardModifiersMonitor *modifiersMonitor = KeyboardModifiersMonitor::instance();
+    HotkeyMonitor& hotkeyMonitor = HotkeyMonitor::instance();
+
+    QVariant value = launcher2dConfiguration().property("superKeyEnable");
+    if (!value.isValid() || value.toBool() == true) {
+        hotkeyMonitor.enableModifiers(Qt::MetaModifier);
+        modifiersMonitor->enableModifiers(Qt::MetaModifier);
+    } else {
+        hotkeyMonitor.disableModifiers(Qt::MetaModifier);
+        modifiersMonitor->disableModifiers(Qt::MetaModifier);
+    }
+}
+
+bool
+ShellManager::superKeyHeld() const
+{
+    if (d->m_superHotModifier == NULL) { // We are just initializing
+        return false;
+    }
+
+    return d->m_superHotModifier->held();
+}
+
+bool
+ShellManager::hudActive() const
+{
+    if (d->m_hudLoader == NULL) { // We are just initializing
+        return false;
+    }
+
+    return d->m_hudLoader->property("active").toBool();
+}
+
+void
+ShellManager::setHudActive(bool active)
+{
+    if (d->m_hudLoader != NULL) {
+        d->m_hudLoader->setProperty("active", active);
+    }
+}
+
+QObject *
+ShellManager::hudShell() const
+{
+    return d->m_shellWithHud;
+}
+
+int
+ShellManager::hudScreen() const
+{
+    if (d->m_shellWithHud != NULL) {
+        return d->m_shellWithHud->screen()->screen();
+    } else {
+        return -1;
+    }
+}
+
+/*------------------ Hotkeys Handling -----------------------*/
+
+void
+ShellManager::onAltF1Pressed()
+{
+    ShellDeclarativeView * activeShell = d->activeShell(ShellManagerPrivate::ActiveShellLauncherRelatedUse);
+    if (activeShell) {
+        if (dashActive()) {
+            // focus the launcher instead of the dash
+            setDashActive(false);
+            Q_EMIT activeShell->launcherFocusRequested();
+        } else {
+            activeShell->toggleLauncher();
+        }
+    }
+}
+
+void
+ShellManager::onAltF2Pressed()
+{
+    ShellDeclarativeView * activeShell = d->activeShell(ShellManagerPrivate::ActiveShellLauncherRelatedUse);
+    if (activeShell) {
+        d->moveDashToShell(activeShell);
+        Q_EMIT dashActivateLens(COMMANDS_LENS_ID);
+    }
+}
+
+void
+ShellManager::onNumericHotkeyPressed()
+{
+    Hotkey* hotkey = qobject_cast<Hotkey*>(sender());
+    if (hotkey) {
+        ShellDeclarativeView * activeShell = d->activeShell(ShellManagerPrivate::ActiveShellLauncherRelatedUse);
+        if (activeShell) {
+            /* 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 activeShell->newInstanceShortcutPressed(index);
+                } else {
+                    Q_EMIT activeShell->activateShortcutPressed(index);
+                }
+            } else if (key == Qt::Key_0) {
+                if (hotkey->modifiers() & Qt::ShiftModifier) {
+                    Q_EMIT activeShell->newInstanceShortcutPressed(10);
+                } else {
+                    Q_EMIT activeShell->activateShortcutPressed(10);
+                }
+            }
+        }
+    }
+}
+
+unsigned int ShellManager::lastFocusedWindow() const
+{
+    return d->m_last_focused_window;
+}
+
+/* Obtaining & Discarding Keyboard Focus for Window on Demand
+ *
+ * In the X world, activating a window means to give it the input (keyboard)
+ * focus. When a new window opens, X usually makes it active immediately.
+ * Clicking on a window makes it active too.
+ *
+ * Qt does not have the capability to explicitly ask the window manager to
+ * make an existing window active - setFocus() only forwards input focus to
+ * whatever QWidget you specify.
+ *
+ * De-Activating a window is not possible with X (and hence with Qt). So
+ * we work-around this by remembering which application is active prior to
+ * stealing focus, and then Re-Activating it when we're finished. This is
+ * not guaranteed to succeed, as previous window may have closed.
+ *
+ * The following methods deal with these tasks. Note that when the window
+ * has been activated (deactivated), Qt will realise it has obtained (lost)
+ * focus and act appropriately.
+ */
+
+/* Save WId of window with keyboard focus to m_last_focused_window */
+void ShellManagerPrivate::saveActiveWindow()
+{
+    /* Using Bamf here, 'cause XGetFocusInputFocus returned a XId
+       different by 1, which then could not be used with Bamf to
+       get the application. The change does not result in any functional
+       differences, though. */
+    const BamfWindow* bamf_active_window = BamfMatcher::get_default().active_window();
+
+    /* Bamf can return a null active window - example case is just after 
+       login when no application has been yet been started. */
+    const WId active_window = bamf_active_window != NULL ? bamf_active_window->xid() : None;
+
+    bool notAShell = true;
+    Q_FOREACH(ShellDeclarativeView * shell, m_viewList) {
+        notAShell = notAShell && active_window != shell->effectiveWinId();
+    }
+
+    if (notAShell && active_window != m_last_focused_window) {
+        m_last_focused_window = active_window;
+        Q_EMIT q->lastFocusedWindowChanged(m_last_focused_window);
+    }
+}
+
+/* Ask Window Manager to activate this window and hence get keyboard focus */
+void ShellManager::forceActivateShell(ShellDeclarativeView *shell)
+{
+    // Save reference to window with current keyboard focus
+    if( d->m_last_focused_window == None ){
+        d->saveActiveWindow();
+    }
+
+    // Show this window by giving it keyboard focus
+    Unity2DDeclarativeView::forceActivateWindow(shell->effectiveWinId(), shell);
+}
+
+/* Ask Window Manager to deactivate this window - not guaranteed to succeed. */
+void ShellManager::forceDeactivateShell(ShellDeclarativeView *shell)
+{
+    if( d->m_last_focused_window == None ){
+        UQ_WARNING << "No previously focused window found, use mouse to select window.";
+        return;
+    }
+
+    // What if previously focused window closed while we we had focus? Check if window
+    // exists by seeing if it has attributes.
+    XWindowAttributes attributes;
+    const int status = XGetWindowAttributes(QX11Info::display(), d->m_last_focused_window, &attributes);
+    if ( status == BadWindow ){
+        UQ_WARNING << "Previously focused window has gone, use mouse to select window.";
+        return;
+    }
+
+    // Show this window by giving it keyboard focus
+    Unity2DDeclarativeView::forceActivateWindow(d->m_last_focused_window);
+
+    d->m_last_focused_window = None;
+    Q_EMIT lastFocusedWindowChanged(d->m_last_focused_window);
+}

=== added file 'shell/app/shellmanager.h'
--- shell/app/shellmanager.h	1970-01-01 00:00:00 +0000
+++ shell/app/shellmanager.h	2012-03-15 09:01:33 +0000
@@ -0,0 +1,128 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#ifndef SHELLMANAGER_H
+#define SHELLMANAGER_H
+
+#include <QObject>
+struct ShellManagerPrivate;
+
+class ShellDeclarativeView;
+
+class QUrl;
+
+class ShellManager : public QObject
+{
+    Q_OBJECT
+
+    Q_ENUMS(DashMode)
+
+    Q_PROPERTY(bool dashActive READ dashActive WRITE setDashActive NOTIFY dashActiveChanged)
+    Q_PROPERTY(DashMode dashMode READ dashMode WRITE setDashMode NOTIFY dashModeChanged)
+    Q_PROPERTY(QString dashActiveLens READ dashActiveLens WRITE setDashActiveLens NOTIFY dashActiveLensChanged)
+    Q_PROPERTY(bool dashHaveCustomHomeShortcuts READ dashHaveCustomHomeShortcuts)
+    Q_PROPERTY(QObject *dashShell READ dashShell NOTIFY dashShellChanged)
+    Q_PROPERTY(int dashScreen READ dashScreen NOTIFY dashScreenChanged)
+    Q_PROPERTY(bool dashAlwaysFullScreen READ dashAlwaysFullScreen NOTIFY dashAlwaysFullScreenChanged)
+    Q_PROPERTY(bool superKeyHeld READ superKeyHeld NOTIFY superKeyHeldChanged)
+    Q_PROPERTY(bool hudActive READ hudActive WRITE setHudActive NOTIFY hudActiveChanged)
+    Q_PROPERTY(QObject *hudShell READ hudShell NOTIFY hudShellChanged)
+    Q_PROPERTY(int hudScreen READ hudScreen NOTIFY hudScreenChanged)
+    Q_PROPERTY(unsigned int lastFocusedWindow READ lastFocusedWindow NOTIFY lastFocusedWindowChanged)
+
+public:
+    enum DashMode {
+        DesktopMode,
+        FullScreenMode
+    };
+
+    ShellManager(const QUrl &sourceFileUrl, QObject* parent = 0);
+    ~ShellManager();
+
+    bool dashActive() const;
+    Q_SLOT void setDashActive(bool active);
+
+    DashMode dashMode() const;
+    Q_INVOKABLE void setDashMode(DashMode);
+
+    const QString& dashActiveLens() const;
+    Q_INVOKABLE void setDashActiveLens(const QString& activeLens);
+
+    bool dashHaveCustomHomeShortcuts() const;
+
+    QObject *dashShell() const;
+
+    int dashScreen() const;
+
+    bool dashAlwaysFullScreen() const;
+
+    bool superKeyHeld() const;
+
+    bool hudActive() const;
+    void setHudActive(bool active);
+
+    QObject *hudShell() const;
+
+    int hudScreen() const;
+
+    unsigned int lastFocusedWindow() const;
+
+    void forceActivateShell(ShellDeclarativeView *shell);
+    void forceDeactivateShell(ShellDeclarativeView *shell);
+
+Q_SIGNALS:
+    void dashActiveChanged(bool);
+    void dashModeChanged(DashMode);
+    void dashActiveLensChanged(const QString&);
+    void dashShellChanged(QObject *shell);
+    void dashScreenChanged(int screen);
+    void dashAlwaysFullScreenChanged(bool dashAlwaysFullScreen);
+    void superKeyHeldChanged(bool superKeyHeld);
+    void hudActiveChanged();
+    void hudShellChanged(QObject *shell);
+    void hudScreenChanged(int screen);
+    void lastFocusedWindowChanged(unsigned int wid);
+
+    void activeWorkspaceChanged();
+    void dashActivateHome();
+    void dashActivateLens(const QString& lensId);
+    void toggleHud();
+
+private Q_SLOTS:
+    void onScreenCountChanged(int);
+
+    void updateSuperKeyMonitoring();
+
+    void onAltF1Pressed();
+    void onAltF2Pressed();
+    void onNumericHotkeyPressed();
+    void toggleDashRequested();
+    void toggleHudRequested();
+
+    void updateDashAlwaysFullScreen();
+
+    void onActiveWorkspaceChanged();
+
+private:
+    Q_DISABLE_COPY(ShellManager)
+    ShellManagerPrivate * const d;
+
+friend class DashDBus;
+friend struct ShellManagerPrivate;
+};
+
+#endif // SHELLMANAGER_H

=== modified file 'shell/common/Background.qml'
--- shell/common/Background.qml	2012-03-13 18:54:14 +0000
+++ shell/common/Background.qml	2012-03-15 09:01:33 +0000
@@ -27,6 +27,15 @@
     property bool fullscreen: false
     property int bottomBorderThickness
     property int rightBorderThickness
+    property bool activeTriggerHelper: true
+    property bool reallyActive: active && activeTriggerHelper
+    property variant view: undefined
+
+    function trigger()
+    {
+        activeTriggerHelper = false
+        activeTriggerHelper = true
+    }
 
     /* Avoid redraw at rendering */
     effect: CacheEffect {}
@@ -49,7 +58,7 @@
 
             /* Use an image of the root window which essentially is a
                capture of the entire screen */
-            source: active ? "image://window/root" : ""
+            source: reallyActive ? "image://window/root" : ""
             cache: false
 
             fillMode: Image.PreserveAspectCrop
@@ -57,7 +66,8 @@
             /* Place the screenshot of the desktop background on top of the desktop background,
                no matter where the DeclarativeView or the parent object are placed.
             */
-            property variant origin: parent.mapFromItem(null, -declarativeView.globalPosition.x, -declarativeView.globalPosition.y)
+            property variant origin: parent.mapFromItem(null, background.view != undefined ? -background.view.globalPosition.x : -declarativeView.globalPosition.x,
+                                                              background.view != undefined ? -background.view.globalPosition.y : -declarativeView.globalPosition.y)
             x: origin.x
             y: origin.y
         }

=== modified file 'shell/common/VisibilityController.qml'
--- shell/common/VisibilityController.qml	2012-02-15 11:55:06 +0000
+++ shell/common/VisibilityController.qml	2012-03-15 09:01:33 +0000
@@ -45,7 +45,7 @@
         var stack = controller.forceVisibleStack
         var wasEmpty = Utils.hashEmpty(stack)
 
-        if (forceHidden) console.log("WARNING: beginForceVisible for id \"" + id +
+        if (forceHidden) console.log("DEBUG: beginForceVisible for id \"" + id +
                         "\" called when forceHidden still true")
 
         if (stack[id]) stack[id] += 1
@@ -64,7 +64,7 @@
         if (stack[id]) {
             stack[id] -= 1
             if (stack[id] === 0) delete stack[id]
-        } else console.log("WARNING: endForceVisible for id \"" + id +
+        } else console.log("DEBUG: endForceVisible for id \"" + id +
                            "\" called without matching startForceVisible")
 
         controller.forceVisibleStack = stack
@@ -78,7 +78,7 @@
         var stack = controller.forceHiddenStack
         var wasEmpty = Utils.hashEmpty(stack)
 
-        if (forceVisible) console.log("WARNING: beginForceHidden for id \"" + id +
+        if (forceVisible) console.log("DEBUG: beginForceHidden for id \"" + id +
                         "\" called when forceVisible still true")
 
         if (stack[id]) stack[id] += 1
@@ -97,7 +97,7 @@
         if (stack[id]) {
             stack[id] -= 1
             if (stack[id] === 0) delete stack[id]
-        } else console.log("WARNING: endForceHidden for id \"" + id +
+        } else console.log("DEBUG: endForceHidden for id \"" + id +
                            "\" called without matching startForceHidden")
 
         controller.forceHiddenStack = stack

=== modified file 'shell/common/visibilityBehaviors/IntelliHideBehavior.qml'
--- shell/common/visibilityBehaviors/IntelliHideBehavior.qml	2012-03-05 14:06:58 +0000
+++ shell/common/visibilityBehaviors/IntelliHideBehavior.qml	2012-03-15 09:01:33 +0000
@@ -41,12 +41,12 @@
         monitoredArea: {
             if (intellihide.target) {
                 if (Utils.isLeftToRight()) {
-                    return Qt.rect(0,
+                    return Qt.rect(declarativeView.screen.geometry.x,
                                    intellihide.target.y,
                                    intellihide.target.width,
                                    intellihide.target.height)
                 } else {
-                    return Qt.rect(declarativeView.screen.availableGeometry.width - intellihide.target.width,
+                    return Qt.rect(declarativeView.screen.geometry.x + declarativeView.screen.availableGeometry.width - intellihide.target.width,
                                    intellihide.target.y,
                                    intellihide.target.width,
                                    intellihide.target.height)

=== modified file 'shell/dash/Dash.qml'
--- shell/dash/Dash.qml	2012-03-13 18:54:14 +0000
+++ shell/dash/Dash.qml	2012-03-15 09:01:33 +0000
@@ -31,48 +31,60 @@
     LayoutMirroring.childrenInherit: true
 
     property variant currentPage
-    /* FIXME: 'active' property exactly mirrors 'declarativeView.dashActive'.
+    /* FIXME: 'active' property exactly mirrors 'shellManager.dashActive'.
        The final goal is to transition to using exclusively the QML 'active' property
-       and drop the C++ 'declarativeView.dashActive'.
+       and drop the C++ 'shellManager.dashActive'.
     */
     property variant active
-    /* The following way of mirroring the values of 'declarativeView.dashActive'
+    /* The following way of mirroring the values of 'shellManager.dashActive'
        and 'active' works now and QML does not see it as a binding loop but we
        cannot count on it long term.
     */
     Binding {
-        target: declarativeView
+        target: shellManager
         property: "dashActive"
         value: dash.active
     }
     Binding {
         target: dash
         property: "active"
-        value: declarativeView.dashActive
-    }
-
-    onActiveChanged: if (dash.active) declarativeView.forceActivateWindow()
+        value: shellManager.dashActive
+    }
+
+    onActiveChanged: if (dash.active) shellManager.dashShell.forceActivateWindow()
+
+    Connections {
+        target: shellManager
+        onDashShellChanged: {
+            if (dash.active) {
+                background.trigger()
+                shellManager.dashShell.forceActivateWindow()
+            }
+        }
+    }
 
     property variant queuedLensId
 
-    Binding {
-        target: declarativeView
-        property: "expanded"
-        value: (currentPage && currentPage.expanded != undefined) ? currentPage.expanded : true
-    }
+    property bool expanded: (currentPage && currentPage.expanded != undefined) ? currentPage.expanded : true
 
     Binding {
-        target: declarativeView
+        target: shellManager
         property: "dashMode"
-        value: declarativeView.dashAlwaysFullScreen || dash2dConfiguration.fullScreen ?
-               ShellDeclarativeView.FullScreenMode : ShellDeclarativeView.DesktopMode
-    }
-
-    Connections {
-        target: declarativeView
-
-        onActivateHome: activateHome()
-        onActivateLens: activateLens(lensId)
+        value: shellManager.alwaysFullScreen || dash2dConfiguration.fullScreen ?
+               ShellManager.FullScreenMode : ShellManager.DesktopMode
+    }
+
+    Connections {
+        target: shellManager
+
+        onDashActivateHome: activateHome()
+        onDashActivateLens: activateLens(lensId)
+    }
+
+    Connections {
+        target: shellManager.dashShell
+
+        onFocusChanged: if (!shellManager.dashShell.focus) active = false
     }
 
     function activatePage(page) {
@@ -103,7 +115,7 @@
         for (var i=0; i<lenses.rowCount(); i++) {
             lenses.get(i).viewType = Lens.Hidden
         }
-        declarativeView.activeLens = ""
+        shellManager.dashActiveLens = ""
     }
 
     SpreadMonitor {
@@ -125,7 +137,7 @@
             return
         }
 
-        if (lensId == declarativeView.activeLens && dash.active) {
+        if (lensId == shellManager.dashActiveLens && dash.active) {
             /* we don't need to activate the lens, just show its UI */
             buildLensPage(lens)
             return
@@ -147,13 +159,13 @@
         }
 
         buildLensPage(lens)
-        declarativeView.activeLens = lens.id
+        shellManager.dashActiveLens = lens.id
         dash.active = true
     }
 
     function activateHome() {
         if (spreadMonitor.shown) return
-        if (declarativeView.haveCustomHomeShortcuts) {
+        if (shellManager.dashHaveCustomHomeShortcuts) {
             for (var i=0; i<lenses.rowCount(); i++) {
                 lenses.get(i).viewType = Lens.Hidden
             }
@@ -161,7 +173,7 @@
             /* Take advantage of the fact that the loaded qml is local and setting
                the source loads it immediately making pageLoader.item valid */
             activatePage(pageLoader.item)
-            declarativeView.activeLens = ""
+            shellManager.dashActiveLens = ""
             dash.active = true
         } else {
             activateLens("home.lens")
@@ -222,7 +234,8 @@
         anchors.fill: parent
 
         active: dash.active
-        fullscreen: declarativeView.dashMode != ShellDeclarativeView.DesktopMode
+        fullscreen: shellManager.dashMode != ShellManager.DesktopMode
+        view: shellManager.dashShell
     }
 
     Item {
@@ -289,7 +302,7 @@
             KeyNavigation.left: search_entry
 
             /* FilterPane is only to be displayed for lenses, not in the home page or Alt+F2 Run page */
-            visible: declarativeView.activeLens != "home.lens" && declarativeView.activeLens != "" && declarativeView.activeLens != "commands.lens"
+            visible: shellManager.dashActiveLens != "home.lens" && shellManager.dashActiveLens != "" && shellManager.dashActiveLens != "commands.lens"
             lens: visible && currentPage != undefined ? currentPage.model : undefined
 
             anchors.top: search_entry.anchors.top
@@ -342,33 +355,31 @@
             anchors.left: parent.left
             anchors.right: parent.right
             height: 44
-            visible: declarativeView.expanded
+            visible: expanded
         }
     }
 
     property int desktopCollapsedHeight: 115
     property int desktopExpandedHeight: 615
     property int desktopWidth: 996
-    property int fullscreenWidth: declarativeView.screen.availableGeometry.width
-    property int fullscreenHeight: declarativeView.screen.availableGeometry.height
 
     states: [
         State {
             name: "desktop"
-            when: declarativeView.dashMode == ShellDeclarativeView.DesktopMode
+            when: shellManager.dashMode == ShellManager.DesktopMode
             PropertyChanges {
                 target: dash
                 width: desktopWidth
-                height: declarativeView.expanded ? desktopExpandedHeight : desktopCollapsedHeight
+                height: expanded ? desktopExpandedHeight : desktopCollapsedHeight
             }
         },
         State {
             name: "fullscreen"
-            when: declarativeView.dashMode == ShellDeclarativeView.FullScreenMode
+            when: shellManager.dashMode == ShellManager.FullScreenMode
             PropertyChanges {
                 target: dash
-                width: fullscreenWidth
-                height: fullscreenHeight
+                width: shellManager.dashShell != undefined ? shellManager.dashShell.screen.panelsFreeGeometry.width : 0
+                height: shellManager.dashShell != undefined ? shellManager.dashShell.screen.panelsFreeGeometry.height : 0
             }
         }
     ]

=== modified file 'shell/dash/Home.qml'
--- shell/dash/Home.qml	2012-03-05 17:20:00 +0000
+++ shell/dash/Home.qml	2012-03-15 09:01:33 +0000
@@ -89,7 +89,7 @@
             verticalAlignment: Text.AlignVCenter
         }
 
-        opacity: (!expanded && declarativeView.dashMode == ShellDeclarativeView.DesktopMode) ? 1 : 0
+        opacity: (!expanded && shellManager.dashMode == ShellManager.DesktopMode) ? 1 : 0
         Behavior on opacity {NumberAnimation {duration: 100}}
 
         onClicked: {
@@ -137,7 +137,7 @@
         id: shortcuts
 
         focus: !globalSearchActive
-        opacity: (!globalSearchActive && (shortcutsActive || declarativeView.dashMode == ShellDeclarativeView.FullScreenMode)) ? 1 : 0
+        opacity: (!globalSearchActive && (shortcutsActive || shellManager.dashMode == ShellManager.FullScreenMode)) ? 1 : 0
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
 
@@ -173,7 +173,7 @@
                 source: "../common/artwork/cross.png"
             }
 
-            opacity: (expanded && declarativeView.dashMode == ShellDeclarativeView.DesktopMode) ? 1 : 0
+            opacity: (expanded && shellManager.dashMode == ShellManager.DesktopMode) ? 1 : 0
             Behavior on opacity {NumberAnimation {duration: 100}}
 
             onClicked: shortcutsActive = false

=== modified file 'shell/dash/LensBar.qml'
--- shell/dash/LensBar.qml	2012-03-06 13:05:19 +0000
+++ shell/dash/LensBar.qml	2012-03-15 09:01:33 +0000
@@ -108,7 +108,7 @@
                 }
                 active: {
                     /* we need this in order to activate the arrow when using a custom shortcuts file */
-                    if (item.id == "home.lens" && declarativeView.activeLens == "") {
+                    if (item.id == "home.lens" && shellManager.dashActiveLens == "") {
                         return true
                     }
                     return item.viewType == Lens.LensView

=== modified file 'shell/hud/Hud.qml'
--- shell/hud/Hud.qml	2012-02-24 11:55:38 +0000
+++ shell/hud/Hud.qml	2012-03-15 09:01:33 +0000
@@ -45,7 +45,7 @@
 
     WindowInfo {
         id: activeWindow
-        contentXid: declarativeView.lastFocusedWindow
+        contentXid: shellManager.lastFocusedWindow
     }
 
     SpreadMonitor {
@@ -55,7 +55,7 @@
 
     onActiveChanged: {
         if (active) {
-            declarativeView.forceActivateWindow()
+            shellManager.hudShell.forceActivateWindow()
             resultList.focus = true
         } else {
             hudModel.endSearch
@@ -64,9 +64,14 @@
     }
 
     Connections {
-        target: declarativeView
+        target: shellManager
 
         onToggleHud: toggleHud()
+        onHudShellChanged: {
+            if (active) {
+                background.trigger()
+            }
+        }
     }
 
     Keys.onPressed: {
@@ -75,12 +80,12 @@
 
     function toggleHud() {
         if (spread.shown) return
-        if (active) declarativeView.forceDeactivateWindow()
+        if (active) shellManager.hudShell.forceDeactivateWindow()
         active = !active
     }
 
     function executeResult(resultId) {
-        declarativeView.forceDeactivateWindow()
+        shellManager.hudShell.forceDeactivateWindow()
         hudModel.executeResult(resultId)
         active = false
     }
@@ -93,6 +98,7 @@
         anchors.fill: parent
 
         active: hud.active
+        view: shellManager.hudShell
     }
 
     Item {

=== modified file 'shell/launcher/Launcher.qml'
--- shell/launcher/Launcher.qml	2012-03-13 18:54:14 +0000
+++ shell/launcher/Launcher.qml	2012-03-15 09:01:33 +0000
@@ -27,31 +27,9 @@
 
     signal barrierTriggered
 
-    property bool shown
     property bool showMenus: true
 
     property bool containsMouse: declarativeView.monitoredAreaContainsMouse
-    property variant barrierP1
-    property variant barrierP2
-    property variant barrierTriggerZoneP1
-    property variant barrierTriggerZoneP2
-
-    PointerBarrier {
-        id: barrier
-        triggerDirection: Utils.isLeftToRight() ? PointerBarrier.TriggerFromRight : PointerBarrier.TriggerFromLeft
-        triggerZoneEnabled: !shown
-        p1: barrierP1
-        p2: barrierP2
-        triggerZoneP1: barrierTriggerZoneP1
-        triggerZoneP2: barrierTriggerZoneP2
-        threshold: launcher2dConfiguration.edgeStopVelocity
-        maxVelocityMultiplier: launcher2dConfiguration.edgeResponsiveness
-        decayRate: launcher2dConfiguration.edgeDecayrate
-        triggerPressure: launcher2dConfiguration.edgeRevealPressure
-        breakPressure: launcher2dConfiguration.edgeOvercomePressure
-
-        onTriggered: launcher.barrierTriggered()
-    }
 
     function hideMenu() {
         if (main.visibleMenu !== undefined) {
@@ -87,8 +65,8 @@
     Rectangle {
         Accessible.name: "background"
         anchors.fill: parent
-        anchors.rightMargin: Utils.isLeftToRight() && !declarativeView.dashActive ? border.width : 0
-        anchors.leftMargin:  Utils.isRightToLeft() && !declarativeView.dashActive ? border.width : 0
+        anchors.rightMargin: Utils.isLeftToRight() && !border.visible ? border.width : 0
+        anchors.leftMargin:  Utils.isRightToLeft() && !border.visible ? border.width : 0
         color: "black"
         opacity: 0.66
         visible: desktop.isCompositingManagerRunning
@@ -102,7 +80,7 @@
         height: parent.height
         anchors.right: Utils.isLeftToRight() ? parent.right : undefined
         anchors.left:  Utils.isLeftToRight() ? undefined : parent.left
-        visible: declarativeView.dashActive
+        visible: shellManager.dashActive && shellManager.dashShell == declarativeView
         source: "artwork/border.png"
         fillMode: Image.Stretch
     }
@@ -114,7 +92,7 @@
         height: parent.height
         anchors.right: Utils.isLeftToRight() ? border.anchors.right : undefined
         anchors.left:  Utils.isLeftToRight() ? undefined : border.anchors.left
-        visible: !declarativeView.dashActive
+        visible: !border.visible
 
         color: "white"
         opacity: 0.15
@@ -216,7 +194,7 @@
 
     BfbModel {
         id: bfbModel
-        dashView: declarativeView
+        dashManager: shellManager
     }
 
     ApplicationsList {

=== modified file 'shell/launcher/LauncherItem.qml'
--- shell/launcher/LauncherItem.qml	2012-02-15 13:26:26 +0000
+++ shell/launcher/LauncherItem.qml	2012-03-15 09:01:33 +0000
@@ -65,6 +65,7 @@
     property alias urgentAnimation: urgentAnimation
     property bool running: false
     property bool active: false
+    property bool activeOnThisScreen: false
     property bool urgent: false
     property bool launching: false
     property alias interactive: mouse.enabled
@@ -138,7 +139,7 @@
             mirror: Utils.isRightToLeft()
 
             source: "image://blended/%1color=%2alpha=%3"
-                  .arg("launcher/artwork/launcher_arrow_rtl.png")
+                  .arg("launcher/artwork/launcher_arrow_" + (activeOnThisScreen ? "" : "outline_" ) + "rtl.png")
                   .arg("lightgrey")
                   .arg(1.0)
 

=== modified file 'shell/launcher/LauncherList.qml'
--- shell/launcher/LauncherList.qml	2012-02-24 12:48:13 +0000
+++ shell/launcher/LauncherList.qml	2012-03-15 09:01:33 +0000
@@ -93,11 +93,12 @@
         }
 
         function updatePips() {
-            if (item.belongsToDifferentWorkspace()) {
+            var windowCount = item.windowsOnCurrentWorkspaceScreen(launcher2dConfiguration.onlyOneLauncher ? -1 : declarativeView.screen.screen);
+            if (windowCount == 0 && item.windowCount != 0) {
                 launcherItem.pips = 1
                 launcherItem.pipSource = "launcher/artwork/launcher_arrow_outline_ltr.png";
             } else {
-                launcherItem.pips = Math.min(item.windowCount, 3)
+                launcherItem.pips = Math.min(windowCount, 3)
                 launcherItem.pipSource = ("launcher/artwork/launcher_" + ((pips <= 1) ? "arrow" : "pip") + "_ltr.png")
             }
         }
@@ -113,9 +114,9 @@
         icon: item.icon != "" ? "image://icons/" + item.icon : "image://icons/unknown"
         running: item.running
         active: item.active
+        activeOnThisScreen: item.activeScreen == declarativeView.screen.screen
         urgent: item.urgent
         launching: item.launching
-        pips: Math.min(item.windowCount, 3)
 
         counter: item.counter
         counterVisible: item.counterVisible
@@ -125,7 +126,7 @@
         emblemVisible: item.emblemVisible
 
         /* Launcher of index 0 is the so-called BFB or Dash launcher */
-        shortcutVisible: declarativeView.superKeyHeld &&
+        shortcutVisible: shellManager.superKeyHeld &&
                          ((item.toString().indexOf("Application") == 0 && index > 0 && index <= 10) ||
                           item.shortcutKey != 0)
         shortcutText: {
@@ -157,7 +158,7 @@
                 list.visibleMenu.hide()
             }
             list.visibleMenu = item.menu
-            item.menu.show(width - 5, declarativeView.globalPosition.y + list.y - list.contentY +
+            item.menu.show(declarativeView.globalPosition.x + width - 5, declarativeView.globalPosition.y + list.y - list.contentY +
                                   y + height - selectionOutlineSize / 2)
         }
 
@@ -262,9 +263,10 @@
 
         function setIconGeometry() {
             if (running) {
+                var screen = launcher2dConfiguration.onlyOneLauncher ? -1 : declarativeView.screen.screen
                 item.setIconGeometry(x + declarativeView.globalPosition.x,
                                      y + declarativeView.globalPosition.y,
-                                     width, height)
+                                     width, height, screen)
             }
         }
 
@@ -304,11 +306,18 @@
 
         Connections {
             target: item
-            onWindowAdded: item.setIconGeometry(x + declarativeView.globalPosition.x,
-                                                y + declarativeView.globalPosition.y,
-                                                width, height, xid)
+            onWindowAdded: {
+                var screen = launcher2dConfiguration.onlyOneLauncher ? -1 : declarativeView.screen.screen
+                item.setIconGeometry(x + declarativeView.globalPosition.x,
+                                     y + declarativeView.globalPosition.y,
+                                     width, height, screen, xid)
+            }
             onWindowCountChanged: updatePips()
             onWindowWorkspaceChanged: updatePips()
+            onWindowGeometryChanged: {
+                updatePips()
+                setIconGeometry()
+            }
             /* Not all items are applications. */
             ignoreUnknownSignals: true
         }
@@ -353,7 +362,7 @@
         }
 
         Connections {
-            target: declarativeView
+            target: shellManager
             onActiveWorkspaceChanged: updatePips()
         }
         Component.onCompleted: updatePips()

=== modified file 'shell/launcher/LauncherLoader.qml'
--- shell/launcher/LauncherLoader.qml	2012-03-06 18:06:03 +0000
+++ shell/launcher/LauncherLoader.qml	2012-03-15 09:01:33 +0000
@@ -22,10 +22,22 @@
 import "../common/utils.js" as Utils
 
 Loader {
+    property bool onlyOneLauncher: true
+    property bool loadLauncher: !onlyOneLauncher || declarativeView.screen.screen == 0
+
     id: launcherLoader
-    source: "Launcher.qml"
+    source: loadLauncher ? "Launcher.qml" : ""
     property variant visibilityController: visibilityController
     onLoaded: item.focus = true
+    property bool launcherInHideMode: Utils.clamp(launcher2dConfiguration.hideMode, 0, 2) != 0
+
+    Timer {
+        // FIXME We need this timer because otherwise changing from
+        // onlyOneLauncher to !onlyOneLauncher gets us in what seems to be a dbus deadlock
+        id: launcher2dConfigurationWorkaround
+        interval: 1
+        onTriggered: launcherLoader.onlyOneLauncher = launcher2dConfiguration.onlyOneLauncher
+    }
 
     VisibilityController {
         id: visibilityController
@@ -52,7 +64,7 @@
     Binding {
         target: declarativeView
         property: "monitoredArea"
-        value: Qt.rect(launcherLoader.x, launcherLoader.item.y, launcherLoader.item.width, launcherLoader.item.height)
+        value: loadLauncher ? Qt.rect(launcherLoader.x, launcherLoader.item.y, launcherLoader.item.width, launcherLoader.item.height) : Qt.rect(0, 0, 0, 0)
         when: launcherBehavior.status == Loader.Ready && !launcherLoaderXAnimation.running
     }
 
@@ -75,16 +87,19 @@
     }
 
     Connections {
-        target: declarativeView
+        target: shellManager
         onSuperKeyHeldChanged: {
             if (superKeyHeld) visibilityController.beginForceVisible()
             else visibilityController.endForceVisible()
         }
     }
 
-    Binding {
-        target: launcherLoader.item
-        property: "shown"
-        value: visibilityController.shown
+    Connections {
+        target: launcher2dConfiguration
+        onOnlyOneLauncherChanged: {
+            launcher2dConfigurationWorkaround.start()
+        }
     }
+
+    Component.onCompleted: launcherLoader.onlyOneLauncher = launcher2dConfiguration.onlyOneLauncher
 }

=== modified file 'shell/launcher/ListViewDragAndDrop.qml'
--- shell/launcher/ListViewDragAndDrop.qml	2011-11-11 10:19:14 +0000
+++ shell/launcher/ListViewDragAndDrop.qml	2012-03-15 09:01:33 +0000
@@ -35,6 +35,8 @@
 
     /* list index of the tile being dragged */
     property int draggedTileIndex
+    /* first list index of the tile being dragged */
+    property int firstDraggedTileIndex
     /* id (desktop file path) of the tile being dragged */
     property string draggedTileId: ""
     /* absolute mouse coordinates in the list */
@@ -65,10 +67,14 @@
            events for other mouse areas below, which is not desired). */
         var coord = mapToItem(list.contentItem, mouse.x, mouse.y)
         draggedTileIndex = list.indexAt(coord.x, coord.y)
+        firstDraggedTileIndex = draggedTileIndex
         longPressDelay.start()
     }
     function drop() {
         longPressDelay.stop()
+        if (draggedTileId != "" && firstDraggedTileIndex != draggedTileIndex) {
+            items.moveFinished(firstDraggedTileIndex, draggedTileIndex)
+        }
         draggedTileId = ""
         parent.interactive = true
     }

=== added file 'shell/launcher/artwork/launcher_arrow_outline_rtl.png'
Binary files shell/launcher/artwork/launcher_arrow_outline_rtl.png	1970-01-01 00:00:00 +0000 and shell/launcher/artwork/launcher_arrow_outline_rtl.png	2012-03-15 09:01:33 +0000 differ
=== modified file 'spread/Windows.qml'
--- spread/Windows.qml	2011-11-29 17:36:45 +0000
+++ spread/Windows.qml	2012-03-15 09:01:33 +0000
@@ -73,6 +73,17 @@
         filterRegExp: RegExp("%1".arg(switcher.applicationFilter))
     }
 
+    /* This proxy model takes care of removing all windows that are not on
+       the screen of this spread. */
+    SortFilterProxyModel {
+        id: filteredByScreen
+        model: filteredByApplication
+        dynamicSortFilter: true
+
+        filterRole: WindowInfo.RoleScreen
+        filterRegExp: RegExp("%1".arg(declarativeView.screen.screen))
+    }
+
     property int columns: Math.ceil(Math.sqrt(count))
     property int rows: Math.ceil(count / columns)
     property int cellSpacing: 10
@@ -84,7 +95,7 @@
      * initialization gets somehow messed up and the "columns" and "rows"
      * variables are set to those of the first workspace. */
     Component.onCompleted: {
-        model = filteredByApplication
+        model = filteredByScreen
     }
 
     delegate:
@@ -130,7 +141,7 @@
                 property bool animateFollow: false
                 property bool followCell: true
 
-                isSelected: cell.activeFocus
+                isSelected: cell.activeFocus && spreadManager.currentSwitcher == switcher
 
                 onEntered: {
                     windows.currentIndex = index

=== modified file 'spread/Workspace.qml'
--- spread/Workspace.qml	2012-01-31 15:09:02 +0000
+++ spread/Workspace.qml	2012-03-15 09:01:33 +0000
@@ -54,8 +54,8 @@
 
             clip: true
             cached: false
-            offsetX: -declarativeView.screen.panelsFreeGeometry.x
-            offsetY: -declarativeView.screen.panelsFreeGeometry.y
+            offsetX: -declarativeView.screen.panelsFreeGeometry.x + declarativeView.screen.geometry.x
+            offsetY: -declarativeView.screen.panelsFreeGeometry.y + declarativeView.screen.geometry.y
         }
 
         Windows {

=== modified file 'spread/Workspaces.qml'
--- spread/Workspaces.qml	2012-02-07 17:06:42 +0000
+++ spread/Workspaces.qml	2012-03-15 09:01:33 +0000
@@ -25,6 +25,10 @@
 
     color: "black"
 
+    signal cancelAndExitStarted ()
+
+    property variant declarativeView
+
     property int columns: desktop.workspaces.columns
     property int rows: desktop.workspaces.rows
 
@@ -104,7 +108,7 @@
             z: -1
             width: workspaces.cellWidth
             height: workspaces.cellHeight
-            visible: workspaces.currentItem.state == "unzoomed"
+            visible: workspaces.currentItem.state == "unzoomed" && spreadManager.currentSwitcher == switcher
         }
         highlightFollowsCurrentItem: false
 
@@ -210,8 +214,7 @@
     function show() {
         allWindows.load()
 
-        spreadView.show()
-        spreadView.forceActivateWindow()
+        declarativeView.show()
         workspaces.currentIndex = desktop.workspaces.current
         /* This is necessary otherwise we don't get keypresses until the user does a
            mouse over on a window */
@@ -228,7 +231,7 @@
         id: exitTransitionTimer
         interval: Utils.transitionDuration
         onTriggered: {
-            spreadView.hide()
+            declarativeView.hide()
 
             /* Nothing should be allowed to touch the windows anymore here, so it should
                be safe to unload them all to save memory.
@@ -263,11 +266,16 @@