Merge lp:~fboucault/unity-2d/no_dash_when_spread_shown into lp:unity-2d

[Florian Boucault]

Inhibit Dash.qml's activateLens() and activateHome() if spread is shown.

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2012-01-18 16:08:06 +0000
+++ .bzrignore	2012-02-09 02:13:26 +0000
@@ -1,14 +1,10 @@
 config.h
 
-launcher/app/unity-2d-launcher
-launcher/app/launcheradaptor.*
-launcher/app/unity-2d-launcher.service
-launcher/tests/launchermenutest
-launcher/tests/launcherviewtest
-
-places/app/unity-2d-places
-places/app/unity-2d-places.service
-places/app/dashadaptor.*
+shell/app/dashadaptor.*
+shell/app/launcheradaptor.*
+shell/app/unity-2d-launcher.service
+shell/app/unity-2d-places.service
+shell/app/unity-2d-shell
 
 spread/app/unity-2d-spread
 spread/app/unity-2d-spread.service
@@ -19,7 +15,6 @@
 panel/applets/indicator/indicator-config.h
 panel/applets/libpanelplugin-*.so.*
 panel/lib/libuqpanel.so*
-panel/tests/homebuttonapplettest
 
 libunity-2d-private/src/libunity-2d-private.so.*
 libunity-2d-private/src/unity-2d-private.pc
@@ -44,6 +39,7 @@
 po/*.gmo
 
 tests/misc/binary_dir.txt
+tests/getshape/getshape
 
 # Cmake files and generated files
 Makefile
@@ -77,10 +73,9 @@
 debian/stamp-*
 debian/tmp
 debian/unity-2d
-debian/unity-2d-launcher
 debian/unity-2d-panel
-debian/unity-2d-places
 debian/unity-2d-spread
+debian/unity-2d-shell
 debian/libunity-2d-private0
 debian/libunity-2d-private-dev
 data/gschemas.compiled
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-12-15 15:34:37 +0000
+++ CMakeLists.txt	2012-02-09 02:13:26 +0000
@@ -93,11 +93,11 @@
 
 # Source
 add_subdirectory(libunity-2d-private)
-add_subdirectory(launcher)
 add_subdirectory(panel)
-add_subdirectory(places)
 add_subdirectory(spread)
+add_subdirectory(shell)
 add_subdirectory(po)
+add_subdirectory(tests/getshape)
 
 # uninstall target
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
 
=== modified file 'README'
--- README	2011-03-22 23:20:29 +0000
+++ README	2012-02-09 02:13:26 +0000
@@ -1,19 +1,18 @@
-Compiling unity-2d
+Compiling Unity 2D
 ==================
 
 cmake . && make
 
 
-Running separate components
-===========================
+Running
+=======
 
-./launcher/app/unity-2d-launcher
+./shell/app/unity-2d-shell
 ./panel/app/unity-2d-panel
-./places/app/unity-2d-places
-
-
-Notes on the dash (places)
-==========================
+
+
+Notes on the Dash
+=================
 
 The dash exposes a D-Bus property for activation and deactivation:
 
 
=== modified file 'debian/control'
--- debian/control	2012-02-03 09:51:46 +0000
+++ debian/control	2012-02-09 02:13:26 +0000
@@ -31,10 +31,9 @@
 Package: unity-2d
 Architecture: all
 Depends: ${misc:Depends},
-         unity-2d-launcher,
          unity-2d-panel,
-         unity-2d-places,
          unity-2d-spread,
+         unity-2d-shell,
          metacity (>= 2.30.3-0ubuntu5)
 Description: Unity interface for non-accelerated graphics cards
  The Unity 2D interface installs a fully usable 2D session and provides the 
@@ -72,21 +71,13 @@
  This package contains the development header files.
 
 Package: unity-2d-launcher
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         unity-asset-pool,
-         libunity-2d-private0 (= ${binary:Version}),
-         libqt4-svg,
-Recommends: unity-lens-files,
-            unity-lens-applications,
-            unity-lens-music,
-Description: Unity 2D Launcher
- The Unity 2D launcher displays a list of running applications as well as a
- list of favorite applications in a panel at the left of the screen.
- Notifications from individual applications are also highlighted in the
- launcher.
- 
+Architecture: all
+Depends: ${misc:Depends},
+         unity-2d-shell,
+Description: Transitional package for unity-2d-launcher
+ This is a transitional package for unity-2d-launcher, and can be safely removed
+ after the installation is complete.
+
 Package: unity-2d-panel
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -105,15 +96,12 @@
  application outside of the Unity 2D environment.
 
 Package: unity-2d-places
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libunity-2d-private0 (= ${binary:Version}),
-         libqt4-svg
-Description: Unity 2D Places
- The Unity 2D places overlay over the desktop to provide quick access to
- various categories of applications. It is part of Unity 2D and can not run
- as a standalone application outside of the Unity 2D environment.
+Architecture: all
+Depends: ${misc:Depends},
+         unity-2d-shell,
+Description: Transitional package for unity-2d-places
+ This is a transitional package for unity-2d-places, and can be safely removed
+ after the installation is complete.
 
 Package: unity-2d-spread
 Architecture: any
@@ -127,6 +115,28 @@
  switch to. It is part of Unity 2D and can not run  as a standalone application
  outside of the Unity 2D environment.
 
+Package: unity-2d-shell
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         unity-asset-pool,
+         libunity-2d-private0 (= ${binary:Version}),
+         libqt4-svg,
+Recommends: unity-lens-files,
+            unity-lens-applications,
+            unity-lens-music,
+Replaces: unity-2d-launcher (<< 5.4~),
+          unity-2d-places (<< 5.4~),
+Breaks: unity-2d-launcher (<< 5.4~),
+        unity-2d-places (<< 5.4~),
+Description: Dash and Launcher for the Unity 2D environment
+ This is part of Unity 2D and can not run as a standalone application outside
+ of the Unity 2D environment. The components included are:
+ * Dash: an overlay over the desktop to provide quick access to
+         various categories of applications.
+ * Launcher: displays in a panel at the left of the screen a list of running
+             and favorite applications as well as highlighting their notifications.
+
 Package: unity-2d-dbg
 Architecture: any
 Section: debug
 
=== removed file 'debian/manpages/unity-2d-launcher.1'
--- debian/manpages/unity-2d-launcher.1	2011-01-14 22:41:51 +0000
+++ debian/manpages/unity-2d-launcher.1	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-.TH unity-2d-launcher 1
-.SH NAME
-unity-2d-launcher \- Provides launcher sidebar in the Unity 2D environment
-.SH SYNOPSIS
-.B unity-2d-launcher
-provides the launcher sidebar for the Unity 2D launcher, which provides the
-icons and application switcher. It is meant to be used as the full Unity 2D
-environment
-.SH OPTIONS
-.TP
-This application takes no arguments.
-
 
=== removed file 'debian/manpages/unity-2d-places.1'
--- debian/manpages/unity-2d-places.1	2011-01-14 23:08:50 +0000
+++ debian/manpages/unity-2d-places.1	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-.TH unity-2d-places 1
-.SH NAME
-unity-2d-places \- Unity 2D Places
-.SH SYNOPSIS
-.B unity-2d-places
-displays a top panel containing the application menu and various indicators.
-It functions as part Unity 2D, and is not meant to be used as a standalone
-application.
-.SH OPTIONS
-.TP
-This application takes no arguments.
-
 
=== added file 'debian/manpages/unity-2d-shell.1'
--- debian/manpages/unity-2d-shell.1	1970-01-01 00:00:00 +0000
+++ debian/manpages/unity-2d-shell.1	2012-02-09 02:13:26 +0000
@@ -0,0 +1,17 @@
+.TH unity-2d-shell 1
+.SH NAME
+unity-2d-shell \- Unity 2D Shell
+.SH SYNOPSIS
+.B unity-2d-shell [-opengl] [-rootqml File.qml]
+displays some components of Unity 2D. It contains the launcher and dash.
+It functions as part Unity 2D, and is not meant to be used as a standalone
+application.
+It can however be used for testing or prototyping of only specific components
+of Unity 2D by using the rootqml argument.
+.SH OPTIONS
+.TP
+\fB\-opengl\fR
+Run the application using an openGL-enabled widget
+.TP
+\fB\qmlfile\fR
+The path of a QML file to load instead of the full shell
 
=== removed file 'debian/unity-2d-launcher.install.in'
--- debian/unity-2d-launcher.install.in	2011-11-09 22:26:57 +0000
+++ debian/unity-2d-launcher.install.in	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity-2d-launcher
-@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/dbus-1/services/unity-2d-launcher.service
-@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/applications/unity-2d-launcher.desktop
-@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/launcher/*.qml
-@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/launcher/artwork
 
=== removed file 'debian/unity-2d-launcher.manpages'
--- debian/unity-2d-launcher.manpages	2011-01-14 22:28:06 +0000
+++ debian/unity-2d-launcher.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/manpages/unity-2d-launcher.1
 
=== removed file 'debian/unity-2d-places.install.in'
--- debian/unity-2d-places.install.in	2011-11-09 22:26:57 +0000
+++ debian/unity-2d-places.install.in	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity-2d-places
-@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/applications/unity-2d-places.desktop
-@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/dbus-1/services/unity-2d-places.service
-@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/places/*.qml
-@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/places/*.js
-@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/places/artwork
 
=== removed file 'debian/unity-2d-places.manpages'
--- debian/unity-2d-places.manpages	2011-01-14 23:08:50 +0000
+++ debian/unity-2d-places.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/manpages/unity-2d-places.1
 
=== added file 'debian/unity-2d-shell.install.in'
--- debian/unity-2d-shell.install.in	1970-01-01 00:00:00 +0000
+++ debian/unity-2d-shell.install.in	2012-02-09 02:13:26 +0000
@@ -0,0 +1,9 @@
+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity-2d-shell
+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/applications/unity-2d-shell.desktop
+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/dbus-1/services/unity-2d-places.service
+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/dbus-1/services/unity-2d-launcher.service
+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/shell/*.qml
+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/shell/dash
+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/shell/launcher
+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/shell/common
+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/shell/artwork
 
=== added file 'debian/unity-2d-shell.manpages'
--- debian/unity-2d-shell.manpages	1970-01-01 00:00:00 +0000
+++ debian/unity-2d-shell.manpages	2012-02-09 02:13:26 +0000
@@ -0,0 +1,1 @@
+debian/manpages/unity-2d-shell.1
 
=== removed directory 'launcher'
=== removed file 'launcher/CMakeLists.txt'
--- launcher/CMakeLists.txt	2011-06-08 20:43:09 +0000
+++ launcher/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-project(unity-2d-launcher)
-
-include_directories(
-    ${libunity-2d-private_SOURCE_DIR}/src
-    )
-
-# Source
-add_subdirectory(app)
-add_subdirectory(tests)
-
-file(GLOB launcher_QML *.qml)
-
-# Install
-install(FILES ${launcher_QML}
-    DESTINATION ${UNITY_2D_DIR}/launcher
-    )
-
-install(DIRECTORY artwork
-    DESTINATION ${UNITY_2D_DIR}/launcher
-    )
 
=== removed directory 'launcher/app'
=== removed file 'launcher/app/CMakeLists.txt'
--- launcher/app/CMakeLists.txt	2011-11-18 10:15:49 +0000
+++ launcher/app/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-# Dependencies
-pkg_check_modules(GEIS REQUIRED libutouch-geis)
-pkg_check_modules(QTGCONF REQUIRED libqtgconf)
-
-# Sources
-set(launcher_SRCS
-    visibilitycontroller.cpp
-    launcherview.cpp
-    launcherdbus.cpp
-    gesturehandler.cpp
-    )
-
-set(launcher_MOC_HDRS
-    visibilitycontroller.h
-    launcherview.h
-    launcherdbus.h
-    gesturehandler.h
-    )
-
-qt4_wrap_cpp(launcher_MOC_SRCS ${launcher_MOC_HDRS})
-
-configure_file(unity-2d-launcher.service.in unity-2d-launcher.service)
-
-qt4_add_dbus_adaptor(launcher_SRCS launcher.xml
-    launcherdbus.h LauncherDBus
-    )
-
-# Build
-add_library(uqlauncher ${launcher_SRCS} ${launcher_MOC_SRCS})
-add_executable(unity-2d-launcher launcher.cpp)
-
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${GTK_INCLUDE_DIRS}
-    ${X11_INCLUDE_DIRS}
-    ${GEIS_INCLUDE_DIRS}
-    ${QTGCONF_INCLUDE_DIRS}
-    ${libunity-2d-private_SOURCE_DIR}/src
-    )
-
-target_link_libraries(uqlauncher
-    ${QT_QTCORE_LIBRARIES}
-    ${QT_QTGUI_LIBRARIES}
-    ${QT_QTDBUS_LIBRARIES}
-    ${QT_QTDECLARATIVE_LIBRARIES}
-    ${GTK_LDFLAGS}
-    ${X11_LDFLAGS}
-    ${GEIS_LDFLAGS}
-    ${QTGCONF_LDFLAGS}
-    ${DCONFQT_LDFLAGS}
-    unity-2d-private
-    )
-
-target_link_libraries(unity-2d-launcher
-    uqlauncher)
-
-# Install
-install(TARGETS unity-2d-launcher
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    )
-
-install(FILES unity-2d-launcher.desktop
-    DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
-    )
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-2d-launcher.service
-    DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services
-    )
-
 
=== removed file 'launcher/app/launcher.cpp'
--- launcher/app/launcher.cpp	2012-02-01 15:01:21 +0000
+++ launcher/app/launcher.cpp	1970-01-01 00:00:00 +0000
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * Authors:
- *  Olivier Tilloy <[e-mail]>
- *
- * 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/>.
- */
-
-// unity-2d
-#include <gnomesessionclient.h>
-#include <launcherclient.h>
-#include <unity2dapplication.h>
-
-// Qt
-#include <QApplication>
-#include <QDesktopWidget>
-#include <QDeclarativeEngine>
-#include <QDeclarativeContext>
-#include <QDir>
-#include <QGraphicsObject>
-
-#include "config.h"
-#include "launcherview.h"
-#include "launcherdbus.h"
-#include "visibilitycontroller.h"
-#include "unity2ddebug.h"
-#include "unity2dpanel.h"
-#include "gesturehandler.h"
-#include "screeninfo.h"
-
-// libc
-#include <stdlib.h>
-
-#if defined(QMLJSDEBUGGER)
-#include <qt_private/qdeclarativedebughelper_p.h>
-#endif
-
-#if defined(QMLJSDEBUGGER) && !defined(NO_JSDEBUGGER)
-#include <jsdebuggeragent.h>
-#endif
-#if defined(QMLJSDEBUGGER) && !defined(NO_QMLOBSERVER)
-#include <qdeclarativeviewobserver.h>
-#endif
-
-#if defined(QMLJSDEBUGGER)
-
-// Enable debugging before any QDeclarativeEngine is created
-struct QmlJsDebuggingEnabler
-{
-    QmlJsDebuggingEnabler()
-    {
-        QDeclarativeDebugHelper::enableDebugging();
-    }
-};
-
-// Execute code in constructor before first QDeclarativeEngine is instantiated
-static QmlJsDebuggingEnabler enableDebuggingHelper;
-
-#endif // QMLJSDEBUGGER
-
-int main(int argc, char *argv[])
-{
-    Unity2dApplication::earlySetup(argc, argv);
-    Unity2dApplication application(argc, argv);
-    application.setApplicationName("Unity 2D Launcher");
-    QSet<QString> arguments = QSet<QString>::fromList(QCoreApplication::arguments());
-
-    GnomeSessionClient client(INSTALL_PREFIX "/share/applications/unity-2d-launcher.desktop");
-    client.connectToSessionManager();
-
-    /* Configure "artwork:" prefix so that any access to a file whose name starts
-       with that prefix resolves properly. */
-    QDir::addSearchPath("artwork", unity2dDirectory() + "/launcher/artwork");
-
-    /* Panel containing the QML declarative view, topleft screen */
-    Unity2dPanel panel(true, -1, ScreenInfo::TopLeft);
-
-    panel.setEdge(Unity2dPanel::LeftEdge);
-    panel.setFixedWidth(LauncherClient::MaximumWidth);
-    panel.setAccessibleName("Launcher");
-
-    VisibilityController* visibilityController = new VisibilityController(&panel);
-
-    /* QML declarative view */
-    LauncherView *launcherView = new LauncherView(&panel);
-    if (arguments.contains("-opengl")) {
-        launcherView->setUseOpenGL(true);
-    }
-
-    launcherView->setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    launcherView->setFocus();
-
-    launcherView->engine()->addImportPath(unity2dImportPath());
-    /* Note: baseUrl seems to be picky: if it does not end with a slash,
-       setSource() will fail */
-    launcherView->engine()->setBaseUrl(QUrl::fromLocalFile(unity2dDirectory() + "/launcher/"));
-
-    launcherView->rootContext()->setContextProperty("declarativeView", launcherView);
-    launcherView->rootContext()->setContextProperty("launcherView", launcherView);
-    launcherView->rootContext()->setContextProperty("panel", &panel);
-    launcherView->rootContext()->setContextProperty("visibilityController", visibilityController);
-
-    LauncherDBus launcherDBus(visibilityController, launcherView);
-    launcherDBus.connectToBus();
-
-    launcherView->setSource(QUrl("./Launcher.qml"));
-
-    /* Composing the QML declarative view inside the panel */
-    panel.addWidget(launcherView);
-    panel.show();
-
-    /* Unset DESKTOP_AUTOSTART_ID in order to avoid child processes (launched
-       applications) to use the same client id.
-       This would prevent some applications (e.g. nautilus) from launching when
-       the launcher itself was autostarted (which is the common case when
-       running installed).
-       For a discussion, see https://bugs.launchpad.net/upicek/+bug/684160. */
-    unsetenv("DESKTOP_AUTOSTART_ID");
-
-    /* Gesture handler instance in charge of listening to gesture events and
-       trigger appropriate actions in response. */
-    GestureHandler gestureHandler(&panel);
-
-    return application.exec();
-}
-
 
=== removed file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2012-02-07 10:43:40 +0000
+++ launcher/app/launcherview.cpp	1970-01-01 00:00:00 +0000
@@ -1,299 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * Authors:
- *  Olivier Tilloy <[e-mail]>
- *
- * 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 "launcherview.h"
-
-#include <config.h>
-#include <keyboardmodifiersmonitor.h>
-#include <hotkey.h>
-#include <hotkeymonitor.h>
-#include <keymonitor.h>
-#include <screeninfo.h>
-#include <debug_p.h>
-
-#include <QApplication>
-#include <QDesktopWidget>
-#include <QX11Info>
-#include <QDebug>
-#include <QGraphicsObject>
-
-#include <QtDeclarative/qdeclarative.h>
-#include <QDeclarativeEngine>
-#include <QDeclarativeContext>
-#include <QDeclarativeImageProvider>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusPendingCall>
-#include <QtDBus/QDBusReply>
-#include <QtDBus/QDBusConnectionInterface>
-
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-
-static const int KEY_HOLD_THRESHOLD = 250;
-
-static const char* DASH_DBUS_SERVICE = "com.canonical.Unity2d.Dash";
-static const char* DASH_DBUS_PATH = "/Dash";
-static const char* DASH_DBUS_INTERFACE = "com.canonical.Unity2d.Dash";
-static const char* SPREAD_DBUS_SERVICE = "com.canonical.Unity2d.Spread";
-static const char* SPREAD_DBUS_PATH = "/Spread";
-static const char* SPREAD_DBUS_INTERFACE = "com.canonical.Unity2d.Spread";
-
-static const char* DASH_DBUS_PROPERTY_ACTIVE = "active";
-static const char* DASH_DBUS_METHOD_ACTIVATE_HOME = "activateHome";
-static const char* SPREAD_DBUS_METHOD_IS_SHOWN = "IsShown";
-static const char* COMMANDS_LENS_ID = "commands.lens";
-
-LauncherView::LauncherView(QWidget* parent) :
-    Unity2DDeclarativeView(parent),
-    m_superKeyPressed(false), m_superKeyHeld(false)
-{
-    setTransparentBackground(QX11Info::isCompositingManagerRunning());
-
-    m_superKeyHoldTimer.setSingleShot(true);
-    m_superKeyHoldTimer.setInterval(KEY_HOLD_THRESHOLD);
-    connect(&m_superKeyHoldTimer, SIGNAL(timeout()), SLOT(updateSuperKeyHoldState()));
-    connect(this, SIGNAL(superKeyTapped()), SLOT(toggleDash()));
-
-    m_screenInfo = new ScreenInfo(ScreenInfo::TopLeft, this);
-
-    connect(&launcher2dConfiguration(), SIGNAL(superKeyEnableChanged(bool)), SLOT(updateSuperKeyMonitoring()));
-    updateSuperKeyMonitoring();
-
-    /* Alt+F1 toggle the keyboard focus between laucher and other(previous) application. */
-    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+S before 'Spread'ing, close all the contextual menus/tooltips in the launcher. */
-    Hotkey* superS = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_S, Qt::MetaModifier);
-    connect(superS, SIGNAL(pressed()), SLOT(onSuperSPressed()));
-
-    /* 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()));
-    }
-}
-
-LauncherView::~LauncherView()
-{
-}
-
-void
-LauncherView::focusInEvent(QFocusEvent* event)
-{
-    QDeclarativeView::focusInEvent(event);
-    Q_EMIT focusChanged(true);
-}
-
-void
-LauncherView::focusOutEvent(QFocusEvent* event)
-{
-    QDeclarativeView::focusOutEvent(event);
-    Q_EMIT focusChanged(false);
-}
-
-void
-LauncherView::updateSuperKeyMonitoring()
-{
-    KeyboardModifiersMonitor *modifiersMonitor = KeyboardModifiersMonitor::instance();
-    KeyMonitor *keyMonitor = KeyMonitor::instance();
-    HotkeyMonitor& hotkeyMonitor = HotkeyMonitor::instance();
-
-    QVariant value = launcher2dConfiguration().property("superKeyEnable");
-    if (!value.isValid() || value.toBool() == true) {
-        hotkeyMonitor.enableModifiers(Qt::MetaModifier);
-        QObject::connect(modifiersMonitor,
-                         SIGNAL(keyboardModifiersChanged(Qt::KeyboardModifiers)),
-                         this, SLOT(setHotkeysForModifiers(Qt::KeyboardModifiers)));
-        /* Ignore Super presses if another key was pressed simultaneously
-           (i.e. a shortcut). https://bugs.launchpad.net/unity-2d/+bug/801073 */
-        QObject::connect(keyMonitor,
-                         SIGNAL(keyPressed()),
-                         this, SLOT(ignoreSuperPress()));
-        setHotkeysForModifiers(modifiersMonitor->keyboardModifiers());
-    } else {
-        hotkeyMonitor.disableModifiers(Qt::MetaModifier);
-        QObject::disconnect(modifiersMonitor,
-                            SIGNAL(keyboardModifiersChanged(Qt::KeyboardModifiers)),
-                            this, SLOT(setHotkeysForModifiers(Qt::KeyboardModifiers)));
-        QObject::disconnect(keyMonitor,
-                            SIGNAL(keyPressed()),
-                            this, SLOT(ignoreSuperPress()));
-        m_superKeyHoldTimer.stop();
-        m_superKeyPressed = false;
-        if (m_superKeyHeld) {
-            m_superKeyHeld = false;
-            Q_EMIT superKeyHeldChanged(false);
-        }
-    }
-}
-
-void
-LauncherView::setHotkeysForModifiers(Qt::KeyboardModifiers modifiers)
-{
-    /* This is the new new state of the Super key (AKA Meta key), while
-       m_superKeyPressed is the previous state of the key at the last modifiers change. */
-    bool superKeyPressed = modifiers.testFlag(Qt::MetaModifier);
-
-    if (m_superKeyPressed != superKeyPressed) {
-        m_superKeyPressed = superKeyPressed;
-        if (superKeyPressed) {
-            m_superPressIgnored = false;
-            /* If the key is pressed, start up a timer to monitor if it's being held short
-               enough to qualify as just a "tap" or as a proper hold */
-            m_superKeyHoldTimer.start();
-        } else {
-            m_superKeyHoldTimer.stop();
-
-            /* If the key is released, and was not being held, it means that the user just
-               performed a "tap". Unless we're told to ignore that tap, that is. */
-            if (!m_superKeyHeld && !m_superPressIgnored) {
-                Q_EMIT superKeyTapped();
-            }
-            /* Otherwise the user just terminated a hold. */
-            else if(m_superKeyHeld){
-                m_superKeyHeld = false;
-                Q_EMIT superKeyHeldChanged(m_superKeyHeld);
-            }
-        }
-    }
-}
-
-void
-LauncherView::updateSuperKeyHoldState()
-{
-    /* If the key was released in the meantime, just do nothing, otherwise
-       consider the key being held, unless we're told to ignore it. */
-    if (m_superKeyPressed && !m_superPressIgnored) {
-        m_superKeyHeld = true;
-        Q_EMIT superKeyHeldChanged(m_superKeyHeld);
-    }
-}
-
-void
-LauncherView::ignoreSuperPress()
-{
-    /* There was a key pressed, ignore current super tap/hold */
-    m_superPressIgnored = true;
-}
-
-void
-LauncherView::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);
-            }
-        }
-    }
-}
-
-void
-LauncherView::toggleDash()
-{
-    QDBusInterface dashInterface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE);
-
-    QVariant dashActiveResult = dashInterface.property(DASH_DBUS_PROPERTY_ACTIVE);
-    if (!dashActiveResult.isValid()) {
-        UQ_WARNING << "Can't read the DBUS Dash property" << DASH_DBUS_PROPERTY_ACTIVE
-                   << "on" << DASH_DBUS_SERVICE << DASH_DBUS_PATH << DASH_DBUS_INTERFACE;
-        return;
-    }
-
-    bool dashActive = dashActiveResult.toBool();
-    if (dashActive) {
-        if (!dashInterface.setProperty(DASH_DBUS_PROPERTY_ACTIVE, false)) {
-            UQ_WARNING << "Can't set the DBUS Dash property" << DASH_DBUS_PROPERTY_ACTIVE
-                       << "on" << DASH_DBUS_SERVICE << DASH_DBUS_PATH << DASH_DBUS_INTERFACE;
-        }
-    } else {
-        /* Check if the spread is active before activating the dash.
-           We need to do this since the spread can't prevent the launcher from
-           monitoring the super key and therefore getting to this point if
-           it's tapped. */
-
-        /* Check if the spread is present on DBUS first, as we don't want to have DBUS
-           activate it if it's not running yet */
-        QDBusConnectionInterface* sessionBusIFace = QDBusConnection::sessionBus().interface();
-        QDBusReply<bool> reply = sessionBusIFace->isServiceRegistered(SPREAD_DBUS_SERVICE);
-        if (reply.isValid() && reply.value() == true) {
-            QDBusInterface spreadInterface(SPREAD_DBUS_SERVICE, SPREAD_DBUS_PATH,
-                                           SPREAD_DBUS_INTERFACE);
-
-            QDBusReply<bool> spreadActiveResult = spreadInterface.call(SPREAD_DBUS_METHOD_IS_SHOWN);
-            if (spreadActiveResult.isValid() && spreadActiveResult.value() == true) {
-                return;
-            }
-        }
-
-        dashInterface.asyncCall(DASH_DBUS_METHOD_ACTIVATE_HOME);
-    }
-}
-
-void
-LauncherView::showCommandsLens()
-{
-    QDBusInterface dashInterface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE);
-    dashInterface.asyncCall("activateLens", COMMANDS_LENS_ID);
-}
-
-/* BUGFIX:881458 */
-void
-LauncherView::onSuperSPressed()
-{
-    QGraphicsObject* launcher = rootObject();
-    QMetaObject::invokeMethod(launcher, "hideMenu", Qt::AutoConnection);
-}
-
-void
-LauncherView::onAltF1Pressed()
-{
-    QGraphicsObject* launcher = rootObject();
-
-    if (hasFocus()) {
-        QMetaObject::invokeMethod(launcher, "hideMenu", Qt::AutoConnection);
-        forceDeactivateWindow();
-    } else {
-        forceActivateWindow();
-        QMetaObject::invokeMethod(launcher, "focusBFB", Qt::AutoConnection);
-    }
-}
 
=== removed file 'launcher/app/launcherview.h'
--- launcher/app/launcherview.h	2011-11-25 12:32:03 +0000
+++ launcher/app/launcherview.h	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * Authors:
- *  Olivier Tilloy <[e-mail]>
- *
- * 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 LAUNCHERVIEW
-#define LAUNCHERVIEW
-
-#include <QDeclarativeView>
-#include <QList>
-#include <QUrl>
-#include <QTimer>
-#include <QVariant>
-
-#include <unity2ddeclarativeview.h>
-
-class DeclarativeDragDropEvent;
-class LauncherDBus;
-
-class LauncherView : public Unity2DDeclarativeView
-{
-    Q_OBJECT
-    Q_PROPERTY(bool superKeyHeld READ superKeyHeld NOTIFY superKeyHeldChanged)
-    Q_PROPERTY(bool focus READ hasFocus NOTIFY focusChanged) // overridden
-
-public:
-    explicit LauncherView(QWidget* parent = NULL);
-    ~LauncherView();
-
-    bool superKeyHeld() const { return m_superKeyHeld; }
-
-Q_SIGNALS:
-    void activateShortcutPressed(int itemIndex);
-    void newInstanceShortcutPressed(int itemIndex);
-    void superKeyHeldChanged(bool superKeyHeld);
-    void superKeyTapped();
-    void addWebFavoriteRequested(const QUrl& url);
-    void focusChanged(bool focus);
-
-private Q_SLOTS:
-    void setHotkeysForModifiers(Qt::KeyboardModifiers modifiers);
-    void forwardNumericHotkey();
-    void ignoreSuperPress();
-    void updateSuperKeyMonitoring();
-    void updateSuperKeyHoldState();
-    void toggleDash();
-    void showCommandsLens();
-    void onSuperSPressed();
-    void onAltF1Pressed();
-
-protected:
-    void focusInEvent(QFocusEvent* event);
-    void focusOutEvent(QFocusEvent* event);
-
-private:
-    bool m_superKeyPressed;
-    bool m_superKeyHeld;
-    bool m_superPressIgnored;
-    QTimer m_superKeyHoldTimer;
-
-    friend class LauncherDBus;
-};
-
-#endif // LAUNCHERVIEW
-
 
=== removed file 'launcher/app/unity-2d-launcher.desktop'
--- launcher/app/unity-2d-launcher.desktop	2011-09-19 16:29:49 +0000
+++ launcher/app/unity-2d-launcher.desktop	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Unity 2d Launcher
-Comment=A Qt-based applications launcher
-Icon=gnome-fs-desktop
-Exec=unity-2d-launcher
-Terminal=false
-Type=Application
-Categories=Utility;
-NoDisplay=true
-X-Ubuntu-Gettext-Domain=unity-2d-launcher
-X-GNOME-Autostart-Notify=false
-X-GNOME-Autostart-Phase=Panel
-X-GNOME-AutoRestart=true
 
=== removed file 'launcher/app/visibilitycontroller.cpp'
--- launcher/app/visibilitycontroller.cpp	2011-12-01 09:55:45 +0000
+++ launcher/app/visibilitycontroller.cpp	1970-01-01 00:00:00 +0000
@@ -1,163 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * 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/>.
- */
-// Self
-#include "visibilitycontroller.h"
-
-// Local
-#include <autohidebehavior.h>
-#include <forcevisiblebehavior.h>
-#include <intellihidebehavior.h>
-
-// unity-2d
-#include <debug_p.h>
-#include <unity2dpanel.h>
-#include <config.h>
-
-// Qt
-#include <QDBusConnection>
-#include <QDBusServiceWatcher>
-
-VisibilityController::VisibilityController(Unity2dPanel* panel)
-: QObject(panel)
-, m_panel(panel)
-, m_dbusWatcher(new QDBusServiceWatcher(this))
-{
-    m_dbusWatcher->setConnection(QDBusConnection::sessionBus());
-    m_dbusWatcher->setWatchMode(QDBusServiceWatcher::WatchForUnregistration);
-
-    connect(&launcher2dConfiguration(), SIGNAL(hideModeChanged(int)), SLOT(update()));
-    connect(m_panel, SIGNAL(manualSlidingChanged(bool)), SLOT(update()));
-    connect(m_dbusWatcher, SIGNAL(serviceUnregistered(const QString&)), SLOT(slotServiceUnregistered(const QString&)));
-    update();
-}
-
-VisibilityController::~VisibilityController()
-{
-}
-
-void VisibilityController::update(UpdateReason reason)
-{
-    if (!m_forceVisibleCountHash.isEmpty()) {
-        return;
-    }
-    AutoHideMode mode = AutoHideMode(launcher2dConfiguration().property("hideMode").toInt());
-
-    setBehavior(0);
-
-    /* Do not use any hiding controller if the panel is being slid manually */
-    if (!m_panel->manualSliding()) {
-        switch (mode) {
-        case ManualHide:
-            m_panel->setUseStrut(true);
-            m_panel->slideIn();
-            break;
-        case AutoHide:
-            m_panel->setUseStrut(false);
-            setBehavior(new AutoHideBehavior(m_panel));
-            break;
-        case IntelliHide:
-            m_panel->setUseStrut(false);
-            setBehavior(new IntelliHideBehavior(m_panel));
-            if (reason == UpdateFromForceVisibilityEnded && !m_panel->geometry().contains(QCursor::pos())) {
-                // The first thing IntelliHideBehavior does is checking if there is
-                // a window behind the panel, and if there is one, hide the panel immediately
-                // This is correct for some cases, but in the case we come from an update because the
-                // panel is not forced visible anymore and the mouse is not in the panel,
-                // i.e. the launcher was visible and the user clicked in an action of the tile menu,
-                // we should still give the user the wait 1 second before hiding behaviour.
-                // To achieve this we tell the behaviour controller to show the panel
-                // and simulate a mouse leave on the panel to start the hiding timer
-                QMetaObject::invokeMethod(m_behavior.data(), "showPanel");
-                QEvent e(QEvent::Leave);
-                QCoreApplication::sendEvent(m_panel, &e);
-            }
-            break;
-        }
-    }
-}
-
-void VisibilityController::beginForceVisible(const QString& service)
-{
-    bool wasEmpty = m_forceVisibleCountHash.isEmpty();
-    if (m_forceVisibleCountHash.contains(service)) {
-        ++m_forceVisibleCountHash[service];
-    } else {
-        m_forceVisibleCountHash[service] = 1;
-        if (!service.isEmpty()) {
-            m_dbusWatcher->addWatchedService(service);
-        }
-    }
-    if (wasEmpty) {
-        setBehavior(new ForceVisibleBehavior(m_panel));
-    }
-}
-
-void VisibilityController::endForceVisible(const QString& service)
-{
-    if (m_forceVisibleCountHash.contains(service)) {
-        if (m_forceVisibleCountHash[service] == 1) {
-            m_forceVisibleCountHash.remove(service);
-            m_dbusWatcher->removeWatchedService(service);
-        } else {
-            --m_forceVisibleCountHash[service];
-        }
-    } else {
-        UQ_WARNING << "Application" << service << "called endForceVisible() more than beginForceVisible().";
-    }
-    if (m_forceVisibleCountHash.isEmpty()) {
-        update(UpdateFromForceVisibilityEnded);
-    }
-}
-
-void VisibilityController::setBehavior(AbstractVisibilityBehavior* behavior)
-{
-    // This method could be replaced by code calling reset() directly but
-    // having only one point where the behavior is changed makes it easy to log
-    // behavior changes using something like: UQ_VAR(behavior);
-    m_behavior.reset(behavior);
-    if (behavior != NULL) {
-        connect(behavior, SIGNAL(visibleChanged(bool)), SLOT(updatePanelVisibility(bool)));
-        updatePanelVisibility(behavior->visible());
-    }
-}
-
-void VisibilityController::updatePanelVisibility(bool visible)
-{
-    if (visible) {
-        m_panel->slideIn();
-    } else {
-        m_panel->slideOut();
-    }
-}
-
-void VisibilityController::slotServiceUnregistered(const QString& service)
-{
-    if (!m_forceVisibleCountHash.contains(service)) {
-        return;
-    }
-
-    UQ_WARNING << "Application" << service << "quit without calling endForceVisible().";
-    m_forceVisibleCountHash.remove(service);
-    m_dbusWatcher->removeWatchedService(service);
-    if (m_forceVisibleCountHash.isEmpty()) {
-        update(UpdateFromForceVisibilityEnded);
-    }
-}
 
=== removed file 'launcher/app/visibilitycontroller.h'
--- launcher/app/visibilitycontroller.h	2011-11-24 15:12:00 +0000
+++ launcher/app/visibilitycontroller.h	1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * 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 VISIBILITYCONTROLLER_H
-#define VISIBILITYCONTROLLER_H
-
-// Local
-
-// Qt
-#include <QHash>
-#include <QObject>
-#include <QScopedPointer>
-
-class AbstractVisibilityBehavior;
-class Unity2dPanel;
-class QDBusServiceWatcher;
-
-/**
- * This class monitors the hide_mode dconf key and set up an instance of
- * AbstractVisibilityBehavior depending on its value
- *
- * It also tracks requests for forced visibility: the launcher or another
- * application (through launcher DBus API) can request the launcher to stay
- * visible for a while, for example because an application requests attention
- * or because the dash is visible. This is handled by the beginForceVisible()
- * and endForceVisible() methods.
- *
- * Internally it maintains a refcount-per-app of forced visibility requests so
- * that it can restore the default mode if an application quits without calling
- * endForceVisible().
- */
-class VisibilityController : public QObject
-{
-Q_OBJECT
-public:
-    VisibilityController(Unity2dPanel* panel);
-    ~VisibilityController();
-
-    /**
-     * Force visibility of the launcher.
-     * service is the dbus service (@see QDBusConnection::baseService()) of the
-     * application which requested forced visibility. It is set to an empty
-     * string for internal requests.
-     */
-    Q_INVOKABLE void beginForceVisible(const QString& service = QString());
-    Q_INVOKABLE void endForceVisible(const QString& service = QString());
-
-private:
-    enum UpdateReason {
-        RegularUpdate,
-        UpdateFromForceVisibilityEnded
-    };
-    
-private Q_SLOTS:
-    void update(UpdateReason reason = RegularUpdate);
-    void slotServiceUnregistered(const QString&);
-    void updatePanelVisibility(bool);
-
-private:
-    enum AutoHideMode {
-        ManualHide,
-        AutoHide,
-        IntelliHide
-    };
-    Q_DISABLE_COPY(VisibilityController);
-    Unity2dPanel* m_panel;
-    QDBusServiceWatcher* m_dbusWatcher;
-    QScopedPointer<AbstractVisibilityBehavior> m_behavior;
-
-    typedef QHash<QString, int> ForceVisibleCountHash;
-    ForceVisibleCountHash m_forceVisibleCountHash;
-
-    void setBehavior(AbstractVisibilityBehavior*);
-};
-
-#endif /* VISIBILITYCONTROLLER_H */
 
=== removed directory 'launcher/artwork'
=== removed file 'launcher/artwork/launcher_arrow_outline_ltr.png'
 Binary files launcher/artwork/launcher_arrow_outline_ltr.png	2012-02-03 13:48:01 +0000 and launcher/artwork/launcher_arrow_outline_ltr.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'launcher/launcher.qmlproject'
--- launcher/launcher.qmlproject	2010-10-12 00:33:09 +0000
+++ launcher/launcher.qmlproject	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-/* File generated by QtCreator */
-
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ "../exampleplugin" ]
-}
 
=== removed directory 'launcher/tests'
=== removed file 'launcher/tests/CMakeLists.txt'
--- launcher/tests/CMakeLists.txt	2011-12-07 12:46:10 +0000
+++ launcher/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-macro(launcher_tests)
-    set(_test_list "")
-    foreach(_test ${ARGN})
-        add_test(NAME ${_test} 
-            COMMAND /bin/bash ${CMAKE_SOURCE_DIR}/tests/misc/run-with-xvfb.sh ./${_test}
-            )
-        add_executable(${_test} ${_test}.cpp ${_test}.moc)
-        qt4_generate_moc(${_test}.cpp ${_test}.moc)
-        target_link_libraries(${_test}
-            ${QT_QTTEST_LIBRARIES}
-            uqlauncher
-            )
-        set(_test_list "${_test_list};${_test}")
-    endforeach(_test)
-endmacro(launcher_tests)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/tests
-    ${CMAKE_CURRENT_SOURCE_DIR}/../app
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${QT_QTTEST_INCLUDE_DIR}
-    ${QTGCONF_INCLUDE_DIRS}
-    )
-
-launcher_tests(
-# FIXME: test need a mock dbus object to message with via dbus-test-runner
-#    launcherviewtest
-    )
-
 
=== removed file 'launcher/tests/launcherviewtest.cpp'
--- launcher/tests/launcherviewtest.cpp	2011-11-17 20:10:19 +0000
+++ launcher/tests/launcherviewtest.cpp	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2010 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * 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/>.
- */
-
-// Local
-#include <unitytestmacro.h>
-#include <launcherview.h>
-
-// Qt
-#include <QtTestGui>
-
-class LauncherViewTest : public QObject
-{
-    Q_OBJECT
-private Q_SLOTS:
-    void testCreate()
-    {
-        LauncherView view;
-    }
-};
-
-QAPP_TEST_MAIN(LauncherViewTest)
-
-#include "launcherviewtest.moc"
-
 
=== modified file 'libunity-2d-private/CMakeLists.txt'
--- libunity-2d-private/CMakeLists.txt	2011-12-07 13:05:37 +0000
+++ libunity-2d-private/CMakeLists.txt	2012-02-09 02:13:26 +0000
@@ -10,6 +10,7 @@
 pkg_check_modules(UNITYCORE REQUIRED unity-core-5.0)
 pkg_check_modules(DEE REQUIRED dee-1.0)
 pkg_check_modules(XINPUT REQUIRED xi)
+pkg_check_modules(GEIS REQUIRED libutouch-geis)
 
 set(libunity-2d-private_SOVERSION 0)
 set(libunity-2d-private_VERSION ${libunity-2d-private_SOVERSION}.0.0)
 
=== modified file 'libunity-2d-private/Unity2d/CMakeLists.txt'
--- libunity-2d-private/Unity2d/CMakeLists.txt	2011-11-29 17:17:35 +0000
+++ libunity-2d-private/Unity2d/CMakeLists.txt	2012-02-09 02:13:26 +0000
@@ -59,7 +59,5 @@
 #Allow build in different directory
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/GnomeBackground.qml"
                                                               "${CMAKE_CURRENT_BINARY_DIR}/GnomeBackground.qml")
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/AbstractScrollbar.qml"
-                                                              "${CMAKE_CURRENT_BINARY_DIR}/AbstractScrollbar.qml")
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
                                                               "${CMAKE_CURRENT_BINARY_DIR}/qmldir")
 
=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2012-02-01 13:59:49 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2012-02-09 02:13:26 +0000
@@ -22,6 +22,7 @@
 */
 #include "plugin.h"
 
+#include "dashclient.h"
 #include "launcherapplication.h"
 #include "launcherdevice.h"
 #include "trash.h"
@@ -50,12 +51,9 @@
 #include "launcherdropitem.h"
 
 #include "config.h"
-#include "dashclient.h"
 
-#include "autohidebehavior.h"
-#include "intellihidebehavior.h"
-#include "forcevisiblebehavior.h"
 #include "bfb.h"
+#include "gesturehandler.h"
 
 #include "lenses.h"
 #include "lens.h"
@@ -68,8 +66,17 @@
 #include "radiooptionfilter.h"
 #include "checkoptionfilter.h"
 #include "multirangefilter.h"
+#include "windowsintersectmonitor.h"
+#include "spreadmonitor.h"
 #include "focuspath.h"
 
+#include "unity2ddeclarativeview.h"
+#include "inputshapemanager.h"
+#include "inputshaperectangle.h"
+#include "inputshapemask.h"
+#include "unity2dpanel.h"
+#include "strutmanager.h"
+
 #include <QtDeclarative/qdeclarative.h>
 #include <QDeclarativeEngine>
 #include <QDeclarativeContext>
@@ -99,6 +106,8 @@
 {
     qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "SortFilterProxyModel");
 
+    qmlRegisterType<DashClient>();
+
     qmlRegisterType<WindowInfo>(uri, 0, 1, "WindowInfo");
     qmlRegisterType<WindowsList>(uri, 0, 1, "WindowsList");
     qmlRegisterType<ScreenInfo>(uri, 0, 1, "ScreenInfo");
@@ -136,10 +145,6 @@
     qmlRegisterType<WorkspacesList>(uri, 0, 1, "WorkspacesList");
     qmlRegisterType<Workspaces>(uri, 0, 1, "Workspaces");
 
-    qmlRegisterType<IntelliHideBehavior>(uri, 0, 1, "IntelliHideBehavior");
-    qmlRegisterType<AutoHideBehavior>(uri, 0, 1, "AutoHideBehavior");
-    qmlRegisterType<ForceVisibleBehavior>(uri, 0, 1, "ForceVisibleBehavior");
-
     qmlRegisterType<IconUtilities>(); // Register the type as non creatable
 
     qmlRegisterType<GioDefaultApplication>(uri, 0, 1, "GioDefaultApplication");
@@ -160,7 +165,17 @@
     qmlRegisterType<FilterOption>();
     qmlRegisterType<FilterOptions>();
 
-    qmlRegisterType<DashClient>();
+    qmlRegisterType<GestureHandler>(uri, 0, 1, "GestureHandler");
+    qmlRegisterType<WindowsIntersectMonitor>(uri, 0, 1, "WindowsIntersectMonitor");
+    qmlRegisterType<SpreadMonitor>(uri, 0, 1, "SpreadMonitor");
+
+    qmlRegisterType<InputShapeManager>(uri, 0, 1, "InputShapeManager");
+    qmlRegisterType<InputShapeRectangle>(uri, 0, 1, "InputShapeRectangle");
+    qmlRegisterType<InputShapeMask>(uri, 0, 1, "InputShapeMask");
+    qmlRegisterType<Unity2DDeclarativeView>();
+
+    qmlRegisterType<Unity2dPanel>(uri, 0, 1, "Unity2dPanel");
+    qmlRegisterType<StrutManager>(uri, 0, 1, "StrutManager");
 }
 
 void Unity2dPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)
@@ -179,8 +194,9 @@
     engine->rootContext()->setContextProperty("iconUtilities", new IconUtilities(engine));
 
     /* Expose QConf objects as a context property not to initialize it multiple times */
+    engine->rootContext()->setContextProperty("unity2dConfiguration", &unity2dConfiguration());
+    engine->rootContext()->setContextProperty("launcher2dConfiguration", &launcher2dConfiguration());
     engine->rootContext()->setContextProperty("dash2dConfiguration", &dash2dConfiguration());
-    engine->rootContext()->setContextProperty("dashClient", DashClient::instance());
 
     /* Critically important to set the client type to pager because wnck
        will pass that type over to the window manager through XEvents.
 
=== modified file 'libunity-2d-private/Unity2d/qmldir'
--- libunity-2d-private/Unity2d/qmldir	2011-11-29 17:17:35 +0000
+++ libunity-2d-private/Unity2d/qmldir	2012-02-09 02:13:26 +0000
@@ -1,4 +1,3 @@
 plugin unity-2d-private-qml
 
 GnomeBackground 1.0 GnomeBackground.qml
-AbstractScrollbar 1.0 AbstractScrollbar.qml
 
=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2012-01-31 15:09:02 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2012-02-09 02:13:26 +0000
@@ -13,7 +13,6 @@
     hotkey.cpp
     keymonitor.cpp
     launcherclient.cpp
-    mousearea.cpp
     unity2dapplication.cpp
     unity2ddebug.cpp
     unity2dpanel.cpp
@@ -22,11 +21,7 @@
     mimedata.cpp
     dragdropevent.cpp
     propertybinder.cpp
-    abstractvisibilitybehavior.cpp
-    autohidebehavior.cpp
-    edgehitdetector.cpp
-    forcevisiblebehavior.cpp
-    intellihidebehavior.cpp
+    gesturehandler.cpp
     giodefaultapplication.cpp
     qsortfilterproxymodelqml.cpp
     blendedimageprovider.cpp
@@ -72,7 +67,14 @@
     panelapplet.cpp
     panelstyle.cpp
     percentcoder.cpp
+    windowsintersectmonitor.cpp
+    abstractdbusservicemonitor.cpp
+    spreadmonitor.cpp
     focuspath.cpp
+    inputshapemanager.cpp
+    inputshaperectangle.cpp
+    inputshapemask.cpp
+    strutmanager.cpp
     )
 
 # Build
@@ -100,6 +102,7 @@
     ${NUXCORE_INCLUDE_DIRS}
     ${DEE_INCLUDE_DIRS}
     ${XINPUT_INCLUDE_DIRS}
+    ${GEIS_INCLUDE_DIRS}
     )
 
 add_library(${LIB_NAME} SHARED ${libunity-2d-private_SRCS} listmodelwrapper.h)
@@ -135,6 +138,7 @@
     ${NUXCORE_LDFLAGS}
     ${DEE_LDFLAGS}
     ${XINPUT_LDFLAGS}
+    ${GEIS_LDFLAGS}
     )
 
 # Install
 
=== added file 'libunity-2d-private/src/abstractdbusservicemonitor.cpp'
--- libunity-2d-private/src/abstractdbusservicemonitor.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/abstractdbusservicemonitor.cpp	2012-02-09 02:13:26 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Ugo Riboni <[e-mail]>
+ *
+ * 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 "abstractdbusservicemonitor.h"
+
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusReply>
+
+AbstractDBusServiceMonitor::AbstractDBusServiceMonitor(QString service, QString path,
+                                                       QString interface, QObject *parent)
+    : QObject(parent)
+    , m_service(service)
+    , m_path(path)
+    , m_interface(interface)
+    , m_watcher(new QDBusServiceWatcher(service, QDBusConnection::sessionBus()))
+    , m_dbusInterface(0)
+{
+    connect(m_watcher, SIGNAL(serviceRegistered(QString)), SLOT(createInterface()));
+    connect(m_watcher, SIGNAL(serviceUnregistered(QString)), SLOT(destroyInterface()));
+
+    // Connect to the service if it's up already
+    QDBusConnectionInterface* sessionBus = QDBusConnection::sessionBus().interface();
+    QDBusReply<bool> reply = sessionBus->isServiceRegistered(m_service);
+    if (reply.isValid() && reply.value()) {
+        createInterface();
+    }
+}
+
+AbstractDBusServiceMonitor::~AbstractDBusServiceMonitor()
+{
+    delete m_watcher;
+    if (m_dbusInterface) {
+        delete m_dbusInterface;
+    }
+}
+
+void AbstractDBusServiceMonitor::createInterface()
+{
+    if (m_dbusInterface != 0) {
+        delete m_dbusInterface;
+        m_dbusInterface = 0;
+    }
+
+    m_dbusInterface = new QDBusInterface(m_service, m_path, m_interface,
+                                         QDBusConnection::sessionBus());
+    Q_EMIT serviceAvailableChanged(true);
+}
+
+void AbstractDBusServiceMonitor::destroyInterface()
+{
+    if (m_dbusInterface != 0) {
+        delete m_dbusInterface;
+        m_dbusInterface = 0;
+    }
+
+    Q_EMIT serviceAvailableChanged(false);
+}
+
+QDBusInterface* AbstractDBusServiceMonitor::dbusInterface() const
+{
+    return m_dbusInterface;
+}
+
+bool AbstractDBusServiceMonitor::serviceAvailable() const
+{
+    return m_dbusInterface != 0;
+}
+
+#include "abstractdbusservicemonitor.moc"
 
=== added file 'libunity-2d-private/src/abstractdbusservicemonitor.h'
--- libunity-2d-private/src/abstractdbusservicemonitor.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/abstractdbusservicemonitor.h	2012-02-09 02:13:26 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Ugo Riboni <[e-mail]>
+ *
+ * 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 ABSTRACTDBUSSERVICEMONITOR_H
+#define ABSTRACTDBUSSERVICEMONITOR_H
+
+#include <QObject>
+
+#include <QDBusInterface>
+#include <QDBusServiceWatcher>
+#include <QObject>
+#include <QString>
+
+class AbstractDBusServiceMonitor : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool serviceAvailable READ serviceAvailable NOTIFY serviceAvailableChanged)
+
+public:
+    explicit AbstractDBusServiceMonitor(QString service, QString path, QString interface,
+                                        QObject *parent = 0);
+    ~AbstractDBusServiceMonitor();
+
+    QDBusInterface* dbusInterface() const;
+
+    bool serviceAvailable() const;
+
+Q_SIGNALS:
+    void serviceAvailableChanged(bool available);
+
+private Q_SLOTS:
+    void createInterface();
+    void destroyInterface();
+
+protected:
+    QString m_service;
+    QString m_path;
+    QString m_interface;
+    QDBusServiceWatcher* m_watcher;
+    QDBusInterface* m_dbusInterface;
+};
+
+#endif // ABSTRACTDBUSSERVICEMONITOR_H
 
=== removed file 'libunity-2d-private/src/abstractvisibilitybehavior.cpp'
--- libunity-2d-private/src/abstractvisibilitybehavior.cpp	2011-06-11 11:33:52 +0000
+++ libunity-2d-private/src/abstractvisibilitybehavior.cpp	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- * - Florian Boucault <[e-mail]>
- *
- * 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/>.
- */
-// Self
-#include "abstractvisibilitybehavior.h"
-
-// Local
-
-// libunity-2d
-
-// Qt
-#include <QWidget>
-
-AbstractVisibilityBehavior::AbstractVisibilityBehavior(QWidget* panel)
-: QObject(panel)
-, m_panel(panel)
-, m_visible(true)
-{
-}
-
-AbstractVisibilityBehavior::~AbstractVisibilityBehavior()
-{
-}
-
-bool AbstractVisibilityBehavior::visible() const
-{
-    return m_visible;
-}
-
-QWidget* AbstractVisibilityBehavior::panel() const
-{
-    return m_panel;
-}
-
-void AbstractVisibilityBehavior::setPanel(QWidget* panel)
-{
-    m_panel = panel;
-    Q_EMIT panelChanged(m_panel);
-}
-
-#include "abstractvisibilitybehavior.moc"
 
=== removed file 'libunity-2d-private/src/abstractvisibilitybehavior.h'
--- libunity-2d-private/src/abstractvisibilitybehavior.h	2011-06-11 11:33:52 +0000
+++ libunity-2d-private/src/abstractvisibilitybehavior.h	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- * - Florian Boucault <[e-mail]>
- *
- * 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 ABSTRACTVISIBILITYBEHAVIOR_H
-#define ABSTRACTVISIBILITYBEHAVIOR_H
-
-// Local
-
-// Qt
-#include <QObject>
-
-class QWidget;
-
-/**
- * Base class for various visibility behaviors.
- *
- */
-class AbstractVisibilityBehavior : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
-    Q_PROPERTY(QWidget* panel READ panel WRITE setPanel NOTIFY panelChanged)
-
-public:
-    AbstractVisibilityBehavior(QWidget* panel=0);
-    ~AbstractVisibilityBehavior();
-
-    // getters
-    bool visible() const;
-    QWidget* panel() const;
-
-    // setters
-    void setPanel(QWidget* panel);
-
-Q_SIGNALS:
-    void visibleChanged(bool visible);
-    void panelChanged(QWidget* panel);
-
-protected:
-    QWidget* m_panel;
-    bool m_visible;
-};
-
-#endif /* ABSTRACTVISIBILITYBEHAVIOR_H */
 
=== removed file 'libunity-2d-private/src/autohidebehavior.cpp'
--- libunity-2d-private/src/autohidebehavior.cpp	2011-12-01 12:22:18 +0000
+++ libunity-2d-private/src/autohidebehavior.cpp	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- * - Florian Boucault <[e-mail]>
- *
- * 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/>.
- */
-// Self
-#include "autohidebehavior.h"
-
-// Local
-#include <edgehitdetector.h>
-
-// libunity-2d
-#include <debug_p.h>
-
-// Qt
-#include <QCursor>
-#include <QTimer>
-#include <QWidget>
-
-// libwnck
-extern "C" {
-#define WNCK_I_KNOW_THIS_IS_UNSTABLE
-#include <libwnck/libwnck.h>
-}
-
-static const int AUTOHIDE_TIMEOUT = 1000;
-
-#define GOBJECT_CALLBACK0(callbackName, slot) \
-static void \
-callbackName(GObject* src, QObject* dst) \
-{ \
-    QMetaObject::invokeMethod(dst, slot); \
-}
-
-GOBJECT_CALLBACK0(showingDesktopChangedCB, "onShowingDesktopChanged");
-
-AutoHideBehavior::AutoHideBehavior(QWidget* panel)
-: AbstractVisibilityBehavior(panel)
-, m_autohideTimer(new QTimer(this))
-, m_edgeHitDetector(0)
-{
-    m_autohideTimer->setSingleShot(true);
-    m_autohideTimer->setInterval(AUTOHIDE_TIMEOUT);
-    connect(m_autohideTimer, SIGNAL(timeout()), SLOT(hidePanel()));
-
-    setPanel(panel);
-
-    WnckScreen* screen = wnck_screen_get_default();
-    g_signal_connect(G_OBJECT(screen), "showing_desktop_changed", G_CALLBACK(showingDesktopChangedCB), this);
-}
-
-AutoHideBehavior::~AutoHideBehavior()
-{
-    WnckScreen* screen = wnck_screen_get_default();
-    g_signal_handlers_disconnect_by_func(G_OBJECT(screen), gpointer(showingDesktopChangedCB), this);
-}
-
-bool AutoHideBehavior::eventFilter(QObject*, QEvent* event)
-{
-    switch (event->type()) {
-    case QEvent::Enter:
-        m_autohideTimer->stop();
-        m_visible = true;
-        Q_EMIT visibleChanged(m_visible);
-        break;
-    case QEvent::Leave:
-        m_autohideTimer->start();
-        break;
-    default:
-        break;
-    }
-    return false;
-}
-
-void AutoHideBehavior::hidePanel()
-{
-    m_visible = false;
-    Q_EMIT visibleChanged(m_visible);
-    createEdgeHitDetector();
-}
-
-void AutoHideBehavior::showPanel()
-{
-    // Delete the mouse area so that it does not prevent mouse events from
-    // reaching the panel
-    delete m_edgeHitDetector;
-    m_edgeHitDetector = 0;
-    m_autohideTimer->stop();
-    m_visible = true;
-    Q_EMIT visibleChanged(m_visible);
-}
-
-void AutoHideBehavior::onShowingDesktopChanged()
-{
-    WnckScreen* screen = wnck_screen_get_default();
-    gboolean isShowingDesktop = wnck_screen_get_showing_desktop(screen);
-    if (isShowingDesktop) {
-        showPanel();
-        m_autohideTimer->start();
-    } else {
-        hidePanel();
-    }
-}
-
-
-void AutoHideBehavior::createEdgeHitDetector()
-{
-    m_edgeHitDetector = new EdgeHitDetector(this);
-    connect(m_edgeHitDetector, SIGNAL(edgeHit()), SLOT(showPanel()));
-}
-
-
-void AutoHideBehavior::setPanel(QWidget *panel)
-{
-    if (m_panel != NULL) {
-        m_panel->removeEventFilter(this);
-    }
-    AbstractVisibilityBehavior::setPanel(panel);
-    if (m_panel != NULL) {
-        m_panel->installEventFilter(this);
-        if (!m_panel->geometry().contains(QCursor::pos())) {
-            m_autohideTimer->start();
-        }
-    }
-}
-
-#include "autohidebehavior.moc"
 
=== removed file 'libunity-2d-private/src/autohidebehavior.h'
--- libunity-2d-private/src/autohidebehavior.h	2011-12-01 12:22:18 +0000
+++ libunity-2d-private/src/autohidebehavior.h	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- * - Florian Boucault <[e-mail]>
- *
- * 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 AUTOHIDEBEHAVIOR_H
-#define AUTOHIDEBEHAVIOR_H
-
-// Local
-#include <abstractvisibilitybehavior.h>
-
-// Qt
-#include <QObject>
-
-class EdgeHitDetector;
-class QTimer;
-class QWidget;
-
-/**
- * This class implements the classic autohide-on-timeout behavior
- */
-class AutoHideBehavior : public AbstractVisibilityBehavior
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QWidget* panel READ panel WRITE setPanel NOTIFY panelChanged)
-
-public:
-    AutoHideBehavior(QWidget* panel=0);
-    ~AutoHideBehavior();
-
-    // setters
-    void setPanel(QWidget *panel);
-
-Q_SIGNALS:
-    void panelChanged(QWidget *panel);
-
-protected:
-    bool eventFilter(QObject*, QEvent*);
-
-private Q_SLOTS:
-    void hidePanel();
-    void showPanel();
-    void onShowingDesktopChanged();
-
-private:
-    QTimer* m_autohideTimer;
-    EdgeHitDetector* m_edgeHitDetector;
-
-    void createEdgeHitDetector();
-};
-
-#endif /* AUTOHIDEBEHAVIOR_H */
 
=== modified file 'libunity-2d-private/src/bfb.cpp'
--- libunity-2d-private/src/bfb.cpp	2011-12-09 13:46:10 +0000
+++ libunity-2d-private/src/bfb.cpp	2012-02-09 02:13:26 +0000
@@ -21,17 +21,14 @@
 #include "bfb.h"
 
 // libunity-2d
-#include <dashclient.h>
 #include <debug_p.h>
 #include <unity2dtr.h>
 
 // Qt
 
 BfbItem::BfbItem()
-: m_active(false)
+: m_active(false), m_view(NULL)
 {
-    connect(DashClient::instance(), SIGNAL(activePageChanged(const QString&)),
-        SLOT(slotActivePageChanged(const QString&)));
 }
 
 BfbItem::~BfbItem()
@@ -43,15 +40,6 @@
     return m_active;
 }
 
-void BfbItem::slotActivePageChanged(const QString& page)
-{
-    bool active = !page.isEmpty();
-    if (m_active != active) {
-        m_active = active;
-        activeChanged(m_active);
-    }
-}
-
 bool BfbItem::running() const
 {
     return false;
@@ -82,15 +70,42 @@
     return false;
 }
 
+QObject* BfbItem::dashView() const
+{
+    return m_view;
+}
+
+void BfbItem::setDashView(QObject* view)
+{
+    if (m_view != NULL) {
+        disconnect(view);
+    }
+    m_view = view;
+    if (m_view != NULL) {
+        connect(view, SIGNAL(dashActiveChanged(bool)), this, SLOT(slotDashActiveChanged(bool)));
+    }
+}
+
 void BfbItem::activate()
 {
-    DashClient::instance()->setActivePage(m_active ? "" : "home");
+    Q_ASSERT(m_view != NULL);
+    if (m_view != NULL) {
+        QMetaObject::invokeMethod(m_view, "toggleDash");
+    }
 }
 
 void BfbItem::createMenuActions()
 {
 }
 
+void BfbItem::slotDashActiveChanged(bool active)
+{
+    if (m_active != active) {
+        m_active = active;
+        Q_EMIT activeChanged(m_active);
+    }
+}
+
 ////////////////////////////////////////////////////////////
 BfbModel::BfbModel(QObject* parent)
 : QAbstractListModel(parent)
@@ -117,4 +132,14 @@
     return QVariant::fromValue(m_bfbItem);
 }
 
+QObject* BfbModel::dashView() const
+{
+    return m_bfbItem->dashView();
+}
+
+void BfbModel::setDashView(QObject* view)
+{
+    m_bfbItem->setDashView(view);
+}
+
 #include <bfb.moc>
 
=== modified file 'libunity-2d-private/src/bfb.h'
--- libunity-2d-private/src/bfb.h	2011-08-11 09:25:35 +0000
+++ libunity-2d-private/src/bfb.h	2012-02-09 02:13:26 +0000
@@ -42,16 +42,20 @@
     virtual QString icon() const;
     virtual bool launching() const;
 
+    QObject* dashView() const;
+    void setDashView(QObject* view);
+
     /* methods */
     Q_INVOKABLE virtual void activate();
     Q_INVOKABLE virtual void createMenuActions();
 
 private Q_SLOTS:
-    void slotActivePageChanged(const QString&);
+    void slotDashActiveChanged(bool active);
 
 private:
     Q_DISABLE_COPY(BfbItem)
     bool m_active;
+    QObject* m_view;
 };
 
 Q_DECLARE_METATYPE(BfbItem*)
@@ -60,6 +64,7 @@
 class BfbModel : public QAbstractListModel
 {
     Q_OBJECT
+    Q_PROPERTY(QObject* dashView READ dashView WRITE setDashView)
 public:
     BfbModel(QObject* parent = 0);
     ~BfbModel();
@@ -67,6 +72,9 @@
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
     int rowCount(const QModelIndex& parent = QModelIndex()) const;
 
+    QObject* dashView() const;
+    void setDashView(QObject* view);
+
 private:
     Q_DISABLE_COPY(BfbModel)
     BfbItem* m_bfbItem;
 
=== removed file 'libunity-2d-private/src/edgehitdetector.cpp'
--- libunity-2d-private/src/edgehitdetector.cpp	2011-11-29 11:46:34 +0000
+++ libunity-2d-private/src/edgehitdetector.cpp	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * License: GPL v3
- */
-// Self
-#include "edgehitdetector.h"
-
-// Local
-
-// libunity-2d
-#include <debug_p.h>
-
-// Qt
-#include <QDesktopWidget>
-#include <QTimer>
-
-static const int EDGE_HIT_DELAY = 500;
-
-EdgeHitDetector::EdgeHitDetector(QObject* parent)
-: QObject(parent)
-, m_mouseArea(new MouseArea(this))
-, m_updateTimer(new QTimer(this))
-, m_edgeHitTimer(new QTimer(this))
-{
-    updateGeometryFromScreen();
-
-    // Use a timer to delay geometry updates because sometimes when
-    // QDesktopWidget emits its signals, immediatly asking for screen geometry
-    // yields wrong results.
-    m_updateTimer->setSingleShot(true);
-    m_updateTimer->setInterval(1000);
-    connect(m_updateTimer, SIGNAL(timeout()), SLOT(updateGeometryFromScreen()));
-
-    QDesktopWidget* desktop = QApplication::desktop();
-    connect(desktop, SIGNAL(resized(int)), m_updateTimer, SLOT(start()));
-    connect(desktop, SIGNAL(screenCountChanged(int)), m_updateTimer, SLOT(start()));
-
-    m_edgeHitTimer->setInterval(EDGE_HIT_DELAY);
-    m_edgeHitTimer->setSingleShot(true);
-    connect(m_edgeHitTimer, SIGNAL(timeout()), SIGNAL(edgeHit()));
-
-    connect(m_mouseArea, SIGNAL(entered()), m_edgeHitTimer, SLOT(start()));
-    connect(m_mouseArea, SIGNAL(exited()), m_edgeHitTimer, SLOT(stop()));
-}
-
-void EdgeHitDetector::updateGeometryFromScreen()
-{
-    QPoint p = QApplication::isLeftToRight() ?
-        QPoint() :
-        QPoint(QApplication::desktop()->width() - 1, 0);
-    QRect rect = QApplication::desktop()->availableGeometry(p);
-    if (QApplication::isLeftToRight()) {
-        m_mouseArea->setGeometry(rect.left(), rect.top(), 1, rect.height());
-    } else {
-        m_mouseArea->setGeometry(rect.right() - 1, rect.top(), 1, rect.height());
-    }
-}
-
-#include "edgehitdetector.moc"
 
=== removed file 'libunity-2d-private/src/edgehitdetector.h'
--- libunity-2d-private/src/edgehitdetector.h	2011-06-11 11:33:52 +0000
+++ libunity-2d-private/src/edgehitdetector.h	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * License: GPL v3
- */
-#ifndef EDGEHITDETECTOR_H
-#define EDGEHITDETECTOR_H
-
-// Local
-
-// libunity-2d
-#include <mousearea.h>
-
-// Qt
-
-class QTimer;
-
-/**
- * A mouse area which stays on the left edge of the leftmost screen
- */
-class EdgeHitDetector : public QObject
-{
-Q_OBJECT
-public:
-    EdgeHitDetector(QObject* parent = 0);
-
-Q_SIGNALS:
-    void edgeHit();
-
-private Q_SLOTS:
-    void updateGeometryFromScreen();
-
-private:
-    MouseArea* m_mouseArea;
-    QTimer* m_updateTimer;
-    QTimer* m_edgeHitTimer;
-};
-
-#endif /* EDGEHITDETECTOR_H */
 
=== removed file 'libunity-2d-private/src/forcevisiblebehavior.cpp'
--- libunity-2d-private/src/forcevisiblebehavior.cpp	2011-06-11 11:33:52 +0000
+++ libunity-2d-private/src/forcevisiblebehavior.cpp	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * 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/>.
- */
-// Self
-#include "forcevisiblebehavior.h"
-
-// Local
-
-// libunity-2d
-
-// Qt
-#include <QWidget>
-
-ForceVisibleBehavior::ForceVisibleBehavior(QWidget* panel)
-: AbstractVisibilityBehavior(panel)
-{
-}
-
-#include "forcevisiblebehavior.moc"
 
=== removed file 'libunity-2d-private/src/forcevisiblebehavior.h'
--- libunity-2d-private/src/forcevisiblebehavior.h	2011-06-11 11:33:52 +0000
+++ libunity-2d-private/src/forcevisiblebehavior.h	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * 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 FORCEVISIBLEBEHAVIOR_H
-#define FORCEVISIBLEBEHAVIOR_H
-
-// Local
-#include <abstractvisibilitybehavior.h>
-
-// Qt
-#include <QObject>
-
-/**
- * Behavior used when someone requested the launcher to be visible even if it
- * is supposed to be hidden
- */
-class ForceVisibleBehavior : public AbstractVisibilityBehavior
-{
-    Q_OBJECT
-public:
-    ForceVisibleBehavior(QWidget* panel=0);
-};
-
-#endif /* FORCEVISIBLEBEHAVIOR_H */
 
=== renamed file 'launcher/app/gesturehandler.cpp' => 'libunity-2d-private/src/gesturehandler.cpp'
--- launcher/app/gesturehandler.cpp	2011-11-08 13:33:33 +0000
+++ libunity-2d-private/src/gesturehandler.cpp	2012-02-09 02:13:26 +0000
@@ -25,10 +25,10 @@
 
 #include <debug_p.h>
 
-GestureHandler::GestureHandler(Unity2dPanel* launcher, QObject *parent)
+GestureHandler::GestureHandler(QObject *parent)
 : QObject(parent)
 , m_geisInstance(NULL)
-, m_launcher(launcher)
+, m_isDragging(false)
 {
     if (geisInitialize() != GEIS_STATUS_SUCCESS) {
         UQ_WARNING << "GEIS initialization failed: multitouch support disabled";
@@ -218,9 +218,10 @@
         /* 4 fingers drag reveals the launcher progressively; if the drag goes far
            enough, the launcher is then locked in place and does not autohide anymore */
         /* FIXME: only supports the launcher positioned on the left edge of the screen */
-        m_launcher->setManualSliding(true);
-        m_dragDelta = m_launcher->delta() + attributes[GEIS_GESTURE_ATTRIBUTE_DELTA_X].float_val;
-        m_launcher->setDelta(m_dragDelta);
+        m_isDragging = true;
+        Q_EMIT isDraggingChanged();
+        m_dragDelta = attributes[GEIS_GESTURE_ATTRIBUTE_DELTA_X].float_val;
+        Q_EMIT dragDeltaChanged();
     }
 }
 
@@ -262,18 +263,17 @@
             m_pinchPreviousTimestamp = timestamp;
         }
     } else if (gestureName == GEIS_GESTURE_TYPE_DRAG4) {
-        /* FIXME: only supports the launcher positioned on the left edge of the screen */
         m_dragDelta += attributes[GEIS_GESTURE_ATTRIBUTE_DELTA_X].float_val;
-        m_launcher->setDelta(m_dragDelta);
+        Q_EMIT dragDeltaChanged();
         /* If the drag goes sufficiently above than the maximum delta then
            lock the launcher in place by reserving the area so that no windows
-           overlap it.
+           overlap it. TODO: move to QML.
          */
-        if (m_dragDelta - m_launcher->delta() > 240) {
-            m_launcher->setUseStrut(true);
-        } else {
-            m_launcher->setUseStrut(false);
-        }
+//        if (m_dragDelta - m_launcher->delta() > 240) {
+//            m_launcher->setUseStrut(true);
+//        } else {
+//            m_launcher->setUseStrut(false);
+//        }
     }
 }
 
@@ -284,8 +284,20 @@
 
     if (gestureName == GEIS_GESTURE_TYPE_DRAG4) {
         m_dragDelta += attributes[GEIS_GESTURE_ATTRIBUTE_DELTA_X].float_val;
-        m_launcher->setDelta(m_dragDelta);
-        m_launcher->setManualSliding(false);
+        Q_EMIT dragDeltaChanged();
+        m_isDragging = false;
+        Q_EMIT isDraggingChanged();
     }
 }
 
+double GestureHandler::dragDelta() const
+{
+    return m_dragDelta;
+}
+
+bool GestureHandler::isDragging() const
+{
+    return m_isDragging;
+}
+
+#include "gesturehandler.moc"
 
=== renamed file 'launcher/app/gesturehandler.h' => 'libunity-2d-private/src/gesturehandler.h'
--- launcher/app/gesturehandler.h	2011-02-21 00:25:44 +0000
+++ libunity-2d-private/src/gesturehandler.h	2012-02-09 02:13:26 +0000
@@ -22,20 +22,29 @@
 
 #include <QObject>
 #include <QHash>
+#include <QMetaType>
 
 extern "C" {
   #include <geis/geis.h>
 }
 
-#include "unity2dpanel.h"
-
 class GestureHandler : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(double dragDelta READ dragDelta NOTIFY dragDeltaChanged)
+    Q_PROPERTY(bool isDragging READ isDragging NOTIFY isDraggingChanged)
+
 public:
-    explicit GestureHandler(Unity2dPanel* launcher, QObject *parent = 0);
+    explicit GestureHandler(QObject *parent = 0);
     ~GestureHandler();
 
+    double dragDelta() const;
+    bool isDragging() const;
+
+Q_SIGNALS:
+    void dragDeltaChanged();
+    void isDraggingChanged();
+
 private Q_SLOTS:
     void geisEventDispatch();
 
@@ -60,7 +69,9 @@
     float m_pinchPreviousRadius;
     int m_pinchPreviousTimestamp;
     float m_dragDelta;
-    Unity2dPanel* m_launcher;
+    bool m_isDragging;
 };
 
+Q_DECLARE_METATYPE(GestureHandler*)
+
 #endif // GESTUREHANDLER_H
 
=== added file 'libunity-2d-private/src/inputshapemanager.cpp'
--- libunity-2d-private/src/inputshapemanager.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/inputshapemanager.cpp	2012-02-09 02:13:26 +0000
@@ -0,0 +1,105 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * 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 <QDebug>
+#include <QRect>
+#include <QX11Info>
+#include <QRegion>
+
+#include "inputshapemanager.h"
+#include "unity2ddeclarativeview.h"
+#include "desktopinfo.h"
+
+// X11
+#include <X11/Xlib.h>
+#include <X11/Xregion.h>
+#include <X11/extensions/shape.h>
+
+InputShapeManager::InputShapeManager(QObject *parent) :
+    QObject(parent),
+    m_target(0)
+{
+}
+
+void InputShapeManager::updateManagedShape()
+{
+    if (m_target == NULL || !m_target->isVisible()) {
+        return;
+    }
+
+    QBitmap inputShape(m_target->width(), m_target->height());
+    inputShape.fill(Qt::color0);
+    QPainter painter(&inputShape);
+
+    Q_FOREACH(InputShapeRectangle* shape, m_shapes) {
+        if (shape->enabled()) {
+            painter.drawPixmap(shape->rectangle().x(), shape->rectangle().y(),
+                               shape->shape());
+        }
+    }
+
+    XShapeCombineRegion(QX11Info::display(), m_target->effectiveWinId(),
+                        DesktopInfo::instance()->isCompositingManagerRunning() ? ShapeInput : ShapeBounding,
+                        0, 0, QRegion(inputShape).handle(), ShapeSet);
+}
+
+Unity2DDeclarativeView* InputShapeManager::target() const
+{
+    return m_target;
+}
+
+void InputShapeManager::setTarget(Unity2DDeclarativeView *target)
+{
+    if (m_target != target) {
+        if (m_target != NULL) m_target->disconnect(this);
+
+        //TODO: de-shape the current target view, if any, before shaping the new one. not used now
+        //      as we never change the view anyway.
+
+        m_target = target;
+        if (m_target != NULL) {
+            // due to the way xshape works we need to re-apply the shaping every time the target window
+            // is mapped again.
+            connect(m_target, SIGNAL(visibleChanged(bool)), SLOT(updateManagedShape()));
+            connect(m_target, SIGNAL(sceneResized(QSize)), SLOT(updateManagedShape()));
+        }
+        Q_EMIT targetChanged();
+        updateManagedShape();
+    }
+}
+
+QDeclarativeListProperty<InputShapeRectangle> InputShapeManager::shapes()
+{
+    return QDeclarativeListProperty<InputShapeRectangle>(this, this, &InputShapeManager::appendShape);
+}
+
+void InputShapeManager::appendShape(QDeclarativeListProperty<InputShapeRectangle> *list, InputShapeRectangle *shape)
+{
+    InputShapeManager* instance = qobject_cast<InputShapeManager*>(list->object);
+    if (instance != NULL) {
+        instance->m_shapes.append(shape);
+        instance->connect(shape, SIGNAL(shapeChanged()), SLOT(updateManagedShape()));
+        instance->connect(shape, SIGNAL(enabledChanged()), SLOT(updateManagedShape()));
+        instance->updateManagedShape();
+    }
+}
+
+#include "inputshapemanager.moc"
 
=== added file 'libunity-2d-private/src/inputshapemanager.h'
--- libunity-2d-private/src/inputshapemanager.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/inputshapemanager.h	2012-02-09 02:13:26 +0000
@@ -0,0 +1,59 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * 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 INPUTSHAPEMANAGER_H
+#define INPUTSHAPEMANAGER_H
+
+#include <QObject>
+#include <QDeclarativeListProperty>
+
+#include "inputshaperectangle.h"
+
+class Unity2DDeclarativeView;
+
+class InputShapeManager : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(Unity2DDeclarativeView* target READ target WRITE setTarget NOTIFY targetChanged)
+    Q_PROPERTY(QDeclarativeListProperty<InputShapeRectangle> shapes READ shapes)
+    Q_CLASSINFO("DefaultProperty", "shapes")
+
+public:
+    explicit InputShapeManager(QObject *parent = 0);
+    Unity2DDeclarativeView* target() const;
+    void setTarget(Unity2DDeclarativeView* target);
+    QDeclarativeListProperty<InputShapeRectangle> shapes();
+
+Q_SIGNALS:
+    void targetChanged();
+
+public Q_SLOTS:
+    void updateManagedShape();
+
+protected:
+    static void appendShape(QDeclarativeListProperty<InputShapeRectangle> *property, InputShapeRectangle *value);
+
+private:
+    Unity2DDeclarativeView* m_target;
+    QList<InputShapeRectangle*> m_shapes;
+};
+
+#endif // INPUTSHAPEMANAGER_H
 
=== added file 'libunity-2d-private/src/inputshapemask.cpp'
--- libunity-2d-private/src/inputshapemask.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/inputshapemask.cpp	2012-02-09 02:13:26 +0000
@@ -0,0 +1,111 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * 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 "inputshapemask.h"
+#include "config.h"
+
+#include <QBitmap>
+#include <QDebug>
+
+InputShapeMask::InputShapeMask(QObject *parent) :
+    QObject(parent),
+    m_enabled(true)
+{
+}
+
+void InputShapeMask::updateShape()
+{
+    QBitmap newShape;
+
+    if (!m_source.isEmpty() && m_color.isValid()) {
+        QPixmap image;
+        QString path = unity2dDirectory() + "/" + m_source;
+        if (image.load(path)) {
+            newShape = image.createMaskFromColor(m_color.rgb(), Qt::MaskInColor);
+        } else {
+            qWarning() << "Failed to load input shape mask image from" << path;
+        }
+    }
+
+    m_shape = newShape;
+    Q_EMIT shapeChanged();
+}
+
+QString InputShapeMask::source() const
+{
+    return m_source;
+}
+
+QColor InputShapeMask::color() const
+{
+    return m_color;
+}
+
+QPoint InputShapeMask::position() const
+{
+    return m_position;
+}
+
+bool InputShapeMask::enabled() const
+{
+    return m_enabled;
+}
+
+QBitmap InputShapeMask::shape() const
+{
+    return m_shape;
+}
+
+void InputShapeMask::setSource(const QString &source)
+{
+    if (m_source != source) {
+        m_source = source;
+        Q_EMIT sourceChanged(m_source);
+        updateShape();
+    }
+}
+
+void InputShapeMask::setColor(const QColor &color)
+{
+    if (m_color != color) {
+        m_color = color;
+        Q_EMIT colorChanged(m_color);
+        updateShape();
+    }
+}
+
+void InputShapeMask::setPosition(const QPoint &position)
+{
+    if (m_position != position) {
+        m_position = position;
+        Q_EMIT positionChanged();
+    }
+}
+
+void InputShapeMask::setEnabled(bool enabled)
+{
+    if (m_enabled != enabled) {
+        m_enabled = enabled;
+        Q_EMIT enabledChanged();
+    }
+}
+
+#include "inputshapemask.moc"
 
=== added file 'libunity-2d-private/src/inputshapemask.h'
--- libunity-2d-private/src/inputshapemask.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/inputshapemask.h	2012-02-09 02:13:26 +0000
@@ -0,0 +1,71 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * 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 INPUTSHAPEMASK_H
+#define INPUTSHAPEMASK_H
+
+#include <QObject>
+#include <QColor>
+#include <QPoint>
+#include <QBitmap>
+
+class InputShapeMask : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+    Q_PROPERTY(QPoint position READ position WRITE setPosition NOTIFY positionChanged)
+    Q_PROPERTY(QBitmap shape READ shape NOTIFY shapeChanged)
+    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
+
+public:
+    explicit InputShapeMask(QObject *parent = 0);
+
+    QString source() const;
+    QColor color() const;
+    QPoint position() const;
+    bool enabled() const;
+    QBitmap shape() const;
+
+    void setSource(const QString& source);
+    void setColor(const QColor& color);
+    void setPosition(const QPoint& position);
+    void setEnabled(bool enabled);
+
+Q_SIGNALS:
+    void sourceChanged(const QString& source);
+    void colorChanged(const QColor& color);
+    void enabledChanged();
+    void shapeChanged();
+    void positionChanged();
+
+protected:
+    void updateShape();
+
+private:
+    QString m_source;
+    QColor m_color;
+    QPoint m_position;
+    bool m_enabled;
+    QBitmap m_shape;
+};
+
+#endif // INPUTSHAPEMASK_H
 
=== added file 'libunity-2d-private/src/inputshaperectangle.cpp'
--- libunity-2d-private/src/inputshaperectangle.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/inputshaperectangle.cpp	2012-02-09 02:13:26 +0000
@@ -0,0 +1,126 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * 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 "inputshaperectangle.h"
+#include "inputshapemask.h"
+
+#include <QBitmap>
+#include <QPainter>
+#include <QPainterPath>
+#include <QDebug>
+#include <QRect>
+
+InputShapeRectangle::InputShapeRectangle(QObject *parent) :
+    QObject(parent),
+    m_enabled(true),
+    m_mirrorHorizontally(false)
+{
+}
+
+void InputShapeRectangle::updateShape()
+{
+    QBitmap newShape(m_rectangle.width(), m_rectangle.height());
+    newShape.fill(Qt::color1);
+
+    if (!m_rectangle.isEmpty() && m_masks.count() > 0) {
+        QPainter painter(&newShape);
+        painter.setBackgroundMode(Qt::OpaqueMode);
+
+        Q_FOREACH (InputShapeMask* mask, m_masks) {
+            if (mask->enabled()) {
+                painter.drawPixmap(mask->position(), mask->shape());
+            }
+        }
+    }
+
+    if (m_mirrorHorizontally) {
+        newShape = QBitmap::fromImage(newShape.toImage().mirrored(true, false));
+    }
+
+    m_shape = newShape;
+    Q_EMIT shapeChanged();
+}
+
+QRect InputShapeRectangle::rectangle() const
+{
+    return m_rectangle;
+}
+
+void InputShapeRectangle::setRectangle(QRect rectangle)
+{
+    if (rectangle != m_rectangle) {
+        m_rectangle = rectangle;
+        updateShape();
+        Q_EMIT rectangleChanged();
+    }
+}
+
+bool InputShapeRectangle::enabled() const
+{
+    return m_enabled;
+}
+
+void InputShapeRectangle::setEnabled(bool enabled)
+{
+    if (enabled != m_enabled) {
+        m_enabled = enabled;
+        Q_EMIT enabledChanged();
+
+    }
+}
+
+QBitmap InputShapeRectangle::shape() const
+{
+    return m_shape;
+}
+
+QDeclarativeListProperty<InputShapeMask> InputShapeRectangle::masks()
+{
+    return QDeclarativeListProperty<InputShapeMask>(this, this, &InputShapeRectangle::appendMask);
+}
+
+bool InputShapeRectangle::mirrorHorizontally() const
+{
+    return m_mirrorHorizontally;
+}
+
+void InputShapeRectangle::setMirrorHorizontally(bool mirror)
+{
+    if (mirror != m_mirrorHorizontally) {
+        m_mirrorHorizontally = mirror;
+        updateShape();
+        Q_EMIT mirrorHorizontallyChanged(m_mirrorHorizontally);
+    }
+}
+
+void InputShapeRectangle::appendMask(QDeclarativeListProperty<InputShapeMask> *list, InputShapeMask *mask)
+{
+    InputShapeRectangle* instance = qobject_cast<InputShapeRectangle*>(list->object);
+    if (instance != NULL) {
+        instance->m_masks.append(mask);
+        instance->connect(mask, SIGNAL(enabledChanged()), SLOT(updateShape()));
+        instance->connect(mask, SIGNAL(shapeChanged()), SLOT(updateShape()));
+        instance->connect(mask, SIGNAL(positionChanged()), SLOT(updateShape()));
+        instance->updateShape();
+    }
+}
+
+#include "inputshaperectangle.moc"
 
=== added file 'libunity-2d-private/src/inputshaperectangle.h'
--- libunity-2d-private/src/inputshaperectangle.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/inputshaperectangle.h	2012-02-09 02:13:26 +0000
@@ -0,0 +1,75 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * Authors:
+ * - Ugo Riboni <[e-mail]>
+ *
+ * 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 INPUTSHAPERECTANGLE_H
+#define INPUTSHAPERECTANGLE_H
+
+#include <QObject>
+#include <QRect>
+#include <QBitmap>
+#include <QDeclarativeListProperty>
+#include <QList>
+
+class InputShapeMask;
+
+class InputShapeRectangle : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QRect rectangle READ rectangle WRITE setRectangle NOTIFY rectangleChanged)
+    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
+    Q_PROPERTY(bool mirrorHorizontally READ mirrorHorizontally WRITE setMirrorHorizontally NOTIFY mirrorHorizontallyChanged)
+    Q_PROPERTY(QBitmap shape READ shape NOTIFY shapeChanged)
+    Q_PROPERTY(QDeclarativeListProperty<InputShapeMask> masks READ masks)
+    Q_CLASSINFO("DefaultProperty", "masks")
+
+public:
+    explicit InputShapeRectangle(QObject *parent = 0);
+
+    QRect rectangle() const;
+    void setRectangle(QRect rectangle);
+    bool enabled() const;
+    void setEnabled(bool enabled);
+    QBitmap shape() const;
+    QDeclarativeListProperty<InputShapeMask> masks();
+    bool mirrorHorizontally() const;
+    void setMirrorHorizontally(bool mirror);
+
+protected:
+    static void appendMask(QDeclarativeListProperty<InputShapeMask> *list, InputShapeMask *mask);
+
+protected Q_SLOTS:
+    void updateShape();
+
+Q_SIGNALS:
+    void rectangleChanged();
+    void enabledChanged();
+    void shapeChanged();
+    void mirrorHorizontallyChanged(bool mirrorHorizontally);
+
+private:
+    QRect m_rectangle;
+    bool m_enabled;
+    bool m_mirrorHorizontally;
+    QBitmap m_shape;
+    QList<InputShapeMask*> m_masks;
+};
+
+#endif // INPUTSHAPERECTANGLE_H
 
=== removed file 'libunity-2d-private/src/intellihidebehavior.cpp'
--- libunity-2d-private/src/intellihidebehavior.cpp	2012-01-17 14:31:19 +0000
+++ libunity-2d-private/src/intellihidebehavior.cpp	1970-01-01 00:00:00 +0000
@@ -1,256 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- * - Florian Boucault <[e-mail]>
- *
- * License: GPL v3
- */
-// Self
-#include "intellihidebehavior.h"
-
-// Local
-#include "unity2dpanel.h"
-
-// libunity-2d
-#include <debug_p.h>
-#include <edgehitdetector.h>
-
-// Qt
-#include <QCursor>
-#include <QEvent>
-#include <QTimer>
-#include <QWidget>
-#include <QDesktopWidget>
-
-// libwnck
-extern "C" {
-#define WNCK_I_KNOW_THIS_IS_UNSTABLE
-#include <libwnck/libwnck.h>
-}
-
-static const int AUTOHIDE_TIMEOUT = 1000;
-
-// Handy macros to declare GObject callbacks. The 'n' in CALLBACKn refers to
-// the number of dummy arguments the callback returns
-#define GOBJECT_CALLBACK0(callbackName, slot) \
-static void \
-callbackName(GObject* src, QObject* dst) \
-{ \
-    QMetaObject::invokeMethod(dst, slot); \
-}
-
-#define GOBJECT_CALLBACK1(callbackName, slot) \
-static void \
-callbackName(GObject* src, void* dummy1, QObject* dst) \
-{ \
-    QMetaObject::invokeMethod(dst, slot); \
-}
-
-#define GOBJECT_CALLBACK2(callbackName, slot) \
-static void \
-callbackName(GObject* src, void* dummy1, void* dummy2, QObject* dst) \
-{ \
-    QMetaObject::invokeMethod(dst, slot); \
-}
-
-// Screen callbacks
-GOBJECT_CALLBACK1(activeWindowChangedCB, "updateActiveWindowConnections");
-GOBJECT_CALLBACK1(activeWorkspaceChangedCB, "updateVisibility");
-
-// Window callbacks
-GOBJECT_CALLBACK2(stateChangedCB, "updateVisibility");
-GOBJECT_CALLBACK0(geometryChangedCB, "updateVisibility");
-GOBJECT_CALLBACK0(workspaceChangedCB, "updateVisibility");
-
-IntelliHideBehavior::IntelliHideBehavior(QWidget* panel)
-: AbstractVisibilityBehavior(panel)
-, m_updateVisibilityTimer(new QTimer(this))
-, m_edgeHitDetector(0)
-, m_activeWindow(0)
-{
-    m_updateVisibilityTimer->setSingleShot(true);
-    m_updateVisibilityTimer->setInterval(AUTOHIDE_TIMEOUT);
-    connect(m_updateVisibilityTimer, SIGNAL(timeout()), SLOT(updateVisibility()));
-
-    setPanel(panel);
-
-    WnckScreen* screen = wnck_screen_get_default();
-    g_signal_connect(G_OBJECT(screen), "active-window-changed", G_CALLBACK(activeWindowChangedCB), this);
-    g_signal_connect(G_OBJECT(screen), "active-workspace-changed", G_CALLBACK(activeWorkspaceChangedCB), this);
-
-    updateActiveWindowConnections();
-}
-
-IntelliHideBehavior::~IntelliHideBehavior()
-{
-    disconnectFromGSignals();
-    WnckScreen* screen = wnck_screen_get_default();
-    g_signal_handlers_disconnect_by_func(G_OBJECT(screen), gpointer(activeWindowChangedCB), this);
-    g_signal_handlers_disconnect_by_func(G_OBJECT(screen), gpointer(activeWorkspaceChangedCB), this);
-}
-
-void IntelliHideBehavior::disconnectFromGSignals()
-{
-    if (m_activeWindow) {
-        g_signal_handlers_disconnect_by_func(m_activeWindow, gpointer(stateChangedCB), this);
-        g_signal_handlers_disconnect_by_func(m_activeWindow, gpointer(geometryChangedCB), this);
-        g_signal_handlers_disconnect_by_func(m_activeWindow, gpointer(workspaceChangedCB), this);
-    }
-}
-
-void IntelliHideBehavior::updateActiveWindowConnections()
-{
-    WnckScreen* screen = wnck_screen_get_default();
-
-    disconnectFromGSignals();
-    m_activeWindow = 0;
-
-    WnckWindow* window = wnck_screen_get_active_window(screen);
-    if (window) {
-        m_activeWindow = window;
-        g_signal_connect(G_OBJECT(window), "state-changed", G_CALLBACK(stateChangedCB), this);
-        g_signal_connect(G_OBJECT(window), "geometry-changed", G_CALLBACK(geometryChangedCB), this);
-        g_signal_connect(G_OBJECT(window), "workspace-changed", G_CALLBACK(workspaceChangedCB), this);
-    }
-
-    gboolean isShowingDesktop = wnck_screen_get_showing_desktop(screen);
-    if (isShowingDesktop) {
-        showPanel();
-    } else {
-        updateVisibility();
-    }
-}
-
-void IntelliHideBehavior::updateVisibility()
-{
-    if (m_panel == NULL) {
-        return;
-    }
-    if (isMouseForcingVisibility()) {
-        return;
-    }
-    int launcherPid = getpid();
-
-    // Compute launcherRect, adjust "left" to the position where the launcher
-    // is fully visible.
-    QRect launcherRect = m_panel->geometry();
-    // FIXME: the following code assumes that the launcher is on the left edge
-    // of the screen
-    if (QApplication::isLeftToRight()) {
-        launcherRect.moveLeft(0);
-    } else {
-        QDesktopWidget* desktop = QApplication::desktop();
-        const QRect screen = desktop->screenGeometry(m_panel);
-        launcherRect.moveRight(screen.right());
-    }
-
-    WnckScreen* screen = wnck_screen_get_default();
-    WnckWorkspace* workspace = wnck_screen_get_active_workspace(screen);
-
-    // Check whether a window is crossing our launcher rect
-    bool crossWindow = false;
-    GList* list = wnck_screen_get_windows(screen);
-    for (; list; list = g_list_next(list)) {
-        WnckWindow* window = WNCK_WINDOW(list->data);
-        if (wnck_window_is_on_workspace(window, workspace) && wnck_window_get_pid(window) != launcherPid) {
-            WnckWindowType type = wnck_window_get_window_type(window);
-
-            // Only take into account typical application windows
-            if (type != WNCK_WINDOW_NORMAL  &&
-                type != WNCK_WINDOW_DIALOG  &&
-                type != WNCK_WINDOW_TOOLBAR &&
-                type != WNCK_WINDOW_MENU    &&
-                type != WNCK_WINDOW_UTILITY) {
-                continue;
-            }
-
-            WnckWindowState state = wnck_window_get_state(window);
-
-            // Skip hidden (==minimized and other states) windows
-            if (state & WNCK_WINDOW_STATE_HIDDEN) {
-                continue;
-            }
-
-            // Check the window rect
-            int x, y, width, height;
-            wnck_window_get_geometry(window, &x, &y, &width, &height);
-            QRect rect(x, y, width, height);
-            if (rect.intersects(launcherRect)) {
-                crossWindow = true;
-                break;
-            }
-        }
-    }
-
-    if (crossWindow) {
-        hidePanel();
-    } else {
-        showPanel();
-    }
-}
-
-bool IntelliHideBehavior::eventFilter(QObject* object, QEvent* event)
-{
-    switch (event->type()) {
-    case QEvent::Enter:
-        m_updateVisibilityTimer->stop();
-        break;
-    case QEvent::Leave:
-        m_updateVisibilityTimer->start();
-        break;
-    default:
-        break;
-    }
-    return false;
-}
-
-bool IntelliHideBehavior::isMouseForcingVisibility() const
-{
-    // We check the cursor position ourself because using QWidget::underMouse()
-    // is unreliable. It causes LP bug #740280
-    return m_panel != NULL && m_panel->geometry().contains(QCursor::pos());
-}
-
-void IntelliHideBehavior::hidePanel()
-{
-    if (m_visible) {
-        m_visible = false;
-        Q_EMIT visibleChanged(m_visible);
-        createEdgeHitDetector();
-    }
-}
-
-void IntelliHideBehavior::showPanel()
-{
-    if (!m_visible) {
-        // Delete the edge hit detector so that it does not prevent mouse events
-        // from reaching the panel
-        delete m_edgeHitDetector;
-        m_edgeHitDetector = 0;
-        m_visible = true;
-        Q_EMIT visibleChanged(m_visible);
-    }
-}
-
-void IntelliHideBehavior::createEdgeHitDetector()
-{
-    m_edgeHitDetector = new EdgeHitDetector(this);
-    connect(m_edgeHitDetector, SIGNAL(edgeHit()), SLOT(showPanel()));
-}
-
-void IntelliHideBehavior::setPanel(QWidget *panel)
-{
-    if (m_panel != NULL) {
-        m_panel->removeEventFilter(this);
-    }
-    AbstractVisibilityBehavior::setPanel(panel);
-    if (m_panel != NULL) {
-        m_panel->installEventFilter(this);
-    }
-}
-
-#include "intellihidebehavior.moc"
 
=== removed file 'libunity-2d-private/src/intellihidebehavior.h'
--- libunity-2d-private/src/intellihidebehavior.h	2011-06-11 11:33:52 +0000
+++ libunity-2d-private/src/intellihidebehavior.h	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- * - Florian Boucault <[e-mail]>
- *
- * License: GPL v3
- */
-#ifndef INTELLIHIDEBEHAVIOR_H
-#define INTELLIHIDEBEHAVIOR_H
-
-// Local
-#include <abstractvisibilitybehavior.h>
-
-// Qt
-#include <QObject>
-
-struct _WnckWindow;
-
-class QTimer;
-
-class QWidget;
-class EdgeHitDetector;
-
-/**
- * This class implements the Intellihide behavior of the launcher
- */
-class IntelliHideBehavior : public AbstractVisibilityBehavior
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QWidget* panel READ panel WRITE setPanel NOTIFY panelChanged)
-
-public:
-    IntelliHideBehavior(QWidget* panel=0);
-    ~IntelliHideBehavior();
-
-    // setters
-    void setPanel(QWidget *panel);
-
-Q_SIGNALS:
-    void panelChanged(QWidget *panel);
-
-protected:
-    bool eventFilter(QObject*, QEvent*);
-
-private Q_SLOTS:
-    void updateVisibility();
-    void updateActiveWindowConnections();
-    void showPanel();
-    void hidePanel();
-
-private:
-    Q_DISABLE_COPY(IntelliHideBehavior);
-
-    enum PanelVisibility {
-        VisiblePanel,
-        HiddenPanel
-    };
-    QTimer* m_updateVisibilityTimer;
-    EdgeHitDetector* m_edgeHitDetector;
-
-    struct _WnckWindow* m_activeWindow;
-
-    void disconnectFromGSignals();
-
-    bool isMouseForcingVisibility() const;
-
-    void createEdgeHitDetector();
-};
-
-#endif /* INTELLIHIDEBEHAVIOR_H */
 
=== modified file 'libunity-2d-private/src/launcherclient.cpp'
--- libunity-2d-private/src/launcherclient.cpp	2011-12-11 16:36:28 +0000
+++ libunity-2d-private/src/launcherclient.cpp	2012-02-09 02:13:26 +0000
@@ -21,54 +21,6 @@
 // Self
 #include "launcherclient.h"
 
-// Qt
-#include <QDBusConnection>
-#include <QDBusMessage>
-#include <QDBusPendingCall>
-
-static const char* LAUNCHER_DBUS_SERVICE = "com.canonical.Unity2d.Launcher";
-static const char* LAUNCHER_DBUS_OBJECT_PATH = "/Launcher";
-static const char* LAUNCHER_DBUS_INTERFACE = "com.canonical.Unity2d.Launcher";
-
 const int LauncherClient::MaximumWidth = 65;
 
-struct LauncherClientPrivate
-{
-    LauncherClient* q;
-
-    void asyncDBusCall(const QString& methodName)
-    {
-        /* The constructor for QDBusInterface potentially does synchronous
-           introspection calls. In contrast, this is really asynchronous.
-           See rationale at https://bugs.launchpad.net/unity-2d/+bug/738025. */
-        QDBusMessage call = QDBusMessage::createMethodCall(LAUNCHER_DBUS_SERVICE,
-                                                           LAUNCHER_DBUS_OBJECT_PATH,
-                                                           LAUNCHER_DBUS_INTERFACE,
-                                                           methodName);
-        QDBusConnection::sessionBus().asyncCall(call);
-    }
-};
-
-LauncherClient::LauncherClient(QObject* parent)
-: QObject(parent)
-, d(new LauncherClientPrivate)
-{
-    d->q = this;
-}
-
-LauncherClient::~LauncherClient()
-{
-    delete d;
-}
-
-void LauncherClient::beginForceVisible()
-{
-    d->asyncDBusCall("BeginForceVisible");
-}
-
-void LauncherClient::endForceVisible()
-{
-    d->asyncDBusCall("EndForceVisible");
-}
-
 #include "launcherclient.moc"
 
=== modified file 'libunity-2d-private/src/launcherclient.h'
--- libunity-2d-private/src/launcherclient.h	2011-03-22 11:30:53 +0000
+++ libunity-2d-private/src/launcherclient.h	2012-02-09 02:13:26 +0000
@@ -26,26 +26,13 @@
 // Qt
 #include <QObject>
 
-struct LauncherClientPrivate;
 /**
  * Makes it easy for unity-2d components to communicate with unity-2d-launcher
  */
-class LauncherClient : public QObject
+class LauncherClient
 {
-    Q_OBJECT
 public:
-    // The amount of pixels used by the launcher on the left edge when it is
-    // fully visible.
     static const int MaximumWidth;
-
-    LauncherClient(QObject* parent = 0);
-    ~LauncherClient();
-
-    void beginForceVisible();
-    void endForceVisible();
-
-private:
-    LauncherClientPrivate* const d;
 };
 
 #endif /* LAUNCHERCLIENT_H */
 
=== removed file 'libunity-2d-private/src/mousearea.cpp'
--- libunity-2d-private/src/mousearea.cpp	2011-06-11 10:50:03 +0000
+++ libunity-2d-private/src/mousearea.cpp	1970-01-01 00:00:00 +0000
@@ -1,117 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * 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/>.
- */
-// Self
-#include "mousearea.h"
-
-// Local
-#include <debug_p.h>
-
-// Qt
-#include <QX11Info>
-
-// X11
-#include <X11/Xlib.h>
-
-struct MouseAreaPrivate
-{
-    Window m_window;
-    QRect m_geometry;
-    bool m_containsMouse;
-};
-
-MouseArea::MouseArea(QObject* parent)
-: QObject(parent)
-, d(new MouseAreaPrivate)
-{
-    Unity2dApplication* application = Unity2dApplication::instance();
-    if (application == NULL) {
-        /* This can happen for example when using qmlviewer */
-        UQ_WARNING << "The application is not an Unity2dApplication."
-                      "MouseArea disabled.";
-    } else {
-        application->installX11EventFilter(this);
-    }
-
-    d->m_containsMouse = false;
-
-    XSetWindowAttributes attributes;
-    attributes.override_redirect = True;
-    attributes.event_mask = EnterWindowMask | LeaveWindowMask;
-    unsigned long attributesMask = CWOverrideRedirect | CWEventMask;
-
-    d->m_geometry = QRect(0, 0, 1, 1);
-
-    d->m_window = XCreateWindow(QX11Info::display(), QX11Info::appRootWindow(),
-        0, 0, 1, 1, // geometry
-        0, // border_width
-        0, // depth
-        InputOnly, // class
-        CopyFromParent, // visual
-        attributesMask,
-        &attributes);
-
-    XMapWindow(QX11Info::display(), d->m_window);
-}
-
-MouseArea::~MouseArea()
-{
-    XDestroyWindow(QX11Info::display(), d->m_window);
-    delete d;
-}
-
-QRect MouseArea::geometry() const
-{
-    return d->m_geometry;
-}
-
-void MouseArea::setGeometry(const QRect& rect)
-{
-    setGeometry(rect.x(), rect.y(), rect.width(), rect.height());
-}
-
-void MouseArea::setGeometry(int x, int y, int width, int height)
-{
-    d->m_geometry = QRect(x, y, width, height);
-    XMoveResizeWindow(QX11Info::display(), d->m_window, x, y, width, height);
-}
-
-bool MouseArea::x11EventFilter(XEvent* _event)
-{
-    if (_event->type == EnterNotify || _event->type == LeaveNotify) {
-        XCrossingEvent* event = (XCrossingEvent*)(_event);
-        if (event->window == d->m_window) {
-            d->m_containsMouse = event->type == EnterNotify;
-            if (d->m_containsMouse) {
-                entered();
-            } else {
-                exited();
-            }
-        }
-    }
-    return false;
-}
-
-bool MouseArea::containsMouse() const
-{
-    return d->m_containsMouse;
-}
-
-#include "mousearea.moc"
 
=== removed file 'libunity-2d-private/src/mousearea.h'
--- libunity-2d-private/src/mousearea.h	2011-02-15 18:18:13 +0000
+++ libunity-2d-private/src/mousearea.h	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * 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 MOUSEAREA_H
-#define MOUSEAREA_H
-
-// Local
-#include <unity2dapplication.h>
-
-// Qt
-#include <QObject>
-#include <QRect>
-
-struct MouseAreaPrivate;
-/**
- * A class to help detecting when the mouse cursor enters an area.
- * Quite similar to QML MouseArea item.
- */
-class MouseArea : public QObject, protected AbstractX11EventFilter
-{
-Q_OBJECT
-public:
-    MouseArea(QObject* parent = 0);
-    ~MouseArea();
-
-    QRect geometry() const;
-    void setGeometry(int x, int y, int width, int height);
-    void setGeometry(const QRect&);
-
-    bool containsMouse() const;
-
-Q_SIGNALS:
-    void entered();
-    void exited();
-
-protected:
-    bool x11EventFilter(XEvent*);
-
-private:
-    MouseAreaPrivate* const d;
-};
-
-#endif /* MOUSEAREA_H */
 
=== added file 'libunity-2d-private/src/spreadmonitor.cpp'
--- libunity-2d-private/src/spreadmonitor.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/spreadmonitor.cpp	2012-02-09 02:13:26 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Ugo Riboni <[e-mail]>
+ *
+ * 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/>.
+ */
+
+// local
+#include "abstractdbusservicemonitor.h"
+#include "spreadmonitor.h"
+
+// QT
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusReply>
+
+SpreadMonitor::SpreadMonitor(QObject *parent)
+    : AbstractDBusServiceMonitor("com.canonical.Unity2d.Spread", "/Spread",
+                                "com.canonical.Unity2d.Spread", parent)
+{
+    connect(this, SIGNAL(serviceAvailableChanged(bool)), SLOT(onServiceAvailableChanged(bool)));
+
+    if (serviceAvailable()) {
+        onServiceAvailableChanged(true);
+    }
+}
+
+void SpreadMonitor::onServiceAvailableChanged(bool available)
+{
+    if (available) {
+        connect(dbusInterface(), SIGNAL(IsShownChanged(bool)), SIGNAL(shownChanged(bool)));
+
+        Q_EMIT shownChanged(shown());
+    } else {
+        Q_EMIT shownChanged(false);
+    }
+}
+
+bool SpreadMonitor::shown() const
+{
+    if (dbusInterface() == 0) {
+        return false;
+    } else {
+        QDBusReply<bool> result = dbusInterface()->call("IsShown");
+        return result.isValid() && result.value() == true;
+    }
+}
+
+#include "spreadmonitor.moc"
 
=== added file 'libunity-2d-private/src/spreadmonitor.h'
--- libunity-2d-private/src/spreadmonitor.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/spreadmonitor.h	2012-02-09 02:13:26 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Ugo Riboni <[e-mail]>
+ *
+ * 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 SPREADMONITOR_H
+#define SPREADMONITOR_H
+
+// QT
+#include <QObject>
+#include <QMetaType>
+
+// local
+#include "abstractdbusservicemonitor.h"
+
+class SpreadMonitor : public AbstractDBusServiceMonitor
+{
+    Q_OBJECT
+    Q_PROPERTY(bool shown READ shown NOTIFY shownChanged)
+
+public:
+    explicit SpreadMonitor(QObject *parent = 0);
+    bool shown() const;
+
+protected Q_SLOTS:
+    void onServiceAvailableChanged(bool available);
+
+Q_SIGNALS:
+    void shownChanged(bool visible);
+};
+
+Q_DECLARE_METATYPE(SpreadMonitor*)
+
+#endif // SPREADMONITOR_H
 
=== added file 'libunity-2d-private/src/strutmanager.cpp'
--- libunity-2d-private/src/strutmanager.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/strutmanager.cpp	2012-02-09 02:13:26 +0000
@@ -0,0 +1,191 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010, 2012 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ * - Albert Astals Cid <[e-mail]>
+ *
+ * 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/>.
+ */
+
+// Self
+#include "strutmanager.h"
+
+// Qt
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QX11Info>
+
+// X
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+
+static void setStrut(ulong* struts, WId effectiveWinId)
+{
+    static Atom atom = XInternAtom(QX11Info::display(), "_NET_WM_STRUT_PARTIAL", False);
+    XChangeProperty(QX11Info::display(), effectiveWinId, atom,
+                    XA_CARDINAL, 32, PropModeReplace,
+                    (unsigned char *) struts, 12);
+}
+
+StrutManager::StrutManager()
+ : m_enabled(true),
+   m_widget(NULL),
+   m_edge(Unity2dPanel::TopEdge),
+   m_width(-1),
+   m_height(-1)
+{
+}
+
+StrutManager::~StrutManager()
+{
+    if (m_enabled) {
+        releaseStrut();
+    }
+}
+
+bool StrutManager::enabled() const
+{
+    return m_enabled;
+}
+
+void StrutManager::setEnabled(bool value)
+{
+    if (m_enabled != value) {
+        if (value) {
+            reserveStrut();
+        } else {
+            releaseStrut();
+        }
+        m_enabled = value;
+        Q_EMIT enabledChanged(value);
+    }
+}
+
+QObject *StrutManager::widget() const
+{
+    return m_widget;
+}
+
+void StrutManager::setWidget(QObject *widget)
+{
+    m_widget = qobject_cast<QWidget*>(widget);
+    Q_ASSERT(m_widget != NULL);
+}
+
+Unity2dPanel::Edge StrutManager::edge() const
+{
+    return m_edge;
+}
+
+void StrutManager::setEdge(Unity2dPanel::Edge edge)
+{
+    m_edge = edge;
+    updateStrut();
+}
+
+int StrutManager::width() const
+{
+    return m_width;
+}
+
+void StrutManager::setWidth(int width)
+{
+    m_width = width;
+}
+
+int StrutManager::realWidth() const
+{
+    if (m_widget == NULL)
+        return m_width;
+
+    if (m_width == -1)
+        return m_widget->width();
+
+    return m_width;
+}
+
+int StrutManager::height() const
+{
+    return m_height;
+}
+
+void StrutManager::setHeight(int height)
+{
+    m_height = height;
+}
+
+int StrutManager::realHeight() const
+{
+    if (m_widget == NULL)
+        return m_height;
+
+    if (m_height == -1)
+        return m_widget->height();
+
+    return m_height;
+}
+
+void StrutManager::updateStrut()
+{
+    if (m_enabled) {
+        reserveStrut();
+    }
+}
+
+
+void StrutManager::reserveStrut()
+{
+    if (m_widget == NULL)
+        return;
+
+    QDesktopWidget* desktop = QApplication::desktop();
+    const QRect screen = desktop->screenGeometry(m_widget);
+    const QRect available = desktop->availableGeometry(m_widget);
+
+    ulong struts[12] = {};
+    switch (m_edge) {
+    case Unity2dPanel::LeftEdge:
+        if (QApplication::isLeftToRight()) {
+            struts[0] = realWidth();
+            struts[4] = available.top();
+            struts[5] = available.y() + available.height();
+        } else {
+            struts[1] = realWidth();
+            struts[6] = available.top();
+            struts[7] = available.y() + available.height();
+        }
+        break;
+    case Unity2dPanel::TopEdge:
+        struts[2] = realHeight();
+        struts[8] = screen.left();
+        struts[9] = screen.x() + screen.width();
+        break;
+    }
+
+    setStrut(struts, m_widget->effectiveWinId());
+}
+
+void StrutManager::releaseStrut()
+{
+    if (m_widget == NULL)
+        return;
+
+    ulong struts[12];
+    memset(struts, 0, sizeof struts);
+    setStrut(struts, m_widget->effectiveWinId());
+}
+
+#include "strutmanager.moc"
 
=== added file 'libunity-2d-private/src/strutmanager.h'
--- libunity-2d-private/src/strutmanager.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/strutmanager.h	2012-02-09 02:13:26 +0000
@@ -0,0 +1,92 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010, 2012 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ * - Albert Astals Cid <[e-mail]>
+ *
+ * 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 STRUTMANAGER_H
+#define STRUTMANAGER_H
+
+// Unity 2D
+#include "unity2dpanel.h"
+
+class StrutManager : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
+    Q_PROPERTY(QObject* widget READ widget WRITE setWidget)
+    Q_PROPERTY(Unity2dPanel::Edge edge READ edge WRITE setEdge)
+    Q_PROPERTY(int width READ width WRITE setWidth)
+    Q_PROPERTY(int height READ height WRITE setHeight)
+
+public:
+    StrutManager();
+    ~StrutManager();
+
+    bool enabled() const;
+    void setEnabled(bool value);
+
+    // QObject due to QML constraints
+    QObject *widget() const;
+    void setWidget(QObject *widget);
+
+    Unity2dPanel::Edge edge() const;
+    void setEdge(Unity2dPanel::Edge edge);
+
+    /**
+     * Returns the width set to the strut manager
+     * If is -1 (the default value) will use the width of the widget given in setWidget
+     */
+    int width() const;
+    void setWidth(int width);
+    /**
+     * Returns the actual width in use by the strut manager
+     * It is either width() or m_widget->width()
+     */
+    int realWidth() const;
+
+    /**
+     * Returns the height set to the strut manager
+     * If is -1 (the default value) will use the height of the widget given in setWidget
+     */
+    int height() const;
+    void setHeight(int height);
+    /**
+     * Returns the actual height in use by the strut manager
+     * It is either width() or m_widget->width()
+     */
+    int realHeight() const;
+
+    Q_INVOKABLE void updateStrut();
+
+Q_SIGNALS:
+    void enabledChanged(bool enabled);
+
+private:
+    void reserveStrut();
+    void releaseStrut();
+
+    bool m_enabled;
+    QWidget *m_widget;
+    Unity2dPanel::Edge m_edge;
+    int m_width;
+    int m_height;
+};
+
+#endif /* STRUTMANAGER_H */
 \ No newline at end of file
 
=== modified file 'libunity-2d-private/src/unity2dpanel.cpp'
--- libunity-2d-private/src/unity2dpanel.cpp	2012-02-03 18:05:42 +0000
+++ libunity-2d-private/src/unity2dpanel.cpp	2012-02-09 02:13:26 +0000
@@ -21,6 +21,7 @@
 
 // Self
 #include "unity2dpanel.h"
+#include "strutmanager.h"
 #include <debug_p.h>
 #include <indicatorsmanager.h>
 
@@ -32,10 +33,6 @@
 #include <QHBoxLayout>
 #include <QX11Info>
 
-// X
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-
 // unity-2d
 #include "screeninfo.h"
 
@@ -47,57 +44,11 @@
     Unity2dPanel::Edge m_edge;
     mutable IndicatorsManager* m_indicatorsManager;
     QHBoxLayout* m_layout;
-    QPropertyAnimation* m_slideInAnimation;
-    QPropertyAnimation* m_slideOutAnimation;
-    bool m_useStrut;
     int m_delta;
     bool m_manualSliding;
+    StrutManager m_strutManager;
     ScreenInfo* m_screenInfo;
 
-    void setStrut(ulong* struts)
-    {
-        static Atom atom = XInternAtom(QX11Info::display(), "_NET_WM_STRUT_PARTIAL", False);
-        XChangeProperty(QX11Info::display(), q->effectiveWinId(), atom,
-                        XA_CARDINAL, 32, PropModeReplace,
-                        (unsigned char *) struts, 12);
-    }
-
-    void reserveStrut()
-    {
-        QDesktopWidget* desktop = QApplication::desktop();
-        const QRect screen = desktop->screenGeometry(q);
-        const QRect available = desktop->availableGeometry(q);
-
-        ulong struts[12] = {};
-        switch (m_edge) {
-        case Unity2dPanel::LeftEdge:
-            if (QApplication::isLeftToRight()) {
-                struts[0] = q->width();
-                struts[4] = available.top();
-                struts[5] = available.y() + available.height();
-            } else {
-                struts[1] = q->width();
-                struts[6] = available.top();
-                struts[7] = available.y() + available.height();
-            }
-            break;
-        case Unity2dPanel::TopEdge:
-            struts[2] = q->height();
-            struts[8] = screen.left();
-            struts[9] = screen.x() + screen.width();
-            break;
-        }
-
-        setStrut(struts);
-    }
-
-    void releaseStrut()
-    {
-        ulong struts[12];
-        memset(struts, 0, sizeof struts);
-        setStrut(struts);
-    }
-
     void updateGeometry()
     {
         const QRect screen = m_screenInfo->geometry();
@@ -139,9 +90,7 @@
 
     void updateEdge()
     {
-        if (m_useStrut) {
-            reserveStrut();
-        }
+        m_strutManager.updateStrut();
         updateGeometry();
         updateLayoutDirection();
     }
@@ -151,10 +100,11 @@
 : QWidget(parent)
 , d(new Unity2dPanelPrivate)
 {
+    d->m_strutManager.setWidget(this);
+    d->m_strutManager.setEdge(Unity2dPanel::TopEdge);
     d->q = this;
     d->m_edge = Unity2dPanel::TopEdge;
     d->m_indicatorsManager = 0;
-    d->m_useStrut = true;
     d->m_delta = 0;
     d->m_manualSliding = false;
     d->m_layout = new QHBoxLayout(this);
@@ -168,18 +118,6 @@
         d->m_screenInfo = new ScreenInfo(this, this);
     }
 
-    d->m_slideInAnimation = new QPropertyAnimation(this);
-    d->m_slideInAnimation->setTargetObject(this);
-    d->m_slideInAnimation->setPropertyName("delta");
-    d->m_slideInAnimation->setDuration(SLIDE_DURATION);
-    d->m_slideInAnimation->setEndValue(0);
-
-    d->m_slideOutAnimation = new QPropertyAnimation(this);
-    d->m_slideOutAnimation->setTargetObject(this);
-    d->m_slideOutAnimation->setPropertyName("delta");
-    d->m_slideOutAnimation->setDuration(SLIDE_DURATION);
-    d->m_slideOutAnimation->setEndValue(-panelSize());
-
     setAttribute(Qt::WA_X11NetWmWindowTypeDock);
     setAttribute(Qt::WA_Hover);
 
@@ -190,19 +128,18 @@
     }
     
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), SLOT(slotWorkAreaResized(int)));
+    connect(&d->m_strutManager, SIGNAL(enabledChanged(bool)), SIGNAL(useStrutChanged(bool)));
 }
 
 Unity2dPanel::~Unity2dPanel()
 {
-    if (d->m_useStrut) {
-        d->releaseStrut();
-    }
     delete d;
 }
 
 void Unity2dPanel::setEdge(Unity2dPanel::Edge edge)
 {
     d->m_edge = edge;
+    d->m_strutManager.setEdge(edge);
     if (isVisible()) {
         d->updateEdge();
     }
@@ -237,13 +174,6 @@
 {
     QWidget::showEvent(event);
     d->updateEdge();
-    d->m_slideOutAnimation->setEndValue(-panelSize());
-}
-
-void Unity2dPanel::resizeEvent(QResizeEvent* event)
-{
-    QWidget::resizeEvent(event);
-    d->m_slideOutAnimation->setEndValue(-panelSize());
 }
 
 void Unity2dPanel::slotWorkAreaResized(int screen)
@@ -273,20 +203,12 @@
 
 bool Unity2dPanel::useStrut() const
 {
-    return d->m_useStrut;
+    return d->m_strutManager.enabled();
 }
 
 void Unity2dPanel::setUseStrut(bool value)
 {
-    if (d->m_useStrut != value) {
-        if (value) {
-            d->reserveStrut();
-        } else {
-            d->releaseStrut();
-        }
-        d->m_useStrut = value;
-        Q_EMIT useStrutChanged(value);
-    }
+    d->m_strutManager.setEnabled(value);
 }
 
 int Unity2dPanel::delta() const
@@ -309,24 +231,6 @@
     return (d->m_edge == Unity2dPanel::TopEdge) ? height() : width();
 }
 
-void Unity2dPanel::slideIn()
-{
-    d->m_slideOutAnimation->stop();
-    if (d->m_slideInAnimation->state() != QAbstractAnimation::Running) {
-        d->m_slideInAnimation->setStartValue(d->m_delta);
-        d->m_slideInAnimation->start();
-    }
-}
-
-void Unity2dPanel::slideOut()
-{
-    d->m_slideInAnimation->stop();
-    if (d->m_slideOutAnimation->state() != QAbstractAnimation::Running) {
-        d->m_slideOutAnimation->setStartValue(d->m_delta);
-        d->m_slideOutAnimation->start();
-    }
-}
-
 bool Unity2dPanel::manualSliding() const
 {
     return d->m_manualSliding;
@@ -336,10 +240,6 @@
 {
     if (d->m_manualSliding != manualSliding) {
         d->m_manualSliding = manualSliding;
-        if (manualSliding) {
-            d->m_slideInAnimation->stop();
-            d->m_slideOutAnimation->stop();
-        }
         Q_EMIT manualSlidingChanged(d->m_manualSliding);
     }
 }
 
=== modified file 'libunity-2d-private/src/unity2dpanel.h'
--- libunity-2d-private/src/unity2dpanel.h	2012-02-01 16:00:48 +0000
+++ libunity-2d-private/src/unity2dpanel.h	2012-02-09 02:13:26 +0000
@@ -47,6 +47,7 @@
      */
     Q_PROPERTY(int manualSliding READ manualSliding WRITE setManualSliding NOTIFY manualSlidingChanged)
     Q_PROPERTY(bool useStrut READ useStrut WRITE setUseStrut NOTIFY useStrutChanged)
+    Q_ENUMS(Edge)
 
 public:
     enum Edge {
@@ -89,17 +90,12 @@
 
     QString id() const;
 
-public Q_SLOTS:
-    void slideIn();
-    void slideOut();
-
 Q_SIGNALS:
     void manualSlidingChanged(bool);
     void useStrutChanged(bool);
 
 protected:
     virtual void showEvent(QShowEvent*);
-    virtual void resizeEvent(QResizeEvent*);
     virtual void paintEvent(QPaintEvent*);
 
 private Q_SLOTS:
 
=== added file 'libunity-2d-private/src/windowsintersectmonitor.cpp'
--- libunity-2d-private/src/windowsintersectmonitor.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/windowsintersectmonitor.cpp	2012-02-09 02:13:26 +0000
@@ -0,0 +1,183 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ * - Florian Boucault <[e-mail]>
+ * - Ugo Riboni <[e-mail]>
+ *
+ * License: GPL v3
+ */
+
+// Self
+#include "windowsintersectmonitor.h"
+
+// libunity-2d
+#include <debug_p.h>
+
+// Qt
+#include <QCursor>
+#include <QEvent>
+#include <QTimer>
+#include <QWidget>
+#include <QDesktopWidget>
+
+// libwnck
+extern "C" {
+#include <libwnck/libwnck.h>
+}
+
+// Handy macros to declare GObject callbacks. The 'n' in CALLBACKn refers to
+// the number of dummy arguments the callback returns
+#define GOBJECT_CALLBACK0(callbackName, slot) \
+static void \
+callbackName(GObject* src, QObject* dst) \
+{ \
+    QMetaObject::invokeMethod(dst, slot); \
+}
+
+#define GOBJECT_CALLBACK1(callbackName, slot) \
+static void \
+callbackName(GObject* src, void* dummy1, QObject* dst) \
+{ \
+    QMetaObject::invokeMethod(dst, slot); \
+}
+
+#define GOBJECT_CALLBACK2(callbackName, slot) \
+static void \
+callbackName(GObject* src, void* dummy1, void* dummy2, QObject* dst) \
+{ \
+    QMetaObject::invokeMethod(dst, slot); \
+}
+
+// Screen callbacks
+GOBJECT_CALLBACK1(activeWindowChangedCB, "updateActiveWindowConnections");
+GOBJECT_CALLBACK1(activeWorkspaceChangedCB, "updateIntersect");
+GOBJECT_CALLBACK0(showingDesktopChangedCB, "updateIntersect");
+
+// Window callbacks
+GOBJECT_CALLBACK2(stateChangedCB, "updateIntersect");
+GOBJECT_CALLBACK0(geometryChangedCB, "updateIntersect");
+GOBJECT_CALLBACK0(workspaceChangedCB, "updateIntersect");
+
+WindowsIntersectMonitor::WindowsIntersectMonitor()
+    : QObject()
+    , m_activeWindow(0)
+{
+    WnckScreen* screen = wnck_screen_get_default();
+    g_signal_connect(G_OBJECT(screen), "active-window-changed", G_CALLBACK(activeWindowChangedCB), this);
+    g_signal_connect(G_OBJECT(screen), "active-workspace-changed", G_CALLBACK(activeWorkspaceChangedCB), this);
+    g_signal_connect(G_OBJECT(screen), "showing-desktop-changed", G_CALLBACK(showingDesktopChangedCB), this);
+
+    updateActiveWindowConnections();
+}
+
+WindowsIntersectMonitor::~WindowsIntersectMonitor()
+{
+    disconnectFromGSignals();
+    WnckScreen* screen = wnck_screen_get_default();
+    g_signal_handlers_disconnect_by_func(G_OBJECT(screen), gpointer(activeWindowChangedCB), this);
+    g_signal_handlers_disconnect_by_func(G_OBJECT(screen), gpointer(activeWorkspaceChangedCB), this);
+    g_signal_handlers_disconnect_by_func(G_OBJECT(screen), gpointer(showingDesktopChangedCB), this);
+}
+
+void WindowsIntersectMonitor::disconnectFromGSignals()
+{
+    if (m_activeWindow) {
+        g_signal_handlers_disconnect_by_func(m_activeWindow, gpointer(stateChangedCB), this);
+        g_signal_handlers_disconnect_by_func(m_activeWindow, gpointer(geometryChangedCB), this);
+        g_signal_handlers_disconnect_by_func(m_activeWindow, gpointer(workspaceChangedCB), this);
+    }
+}
+
+void WindowsIntersectMonitor::updateActiveWindowConnections()
+{
+    WnckScreen* screen = wnck_screen_get_default();
+
+    disconnectFromGSignals();
+    m_activeWindow = 0;
+
+    WnckWindow* window = wnck_screen_get_active_window(screen);
+    if (window) {
+        m_activeWindow = window;
+        g_signal_connect(G_OBJECT(window), "state-changed", G_CALLBACK(stateChangedCB), this);
+        g_signal_connect(G_OBJECT(window), "geometry-changed", G_CALLBACK(geometryChangedCB), this);
+        g_signal_connect(G_OBJECT(window), "workspace-changed", G_CALLBACK(workspaceChangedCB), this);
+    }
+
+    updateIntersect();
+}
+
+void WindowsIntersectMonitor::updateIntersect()
+{
+    int thisProcessPid = getpid();
+
+    WnckScreen* screen = wnck_screen_get_default();
+    WnckWorkspace* workspace = wnck_screen_get_active_workspace(screen);
+
+    // Check whether a window is crossing our rect
+    bool crossWindow = false;
+    if (!wnck_screen_get_showing_desktop(screen)) {
+        GList* list = wnck_screen_get_windows(screen);
+        for (; list; list = g_list_next(list)) {
+            WnckWindow* window = WNCK_WINDOW(list->data);
+            if (wnck_window_is_on_workspace(window, workspace) &&
+                wnck_window_get_pid(window) != thisProcessPid) {
+                WnckWindowType type = wnck_window_get_window_type(window);
+
+                // Only take into account typical application windows
+                if (type != WNCK_WINDOW_NORMAL  &&
+                    type != WNCK_WINDOW_DIALOG  &&
+                    type != WNCK_WINDOW_TOOLBAR &&
+                    type != WNCK_WINDOW_MENU    &&
+                    type != WNCK_WINDOW_UTILITY) {
+                    continue;
+                }
+
+                WnckWindowState state = wnck_window_get_state(window);
+
+                // Skip hidden (==minimized and other states) windows
+                if (state & WNCK_WINDOW_STATE_HIDDEN) {
+                    continue;
+                }
+
+                // Check the window rect
+                int x, y, width, height;
+                wnck_window_get_geometry(window, &x, &y, &width, &height);
+                QRectF rect(x, y, width, height);
+                if (rect.intersects(m_monitoredArea)) {
+                    crossWindow = true;
+                    break;
+                }
+            }
+        }
+    }
+
+    if (crossWindow != m_intersects) {
+        m_intersects = crossWindow;
+        Q_EMIT intersectsChanged();
+    }
+}
+
+QRectF WindowsIntersectMonitor::monitoredArea() const
+{
+    return m_monitoredArea;
+}
+
+void WindowsIntersectMonitor::setMonitoredArea(const QRectF& monitoredArea)
+{
+    if (m_monitoredArea != monitoredArea) {
+        m_monitoredArea = monitoredArea;
+        Q_EMIT monitoredAreaChanged();
+        updateIntersect();
+    }
+}
+
+bool WindowsIntersectMonitor::intersects() const
+{
+    return m_intersects;
+}
+
+#include "windowsintersectmonitor.moc"
 
=== added file 'libunity-2d-private/src/windowsintersectmonitor.h'
--- libunity-2d-private/src/windowsintersectmonitor.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/windowsintersectmonitor.h	2012-02-09 02:13:26 +0000
@@ -0,0 +1,55 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ * - Florian Boucault <[e-mail]>
+ * - Ugo Riboni <[e-mail]>
+ *
+ * License: GPL v3
+ */
+#ifndef WINDOWSINTERSECTMONITOR_H
+#define WINDOWSINTERSECTMONITOR_H
+
+// Qt
+#include <QObject>
+#include <QRectF>
+
+struct _WnckWindow;
+
+class WindowsIntersectMonitor : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QRectF monitoredArea READ monitoredArea WRITE setMonitoredArea
+                                    NOTIFY monitoredAreaChanged)
+    Q_PROPERTY(bool intersects READ intersects NOTIFY intersectsChanged)
+
+public:
+    WindowsIntersectMonitor();
+    ~WindowsIntersectMonitor();
+
+    QRectF monitoredArea() const;
+    void setMonitoredArea(const QRectF& monitoredArea);
+    bool intersects() const;
+
+Q_SIGNALS:
+    void monitoredAreaChanged();
+    void intersectsChanged();
+
+private Q_SLOTS:
+    void updateIntersect();
+    void updateActiveWindowConnections();
+
+private:
+    Q_DISABLE_COPY(WindowsIntersectMonitor);
+    void disconnectFromGSignals();
+
+    struct _WnckWindow* m_activeWindow;
+    QRectF m_monitoredArea;
+    bool m_intersects;
+};
+
+#endif /* WINDOWSINTERSECTMONITOR_H */
 
=== modified file 'libunity-2d-private/tests/CMakeLists.txt'
--- libunity-2d-private/tests/CMakeLists.txt	2011-12-07 12:46:10 +0000
+++ libunity-2d-private/tests/CMakeLists.txt	2012-02-09 02:13:26 +0000
@@ -83,10 +83,3 @@
 #    COMMAND /bin/sh gnomesessionclienttest.sh
 #    )
 
-# mouseareademo
-add_executable(mouseareademo
-    mouseareademo.cpp
-    )
-target_link_libraries(mouseareademo
-    unity-2d-private
-    )
 
=== removed file 'libunity-2d-private/tests/mouseareademo.cpp'
--- libunity-2d-private/tests/mouseareademo.cpp	2011-07-18 14:36:34 +0000
+++ libunity-2d-private/tests/mouseareademo.cpp	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * 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/>.
- */
-
-// Local
-#include <mousearea.h>
-#include <unity2dapplication.h>
-
-// Qt
-#include <QLabel>
-#include <QVBoxLayout>
-
-int main(int argc, char** argv)
-{
-    Unity2dApplication::earlySetup(argc, argv);
-    Unity2dApplication app(argc, argv);
-    QWidget window;
-    QLabel* enteredLabel = new QLabel("Entered");
-    QVBoxLayout* layout = new QVBoxLayout(&window);
-    layout->addWidget(enteredLabel);
-
-    MouseArea* area = new MouseArea(&window);
-    area->setGeometry(QRect(10, 10, 200, 100));
-    QObject::connect(area, SIGNAL(entered()), enteredLabel, SLOT(show()));
-    QObject::connect(area, SIGNAL(exited()), enteredLabel, SLOT(hide()));
-
-    enteredLabel->setVisible(area->containsMouse());
-
-    window.show();
-    return app.exec();
-}
 
=== modified file 'panel/applets/CMakeLists.txt'
--- panel/applets/CMakeLists.txt	2011-08-29 00:47:24 +0000
+++ panel/applets/CMakeLists.txt	2012-02-09 02:13:26 +0000
@@ -1,5 +1,4 @@
 add_subdirectory(separator)
-add_subdirectory(homebutton)
 add_subdirectory(appname)
 add_subdirectory(legacytray)
 add_subdirectory(indicator)
 
=== removed directory 'panel/applets/homebutton'
=== removed file 'panel/applets/homebutton/CMakeLists.txt'
--- panel/applets/homebutton/CMakeLists.txt	2011-11-09 21:28:49 +0000
+++ panel/applets/homebutton/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-project(panelplugin-homebutton)
-
-# Sources
-set(homebutton_SRCS
-    homebuttonapplet.cpp
-    homebutton.cpp
-    plugin.cpp
-    )
-
-# Build
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${libunity-2d-private_SOURCE_DIR}/src
-    )
-
-qt4_automoc(${homebutton_SRCS})
-add_library(panelplugin-homebutton SHARED ${homebutton_SRCS})
-set_target_properties(panelplugin-homebutton PROPERTIES
-    LIBRARY_OUTPUT_DIRECTORY ".."
-    VERSION 0
-    SOVERSION 0.0
-    )
-
-target_link_libraries(panelplugin-homebutton
-    ${QT_QTGUI_LIBRARIES}
-    ${QT_QTCORE_LIBRARIES}
-    unity-2d-private
-    )
-
-install(TARGETS panelplugin-homebutton
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity-2d/plugins/panel
-       )
 
=== removed file 'panel/applets/homebutton/homebutton.cpp'
--- panel/applets/homebutton/homebutton.cpp	2011-08-22 10:47:51 +0000
+++ panel/applets/homebutton/homebutton.cpp	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Alberto Mardegan <[e-mail]>
- *
- * 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/>.
- */
-
-// Self
-#include "homebutton.h"
-
-// Local
-#include <debug_p.h>
-
-// Qt
-#include <QApplication>
-
-HomeButton::HomeButton(QWidget *parent)
-: QToolButton(parent)
-{
-    setAutoRaise(true);
-    setIconSize(QSize(24, 24));
-    QString themeIconName = QIcon::hasThemeIcon("start-here") ? "start-here" : "distributor-logo";
-    setIcon(QIcon::fromTheme(themeIconName));
-    setCheckable(true);
-
-    setStyleSheet(
-            "QToolButton { border: none; margin: 0; padding: 0; width: 61 }"
-            "QToolButton:checked, QToolButton:pressed {"
-            "   padding-top: 1px;"
-            "   padding-left: 1px;"
-            "   padding-right: -1px;"
-            "   padding-bottom: -1px;"
-            "}"
-    );
-}
-
-void HomeButton::mousePressEvent(QMouseEvent *event)
-{
-    if (lastClickTime.isValid() &&
-        lastClickTime.elapsed() < QApplication::doubleClickInterval()) {
-        /* ignore this click */
-        return;
-    }
-
-    QToolButton::mousePressEvent(event);
-    lastClickTime.restart();
-}
-
-#include "homebutton.moc"
 
=== removed file 'panel/applets/homebutton/homebutton.h'
--- panel/applets/homebutton/homebutton.h	2011-08-22 09:17:03 +0000
+++ panel/applets/homebutton/homebutton.h	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Alberto Mardegan <[e-mail]>
- *
- * 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 HOMEBUTTON_H
-#define HOMEBUTTON_H
-
-// Qt
-#include <QTime>
-#include <QToolButton>
-
-class HomeButton : public QToolButton
-{
-Q_OBJECT
-public:
-    HomeButton(QWidget *parent = 0);
-
-protected:
-    void mousePressEvent(QMouseEvent*);
-
-private:
-    Q_DISABLE_COPY(HomeButton)
-    QTime lastClickTime;
-};
-
-#endif /* HOMEBUTTON_H */
 
=== removed file 'panel/applets/homebutton/homebuttonapplet.cpp'
--- panel/applets/homebutton/homebuttonapplet.cpp	2011-08-22 09:17:03 +0000
+++ panel/applets/homebutton/homebuttonapplet.cpp	1970-01-01 00:00:00 +0000
@@ -1,112 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2010 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * 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/>.
- */
-
-// Self
-#include "homebuttonapplet.h"
-
-// Local
-#include <debug_p.h>
-
-// libunity-2d
-#include <launcherclient.h>
-
-// Qt
-#include <QHBoxLayout>
-#include <QDBusInterface>
-#include <QDBusServiceWatcher>
-#include <QDBusConnectionInterface>
-
-static const char* DBUS_SERVICE = "com.canonical.Unity2d.Dash";
-static const char* DBUS_PATH = "/Dash";
-static const char* DBUS_IFACE = "com.canonical.Unity2d.Dash";
-
-HomeButtonApplet::HomeButtonApplet(Unity2dPanel* panel)
-: Unity2d::PanelApplet(panel)
-, m_button(new HomeButton)
-, m_dashInterface(NULL)
-, m_launcherClient(new LauncherClient(this))
-{
-    connect(m_button, SIGNAL(clicked()), SLOT(toggleDash()));
-
-    QHBoxLayout* layout = new QHBoxLayout(this);
-    layout->setMargin(0);
-    layout->addWidget(m_button);
-
-    /* Check if the dash is already up and running by asking the bus instead of
-       trying to create an instance of the interface. Creating an instance
-       will cause DBUS to activate the dash and we don't want this to happen, especially
-       during startup where the dash is started with a delay. */
-    QDBusConnectionInterface* sessionBusIFace = QDBusConnection::sessionBus().interface();
-    QDBusReply<bool> reply = sessionBusIFace->isServiceRegistered(DBUS_SERVICE);
-    if (reply.isValid() && reply.value() == true) {
-        connectToDash();
-    } else {
-        /* If the dash is not running, setup a notification so that we can
-           connect to it later when it comes up */
-        QDBusServiceWatcher* serviceWatcher = new QDBusServiceWatcher(DBUS_SERVICE, QDBusConnection::sessionBus(),
-                                                                      QDBusServiceWatcher::WatchForRegistration, this);
-        connect(serviceWatcher, SIGNAL(serviceRegistered(QString)), SLOT(connectToDash()));
-    }
-}
-
-void HomeButtonApplet::connectToDash()
-{
-    if (m_dashInterface != NULL) {
-        return;
-    }
-
-    m_dashInterface = new QDBusInterface(DBUS_SERVICE, DBUS_PATH, DBUS_IFACE,
-                                        QDBusConnection::sessionBus(), this);
-    m_button->connect(m_dashInterface, SIGNAL(activeChanged(bool)), SLOT(setChecked(bool)));
-
-    /* Immediately update the home button with the current state of the dash */
-    m_button->setChecked(m_dashInterface->property("active").toBool());
-}
-
-void HomeButtonApplet::toggleDash()
-{
-    if (m_dashInterface == NULL || !m_dashInterface->isValid()) {
-        connectToDash();
-    }
-
-    bool dashActive = m_dashInterface->property("active").toBool();
-
-    if (dashActive) {
-        m_dashInterface->setProperty("active", false);
-    } else {
-        /* Call com.canonical.Unity2d.Dash.activateHome (will set com.canonical.Unity2d.Dash.active to true */
-        m_dashInterface->call(QDBus::Block, "activateHome");
-    }
-}
-
-void HomeButtonApplet::enterEvent(QEvent* event)
-{
-    QWidget::enterEvent(event);
-    m_launcherClient->beginForceVisible();
-}
-
-void HomeButtonApplet::leaveEvent(QEvent* event)
-{
-    QWidget::leaveEvent(event);
-    m_launcherClient->endForceVisible();
-}
-
-#include "homebuttonapplet.moc"
 
=== removed file 'panel/applets/homebutton/homebuttonapplet.h'
--- panel/applets/homebutton/homebuttonapplet.h	2011-08-22 09:17:03 +0000
+++ panel/applets/homebutton/homebuttonapplet.h	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2010 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * 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 HOMEBUTTONAPPLET_H
-#define HOMEBUTTONAPPLET_H
-
-// Local
-#include "homebutton.h"
-
-// Unity-2d
-#include <panelapplet.h>
-
-class QDBusInterface;
-class LauncherClient;
-
-class HomeButtonApplet : public Unity2d::PanelApplet
-{
-Q_OBJECT
-public:
-    HomeButtonApplet(Unity2dPanel* panel);
-
-protected: