Unity 8

Merge lp:~nick-dedekind/unity8/multi-monitor into lp:unity8

multi-monitor
Merge into trunk

Proposed by Michael Zanetti on 2017-01-16

Status:	Needs review
Proposed branch:	lp:~nick-dedekind/unity8/multi-monitor
Merge into:	lp:unity8
Diff against target:	3616 lines (+1262/-646) 73 files modified debian/control (+1/-1) debian/unity8.install (+5/-0) plugins/Cursor/CMakeLists.txt (+1/-0) plugins/Cursor/InputDispatcherFilter.cpp (+175/-0) plugins/Cursor/InputDispatcherFilter.h (+62/-0) plugins/Cursor/MousePointer.cpp (+65/-80) plugins/Cursor/MousePointer.h (+5/-4) plugins/GlobalShortcut/globalshortcut.cpp (+0/-15) plugins/GlobalShortcut/globalshortcut.h (+0/-4) plugins/GlobalShortcut/globalshortcutregistry.cpp (+23/-15) plugins/GlobalShortcut/globalshortcutregistry.h (+2/-2) plugins/UInput/plugin.cpp (+7/-1) qml/ApplicationMenus/ApplicationMenuItemFactory.qml (+4/-4) qml/ApplicationMenus/MenuBar.qml (+5/-1) qml/ApplicationMenus/MenuItem.qml (+2/-0) qml/ApplicationMenus/MenuPopup.qml (+4/-1) qml/CMakeLists.txt (+1/-1) qml/Components/PanelState/PanelState.qml (+0/-1) qml/Components/PanelState/qmldir (+1/-1) qml/Components/VirtualTouchPad.qml (+13/-19) qml/DisabledScreenNotice.qml (+2/-1) qml/ErrorApplication.qml (+67/-0) qml/Greeter/Greeter.qml (+21/-3) qml/Greeter/SecondaryGreeter.qml (+75/-0) qml/OrientedShell.qml (+5/-7) qml/Panel/Panel.qml (+17/-15) qml/Shell.qml (+29/-11) qml/ShellApplication.qml (+52/-0) qml/ShellNotifier.qml (+30/-0) qml/ShellScreen.qml (+66/-0) qml/Stage/DecoratedWindow.qml (+3/-1) qml/Stage/FakeMaximizeDelegate.qml (+12/-11) qml/Stage/Stage.qml (+13/-10) qml/Stage/WindowDecoration.qml (+2/-0) qml/qmldir (+1/-0) src/ApplicationArguments.cpp (+12/-3) src/ApplicationArguments.h (+19/-17) src/CMakeLists.txt (+0/-2) src/SecondaryWindow.cpp (+0/-40) src/SecondaryWindow.h (+0/-30) src/ShellApplication.cpp (+30/-105) src/ShellApplication.h (+1/-13) src/ShellView.cpp (+0/-85) src/ShellView.h (+0/-34) src/UnityCommandLineParser.h (+1/-1) tests/mocks/Cursor/Cursor.qml (+50/-3) tests/mocks/GSettings.1.0/plugin.cpp (+12/-0) tests/mocks/GSettings.1.0/plugin.h (+1/-0) tests/mocks/UInput/plugin.cpp (+6/-1) tests/mocks/Unity/Application/SurfaceManager.cpp (+1/-1) tests/mocks/Unity/InputInfo/mockcontroller.cpp (+10/-0) tests/mocks/Unity/InputInfo/mockcontroller.h (+3/-1) tests/mocks/Unity/InputInfo/plugin.cpp (+1/-2) tests/mocks/Unity/Screens/CMakeLists.txt (+2/-1) tests/mocks/Unity/Screens/plugin.cpp (+14/-1) tests/mocks/Unity/Screens/screens.cpp (+52/-9) tests/mocks/Unity/Screens/screens.h (+87/-7) tests/mocks/Unity/Screens/screenwindow.cpp (+35/-0) tests/mocks/Unity/Screens/screenwindow.h (+42/-0) tests/plugins/GlobalShortcut/GlobalShortcutTest.cpp (+1/-0) tests/qmltests/ApplicationMenus/tst_MenuBar.qml (+2/-0) tests/qmltests/ApplicationMenus/tst_MenuPopup.qml (+2/-0) tests/qmltests/Components/tst_VirtualTouchPad.qml (+2/-2) tests/qmltests/Panel/tst_Panel.qml (+18/-14) tests/qmltests/Stage/tst_DecoratedWindow.qml (+5/-1) tests/qmltests/Stage/tst_DesktopStage.qml (+6/-4) tests/qmltests/Stage/tst_PhoneStage.qml (+2/-0) tests/qmltests/Stage/tst_WindowResizeArea.qml (+1/-8) tests/qmltests/Tutorial/tst_Tutorial.qml (+9/-17) tests/qmltests/tst_OrientedShell.qml (+25/-5) tests/qmltests/tst_Shell.qml (+30/-17) tests/qmltests/tst_ShellWithPin.qml (+7/-13) tests/uqmlscene/main.cpp (+2/-0)
To merge this branch:	bzr merge lp:~nick-dedekind/unity8/multi-monitor
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2017-03-31
Unity Team		2017-01-16	Pending
Review via email: mp+314835@code.launchpad.net

Commit message

multimonitor support

Description of the change

Prereq-archive: ppa:ci-train-ppa-service/2663

WIP - putting to needs review to get jenkins' opinion

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-28:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3576/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-28:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3577/rebuild

review: Needs Fixing (continuous-integration)

lp:~nick-dedekind/unity8/multi-monitor updated on 2017-03-28

2790. By Nick Dedekind on 2017-03-28: panelState fixes
2791. By Nick Dedekind on 2017-03-28: Fixed PhoneStage & ShellWithPin tests
2792. By Nick Dedekind on 2017-03-28: Stage fixes for panelState

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-28:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3584/rebuild

review: Needs Fixing (continuous-integration)

lp:~nick-dedekind/unity8/multi-monitor updated on 2017-03-29

2793. By Nick Dedekind on 2017-03-29: more test fixes

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-29:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3592/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-29:

FAILED: Continuous integration, rev:2794
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3596/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3596/rebuild

review: Needs Fixing (continuous-integration)

lp:~nick-dedekind/unity8/multi-monitor updated on 2017-03-29

2794. By Nick Dedekind on 2017-03-29: Added requestActivate to view

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-29:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3597/rebuild

review: Approve (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-31:

FAILED: Continuous integration, rev:2794
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3616/
Executed test runs:
FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4793/console
FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4821/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3616/rebuild

review: Needs Fixing (continuous-integration)

lp:~nick-dedekind/unity8/multi-monitor updated on 2017-03-31

2795. By Nick Dedekind on 2017-03-31: merged with trunk

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-31:

FAILED: Continuous integration, rev:2795
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3625/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3625/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-31:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3626/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

2795. By Nick Dedekind on 2017-03-31: merged with trunk
2794. By Nick Dedekind on 2017-03-29: Added requestActivate to view
2793. By Nick Dedekind on 2017-03-29: more test fixes
2792. By Nick Dedekind on 2017-03-28: Stage fixes for panelState
2791. By Nick Dedekind on 2017-03-28: Fixed PhoneStage & ShellWithPin tests
2790. By Nick Dedekind on 2017-03-28: panelState fixes
2789. By Nick Dedekind on 2017-03-28: Panel bidnings for app menus
2788. By Nick Dedekind on 2017-03-28: Fixed shortcuts parented to non QuickItems
2787. By Nick Dedekind on 2017-03-28: removed Unity.Debug import
2786. By Nick Dedekind on 2017-03-27: fixed surfaceManager in tstShell

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Nick Dedekind

Unity Team

 === modified file 'debian/control'
 --- debian/control	2017-03-20 10:19:11 +0000
 +++ debian/control	2017-03-31 15:02:41 +0000
@@ -40,7 +40,7 @@
                 libubuntugestures5-private-dev (>= 1.3.2030),
                 libudev-dev,
                 libudm-common-dev,
--               libunity-api-dev (>= 8.6),
++               libunity-api-dev (>= 8.7),
                 libusermetricsoutput1-dev,
  # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                 libx11-dev[!arm64 !armhf],
 === modified file 'debian/unity8.install'
 --- debian/unity8.install	2016-10-04 16:21:38 +0000
 +++ debian/unity8.install	2017-03-31 15:02:41 +0000
@@ -16,7 +16,12 @@
  usr/share/unity8/DeviceConfiguration.qml
  usr/share/unity8/OrientedShell.qml
  usr/share/unity8/DisabledScreenNotice.qml
++usr/share/unity8/ErrorApplication.qml
++usr/share/unity8/qmldir
  usr/share/unity8/Shell.qml
++usr/share/unity8/ShellApplication.qml
++usr/share/unity8/ShellNotifier.qml
++usr/share/unity8/ShellScreen.qml
  usr/share/unity8/Stage
  usr/share/unity8/Tutorial
  usr/share/unity8/Wizard
 === modified file 'plugins/Cursor/CMakeLists.txt'
 --- plugins/Cursor/CMakeLists.txt	2016-11-28 09:57:06 +0000
 +++ plugins/Cursor/CMakeLists.txt	2017-03-31 15:02:41 +0000
@@ -15,6 +15,7 @@
      CursorImageInfo.cpp
      CursorImageProvider.cpp
      MousePointer.cpp
++    InputDispatcherFilter.cpp
      # We need to run moc on this header
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h
+     )
 === added file 'plugins/Cursor/InputDispatcherFilter.cpp'
 --- plugins/Cursor/InputDispatcherFilter.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/Cursor/InputDispatcherFilter.cpp	2017-03-31 15:02:41 +0000
@@ -0,0 +1,175 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3, as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "InputDispatcherFilter.h"
++#include "MousePointer.h"
++
++#include <QEvent>
++#include <QGuiApplication>
++#include <QQuickWindow>
++#include <QScreen>
++#include <QtMath>
++#include <qpa/qplatformnativeinterface.h>
++#include <qpa/qplatformscreen.h>
++
++InputDispatcherFilter *InputDispatcherFilter::instance()
++{
++    static InputDispatcherFilter filter;
++    return &filter;
++}
++
++InputDispatcherFilter::InputDispatcherFilter(QObject *parent)
++    : QObject(parent)
++    , m_pushing(false)
++{
++    QPlatformNativeInterface *ni = QGuiApplication::platformNativeInterface();
++    m_inputDispatcher = static_cast<QObject*>(ni->nativeResourceForIntegration("InputDispatcher"));
++    if (m_inputDispatcher) {
++        m_inputDispatcher->installEventFilter(this);
++    }
++}
++
++void InputDispatcherFilter::registerPointer(MousePointer *pointer)
++{
++    // allow first registered pointer to be visible.
++    m_pointers.insert(pointer);
++}
++
++void InputDispatcherFilter::unregisterPointer(MousePointer *pointer)
++{
++    m_pointers.remove(pointer);
++}
++
++bool InputDispatcherFilter::eventFilter(QObject *o, QEvent *e)
++{
++    if (o != m_inputDispatcher) return false;
++
++    switch (e->type()) {
++        case QEvent::MouseMove:
++        case QEvent::MouseButtonPress:
++        case QEvent::MouseButtonRelease:
++        {
++            // if we don't have any pointers, filter all mouse events.
++            auto pointer = currentPointer();
++            if (!pointer) return true;
++
++            QMouseEvent* me = static_cast<QMouseEvent*>(e);
++
++            // Local position gives relative change of mouse pointer.
++            QPointF movement = me->localPos();
++
++            // Adjust the position
++            QPointF oldPos = pointer->window()->geometry().topLeft() + pointer->position();
++            QPointF newPos = adjustedPositionForMovement(oldPos, movement);
++
++            QScreen* currentScreen = screenAt(newPos);
++            if (currentScreen) {
++                QRect screenRect = currentScreen->geometry();
++                qreal newX = (oldPos + movement).x();
++                qreal newY = (oldPos + movement).y();
++
++                if (newX <= screenRect.left() && newY < screenRect.top() + pointer->topBoundaryOffset()) { // top left corner
++                    const auto distance = qSqrt(qPow(newX, 2) + qPow(newY- screenRect.top() - pointer->topBoundaryOffset(), 2));
++                    Q_EMIT pushedTopLeftCorner(currentScreen, qAbs(distance), me->buttons());
++                    m_pushing = true;
++                } else if (newX >= screenRect.right()-1 && newY < screenRect.top() + pointer->topBoundaryOffset()) { // top right corner
++                    const auto distance = qSqrt(qPow(newX-screenRect.right(), 2) + qPow(newY - screenRect.top() - pointer->topBoundaryOffset(), 2));
++                    Q_EMIT pushedTopRightCorner(currentScreen, qAbs(distance), me->buttons());
++                    m_pushing = true;
++                } else if (newX < 0 && newY >= screenRect.bottom()-1) { // bottom left corner
++                    const auto distance = qSqrt(qPow(newX, 2) + qPow(newY-screenRect.bottom(), 2));
++                    Q_EMIT pushedBottomLeftCorner(currentScreen, qAbs(distance), me->buttons());
++                    m_pushing = true;
++                } else if (newX >= screenRect.right()-1 && newY >= screenRect.bottom()-1) { // bottom right corner
++                    const auto distance = qSqrt(qPow(newX-screenRect.right(), 2) + qPow(newY-screenRect.bottom(), 2));
++                    Q_EMIT pushedBottomRightCorner(currentScreen, qAbs(distance), me->buttons());
++                    m_pushing = true;
++                } else if (newX <  screenRect.left()) { // left edge
++                    Q_EMIT pushedLeftBoundary(currentScreen, qAbs(newX), me->buttons());
++                    m_pushing = true;
++                } else if (newX >=  screenRect.right()) { // right edge
++                    Q_EMIT pushedRightBoundary(currentScreen, newX - (screenRect.right() - 1), me->buttons());
++                    m_pushing = true;
++                } else if (newY < screenRect.top() + pointer->topBoundaryOffset()) { // top edge
++                    Q_EMIT pushedTopBoundary(currentScreen, qAbs(newY - screenRect.top() - pointer->topBoundaryOffset()), me->buttons());
++                    m_pushing = true;
++                } else if (Q_LIKELY(newX > 0 && newX < screenRect.right()-1 && newY > 0 && newY < screenRect.bottom()-1)) { // normal pos, not pushing
++                    if (m_pushing) {
++                        Q_EMIT pushStopped(currentScreen);
++                        m_pushing = false;
++                    }
++                }
++            }
++
++            // Send the event
++            QMouseEvent eCopy(me->type(), me->localPos(), newPos, me->button(), me->buttons(), me->modifiers());
++            eCopy.setTimestamp(me->timestamp());
++            o->event(&eCopy);
++            return true;
++        }
++        default:
++            break;
++    }
++    return false;
++}
++
++QPointF InputDispatcherFilter::adjustedPositionForMovement(const QPointF &pt, const QPointF &movement) const
++{
++    QPointF adjusted = pt + movement;
++
++    auto screen = screenAt(adjusted); // first check if our move was to a screen with an enabled pointer.
++    if (screen) {
++        return adjusted;
++    } else if ((screen = screenAt(pt))) { // then check if our old position was valid
++        QRectF screenBounds = screen->geometry();
++        // bound the new position to the old screen geometry
++        adjusted.rx() = qMax(screenBounds.left(), qMin(adjusted.x(), screenBounds.right()-1));
++        adjusted.ry() = qMax(screenBounds.top(), qMin(adjusted.y(), screenBounds.bottom()-1));
++    } else {
++        auto screens = QGuiApplication::screens();
++
++        // center of first screen with a pointer.
++        Q_FOREACH(QScreen* screen, screens) {
++            Q_FOREACH(MousePointer* pointer, m_pointers) {
++                if (pointer->isEnabled() && pointer->screen() == screen) {
++                    return screen->geometry().center();
++                }
++            }
++        }
++    }
++    return adjusted;
++}
++
++QScreen *InputDispatcherFilter::screenAt(const QPointF &pt) const
++{
++    Q_FOREACH(MousePointer* pointer, m_pointers) {
++        if (!pointer->isEnabled()) continue;
++
++        QScreen* screen = pointer->screen();
++        if (screen && screen->geometry().contains(pt.toPoint()))
++            return screen;
++    }
++    return nullptr;
++}
++
++MousePointer *InputDispatcherFilter::currentPointer() const
++{
++    Q_FOREACH(MousePointer* pointer, m_pointers) {
++        if (!pointer->isEnabled()) continue;
++        return pointer;
++    }
++    return nullptr;
++}
 === added file 'plugins/Cursor/InputDispatcherFilter.h'
 --- plugins/Cursor/InputDispatcherFilter.h	1970-01-01 00:00:00 +0000
 +++ plugins/Cursor/InputDispatcherFilter.h	2017-03-31 15:02:41 +0000
@@ -0,0 +1,62 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3, as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef INPUTDISPATCHERFILTER_H
++#define INPUTDISPATCHERFILTER_H
++
++#include <QObject>
++#include <QPointF>
++#include <QSet>
++
++class MousePointer;
++class QScreen;
++
++class InputDispatcherFilter : public QObject
++{
++    Q_OBJECT
++public:
++    static InputDispatcherFilter *instance();
++
++    void registerPointer(MousePointer* pointer);
++    void unregisterPointer(MousePointer* pointer);
++
++Q_SIGNALS:
++    void pushedLeftBoundary(QScreen* screen, qreal amount, Qt::MouseButtons buttons);
++    void pushedRightBoundary(QScreen* screen, qreal amount, Qt::MouseButtons buttons);
++    void pushedTopBoundary(QScreen* screen, qreal amount, Qt::MouseButtons buttons);
++    void pushedTopLeftCorner(QScreen* screen, qreal amount, Qt::MouseButtons buttons);
++    void pushedTopRightCorner(QScreen* screen, qreal amount, Qt::MouseButtons buttons);
++    void pushedBottomLeftCorner(QScreen* screen, qreal amount, Qt::MouseButtons buttons);
++    void pushedBottomRightCorner(QScreen* screen, qreal amount, Qt::MouseButtons buttons);
++    void pushStopped(QScreen* screen);
++
++protected:
++    InputDispatcherFilter(QObject* parent = nullptr);
++
++    bool eventFilter(QObject *o, QEvent *e) override;
++
++    QPointF adjustedPositionForMovement(const QPointF& pt, const QPointF& movement) const;
++    QScreen* screenAt(const QPointF& pt) const;
++
++    MousePointer* currentPointer() const;
++
++private:
++    QObject* m_inputDispatcher;
++    QSet<MousePointer*> m_pointers;
++    bool m_pushing;
++};
++
++#endif // INPUTDISPATCHERFILTER_H
 === modified file 'plugins/Cursor/MousePointer.cpp'
 --- plugins/Cursor/MousePointer.cpp	2016-09-07 08:36:59 +0000
 +++ plugins/Cursor/MousePointer.cpp	2017-03-31 15:02:41 +0000
@@ -16,84 +16,74 @@
  #include "MousePointer.h"
  #include "CursorImageProvider.h"
++#include "InputDispatcherFilter.h"
++
++#include <QQuickWindow>
  // Unity API
  #include <unity/shell/application/MirPlatformCursor.h>
--#include <QQuickWindow>
--#include <QGuiApplication>
--#include <QtMath>
--
--#include <qpa/qwindowsysteminterface.h>
--
  MousePointer::MousePointer(QQuickItem *parent)
      : MirMousePointerInterface(parent)
      , m_cursorName(QStringLiteral("left_ptr"))
      , m_themeName(QStringLiteral("default"))
+ {
--}
--
--void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
--        Qt::KeyboardModifiers modifiers)
--{
--    if (!parentItem()) {
--        return;
--    }
--
--    if (!movement.isNull()) {
--        Q_EMIT mouseMoved();
--    }
--
--    m_accumulatedMovement += movement;
--    // don't apply the fractional part
--    QPointF appliedMovement(int(m_accumulatedMovement.x()), int(m_accumulatedMovement.y()));
--    m_accumulatedMovement -= appliedMovement;
--
--    qreal newX = x() + appliedMovement.x();
--    qreal newY = y() + appliedMovement.y();
--    const qreal sceneWidth = parentItem()->width();
--    const qreal sceneHeight = parentItem()->height();
--
--    if (newX <= 0 && newY < m_topBoundaryOffset) { // top left corner
--        const auto distance = qSqrt(qPow(newX, 2) + qPow(newY-m_topBoundaryOffset, 2));
--        Q_EMIT pushedTopLeftCorner(qAbs(distance), buttons);
--        m_pushing = true;
--    } else if (newX >= sceneWidth-1 && newY < m_topBoundaryOffset) { // top right corner
--        const auto distance = qSqrt(qPow(newX-sceneWidth, 2) + qPow(newY-m_topBoundaryOffset, 2));
--        Q_EMIT pushedTopRightCorner(qAbs(distance), buttons);
--        m_pushing = true;
--    } else if (newX < 0 && newY >= sceneHeight-1) { // bottom left corner
--        const auto distance = qSqrt(qPow(newX, 2) + qPow(newY-sceneHeight, 2));
--        Q_EMIT pushedBottomLeftCorner(qAbs(distance), buttons);
--        m_pushing = true;
--    } else if (newX >= sceneWidth-1 && newY >= sceneHeight-1) { // bottom right corner
--        const auto distance = qSqrt(qPow(newX-sceneWidth, 2) + qPow(newY-sceneHeight, 2));
--        Q_EMIT pushedBottomRightCorner(qAbs(distance), buttons);
--        m_pushing = true;
--    } else if (newX < 0) { // left edge
--        Q_EMIT pushedLeftBoundary(qAbs(newX), buttons);
--        m_pushing = true;
--    } else if (newX >= sceneWidth) { // right edge
--        Q_EMIT pushedRightBoundary(newX - (sceneWidth - 1), buttons);
--        m_pushing = true;
--    } else if (newY < m_topBoundaryOffset) { // top edge
--        Q_EMIT pushedTopBoundary(qAbs(newY - m_topBoundaryOffset), buttons);
--        m_pushing = true;
--    } else if (Q_LIKELY(newX > 0 && newX < sceneWidth-1 && newY > 0 && newY < sceneHeight-1)) { // normal pos, not pushing
--        if (m_pushing) {
++    connect(InputDispatcherFilter::instance(), &InputDispatcherFilter::pushedLeftBoundary,
++            this, [this](QScreen* screen, qreal amount, Qt::MouseButtons buttons) {
++        if (window() && window()->screen() == screen) {
++            Q_EMIT pushedLeftBoundary(amount, buttons);
++        }
++    });
++    connect(InputDispatcherFilter::instance(), &InputDispatcherFilter::pushedRightBoundary,
++            this, [this](QScreen* screen, qreal amount, Qt::MouseButtons buttons) {
++        if (window() && window()->screen() == screen) {
++            Q_EMIT pushedRightBoundary(amount, buttons);
++        }
++    });
++    connect(InputDispatcherFilter::instance(), &InputDispatcherFilter::pushedTopBoundary,
++            this, [this](QScreen* screen, qreal amount, Qt::MouseButtons buttons) {
++        if (window() && window()->screen() == screen) {
++            Q_EMIT pushedTopBoundary(amount, buttons);
++        }
++    });
++    connect(InputDispatcherFilter::instance(), &InputDispatcherFilter::pushedTopLeftCorner,
++            this, [this](QScreen* screen, qreal amount, Qt::MouseButtons buttons) {
++        if (window() && window()->screen() == screen) {
++            Q_EMIT pushedTopLeftCorner(amount, buttons);
++        }
++    });
++    connect(InputDispatcherFilter::instance(), &InputDispatcherFilter::pushedTopRightCorner,
++            this, [this](QScreen* screen, qreal amount, Qt::MouseButtons buttons) {
++        if (window() && window()->screen() == screen) {
++            Q_EMIT pushedTopRightCorner(amount, buttons);
++        }
++    });
++    connect(InputDispatcherFilter::instance(), &InputDispatcherFilter::pushedBottomLeftCorner,
++            this, [this](QScreen* screen, qreal amount, Qt::MouseButtons buttons) {
++        if (window() && window()->screen() == screen) {
++            Q_EMIT pushedBottomLeftCorner(amount, buttons);
++        }
++    });
++    connect(InputDispatcherFilter::instance(), &InputDispatcherFilter::pushedBottomRightCorner,
++            this, [this](QScreen* screen, qreal amount, Qt::MouseButtons buttons) {
++        if (window() && window()->screen() == screen) {
++            Q_EMIT pushedBottomRightCorner(amount, buttons);
++        }
++    });
++    connect(InputDispatcherFilter::instance(), &InputDispatcherFilter::pushStopped,
++            this, [this](QScreen* screen) {
++        if (window() && window()->screen() == screen) {
              Q_EMIT pushStopped();
--            m_pushing = false;
+         }
--    }
--
--    applyItemConfinement(newX, newY);
--
--    setX(qBound(0.0, newX, sceneWidth - 1));
--    setY(qBound(0.0, newY, sceneHeight - 1));
--
--    QPointF scenePosition = mapToItem(nullptr, QPointF(0, 0));
--    QWindowSystemInterface::handleMouseEvent(window(), timestamp, scenePosition /*local*/, scenePosition /*global*/,
--        buttons, modifiers);
++    });
++
++    InputDispatcherFilter::instance()->registerPointer(this);
++}
++
++MousePointer::~MousePointer()
++{
++    registerScreen(nullptr);
++    InputDispatcherFilter::instance()->unregisterPointer(this);
+ }
  void MousePointer::applyItemConfinement(qreal &newX, qreal &newY)
@@ -121,17 +111,6 @@
+     }
+ }
--void MousePointer::handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers)
--{
--    if (!parentItem()) {
--        return;
--    }
--
--    QPointF scenePosition = mapToItem(nullptr, QPointF(0, 0));
--    QWindowSystemInterface::handleWheelEvent(window(), timestamp, scenePosition /* local */, scenePosition /* global */,
--            QPoint() /* pixelDelta */, angleDelta, modifiers, Qt::ScrollUpdate);
--}
--
  int MousePointer::topBoundaryOffset() const
+ {
      return m_topBoundaryOffset;
@@ -182,7 +161,7 @@
      if (m_registeredScreen) {
          auto previousCursor = dynamic_cast<MirPlatformCursor*>(m_registeredScreen->handle()->cursor());
          if (previousCursor) {
--            previousCursor->setMousePointer(nullptr);
++            previousCursor->unregisterMousePointer(this);
          } else {
              qCritical("QPlatformCursor is not a MirPlatformCursor! Cursor module only works in a Mir server.");
+         }
@@ -193,7 +172,7 @@
      if (m_registeredScreen) {
          auto cursor = dynamic_cast<MirPlatformCursor*>(m_registeredScreen->handle()->cursor());
          if (cursor) {
--            cursor->setMousePointer(this);
++            cursor->registerMousePointer(this);
          } else {
              qCritical("QPlaformCursor is not a MirPlatformCursor! Cursor module only works in Mir.");
+         }
@@ -216,6 +195,12 @@
+     }
+ }
++void MousePointer::moveTo(const QPoint &position)
++{
++    setPosition(position);
++    Q_EMIT mouseMoved();
++}
++
  void MousePointer::setCustomCursor(const QCursor &customCursor)
+ {
      CursorImageProvider::instance()->setCustomCursor(customCursor);
 === modified file 'plugins/Cursor/MousePointer.h'
 --- plugins/Cursor/MousePointer.h	2016-09-07 08:36:59 +0000
 +++ plugins/Cursor/MousePointer.h	2017-03-31 15:02:41 +0000
@@ -31,6 +31,7 @@
      Q_PROPERTY(int topBoundaryOffset READ topBoundaryOffset WRITE setTopBoundaryOffset NOTIFY topBoundaryOffsetChanged)
  public:
      MousePointer(QQuickItem *parent = nullptr);
++    ~MousePointer();
      void setCursorName(const QString &qtCursorName) override;
      QString cursorName() const override { return m_cursorName; }
@@ -38,6 +39,8 @@
      void setThemeName(const QString &themeName) override;
      QString themeName() const override { return m_themeName; }
++    void moveTo(const QPoint& position) override;
++
      void setCustomCursor(const QCursor &) override;
      QQuickItem* confiningItem() const;
@@ -46,10 +49,7 @@
      int topBoundaryOffset() const;
      void setTopBoundaryOffset(int topBoundaryOffset);
--public Q_SLOTS:
--    void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
--            Qt::KeyboardModifiers modifiers) override;
--    void handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers) override;
++    QScreen* screen() const { return m_registeredScreen; }
  Q_SIGNALS:
      void pushedLeftBoundary(qreal amount, Qt::MouseButtons buttons);
@@ -79,6 +79,7 @@
      QPointer<QScreen> m_registeredScreen;
      QString m_cursorName;
      QString m_themeName;
++    bool m_active;
      // Accumulated, unapplied, mouse movement.
      QPointF m_accumulatedMovement;
 === modified file 'plugins/GlobalShortcut/globalshortcut.cpp'
 --- plugins/GlobalShortcut/globalshortcut.cpp	2016-12-14 13:15:06 +0000
 +++ plugins/GlobalShortcut/globalshortcut.cpp	2017-03-31 15:02:41 +0000
@@ -56,11 +56,6 @@
      Q_EMIT activeChanged(active);
+ }
--void GlobalShortcut::componentComplete()
--{
--    connect(this, &QQuickItem::windowChanged, this, &GlobalShortcut::setupFilterOnWindow);
--}
--
  void GlobalShortcut::keyPressEvent(QKeyEvent * event)
+ {
      if (!m_active) return;
@@ -76,13 +71,3 @@
      event->accept();
      Q_EMIT released(m_shortcut.toString());
+ }
--
--void GlobalShortcut::setupFilterOnWindow(QQuickWindow *window)
--{
--    if (!window) {
--//        qWarning() << Q_FUNC_INFO << "Failed to setup filter on window";
--        return;
--    }
--
--    registry->setupFilterOnWindow((qulonglong) window->winId());
--}
 === modified file 'plugins/GlobalShortcut/globalshortcut.h'
 --- plugins/GlobalShortcut/globalshortcut.h	2016-10-12 17:11:41 +0000
 +++ plugins/GlobalShortcut/globalshortcut.h	2017-03-31 15:02:41 +0000
@@ -53,7 +53,6 @@
      void setActive(bool active);
  protected:
--    void componentComplete() override;
      void keyPressEvent(QKeyEvent * event) override;
      void keyReleaseEvent(QKeyEvent * event) override;
@@ -69,9 +68,6 @@
      void released(const QString &shortcut);
      void activeChanged(bool active);
--private Q_SLOTS:
--    void setupFilterOnWindow(QQuickWindow* window);
--
  private:
      QVariant m_shortcut;
      bool m_active = true;
 === modified file 'plugins/GlobalShortcut/globalshortcutregistry.cpp'
 --- plugins/GlobalShortcut/globalshortcutregistry.cpp	2016-10-12 17:11:41 +0000
 +++ plugins/GlobalShortcut/globalshortcutregistry.cpp	2017-03-31 15:02:41 +0000
@@ -21,11 +21,25 @@
  #include "globalshortcutregistry.h"
--static qulonglong s_windowId = 0;
++namespace {
++QWindow* windowForShortcut(GlobalShortcut *sc) {
++    QObject* parent= sc;
++    while(parent) {
++        if (auto item = qobject_cast<QQuickItem*>(parent)) {
++            auto window = item->window();
++            if (window) return window;
++        }
++        parent = parent->parent();
++    }
++    return nullptr;
++}
++} // namespace
  GlobalShortcutRegistry::GlobalShortcutRegistry(QObject *parent)
      : QObject(parent)
+ {
++    connect(qGuiApp, &QGuiApplication::focusWindowChanged, this, &GlobalShortcutRegistry::setupFilterOnWindow);
++    setupFilterOnWindow(qGuiApp->focusWindow());
+ }
  GlobalShortcutList GlobalShortcutRegistry::shortcuts() const
@@ -91,7 +105,10 @@
              const auto shortcuts = m_shortcuts.value(seq);
              Q_FOREACH(const auto &shortcut, shortcuts) {
                  if (shortcut) {
--                    qApp->sendEvent(shortcut, &eCopy);
++                    auto window = windowForShortcut(shortcut);
++                    if (!window || window == obj) { // accept shortcut if it's not attached to a window or it's window is active.
++                        qApp->sendEvent(shortcut, &eCopy);
++                    }
+                 }
+             }
+         }
@@ -102,24 +119,15 @@
      return QObject::eventFilter(obj, event);
+ }
--void GlobalShortcutRegistry::setupFilterOnWindow(qulonglong wid)
++void GlobalShortcutRegistry::setupFilterOnWindow(QWindow* window)
+ {
--    if (wid == s_windowId) {
--        return;
--    }
--
      if (m_filteredWindow) {
          m_filteredWindow->removeEventFilter(this);
          m_filteredWindow.clear();
--        s_windowId = 0;
+     }
--    Q_FOREACH(QWindow *window, qApp->allWindows()) {
--        if (window && window->winId() == wid) {
--            m_filteredWindow = window;
--            window->installEventFilter(this);
--            s_windowId = wid;
--            break;
--        }
++    if (window) {
++        m_filteredWindow = window;
++        window->installEventFilter(this);
+     }
+ }
 === modified file 'plugins/GlobalShortcut/globalshortcutregistry.h'
 --- plugins/GlobalShortcut/globalshortcutregistry.h	2015-08-25 11:05:38 +0000
 +++ plugins/GlobalShortcut/globalshortcutregistry.h	2017-03-31 15:02:41 +0000
@@ -52,9 +52,9 @@
      void addShortcut(const QVariant &seq, GlobalShortcut * sc);
      /**
--     * Sets up key events filtering on window @p wid
++     * Sets up key events filtering on window @p window
       */
--    void setupFilterOnWindow(qulonglong wid);
++    void setupFilterOnWindow(QWindow* window);
  protected:
      bool eventFilter(QObject *obj, QEvent *event) override;
 === modified file 'plugins/UInput/plugin.cpp'
 --- plugins/UInput/plugin.cpp	2015-11-11 16:03:24 +0000
 +++ plugins/UInput/plugin.cpp	2017-03-31 15:02:41 +0000
@@ -19,8 +19,14 @@
  #include <QtQml/qqml.h>
++
++QObject* uinputSingleton(QQmlEngine*, QJSEngine*)
++{
++    return new UInput;
++}
++
  void UInputPlugin::registerTypes(const char *uri)
+ {
      Q_ASSERT(uri == QLatin1String("UInput"));
--    qmlRegisterType<UInput>(uri, 0, 1, "UInput");
++    qmlRegisterSingletonType<UInput>(uri, 0, 1, "UInput", uinputSingleton);
+ }
 === modified file 'qml/ApplicationMenus/ApplicationMenuItemFactory.qml'
 --- qml/ApplicationMenus/ApplicationMenuItemFactory.qml	2016-11-28 16:32:56 +0000
 +++ qml/ApplicationMenus/ApplicationMenuItemFactory.qml	2017-03-31 15:02:41 +0000
@@ -45,7 +45,7 @@
              Action {
                  id: action
--                text: menuData.label.replace("_", "&")
++                text: menuData && menuData.label.replace("_", "&") || ""
+             }
              ListItemLayout {
@@ -59,8 +59,8 @@
+                 }
                  Label {
--                    text: menuData.shortcut
--                    visible: menuData.shortcut && QuickUtils.keyboardAttached
++                    text: menuData && menuData.shortcut || ""
++                    visible: menuData && menuData.shortcut && QuickUtils.keyboardAttached
                      SlotsLayout.position: SlotsLayout.Trailing
                      color: enabled ? theme.palette.normal.backgroundSecondaryText :
                                       theme.palette.disabled.backgroundSecondaryText
@@ -86,7 +86,7 @@
              Action {
                  id: action
--                text: menuData.label.replace("_", "&")
++                text: menuData && menuData.label.replace("_", "&") || ""
+             }
              ListItemLayout {
 === modified file 'qml/ApplicationMenus/MenuBar.qml'
 --- qml/ApplicationMenus/MenuBar.qml	2017-03-28 21:47:53 +0000
 +++ qml/ApplicationMenus/MenuBar.qml	2017-03-31 15:02:41 +0000
@@ -19,6 +19,7 @@
  import Utils 0.1
  import Ubuntu.Components 1.3
  import GlobalShortcut 1.0
++import "../Components/PanelState"
  Item {
      id: root
@@ -29,6 +30,7 @@
      property bool enableKeyFilter: false
      property real overflowWidth: width
      property bool windowMoving: false
++    property PanelState panelState
      // read from outside
      readonly property bool valid: rowRepeater.count > 0
@@ -106,7 +108,9 @@
          Component {
              id: menuComponent
--            MenuPopup { }
++            MenuPopup {
++                panelState: root.panelState
++            }
+         }
          Repeater {
 === modified file 'qml/ApplicationMenus/MenuItem.qml'
 --- qml/ApplicationMenus/MenuItem.qml	2017-02-23 13:19:41 +0000
 +++ qml/ApplicationMenus/MenuItem.qml	2017-03-31 15:02:41 +0000
@@ -17,6 +17,7 @@
  import QtQuick 2.4
  import QtQuick.Layouts 1.1
  import Ubuntu.Components 1.3
++import "../Components/PanelState"
  ActionItem {
      id: root
@@ -24,6 +25,7 @@
      implicitWidth: requiredWidth
      property var menuData: undefined
++    property PanelState panelState
      readonly property real requiredWidth: {
          var val = 0;
 === modified file 'qml/ApplicationMenus/MenuPopup.qml'
 --- qml/ApplicationMenus/MenuPopup.qml	2017-03-24 08:29:56 +0000
 +++ qml/ApplicationMenus/MenuPopup.qml	2017-03-31 15:02:41 +0000
@@ -64,6 +64,7 @@
+     }
      property alias unityMenuModel: repeater.model
++    property PanelState panelState
      function show() {
          visible = true;
@@ -103,7 +104,7 @@
          property real __minimumWidth: units.gu(20)
          property real __maximumWidth: ApplicationMenusLimits.screenWidth * 0.7
          property real __minimumHeight: units.gu(2)
--        property real __maximumHeight: ApplicationMenusLimits.screenHeight - PanelState.panelHeight
++        property real __maximumHeight: ApplicationMenusLimits.screenHeight - panelState.panelHeight
          signal dismissAll()
@@ -293,6 +294,7 @@
                          // Parent will be loader
                          id: menuItem
                          menuData: parent.__menuData
++                        panelState: root.panelState
                          objectName: parent.objectName + "-actionItem"
                          width: MathUtils.clamp(implicitWidth, d.__minimumWidth, d.__maximumWidth)
@@ -492,6 +494,7 @@
                  onLoaded: {
                      item.unityMenuModel = Qt.binding(function() { return submenuLoader.unityMenuModel; });
++                    item.panelState = Qt.binding(function() { return root.panelState; });
                      item.objectName = Qt.binding(function() { return submenuLoader.objectName + "menu"; });
                      item.desiredX = Qt.binding(function() { return submenuLoader.desiredX; });
                      item.desiredY = Qt.binding(function() { return submenuLoader.desiredY; });
 === modified file 'qml/CMakeLists.txt'
 --- qml/CMakeLists.txt	2016-10-04 16:21:38 +0000
 +++ qml/CMakeLists.txt	2017-03-31 15:02:41 +0000
@@ -1,4 +1,4 @@
--file(GLOB QML_JS_FILES *.qml *.js)
++file(GLOB QML_JS_FILES *.qml *.js qmldir)
  install(FILES ${QML_JS_FILES}
      DESTINATION ${SHELL_APP_DIR}
 === modified file 'qml/Components/PanelState/PanelState.qml'
 --- qml/Components/PanelState/PanelState.qml	2016-09-29 09:15:04 +0000
 +++ qml/Components/PanelState/PanelState.qml	2017-03-31 15:02:41 +0000
@@ -14,7 +14,6 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--pragma Singleton
  import QtQuick 2.4
  QtObject {
 === modified file 'qml/Components/PanelState/qmldir'
 --- qml/Components/PanelState/qmldir	2014-11-24 11:21:38 +0000
 +++ qml/Components/PanelState/qmldir	2017-03-31 15:02:41 +0000
@@ -1,1 +1,1 @@
--singleton PanelState 1.0 PanelState.qml
++PanelState 1.0 PanelState.qml
 === modified file 'qml/Components/VirtualTouchPad.qml'
 --- qml/Components/VirtualTouchPad.qml	2016-12-05 11:17:15 +0000
 +++ qml/Components/VirtualTouchPad.qml	2017-03-31 15:02:41 +0000
@@ -24,16 +24,14 @@
  Item {
      id: root
--    property var uinput: UInput {
--        Component.onCompleted: createMouse();
--        Component.onDestruction: removeMouse();
--    }
      Component.onCompleted: {
++        UInput.createMouse();
          if (!settings.touchpadTutorialHasRun) {
              root.runTutorial()
+         }
+     }
++    Component.onDestruction: UInput.removeMouse()
      function runTutorial() {
          // If the tutorial animation is started too early, e.g. in Component.onCompleted,
@@ -85,7 +83,7 @@
              if (((point1.pressed && !point2.pressed) || (!point1.pressed && point2.pressed))
                      && clickTimer.running) {
                  clickTimer.stop();
--                uinput.pressMouse(UInput.ButtonLeft)
++                UInput.pressMouse(UInput.ButtonLeft)
                  isDoubleClick = true;
+             }
              isClick = true;
@@ -104,7 +102,7 @@
          onReleased: {
              if (isDoubleClick || isDrag) {
--                uinput.releaseMouse(UInput.ButtonLeft)
++                UInput.releaseMouse(UInput.ButtonLeft)
                  isDoubleClick = false;
+             }
              if (isClick) {
@@ -120,8 +118,8 @@
              interval: 200
              property int button: UInput.ButtonLeft
              onTriggered: {
--                uinput.pressMouse(button);
--                uinput.releaseMouse(button);
++                UInput.pressMouse(button);
++                UInput.releaseMouse(button);
+             }
              function scheduleClick(button) {
                  clickTimer.button = button;
@@ -138,7 +136,7 @@
                  isDrag = true;
+             }
--            uinput.moveMouse(tp.x - tp.previousX, tp.y - tp.previousY);
++            UInput.moveMouse(tp.x - tp.previousX, tp.y - tp.previousY);
+         }
          function scroll(touchPoints) {
@@ -166,7 +164,7 @@
              dh /= 2;
              dv /= 2;
--            uinput.scrollMouse(dh, dv);
++            UInput.scrollMouse(dh, dv);
+         }
          touchPoints: [
@@ -189,8 +187,8 @@
              objectName: "leftButton"
              Layout.fillWidth: true
              Layout.fillHeight: true
--            onPressed: uinput.pressMouse(UInput.ButtonLeft);
--            onReleased: uinput.releaseMouse(UInput.ButtonLeft);
++            onPressed: UInput.pressMouse(UInput.ButtonLeft);
++            onReleased: UInput.releaseMouse(UInput.ButtonLeft);
              property bool highlight: false
              UbuntuShape {
                  anchors.fill: parent
@@ -204,8 +202,8 @@
              objectName: "rightButton"
              Layout.fillWidth: true
              Layout.fillHeight: true
--            onPressed: uinput.pressMouse(UInput.ButtonRight);
--            onReleased: uinput.releaseMouse(UInput.ButtonRight);
++            onPressed: UInput.pressMouse(UInput.ButtonRight);
++            onReleased: UInput.releaseMouse(UInput.ButtonRight);
              property bool highlight: false
              UbuntuShape {
                  anchors.fill: parent
@@ -239,14 +237,10 @@
+         }
+     }
--    Screens {
--        id: screens
--    }
--
      InputMethod {
          id: inputMethod
          // Don't resize when there is only one screen to avoid resize clashing with the InputMethod in the Shell.
--        enabled: screens.count > 1 && settings.oskEnabled && !tutorial.running
++        enabled: Screens.count > 1 && settings.oskEnabled && !tutorial.running
          objectName: "inputMethod"
          anchors.fill: parent
+     }
 === modified file 'qml/DisabledScreenNotice.qml'
 --- qml/DisabledScreenNotice.qml	2016-08-01 17:43:18 +0000
 +++ qml/DisabledScreenNotice.qml	2017-03-31 15:02:41 +0000
@@ -28,8 +28,9 @@
      property var screen: Screen
      property var orientationLock: OrientationLock
++    property alias deviceConfiguration: _deviceConfiguration
      DeviceConfiguration {
--        id: deviceConfiguration
++        id: _deviceConfiguration
          name: applicationArguments.deviceName
+     }
 === added file 'qml/ErrorApplication.qml'
 --- qml/ErrorApplication.qml	1970-01-01 00:00:00 +0000
 +++ qml/ErrorApplication.qml	2017-03-31 15:02:41 +0000
@@ -0,0 +1,67 @@
++/*
++* Copyright (C) 2017 Canonical, Ltd.
++*
++* This program is free software; you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation; version 3.
++*
++* This program is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with this program.  If not, see <http://www.gnu.org/licenses/>.
++*/
++
++import QtQuick 2.4
++import QtQuick.Window 2.2
++import Ubuntu.Components 1.3
++import Unity.Screens 0.1
++
++Instantiator {
++    id: root
++    model: Screens
++
++    ScreenWindow {
++        id: window
++        objectName: "screen"+index
++        screen: model.screen
++        visibility:  applicationArguments.hasFullscreen ? Window.FullScreen : Window.Windowed
++        flags: applicationArguments.hasFrameless ? Qt.FramelessWindowHint : 0
++
++        Binding {
++            when: applicationArguments.hasGeometry
++            target: window
++            property: "width"
++            value: applicationArguments.windowGeometry.width
++        }
++        Binding {
++            when: applicationArguments.hasGeometry
++            target: window
++            property: "height"
++            value: applicationArguments.windowGeometry.height
++        }
++
++        Loader {
++            width: window.width
++            height: window.height
++
++            Rectangle {
++                color: "white"
++                Column {
++                    spacing: units.gu(1)
++
++                    Label {
++                        text: "Unity encountered an unrecoverable error while loading:"
++                        fontSize: "large"
++                    }
++
++                    Label {
++                        text: errorString
++                    }
++                }
++            }
++        }
++    }
++}
 === modified file 'qml/Greeter/Greeter.qml'
 --- qml/Greeter/Greeter.qml	2017-03-22 20:14:44 +0000
 +++ qml/Greeter/Greeter.qml	2017-03-31 15:02:41 +0000
@@ -24,6 +24,7 @@
  import Unity.Session 0.1
  import "." 0.1
++import ".." 0.1
  import "../Components"
  Showable {
@@ -225,7 +226,7 @@
              if (forcedUnlock && shown) {
                  hideView();
                  if (hideNow) {
--                    root.hideNow(); // skip hide animation
++                    ShellNotifier.greeter.hide(true); // skip hide animation
+                 }
+             }
+         }
@@ -373,7 +374,7 @@
              onEmergencyCall: root.emergencyCall()
              onRequiredChanged: {
                  if (!loader.item.required) {
--                    root.hide();
++                    ShellNotifier.greeter.hide(false);
+                 }
+             }
+         }
@@ -488,11 +489,28 @@
+     }
      Connections {
++        target: ShellNotifier.greeter
++        onHide: {
++            if (now) {
++                root.hideNow(); // skip hide animation
++            } else {
++                root.hide();
++            }
++        }
++    }
++
++    Binding {
++        target: ShellNotifier.greeter
++        property: "shown"
++        value: root.shown
++    }
++
++    Connections {
          target: DBusUnitySessionService
          onLockRequested: root.forceShow()
          onUnlocked: {
              root.forcedUnlock = true;
--            root.hideNow();
++            ShellNotifier.greeter.hide(true);
+         }
+     }
 === added file 'qml/Greeter/SecondaryGreeter.qml'
 --- qml/Greeter/SecondaryGreeter.qml	1970-01-01 00:00:00 +0000
 +++ qml/Greeter/SecondaryGreeter.qml	2017-03-31 15:02:41 +0000
@@ -0,0 +1,75 @@
++/*
++ * Copyright (C)  2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import Ubuntu.Components 1.3
++
++import "../Components"
++import ".." 0.1
++
++Showable {
++    id: root
++
++    readonly property bool active: required || hasLockedApp
++
++    readonly property bool hasLockedApp: lockedApp !== ""
++    readonly property bool locked: false
++    readonly property bool waiting: false
++    readonly property bool fullyShown: shown
++
++    property string lockedApp: ""
++
++    function forceShow() { show(); }
++    property var notifyAppFocusRequested: (function(appId) { return; })
++    property var notifyUserRequestedApp: (function(appId) { return; })
++    property var notifyShowingDashFromDrag: (function(appId) { return false; })
++
++    showAnimation: StandardAnimation { property: "opacity"; to: 1 }
++    hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
++
++    shown: ShellNotifier.greeter.shown
++    Component.onCompleted: opacity = shown ? 1 : 0
++    visible: opacity != 0
++
++    Rectangle {
++        anchors.fill: parent
++        color: UbuntuColors.purple
++    }
++
++    MouseArea {
++        anchors.fill: parent
++        acceptedButtons: Qt.AllButtons
++        onWheel: wheel.accepted = true
++    }
++
++    Connections {
++        target: ShellNotifier.greeter
++        onHide: {
++            if (now) {
++                root.hideNow(); // skip hide animation
++            } else {
++                root.hide();
++            }
++        }
++        onShownChanged: {
++            if (ShellNotifier.greeter.shown) {
++                root.show();
++            } else {
++                root.hide();
++            }
++        }
++    }
++}
 === modified file 'qml/OrientedShell.qml'
 --- qml/OrientedShell.qml	2017-03-21 10:51:57 +0000
 +++ qml/OrientedShell.qml	2017-03-31 15:02:41 +0000
@@ -32,15 +32,17 @@
      implicitWidth: units.gu(40)
      implicitHeight: units.gu(71)
++    property alias deviceConfiguration: _deviceConfiguration
++    property alias orientations: d.orientations
++    property alias surfaceManager: shell.surfaceManager
++
      onWidthChanged: calculateUsageMode();
      DeviceConfiguration {
--        id: deviceConfiguration
++        id: _deviceConfiguration
          name: applicationArguments.deviceName
+     }
--    property alias orientations: d.orientations
--
      Item {
          id: d
@@ -157,10 +159,6 @@
          return false;
+     }
--    Screens {
--        id: screens
--    }
--
      property int orientation
      onPhysicalOrientationChanged: {
          if (!orientationLocked) {
 === modified file 'qml/Panel/Panel.qml'
 --- qml/Panel/Panel.qml	2017-03-21 10:55:52 +0000
 +++ qml/Panel/Panel.qml	2017-03-31 15:02:41 +0000
@@ -48,6 +48,7 @@
      property bool hasKeyboard: false
      property string mode: "staged"
++    property PanelState panelState
      MouseArea {
          id: backMouseEater
@@ -64,14 +65,14 @@
+     }
      Binding {
--        target: PanelState
++        target: panelState
          property: "panelHeight"
          value: minimizedPanelHeight
+     }
      RegisteredApplicationMenuModel {
          id: registeredMenuModel
--        persistentSurfaceId: PanelState.focusedPersistentSurfaceId
++        persistentSurfaceId: panelState.focusedPersistentSurfaceId
+     }
      QtObject {
@@ -82,11 +83,11 @@
                                        !indicators.shown &&
                                        (decorationMouseArea.containsMouse || menuBarLoader.menusRequested)
--        property bool showWindowDecorationControls: (revealControls && PanelState.decorationsVisible) ||
--                                                    PanelState.decorationsAlwaysVisible
++        property bool showWindowDecorationControls: (revealControls && panelState.decorationsVisible) ||
++                                                    panelState.decorationsAlwaysVisible
          property bool showPointerMenu: revealControls &&
--                                       (PanelState.decorationsVisible || mode == "staged")
++                                       (panelState.decorationsVisible || mode == "staged")
          property bool enablePointerMenu: revealControls &&
                                           applicationMenus.available &&
@@ -138,7 +139,7 @@
                  fill: panelAreaBackground
                  bottomMargin: -units.gu(1)
+             }
--            visible: PanelState.dropShadow
++            visible: panelState.dropShadow
              source: "graphics/rectangular_dropshadow.sci"
+         }
@@ -195,12 +196,12 @@
                      visible: opacity != 0
                      Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
--                    active: PanelState.decorationsVisible || PanelState.decorationsAlwaysVisible
++                    active: panelState.decorationsVisible || panelState.decorationsAlwaysVisible
                      windowIsMaximized: true
--                    onCloseClicked: PanelState.closeClicked()
--                    onMinimizeClicked: PanelState.minimizeClicked()
--                    onMaximizeClicked: PanelState.restoreClicked()
--                    closeButtonShown: PanelState.closeButtonShown
++                    onCloseClicked: panelState.closeClicked()
++                    onMinimizeClicked: panelState.minimizeClicked()
++                    onMaximizeClicked: panelState.restoreClicked()
++                    closeButtonShown: panelState.closeButtonShown
+                 }
                  Loader {
@@ -220,11 +221,12 @@
                      sourceComponent: MenuBar {
                          id: bar
                          objectName: "menuBar"
--                        anchors.left: parent.left
++                        anchors.left: menuBarLoader.left
                          anchors.margins: units.gu(1)
                          height: menuBarLoader.height
--                        enableKeyFilter: valid && PanelState.decorationsVisible
++                        enableKeyFilter: valid && panelState.decorationsVisible
                          unityMenuModel: __applicationMenus.model
++                        panelState: root.panelState
                          Connections {
                              target: __applicationMenus
@@ -236,7 +238,7 @@
                              onShownChanged: bar.dismiss();
+                         }
--                        onDoubleClicked: PanelState.restoreClicked()
++                        onDoubleClicked: panelState.restoreClicked()
                          onPressed: mouse.accepted = false // let the parent mouse area handle this, so it can both unsnap window and show menu
+                     }
+                 }
@@ -343,7 +345,7 @@
              opacity: __applicationMenus.visible && !__applicationMenus.expanded ? 1 : 0
              visible: opacity != 0
              Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration } }
--            text: PanelState.title
++            text: panelState.title
+         }
          PanelMenu {
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2017-03-24 14:04:50 +0000
 +++ qml/Shell.qml	2017-03-31 15:02:41 +0000
@@ -1,4 +1,4 @@
--/*
++/*
   * Copyright (C) 2013-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
@@ -38,6 +38,7 @@
  import "Stage"
  import "Tutorial"
  import "Wizard"
++import "Components/PanelState"
  import Unity.Notifications 1.0 as NotificationBackend
  import Unity.Session 0.1
  import Unity.DashCommunicator 0.1
@@ -52,6 +53,7 @@
      theme.name: "Ubuntu.Components.Themes.SuruDark"
      // to be set from outside
++    property alias surfaceManager: topLevelSurfaceList.surfaceManager
      property int orientationAngle: 0
      property int orientation
      property Orientations orientations
@@ -267,21 +269,21 @@
          schema.id: "com.canonical.Unity8"
+     }
++    PanelState {
++        id: panelState
++        objectName: "panelState"
++    }
++
      Item {
          id: stages
          objectName: "stages"
          width: parent.width
          height: parent.height
--        SurfaceManager {
--            id: surfaceMan
--            objectName: "surfaceManager"
--        }
          TopLevelWindowModel {
              id: topLevelSurfaceList
              objectName: "topLevelSurfaceList"
              applicationManager: ApplicationManager // it's a singleton
--            surfaceManager: surfaceMan
+         }
          Stage {
@@ -323,6 +325,7 @@
              altTabPressed: physicalKeysMapper.altTabPressed
              oskEnabled: shell.oskEnabled
              spreadEnabled: tutorial.spreadEnabled && (!greeter || (!greeter.hasLockedApp && !greeter.shown))
++            panelState: panelState
              onSpreadShownChanged: {
                  panel.indicators.hide();
@@ -377,8 +380,13 @@
          objectName: "greeterLoader"
          anchors.fill: parent
          anchors.topMargin: panel.panelHeight
--        sourceComponent: shell.mode != "shell" ? integratedGreeter :
--            Qt.createComponent(Qt.resolvedUrl("Greeter/ShimGreeter.qml"));
++        sourceComponent: {
++            if (shell.mode != "shell") {
++                if (screenWindow.primary) return integratedGreeter;
++                return secondaryGreeter;
++            }
++            return Qt.createComponent(Qt.resolvedUrl("Greeter/ShimGreeter.qml"));
++        }
          onLoaded: {
              item.objectName = "greeter"
+         }
@@ -428,6 +436,13 @@
+         }
+     }
++    Component {
++        id: secondaryGreeter
++        SecondaryGreeter {
++            hides: [launcher, panel.indicators]
++        }
++    }
++
      Timer {
          // See powerConnection for why this is useful
          id: showGreeterDelayed
@@ -545,6 +560,7 @@
                              || greeter.hasLockedApp
              greeterShown: greeter && greeter.shown
              hasKeyboard: shell.hasKeyboard
++            panelState: panelState
+         }
          Launcher {
@@ -793,11 +809,11 @@
      Cursor {
          id: cursor
          objectName: "cursor"
--        visible: shell.hasMouse
++
          z: itemGrabber.z + 1
          topBoundaryOffset: panel.panelHeight
--
--        confiningItem: stage.itemConfiningMouseCursor
++        enabled: shell.hasMouse && screenWindow.active
++        visible: enabled
          property bool mouseNeverMoved: true
          Binding {
@@ -809,6 +825,8 @@
              when: cursor.mouseNeverMoved && cursor.visible
+         }
++        confiningItem: stage.itemConfiningMouseCursor
++
          height: units.gu(3)
          readonly property var previewRectangle: stage.previewRectangle.target &&
 === added file 'qml/ShellApplication.qml'
 --- qml/ShellApplication.qml	1970-01-01 00:00:00 +0000
 +++ qml/ShellApplication.qml	2017-03-31 15:02:41 +0000
@@ -0,0 +1,52 @@
++/*
++* Copyright (C) 2016 Canonical, Ltd.
++*
++* This program is free software; you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation; version 3.
++*
++* This program is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with this program.  If not, see <http://www.gnu.org/licenses/>.
++*/
++
++import QtQuick 2.4
++import QtQuick.Window 2.2
++import Unity.Screens 0.1
++import Unity.Application 0.1
++
++Instantiator {
++    id: root
++    model: Screens
++
++    property QtObject surfaceMan: SurfaceManager {}
++
++    ShellScreen {
++        id: window
++        objectName: "screen"+index
++        screen: model.screen
++        visibility:  applicationArguments.hasFullscreen ? Window.FullScreen : Window.Windowed
++        flags: applicationArguments.hasFrameless ? Qt.FramelessWindowHint : 0
++        surfaceManager: surfaceMan
++
++        Binding {
++            when: applicationArguments.hasGeometry
++            target: window
++            property: "width"
++            value: applicationArguments.windowGeometry.width
++        }
++        Binding {
++            when: applicationArguments.hasGeometry
++            target: window
++            property: "height"
++            value: applicationArguments.windowGeometry.height
++        }
++
++        Component.onCompleted: screen.active = primary
++        primary: index == 0
++    }
++}
 === added file 'qml/ShellNotifier.qml'
 --- qml/ShellNotifier.qml	1970-01-01 00:00:00 +0000
 +++ qml/ShellNotifier.qml	2017-03-31 15:02:41 +0000
@@ -0,0 +1,30 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++/*
++    Shared signals & properties on multi-window desktop
++ */
++
++pragma Singleton
++import QtQuick 2.4
++
++QtObject {
++    property var greeter: QtObject {
++        signal hide(bool now)
++
++        property bool shown: true
++    }
++}
 === added file 'qml/ShellScreen.qml'
 --- qml/ShellScreen.qml	1970-01-01 00:00:00 +0000
 +++ qml/ShellScreen.qml	2017-03-31 15:02:41 +0000
@@ -0,0 +1,66 @@
++/*
++* Copyright (C) 2016 Canonical, Ltd.
++*
++* This program is free software; you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation; version 3.
++*
++* This program is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with this program.  If not, see <http://www.gnu.org/licenses/>.
++*/
++
++import QtQuick 2.4
++import Ubuntu.Components 1.3
++import Unity.Screens 0.1
++import Cursor 1.1
++import "Components"
++
++ScreenWindow {
++    id: screenWindow
++
++    color: "black"
++    title: "Unity8 Shell"
++    property bool primary: false
++    property QtObject surfaceManager: null
++
++    DeviceConfiguration {
++        id: deviceConfiguration
++        name: applicationArguments.deviceName
++    }
++
++    Loader {
++        id: loader
++        width: screenWindow.width
++        height: screenWindow.height
++
++        sourceComponent: {
++            if (Screens.count > 1 && primary && deviceConfiguration.category !== "desktop") {
++                return disabledScreenComponent;
++            }
++            return shellComponent;
++        }
++    }
++
++    Component {
++        id: shellComponent
++        OrientedShell {
++            implicitWidth: screenWindow.width
++            implicitHeight: screenWindow.height
++            surfaceManager: screenWindow.surfaceManager
++
++            deviceConfiguration {
++                name: Screens.count > 1 ? "desktop" : applicationArguments.deviceName
++            }
++        }
++    }
++
++    Component {
++        id: disabledScreenComponent
++        DisabledScreenNotice {}
++    }
++}
 === modified file 'qml/Stage/DecoratedWindow.qml'
 --- qml/Stage/DecoratedWindow.qml	2017-03-24 14:04:50 +0000
 +++ qml/Stage/DecoratedWindow.qml	2017-03-31 15:02:41 +0000
@@ -38,6 +38,7 @@
      property alias maximizeButtonShown: decoration.maximizeButtonShown
      property alias interactive: applicationWindow.interactive
      readonly property alias orientationChangesEnabled: applicationWindow.orientationChangesEnabled
++    property PanelState panelState
      // Changing this will actually add/remove a decoration, meaning, requestedHeight will take the decoration into account.
      property bool hasDecoration: true
@@ -218,6 +219,7 @@
          title: applicationWindow.title
          windowMoving: moveHandler.moving && !altDragHandler.dragging
++        panelState: root.panelState
          opacity: root.hasDecoration ? Math.min(1, root.showDecoration) : 0
          Behavior on opacity { UbuntuNumberAnimation { } }
@@ -241,7 +243,7 @@
          enableMenus: {
              return active &&
                       surface &&
--                      (PanelState.focusedPersistentSurfaceId === surface.persistentId && !PanelState.decorationsVisible)
++                      (panelState.focusedPersistentSurfaceId === surface.persistentId && !panelState.decorationsVisible)
+         }
          menu: sharedAppModel.model
 === modified file 'qml/Stage/FakeMaximizeDelegate.qml'
 --- qml/Stage/FakeMaximizeDelegate.qml	2016-11-30 19:24:02 +0000
 +++ qml/Stage/FakeMaximizeDelegate.qml	2017-03-31 15:02:41 +0000
@@ -35,6 +35,7 @@
      property int leftMargin
      property real appContainerWidth
      property real appContainerHeight
++    property PanelState panelState
      readonly property real hintThreshold: 0.1
@@ -178,7 +179,7 @@
      ParallelAnimation {
          id: fakeMaximizeAnimation
          UbuntuNumberAnimation { target: fakeRectangle; properties: "x"; duration: UbuntuAnimation.BriskDuration; to: leftMargin }
--        UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: PanelState.panelHeight }
++        UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: panelState.panelHeight }
          UbuntuNumberAnimation { target: fakeRectangle; properties: "width"; duration: UbuntuAnimation.BriskDuration; to: appContainerWidth - leftMargin }
          UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: appContainerHeight }
+     }
@@ -186,39 +187,39 @@
      ParallelAnimation {
          id: fakeMaximizeLeftAnimation
          UbuntuNumberAnimation { target: fakeRectangle; properties: "x"; duration: UbuntuAnimation.BriskDuration; to: leftMargin }
--        UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: PanelState.panelHeight }
++        UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: panelState.panelHeight }
          UbuntuNumberAnimation { target: fakeRectangle; properties: "width"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth - leftMargin)/2 }
--        UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: appContainerHeight - PanelState.panelHeight }
++        UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: appContainerHeight - panelState.panelHeight }
+     }
      ParallelAnimation {
          id: fakeMaximizeRightAnimation
          UbuntuNumberAnimation { target: fakeRectangle; properties: "x"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth + leftMargin)/2 }
--        UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: PanelState.panelHeight }
++        UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: panelState.panelHeight }
          UbuntuNumberAnimation { target: fakeRectangle; properties: "width"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth - leftMargin)/2 }
--        UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: appContainerHeight - PanelState.panelHeight }
++        UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: appContainerHeight - panelState.panelHeight }
+     }
      ParallelAnimation {
          id: fakeMaximizeTopLeftAnimation
          UbuntuNumberAnimation { target: fakeRectangle; properties: "x"; duration: UbuntuAnimation.BriskDuration; to: leftMargin }
--        UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: PanelState.panelHeight }
++        UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: panelState.panelHeight }
          UbuntuNumberAnimation { target: fakeRectangle; properties: "width"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth - leftMargin)/2 }
--        UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight - PanelState.panelHeight)/2 }
++        UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight - panelState.panelHeight)/2 }
+     }
      ParallelAnimation {
          id: fakeMaximizeTopRightAnimation
          UbuntuNumberAnimation { target: fakeRectangle; properties: "x"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth + leftMargin)/2 }
--        UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: PanelState.panelHeight }
++        UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: panelState.panelHeight }
          UbuntuNumberAnimation { target: fakeRectangle; properties: "width"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth - leftMargin)/2 }
--        UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight - PanelState.panelHeight)/2 }
++        UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight - panelState.panelHeight)/2 }
+     }
      ParallelAnimation {
          id: fakeMaximizeBottomLeftAnimation
          UbuntuNumberAnimation { target: fakeRectangle; properties: "x"; duration: UbuntuAnimation.BriskDuration; to: leftMargin }
--        UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight + PanelState.panelHeight)/2 }
++        UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight + panelState.panelHeight)/2 }
          UbuntuNumberAnimation { target: fakeRectangle; properties: "width"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth - leftMargin)/2 }
          UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: appContainerHeight/2 }
+     }
@@ -226,7 +227,7 @@
      ParallelAnimation {
          id: fakeMaximizeBottomRightAnimation
          UbuntuNumberAnimation { target: fakeRectangle; properties: "x"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth + leftMargin)/2 }
--        UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight + PanelState.panelHeight)/2 }
++        UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight + panelState.panelHeight)/2 }
          UbuntuNumberAnimation { target: fakeRectangle; properties: "width"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth - leftMargin)/2 }
          UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: appContainerHeight/2 }
+     }
 === modified file 'qml/Stage/Stage.qml'
 --- qml/Stage/Stage.qml	2017-03-28 21:46:37 +0000
 +++ qml/Stage/Stage.qml	2017-03-31 15:02:41 +0000
@@ -48,6 +48,7 @@
      property rect inputMethodRect
      property real rightEdgePushProgress: 0
      property Item availableDesktopArea
++    property PanelState panelState
      // Configuration
      property string mode: "staged"
@@ -381,20 +382,20 @@
      Component.onCompleted: priv.updateMainAndSideStageIndexes();
      Connections {
--        target: PanelState
++        target: panelState
          onCloseClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.close(); } }
          onMinimizeClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.requestMinimize(); } }
          onRestoreClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.requestRestore(); } }
+     }
      Binding {
--        target: PanelState
++        target: panelState
          property: "decorationsVisible"
          value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.maximized // FIXME for Locally integrated menus
+     }
      Binding {
--        target: PanelState
++        target: panelState
          property: "title"
          value: {
              if (priv.focusedAppDelegate !== null) {
@@ -409,7 +410,7 @@
+     }
      Binding {
--        target: PanelState
++        target: panelState
          property: "focusedPersistentSurfaceId"
          value: {
              if (priv.focusedAppDelegate !== null) {
@@ -423,21 +424,21 @@
+     }
      Binding {
--        target: PanelState
++        target: panelState
          property: "dropShadow"
          value: priv.focusedAppDelegate && !priv.focusedAppDelegate.maximized && priv.foregroundMaximizedAppDelegate !== null && mode == "windowed"
+     }
      Binding {
--        target: PanelState
++        target: panelState
          property: "closeButtonShown"
          value: priv.focusedAppDelegate && priv.focusedAppDelegate.maximized && !priv.focusedAppDelegate.isDash
+     }
      Component.onDestruction: {
--        PanelState.title = "";
--        PanelState.decorationsVisible = false;
--        PanelState.dropShadow = false;
++        panelState.title = "";
++        panelState.decorationsVisible = false;
++        panelState.dropShadow = false;
+     }
      Instantiator {
@@ -1606,7 +1607,7 @@
+                 ]
                  Binding {
--                    target: PanelState
++                    target: panelState
                      property: "decorationsAlwaysVisible"
                      value: appDelegate && appDelegate.maximized && touchControls.overlayShown
+                 }
@@ -1652,6 +1653,7 @@
                      highlightSize: windowInfoItem.iconMargin / 2
                      altDragEnabled: root.mode == "windowed"
                      boundsItem: root.availableDesktopArea
++                    panelState: root.panelState
                      requestedWidth: appDelegate.requestedWidth
                      requestedHeight: appDelegate.requestedHeight
@@ -1860,6 +1862,7 @@
          leftMargin: root.availableDesktopArea.x
          appContainerWidth: appContainer.width
          appContainerHeight: appContainer.height
++        panelState: root.panelState
+     }
      MouseArea {
 === modified file 'qml/Stage/WindowDecoration.qml'
 --- qml/Stage/WindowDecoration.qml	2017-03-01 12:18:59 +0000
 +++ qml/Stage/WindowDecoration.qml	2017-03-31 15:02:41 +0000
@@ -34,6 +34,7 @@
      property var menu: undefined
      property bool enableMenus: true
      property bool windowMoving: false
++    property PanelState panelState
      readonly property real buttonsWidth: buttons.width + row.spacing
@@ -146,6 +147,7 @@
                      enableKeyFilter: valid && root.active && root.enableMenus
                      unityMenuModel: root.menu
                      windowMoving: root.windowMoving
++                    panelState: root.panelState
                      onPressed: root.onPressed(mouse)
                      onPressedChangedEx: root.pressedChangedEx(pressed, pressedButtons, mouseX, mouseY)
 === added file 'qml/qmldir'
 --- qml/qmldir	1970-01-01 00:00:00 +0000
 +++ qml/qmldir	2017-03-31 15:02:41 +0000
@@ -0,0 +1,1 @@
++singleton ShellNotifier 0.1 ShellNotifier.qml
 === modified file 'src/ApplicationArguments.cpp'
 --- src/ApplicationArguments.cpp	2015-03-06 04:44:11 +0000
 +++ src/ApplicationArguments.cpp	2017-03-31 15:02:41 +0000
@@ -16,7 +16,16 @@
  #include "ApplicationArguments.h"
--ApplicationArguments::ApplicationArguments(QObject *parent)
--    : QObject(parent)
--{
++ApplicationArguments::ApplicationArguments(QCoreApplication *app)
++    : QObject(app)
++    , UnityCommandLineParser(*app)
++{
++}
++
++void ApplicationArguments::setDeviceName(const QString &deviceName)
++{
++    if (deviceName != m_deviceName) {
++        m_deviceName = deviceName;
++        Q_EMIT deviceNameChanged(m_deviceName);
++    }
+ }
 === modified file 'src/ApplicationArguments.h'
 --- src/ApplicationArguments.h	2015-10-05 16:43:41 +0000
 +++ src/ApplicationArguments.h	2017-03-31 15:02:41 +0000
@@ -23,31 +23,33 @@
  #include <QSize>
  #include <QString>
--class ApplicationArguments : public QObject
++#include "UnityCommandLineParser.h"
++
++class ApplicationArguments : public QObject,
++                             public UnityCommandLineParser
+ {
      Q_OBJECT
      Q_PROPERTY(QString deviceName READ deviceName NOTIFY deviceNameChanged)
      Q_PROPERTY(QString mode READ mode CONSTANT)
++
++    Q_PROPERTY(bool hasGeometry READ hasGeometry CONSTANT)
++    Q_PROPERTY(QSize windowGeometry READ windowGeometry CONSTANT)
++    Q_PROPERTY(bool hasTestability READ hasTestability CONSTANT)
++    Q_PROPERTY(bool hasFrameless READ hasFrameless CONSTANT)
++    Q_PROPERTY(bool hasFullscreen READ hasFullscreen CONSTANT)
++#ifdef UNITY8_ENABLE_TOUCH_EMULATION
++    Q_PROPERTY(bool hasMouseToTouch READ hasMouseToTouch CONSTANT)
++#endif
++
  public:
--    ApplicationArguments(QObject *parent = nullptr);
--
--    void setDeviceName(const QString &deviceName) {
--        if (deviceName != m_deviceName) {
--            m_deviceName = deviceName;
--            Q_EMIT deviceNameChanged(m_deviceName);
--        }
--    }
--    QString deviceName() const { return m_deviceName; }
--
--    void setMode(const QString &mode) { m_mode = mode; }
--    QString mode() const { return m_mode; }
++    ApplicationArguments(QCoreApplication *app);
++
++    void setDeviceName(const QString &deviceName);
++
++    bool hasGeometry() const { return m_windowGeometry.isValid(); }
  Q_SIGNALS:
      void deviceNameChanged(const QString&);
--
--private:
--    QString m_deviceName;
--    QString m_mode;
  };
  #endif // APPLICATION_ARGUMENTS_H
 === modified file 'src/CMakeLists.txt'
 --- src/CMakeLists.txt	2017-03-28 21:45:14 +0000
 +++ src/CMakeLists.txt	2017-03-31 15:02:41 +0000
@@ -29,9 +29,7 @@
      ApplicationArguments.cpp
      main.cpp
      CachingNetworkManagerFactory.cpp
--    SecondaryWindow.cpp
      ShellApplication.cpp
--    ShellView.cpp
      UnityCommandLineParser.cpp
      UnixSignalHandler.cpp
      DebuggingController.cpp
 === removed file 'src/SecondaryWindow.cpp'
 --- src/SecondaryWindow.cpp	2016-05-09 12:25:29 +0000
 +++ src/SecondaryWindow.cpp	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
--/*
-- * Copyright (C) 2015 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "SecondaryWindow.h"
--
--// local
--#include <paths.h>
--
--#include <QQmlContext>
--
--SecondaryWindow::SecondaryWindow(QQmlEngine *engine)
--    : QQuickView(engine, nullptr)
--{
--    QByteArray pxpguEnv = qgetenv("GRID_UNIT_PX");
--    bool ok;
--    int pxpgu = pxpguEnv.toInt(&ok);
--    if (!ok) {
--        pxpgu = 8;
--    }
--    engine->rootContext()->setContextProperty(QStringLiteral("internalGu"), pxpgu);
--    setResizeMode(QQuickView::SizeRootObjectToView);
--    setColor("black");
--    setTitle(QStringLiteral("Unity8 Shell - Secondary Screen"));
--
--    QUrl source(::qmlDirectory() + "/DisabledScreenNotice.qml");
--    setSource(source);
--}
 === removed file 'src/SecondaryWindow.h'
 --- src/SecondaryWindow.h	2015-10-02 21:50:07 +0000
 +++ src/SecondaryWindow.h	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
--/*
-- * Copyright (C) 2015 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef UNITY_SECONDARY_WINDOW_H
--#define UNITY_SECONDARY_WINDOW_H
--
--#include <QQuickView>
--
--class SecondaryWindow : public QQuickView
--{
--    Q_OBJECT
--
--public:
--    SecondaryWindow(QQmlEngine *engine);
--};
--
--#endif // UNITY_SECONDARY_WINDOW_H
 === modified file 'src/ShellApplication.cpp'
 --- src/ShellApplication.cpp	2017-03-08 15:12:15 +0000
 +++ src/ShellApplication.cpp	2017-03-31 15:02:41 +0000
@@ -20,6 +20,8 @@
  #include <QLibrary>
  #include <QProcess>
  #include <QScreen>
++#include <QQmlContext>
++#include <QQmlComponent>
  #include <QGSettings>
@@ -36,30 +38,22 @@
  ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)
      : QGuiApplication(argc, argv)
++    , m_qmlArgs(this)
+ {
      setApplicationName(QStringLiteral("unity8"));
      setOrganizationName(QStringLiteral("Canonical"));
--    connect(this, &QGuiApplication::screenAdded, this, &ShellApplication::onScreenAdded);
--
      setupQmlEngine(isMirServer);
--    UnityCommandLineParser parser(*this);
--
--    if (!parser.deviceName().isEmpty()) {
--        m_deviceName = parser.deviceName();
--    } else {
++    if (m_qmlArgs.deviceName().isEmpty()) {
          char buffer[200];
          property_get("ro.product.device", buffer /* value */, "desktop" /* default_value*/);
--        m_deviceName = QString(buffer);
++        m_qmlArgs.setDeviceName(QString(buffer));
+     }
--    m_qmlArgs.setDeviceName(m_deviceName);
--
--    m_qmlArgs.setMode(parser.mode());
      // The testability driver is only loaded by QApplication but not by QGuiApplication.
      // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.
--    if (parser.hasTestability() || getenv("QT_LOAD_TESTABILITY")) {
++    if (m_qmlArgs.hasTestability() || getenv("QT_LOAD_TESTABILITY")) {
          QLibrary testLib(QStringLiteral("qttestability"));
          if (testLib.load()) {
              typedef void (*TasInitialize)(void);
@@ -80,57 +74,41 @@
      QScopedPointer<QGSettings> gSettings(new QGSettings("com.canonical.Unity8"));
      gSettings->reset(QStringLiteral("alwaysShowOsk"));
--    m_shellView = new ShellView(m_qmlEngine, &m_qmlArgs);
--
--    if (parser.windowGeometry().isValid()) {
--        m_shellView->setWidth(parser.windowGeometry().width());
--        m_shellView->setHeight(parser.windowGeometry().height());
--    }
--
--    if (parser.hasFrameless()) {
--        m_shellView->setFlags(Qt::FramelessWindowHint);
--    }
--
++
++    QByteArray pxpguEnv = qgetenv("GRID_UNIT_PX");
++    bool ok;
++    int pxpgu = pxpguEnv.toInt(&ok);
++    if (!ok) {
++        pxpgu = 8;
++    }
++    m_qmlEngine->rootContext()->setContextProperty("internalGu", pxpgu);
++    m_qmlEngine->rootContext()->setContextProperty(QStringLiteral("applicationArguments"), &m_qmlArgs);
++    m_qmlEngine->rootContext()->setContextProperty("DebuggingController", new DebuggingController(this));
++
++    auto component(new QQmlComponent(m_qmlEngine,
++                                     QUrl::fromLocalFile(::qmlDirectory() + "/ShellApplication.qml")));
++    component->create();
++    if (component->status() == QQmlComponent::Error) {
++        m_qmlEngine->rootContext()->setContextProperty(QStringLiteral("errorString"), component->errorString());
++        auto errorComponent(new QQmlComponent(m_qmlEngine,
++                                         QUrl::fromLocalFile(::qmlDirectory() + "/ErrorApplication.qml")));
++        errorComponent->create();
++        qDebug() << errorComponent->errorString();
++        return;
++    }
      #ifdef UNITY8_ENABLE_TOUCH_EMULATION
      // You will need this if you want to interact with touch-only components using a mouse
      // Needed only when manually testing on a desktop.
--    if (parser.hasMouseToTouch()) {
++    if (m_qmlArgs.hasMouseToTouch()) {
          m_mouseTouchAdaptor = MouseTouchAdaptor::instance();
+     }
      #endif
--    new DebuggingController(this);
--
--    // Some hard-coded policy for now.
--    // NB: We don't support more than two screens at the moment
--    //
--    // TODO: Support an arbitrary number of screens and different policies
--    //       (eg cloned desktop, several desktops, etc)
--    if (isMirServer && screens().count() == 2) {
--        m_shellView->setScreen(screens().at(1));
--        m_qmlArgs.setDeviceName(QStringLiteral("desktop"));
--
--        m_secondaryWindow = new SecondaryWindow(m_qmlEngine);
--        m_secondaryWindow->setScreen(screens().at(0));
--        // QWindow::showFullScreen() also calls QWindow::requestActivate() and we don't want that!
--        m_secondaryWindow->setWindowState(Qt::WindowFullScreen);
--        m_secondaryWindow->setVisible(true);
--    }
--
--    if (parser.mode().compare("greeter") == 0) {
--        QSize primaryScreenSize = this->primaryScreen()->size();
--        m_shellView->setHeight(primaryScreenSize.height());
--        m_shellView->setWidth(primaryScreenSize.width());
--        m_shellView->show();
--        m_shellView->requestActivate();
++    if (m_qmlArgs.mode().compare("greeter") == 0) {
          if (!QProcess::startDetached("initctl emit --no-wait unity8-greeter-started")) {
              qDebug() << "Unable to send unity8-greeter-started event to Upstart";
+         }
--    } else if (isMirServer || parser.hasFullscreen()) {
--        m_shellView->showFullScreen();
--    } else {
--        m_shellView->show();
+     }
+ }
@@ -141,14 +119,6 @@
  void ShellApplication::destroyResources()
+ {
--    // Deletion order is important. Don't use QScopedPointers and the like
--    // Otherwise the process will hang on shutdown (bug somewhere I guess).
--    delete m_shellView;
--    m_shellView = nullptr;
--
--    delete m_secondaryWindow;
--    m_secondaryWindow = nullptr;
--
      #ifdef UNITY8_ENABLE_TOUCH_EMULATION
      delete m_mouseTouchAdaptor;
      m_mouseTouchAdaptor = nullptr;
@@ -174,48 +144,3 @@
      QObject::connect(m_qmlEngine, &QQmlEngine::quit, this, &QGuiApplication::quit);
+ }
--
--void ShellApplication::onScreenAdded(QScreen * /*screen*/)
--{
--    // TODO: Support an arbitrary number of screens and different policies
--    //       (eg cloned desktop, several desktops, etc)
--    if (screens().count() == 2) {
--        m_shellView->setScreen(screens().at(1));
--        m_qmlArgs.setDeviceName(QStringLiteral("desktop"));
--        // Changing the QScreen where a QWindow is drawn makes it also lose focus (besides having
--        // its backing QPlatformWindow recreated). So lets refocus it.
--        m_shellView->requestActivate();
--        // QWindow::destroy() is called when it changes between screens. We have to manually make it visible again
--        // <dandrader> This bug is supposedly fixed in Qt 5.5.1, although I can still reproduce it there. :-/
--        m_shellView->setVisible(true);
--
--        m_secondaryWindow = new SecondaryWindow(m_qmlEngine);
--        m_secondaryWindow->setScreen(screens().at(0));
--
--        // QWindow::showFullScreen() also calls QWindow::requestActivate() and we don't want that!
--        m_secondaryWindow->setWindowState(Qt::WindowFullScreen);
--        m_secondaryWindow->setVisible(true);
--    }
--}
--
--void ShellApplication::onScreenAboutToBeRemoved(QScreen *screen)
--{
--    // TODO: Support an arbitrary number of screens and different policies
--    //       (eg cloned desktop, several desktops, etc)
--    if (screen == m_shellView->screen()) {
--        const QList<QScreen *> allScreens = screens();
--        Q_ASSERT(allScreens.count() > 1);
--        Q_ASSERT(allScreens.at(0) != screen);
--        Q_ASSERT(m_secondaryWindow);
--        delete m_secondaryWindow;
--        m_secondaryWindow = nullptr;
--        m_shellView->setScreen(allScreens.first());
--        m_qmlArgs.setDeviceName(m_deviceName);
--        // Changing the QScreen where a QWindow is drawn makes it also lose focus (besides having
--        // its backing QPlatformWindow recreated). So lets refocus it.
--        m_shellView->requestActivate();
--        // QWindow::destroy() is called when it changes between screens. We have to manually make it visible again
--        // <dandrader> This bug is supposedly fixed in Qt 5.5.1, although I can still reproduce it there. :-/
--        m_shellView->setVisible(true);
--    }
--}
 === modified file 'src/ShellApplication.h'
 --- src/ShellApplication.h	2015-12-16 13:58:39 +0000
 +++ src/ShellApplication.h	2017-03-31 15:02:41 +0000
@@ -18,7 +18,7 @@
  #define SHELLAPPLICATION_H
  #include <QGuiApplication>
--#include <QQmlEngine>
++#include <QQmlApplicationEngine>
  #include <QQuickView>
  #include <QScopedPointer>
@@ -28,9 +28,6 @@
  #include "MouseTouchAdaptor.h"
  #endif
--#include "SecondaryWindow.h"
--#include "ShellView.h"
--
  class ShellApplication : public QGuiApplication
+ {
      Q_OBJECT
@@ -39,19 +36,10 @@
      virtual ~ShellApplication();
      void destroyResources();
--public Q_SLOTS:
--    // called by qtmir
--    void onScreenAboutToBeRemoved(QScreen *screen);
--
--private Q_SLOTS:
--    void onScreenAdded(QScreen*);
  private:
      void setupQmlEngine(bool isMirServer);
--    QString m_deviceName;
      ApplicationArguments m_qmlArgs;
--    ShellView *m_shellView{nullptr};
--    SecondaryWindow *m_secondaryWindow{nullptr};
      #ifdef UNITY8_ENABLE_TOUCH_EMULATION
      MouseTouchAdaptor *m_mouseTouchAdaptor{nullptr};
 === removed file 'src/ShellView.cpp'
 --- src/ShellView.cpp	2017-02-15 14:31:20 +0000
 +++ src/ShellView.cpp	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
--/*
-- * Copyright (C) 2015 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "ShellView.h"
--
--// Qt
--#include <QQmlContext>
--#include <QQuickItem>
--#include <QtQuick/private/qquickitem_p.h>
--#include <QtQuick/private/qquickrectangle_p.h>
--#include <QtQuick/private/qquicktext_p.h>
--
--// local
--#include <paths.h>
--
--ShellView::ShellView(QQmlEngine *engine, QObject *qmlArgs)
--    : QQuickView(engine, nullptr)
--{
--    setResizeMode(QQuickView::SizeRootObjectToView);
--    setColor("black");
--    setTitle(QStringLiteral("Unity8"));
--
--    rootContext()->setContextProperty(QStringLiteral("applicationArguments"), qmlArgs);
--
--    connect(this, &QQuickView::statusChanged, this, [this] {
--            if (status() == QQuickView::Error) {
--                QQuickRectangle *rect = new QQuickRectangle(contentItem());
--                rect->setColor(Qt::white);
--                QQuickItemPrivate::get(rect)->anchors()->setFill(contentItem());
--
--                QString errorsString;
--                for(const QQmlError &e: errors()) {
--                    errorsString += e.toString() + "\n";
--                }
--                QQuickText *text = new QQuickText(rect);
--                text->setColor(Qt::black);
--                text->setWrapMode(QQuickText::Wrap);
--                text->setText(QString("There was an error loading Unity8:\n%1").arg(errorsString));
--                QQuickItemPrivate::get(text)->anchors()->setFill(rect);
--            }
--        }
--    );
--
--    QUrl source(::qmlDirectory() + "/OrientedShell.qml");
--    setSource(source);
--
--    connect(this, &QWindow::widthChanged, this, &ShellView::onWidthChanged);
--    connect(this, &QWindow::heightChanged, this, &ShellView::onHeightChanged);
--}
--
--void ShellView::onWidthChanged(int w)
--{
--    // For good measure in case SizeRootObjectToView doesn't fulfill its promise.
--    //
--    // There's at least one situation that's know to leave the root object with an outdated size.
--    // (really looks like Qt bug)
--    // Happens when starting unity8 with an external monitor already connected.
--    // The QResizeEvent we get still has the size of the first screen and since the resize move is triggered
--    // from the resize event handler, the root item doesn't get resized.
--    // TODO: Confirm the Qt bug and submit a patch upstream
--    if (rootObject()) {
--        rootObject()->setWidth(w);
--    }
--}
--
--void ShellView::onHeightChanged(int h)
--{
--    // See comment in ShellView::onWidthChanged()
--    if (rootObject()) {
--        rootObject()->setHeight(h);
--    }
--}
 === removed file 'src/ShellView.h'
 --- src/ShellView.h	2015-10-16 16:56:14 +0000
 +++ src/ShellView.h	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
--/*
-- * Copyright (C) 2015 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef UNITY_SHELL_VIEW_H
--#define UNITY_SHELL_VIEW_H
--
--#include <QQuickView>
--
--class ShellView : public QQuickView
--{
--    Q_OBJECT
--
--public:
--    ShellView(QQmlEngine *engine, QObject *qmlArgs);
--
--private Q_SLOTS:
--    void onWidthChanged(int);
--    void onHeightChanged(int);
--};
--
--#endif // UNITY_SHELL_VIEW_H
 === modified file 'src/UnityCommandLineParser.h'
 --- src/UnityCommandLineParser.h	2015-12-16 13:58:39 +0000
 +++ src/UnityCommandLineParser.h	2017-03-31 15:02:41 +0000
@@ -36,8 +36,8 @@
      bool hasFullscreen() const { return m_hasFullscreen; }
      QString deviceName() const { return m_deviceName; }
      QString mode() const { return m_mode; }
--private:
++protected:
      int parsePixelsValue(const QString &str);
      static float getenvFloat(const char* name, float defaultValue);
      void resolveMode(QCommandLineParser &parser, QCommandLineOption &modeOption);
 === modified file 'tests/mocks/Cursor/Cursor.qml'
 --- tests/mocks/Cursor/Cursor.qml	2016-10-03 11:15:27 +0000
 +++ tests/mocks/Cursor/Cursor.qml	2017-03-31 15:02:41 +0000
@@ -15,8 +15,11 @@
   */
  import QtQuick 2.4
--
--Item {
++import UInput 0.1
++
++Canvas {
++    id: root
++
      property int topBoundaryOffset // effectively panel height
      property Item confiningItem
@@ -30,5 +33,49 @@
      signal pushStopped()
      signal mouseMoved()
--    onMouseMoved: opacity = 1;
++    width: units.gu(2)
++    height: units.gu(2)
++    antialiasing: true
++
++    onPaint: {
++        var ctx = getContext("2d");
++        ctx.save();
++        ctx.clearRect(0,0,width, height);
++        ctx.strokeStyle = "#000000";
++        ctx.lineWidth = 1
++        ctx.fillStyle = "#ffffff";
++        ctx.globalAlpha = 1.0;
++        ctx.lineJoin = "round";
++        ctx.beginPath();
++
++        // put rectangle in the middle
++        // draw the rectangle
++        ctx.moveTo(width/2,height);
++        ctx.lineTo(width, height/2);
++        ctx.lineTo(0,0);
++
++        ctx.closePath();
++        ctx.fill();
++        ctx.stroke();
++        ctx.restore();
++    }
++
++    Connections {
++        target: UInput
++        onMouseMoved: {
++            var newX = root.x;
++            newX += dx;
++            if (newX < 0) newX = 0;
++            else if (newX >= parent.width) newX = parent.width-1;
++
++            var newY = root.y;
++            newY += dy;
++            if (newY < 0) newY = 0;
++            else if (newY >= parent.height) newY = parent.height-1;
++
++            root.x = newX;
++            root.y = newY;
++            root.mouseMoved();
++        }
++    }
+ }
 === modified file 'tests/mocks/GSettings.1.0/plugin.cpp'
 --- tests/mocks/GSettings.1.0/plugin.cpp	2015-04-15 14:09:06 +0000
 +++ tests/mocks/GSettings.1.0/plugin.cpp	2017-03-31 15:02:41 +0000
@@ -18,6 +18,8 @@
  #include "fake_gsettings.h"
  #include <QtQml/qqml.h>
++#include <QQmlEngine>
++#include <QQmlContext>
  static QObject* controllerProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
+ {
@@ -31,3 +33,13 @@
      qmlRegisterUncreatableType<GSettingsSchemaQml>(uri, 1, 0, "GSettingsSchema",
                                                     "GSettingsSchema can only be used inside of a GSettings component");
+ }
++
++void FakeGSettingsQmlPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
++{
++    QQmlExtensionPlugin::initializeEngine(engine, uri);
++
++    QString usageType = qgetenv("UNITY_MOCK_DESKTOP");
++    if (!usageType.isEmpty()) {
++        GSettingsControllerQml::instance()->setUsageMode("Windowed");
++    }
++}
 === modified file 'tests/mocks/GSettings.1.0/plugin.h'
 --- tests/mocks/GSettings.1.0/plugin.h	2015-04-30 09:31:51 +0000
 +++ tests/mocks/GSettings.1.0/plugin.h	2017-03-31 15:02:41 +0000
@@ -26,6 +26,7 @@
  public:
      void registerTypes(const char *uri) override;
++    void initializeEngine(QQmlEngine *engine, const char *uri) override;
  };
  #endif // PLUGIN_H
 === modified file 'tests/mocks/UInput/plugin.cpp'
 --- tests/mocks/UInput/plugin.cpp	2015-11-23 16:50:26 +0000
 +++ tests/mocks/UInput/plugin.cpp	2017-03-31 15:02:41 +0000
@@ -19,8 +19,13 @@
  #include <QtQml/qqml.h>
++QObject* uinputSingleton(QQmlEngine*, QJSEngine*)
++{
++    return new MockUInput;
++}
++
  void MockUInputPlugin::registerTypes(const char *uri)
+ {
      Q_ASSERT(uri == QLatin1String("UInput"));
--    qmlRegisterType<MockUInput>(uri, 0, 1, "UInput");
++    qmlRegisterSingletonType<MockUInput>(uri, 0, 1, "UInput", uinputSingleton);
+ }
 === modified file 'tests/mocks/Unity/Application/SurfaceManager.cpp'
 --- tests/mocks/Unity/Application/SurfaceManager.cpp	2017-02-07 16:21:09 +0000
 +++ tests/mocks/Unity/Application/SurfaceManager.cpp	2017-03-31 15:02:41 +0000
@@ -21,7 +21,7 @@
  #include <paths.h>
--#define SURFACEMANAGER_DEBUG 0
++#define SURFACEMANAGER_DEBUG 1
  #if SURFACEMANAGER_DEBUG
  #define DEBUG_MSG(params) qDebug().nospace() << "SurfaceManager[" << (void*)this << "]::" << __func__  << params
 === modified file 'tests/mocks/Unity/InputInfo/mockcontroller.cpp'
 --- tests/mocks/Unity/InputInfo/mockcontroller.cpp	2015-11-09 09:23:23 +0000
 +++ tests/mocks/Unity/InputInfo/mockcontroller.cpp	2017-03-31 15:02:41 +0000
@@ -18,10 +18,20 @@
  #include "qinputdeviceinfo_mock_p.h"
++#include <QQuickView>
++#include <QQmlComponent>
++#include <QQuickItem>
++#include <paths.h>
++
  MockController::MockController(QObject *parent):
      QObject(parent)
+ {
++}
++MockController *MockController::instance()
++{
++    static MockController* controller = new MockController();
++    return controller;
+ }
  QInputDevice *MockController::addMockDevice(const QString &devicePath, QInputDevice::InputType type)
 === modified file 'tests/mocks/Unity/InputInfo/mockcontroller.h'
 --- tests/mocks/Unity/InputInfo/mockcontroller.h	2015-11-02 15:55:58 +0000
 +++ tests/mocks/Unity/InputInfo/mockcontroller.h	2017-03-31 15:02:41 +0000
@@ -24,9 +24,11 @@
+ {
      Q_OBJECT
  public:
--    MockController(QObject *parent = 0);
++    MockController(QObject *parent = nullptr);
      ~MockController() = default;
++    static MockController *instance();
++
      Q_INVOKABLE QInputDevice* addMockDevice(const QString &devicePath, QInputDevice::InputType type);
      Q_INVOKABLE void removeDevice(const QString &devicePath);
  };
 === modified file 'tests/mocks/Unity/InputInfo/plugin.cpp'
 --- tests/mocks/Unity/InputInfo/plugin.cpp	2015-11-02 15:55:58 +0000
 +++ tests/mocks/Unity/InputInfo/plugin.cpp	2017-03-31 15:02:41 +0000
@@ -26,9 +26,8 @@
  static QObject *backendProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
+ {
--    Q_UNUSED(engine)
      Q_UNUSED(scriptEngine)
--    return new MockController(engine);
++    return MockController::instance();
+ }
  void InputInfoPlugin::registerTypes(const char *uri)
 === modified file 'tests/mocks/Unity/Screens/CMakeLists.txt'
 --- tests/mocks/Unity/Screens/CMakeLists.txt	2016-10-25 10:10:08 +0000
 +++ tests/mocks/Unity/Screens/CMakeLists.txt	2017-03-31 15:02:41 +0000
@@ -5,10 +5,11 @@
  set(MockScreens_SOURCES
      plugin.cpp
      screens.cpp
++    screenwindow.cpp
+ )
  add_library(MockScreensPlugin MODULE ${MockScreens_SOURCES})
--qt5_use_modules(MockScreensPlugin Gui Qml)
++qt5_use_modules(MockScreensPlugin Gui Qml Quick)
  add_unity8_mock(Unity.Screens 0.1 Unity/Screens PREFIX mocks TARGETS MockScreensPlugin)
 === modified file 'tests/mocks/Unity/Screens/plugin.cpp'
 --- tests/mocks/Unity/Screens/plugin.cpp	2015-12-02 13:23:45 +0000
 +++ tests/mocks/Unity/Screens/plugin.cpp	2017-03-31 15:02:41 +0000
@@ -16,14 +16,27 @@
  #include "plugin.h"
  #include "screens.h"
++#include "screenwindow.h"
  #include <QScreen>
++namespace {
++QObject* screensSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
++    Q_UNUSED(engine);
++    Q_UNUSED(scriptEngine);
++    return new Screens();
++}
++}
++
  void UnityScreensPlugin::registerTypes(const char* uri)
+ {
      Q_ASSERT(QLatin1String(uri) == QLatin1String("Unity.Screens"));
      qRegisterMetaType<QScreen*>("QScreen*");
++    qRegisterMetaType<ScreenMode*>("ScreenMode*");
++    qmlRegisterUncreatableType<ScreenMode>(uri, 0, 1, "ScreenMode", "ScreenMode is not creatable.");
--    qmlRegisterType<Screens>(uri, 0, 1, "Screens");
++    qmlRegisterSingletonType<Screens>(uri, 0, 1, "Screens", screensSingleton);
++    qmlRegisterType<ScreenWindow>(uri, 0, 1, "ScreenWindow");
++    qmlRegisterRevision<QWindow,1>(uri, 0, 1);
+ }
 === modified file 'tests/mocks/Unity/Screens/screens.cpp'
 --- tests/mocks/Unity/Screens/screens.cpp	2016-12-23 11:04:53 +0000
 +++ tests/mocks/Unity/Screens/screens.cpp	2017-03-31 15:02:41 +0000
@@ -18,16 +18,30 @@
  // Qt
  #include <QGuiApplication>
--#include <QScreen>
  #include <QDebug>
--Q_DECLARE_METATYPE(QScreen*)
--
  Screens::Screens(QObject *parent) :
      QAbstractListModel(parent)
+ {
--    // start with one screen attached
--    m_screenList.append(new Screen());
++    bool ok = false;
++    int screenCount = qEnvironmentVariableIntValue("UNITY_MOCK_SCREEN_COUNT", &ok);
++    if (!ok) screenCount = 1;
++    QPoint lastPoint(0,0);
++    for (int i = 0; i < screenCount; ++i) {
++        auto screen = new Screen();
++        screen->m_active = i == 0;
++        screen->m_name = QString("Monitor %1").arg(i);
++        screen->m_position = QPoint(lastPoint.x(), lastPoint.y());
++        screen->m_sizes.append(new ScreenMode(50, QSize(640,480)));
++        screen->m_sizes.append(new ScreenMode(60, QSize(1280,1024)));
++        screen->m_sizes.append(new ScreenMode(60, QSize(1440,900)));
++        screen->m_sizes.append(new ScreenMode(60, QSize(1920,1080)));
++        screen->m_currentModeIndex = 3;
++        screen->m_physicalSize = QSize(300,200);
++        m_screenList.append(screen);
++
++        lastPoint.rx() += screen->m_sizes[screen->m_currentModeIndex]->size.width();
++    }
+ }
  Screens::~Screens() noexcept
@@ -40,7 +54,6 @@
+ {
      QHash<int, QByteArray> roles;
      roles[ScreenRole] = "screen";
--    roles[OutputTypeRole] = "outputType";
      return roles;
+ }
@@ -52,9 +65,7 @@
      switch(role) {
      case ScreenRole:
--        return QVariant::fromValue(m_screenList.at(index.row())->qScreen);
--    case OutputTypeRole:
--        return m_screenList.at(index.row())->outputTypes;
++        return QVariant::fromValue(m_screenList.at(index.row()));
+     }
      return QVariant();
@@ -69,3 +80,35 @@
+ {
      return m_screenList.size();
+ }
++
++void Screens::activateScreen(int)
++{
++    qWarning("Not Implemented");
++}
++
++Screen::Screen(QObject* parent)
++    : QObject(parent)
++{
++}
++
++Screen::~Screen()
++{
++    qDeleteAll(m_sizes);
++    m_sizes.clear();
++}
++
++QQmlListProperty<ScreenMode> Screen::availableModes()
++{
++    return QQmlListProperty<ScreenMode>(this, m_sizes);
++}
++
++Screen *Screen::beginConfiguration()
++{
++    qWarning("Not Implemented");
++    return nullptr;
++}
++
++void Screen::applyConfiguration()
++{
++    qWarning("Not Implemented");
++}
 === modified file 'tests/mocks/Unity/Screens/screens.h'
 --- tests/mocks/Unity/Screens/screens.h	2016-12-23 11:04:53 +0000
 +++ tests/mocks/Unity/Screens/screens.h	2017-03-31 15:02:41 +0000
@@ -19,6 +19,7 @@
  #include <QAbstractListModel>
  #include <QScreen>
++#include <QQmlListProperty>
  class Screen;
@@ -31,7 +32,13 @@
  public:
      enum ItemRoles {
          ScreenRole = Qt::UserRole + 1,
--        OutputTypeRole
++        OutputTypeRole,
++        EnabledRole,
++        NameRole,
++        ScaleRole,
++        FormFactorRole,
++        GeometryRole,
++        SizesRole
      };
      enum OutputTypes {
@@ -53,6 +60,15 @@
      };
      Q_ENUM(OutputTypes)
++    enum FormFactor {
++        FormFactorUnknown,
++        FormFactorPhone,
++        FormFactorTablet,
++        FormFactorMonitor,
++        FormFactorTV,
++        FormFactorProjector,
++    };
++
      explicit Screens(QObject *parent = 0);
      virtual ~Screens() noexcept;
@@ -63,6 +79,9 @@
      int count() const;
++public Q_SLOTS:
++    void activateScreen(int index);
++
  Q_SIGNALS:
      void countChanged();
      void screenAdded(QScreen *screen);
@@ -72,11 +91,72 @@
      QList<Screen *> m_screenList;
  };
--class Screen
--{
--public:
--    Screens::OutputTypes outputTypes = Screens::Unknown;
--    QScreen *qScreen = nullptr;
--};
++class ScreenMode : public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(qreal refreshRate MEMBER refreshRate CONSTANT)
++    Q_PROPERTY(QSize size MEMBER size CONSTANT)
++public:
++    ScreenMode() {}
++    ScreenMode(qreal refreshRate, QSize size):refreshRate(refreshRate),size(size) {}
++    ScreenMode(const ScreenMode& other)
++        : QObject(nullptr),
++          refreshRate{other.refreshRate},size{other.size}
++    {}
++
++    qreal refreshRate;
++    QSize size;
++};
++
++class Screen : public QObject
++{
++    Q_OBJECT
++
++    Q_PROPERTY(bool active MEMBER m_active NOTIFY activeChanged)
++
++    Q_PROPERTY(bool used MEMBER m_used NOTIFY usedChanged)
++    Q_PROPERTY(QString name MEMBER m_name NOTIFY nameChanged)
++    Q_PROPERTY(Screens::OutputTypes outputType MEMBER m_outputType NOTIFY outputTypeChanged)
++    Q_PROPERTY(float scale MEMBER m_scale NOTIFY scaleChanged)
++    Q_PROPERTY(Screens::FormFactor formFactor MEMBER m_formFactor NOTIFY formFactorChanged)
++    Q_PROPERTY(QPoint position MEMBER m_position NOTIFY positionChanged)
++    Q_PROPERTY(uint currentModeIndex MEMBER m_currentModeIndex NOTIFY currentModeIndexChanged)
++    Q_PROPERTY(QQmlListProperty<ScreenMode> availableModes READ availableModes NOTIFY availableModesChanged)
++    Q_PROPERTY(QSizeF physicalSize MEMBER m_physicalSize NOTIFY physicalSizeChanged)
++public:
++    Screen(QObject* parent = 0);
++    ~Screen();
++
++    QQmlListProperty<ScreenMode> availableModes();
++
++    Q_INVOKABLE Screen* beginConfiguration();
++    Q_INVOKABLE void applyConfiguration();
++
++Q_SIGNALS:
++    void activeChanged();
++    void usedChanged();
++    void nameChanged();
++    void outputTypeChanged();
++    void scaleChanged();
++    void formFactorChanged();
++    void positionChanged();
++    void currentModeIndexChanged();
++    void availableModesChanged();
++    void physicalSizeChanged();
++
++public:
++    bool m_active{false};
++    bool m_used{true};
++    QString m_name;
++    Screens::OutputTypes m_outputType{Screens::Unknown};
++    float m_scale{1.0};
++    Screens::FormFactor m_formFactor{Screens::FormFactorMonitor};
++    QPoint m_position;
++    uint m_currentModeIndex{0};
++    QList<ScreenMode*> m_sizes;
++    QSizeF m_physicalSize;
++};
++
++Q_DECLARE_METATYPE(ScreenMode)
  #endif // SCREENS_H
 === added file 'tests/mocks/Unity/Screens/screenwindow.cpp'
 --- tests/mocks/Unity/Screens/screenwindow.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/Screens/screenwindow.cpp	2017-03-31 15:02:41 +0000
@@ -0,0 +1,35 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3, as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "screenwindow.h"
++
++ScreenWindow::ScreenWindow(QWindow *parent)
++    : QQuickWindow(parent)
++{
++}
++
++Screen *ScreenWindow::screenWrapper() const
++{
++    return m_screen.data();
++}
++
++void ScreenWindow::setScreenWrapper(Screen *screen)
++{
++    if (m_screen != screen) {
++        m_screen = screen;
++        Q_EMIT screenWrapperChanged();
++    }
++}
 === added file 'tests/mocks/Unity/Screens/screenwindow.h'
 --- tests/mocks/Unity/Screens/screenwindow.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/Screens/screenwindow.h	2017-03-31 15:02:41 +0000
@@ -0,0 +1,42 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3, as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef SCREENWINDOW_H
++#define SCREENWINDOW_H
++
++#include <QQuickWindow>
++#include <QPointer>
++
++#include "screens.h"
++
++class ScreenWindow : public QQuickWindow
++{
++    Q_OBJECT
++    Q_PROPERTY(Screen *screen READ screenWrapper WRITE setScreenWrapper NOTIFY screenWrapperChanged)
++public:
++    ScreenWindow(QWindow *parent = 0);
++
++    Screen *screenWrapper() const;
++    void setScreenWrapper(Screen *screen);
++
++Q_SIGNALS:
++    void screenWrapperChanged();
++
++private:
++    QPointer<Screen> m_screen;
++};
++
++#endif // SCREENWINDOW_H
 === modified file 'tests/plugins/GlobalShortcut/GlobalShortcutTest.cpp'
 --- tests/plugins/GlobalShortcut/GlobalShortcutTest.cpp	2016-04-22 20:19:57 +0000
 +++ tests/plugins/GlobalShortcut/GlobalShortcutTest.cpp	2017-03-31 15:02:41 +0000
@@ -38,6 +38,7 @@
          m_inactiveShortcut = dynamic_cast<GlobalShortcut*>(m_view->rootObject()->property("inactiveShortcut").value<QObject*>());
          QVERIFY(m_inactiveShortcut);
          m_view->show();
++        m_view->requestActivate();
          QTest::qWaitForWindowExposed(m_view);
+     }
 === modified file 'tests/qmltests/ApplicationMenus/tst_MenuBar.qml'
 --- tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-03-28 21:47:53 +0000
 +++ tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-03-31 15:02:41 +0000
@@ -24,6 +24,7 @@
  import Utils 0.1
  import "../../../qml/ApplicationMenus"
++import "../../../qml/Components/PanelState"
  import ".."
  Item {
@@ -67,6 +68,7 @@
                  id: menuBackend
                  modelData: appMenuData.generateTestData(10,5,2,3)
+             }
++            panelState: PanelState {}
+         }
+     }
 === modified file 'tests/qmltests/ApplicationMenus/tst_MenuPopup.qml'
 --- tests/qmltests/ApplicationMenus/tst_MenuPopup.qml	2017-03-21 10:56:10 +0000
 +++ tests/qmltests/ApplicationMenus/tst_MenuPopup.qml	2017-03-31 15:02:41 +0000
@@ -24,6 +24,7 @@
  import Utils 0.1
  import "../../../qml/ApplicationMenus"
++import "../../../qml/Components/PanelState"
  import ".."
  Item {
@@ -59,6 +60,7 @@
                         }}
+                     ]
+             }
++            panelState: PanelState {}
+         }
+     }
 === modified file 'tests/qmltests/Components/tst_VirtualTouchPad.qml'
 --- tests/qmltests/Components/tst_VirtualTouchPad.qml	2016-12-05 11:17:15 +0000
 +++ tests/qmltests/Components/tst_VirtualTouchPad.qml	2017-03-31 15:02:41 +0000
@@ -39,11 +39,11 @@
      SignalSpy {
          id: mouseEventSpy1
--        target: touchScreenPad.uinput
++        target: UInput
+     }
      SignalSpy {
          id: mouseEventSpy2
--        target: touchScreenPad.uinput
++        target: UInput
+     }
      UnityTestCase {
 === modified file 'tests/qmltests/Panel/tst_Panel.qml'
 --- tests/qmltests/Panel/tst_Panel.qml	2017-03-17 13:44:30 +0000
 +++ tests/qmltests/Panel/tst_Panel.qml	2017-03-31 15:02:41 +0000
@@ -42,6 +42,8 @@
          value: keyboardAttached.checked
+     }
++    readonly property alias panelState: panel.panelState
++
      SurfaceManager { id: sMgr }
      ApplicationMenuDataLoader {
          id: appMenuData
@@ -99,6 +101,8 @@
                          model: root.indicatorsModel
                          hides: [ panel.applicationMenus ]
+                     }
++
++                    panelState: PanelState {}
+                 }
+             }
+         }
@@ -153,7 +157,7 @@
                  Layout.fillWidth: true
                  CheckBox {
                      id: windowControlsCB
--                    onClicked: PanelState.decorationsVisible = checked
++                    onClicked: panelState.decorationsVisible = checked
+                 }
                  Label {
                      text: "Show window decorations"
@@ -164,7 +168,7 @@
              RowLayout {
                  Layout.fillWidth: true
                  CheckBox {
--                    onClicked: PanelState.title = checked ? "Fake window title" : ""
++                    onClicked: panelState.title = checked ? "Fake window title" : ""
+                 }
                  Label {
                      text: "Show fake window title"
@@ -250,7 +254,7 @@
          SignalSpy {
              id: windowControlButtonsSpy
--            target: PanelState
++            target: panelState
              signalName: "closeClicked"
+         }
@@ -260,8 +264,8 @@
              panel.fullscreenMode = false;
              callManager.foregroundCall = null;
--            PanelState.title = "";
--            PanelState.decorationsVisible = false;
++            panelState.title = "";
++            panelState.decorationsVisible = false;
              // Wait for the indicators to get into position.
              // (switches between normal and fullscreen modes are animated)
@@ -456,7 +460,7 @@
+         }
          function test_hint(data) {
--            PanelState.title = "Fake Title"
++            panelState.title = "Fake Title"
              panel.fullscreenMode = data.fullscreen;
              callManager.foregroundCall = data.call;
@@ -498,7 +502,7 @@
          // menus, first by running the hint animation, then after dragging down will
          // expose more of the panel. Releasing the touch will complete the show.
          function test_drag_applicationMenu_down_shows_menu(data) {
--            PanelState.title = "Fake Title";
++            panelState.title = "Fake Title";
              panel.fullscreenMode = data.fullscreen;
              callManager.foregroundCall = data.call;
@@ -589,7 +593,7 @@
+         }
          function test_darkenedAreaEatsAllApplicationMenuEvents() {
--            PanelState.title = "Fake Title"
++            panelState.title = "Fake Title"
              // The center of the area not covered by the indicators menu
              // Ie, the visible darkened area behind the menu
@@ -710,7 +714,7 @@
              var windowControlArea = findChild(panel, "windowControlArea");
              verify(windowControlArea, "Window control area should have been created in windowed mode")
--            PanelState.decorationsVisible = true;
++            panelState.decorationsVisible = true;
              // click in very topleft corner and verify the close button got clicked too
              mouseMove(panel, 0, 0);
              mouseClick(panel, 0, 0, undefined /*button*/, undefined /*modifiers*/, 100 /*short delay*/);
@@ -773,7 +777,7 @@
+         }
          function test_stagedApplicationMenuBarShowOnMouseHover() {
--            PanelState.title = "Fake Title";
++            panelState.title = "Fake Title";
              panel.mode = "staged";
              mouseEmulation.checked = false;
@@ -791,7 +795,7 @@
+         }
          function test_windowedApplicationMenuShowOnMouseHoverWhenDecorationsShown() {
--            PanelState.title = "Fake Title";
++            panelState.title = "Fake Title";
              panel.mode = "windowed";
              mouseEmulation.checked = false;
@@ -807,7 +811,7 @@
              tryCompare(appTitle, "visible", true, undefined, "App title should still be visible on mouse hover when panel decorations are not visible");
              tryCompare(appMenuBar, "visible", false, undefined, "App menu bar should be visible on mouse hover when panel decorations are not visible");
--            PanelState.decorationsVisible = true;
++            panelState.decorationsVisible = true;
              tryCompare(appTitle, "visible", false, undefined, "App title should still be visible on mouse hover when panel decorations are visible");
              tryCompare(appMenuBar, "visible", true, undefined, "App menu bar should be visible on mouse hover when panel decorations not visible");
@@ -855,7 +859,7 @@
              var indicatorsBar = findChild(panel.applicationMenus, "indicatorsBar");
--            PanelState.title = "Fake Title"
++            panelState.title = "Fake Title"
              pullDownApplicationsMenu(0 /*xPos*/);
              compare(aboutToShowCalledSpy.count, 1);
@@ -888,7 +892,7 @@
              var indicatorsBar = findChild(panel.applicationMenus, "indicatorsBar");
--            PanelState.title = "Fake Title"
++            panelState.title = "Fake Title"
              pullDownApplicationsMenu(0 /*xPos*/);
              tryCompare(indicatorsBar, "currentItemIndex", 0);
 === modified file 'tests/qmltests/Stage/tst_DecoratedWindow.qml'
 --- tests/qmltests/Stage/tst_DecoratedWindow.qml	2017-01-03 12:45:42 +0000
 +++ tests/qmltests/Stage/tst_DecoratedWindow.qml	2017-03-31 15:02:41 +0000
@@ -52,6 +52,10 @@
          surfaceManager: sMgr
+     }
++    PanelState {
++        id: panelState
++    }
++
      Item {
          id: fakeShell
@@ -99,7 +103,7 @@
                  surface: fakeApplication && fakeApplication.surfaceList.count > 0 ? fakeApplication.surfaceList.get(0) : null
                  Binding {
--                    target: PanelState
++                    target: panelState
                      property: "focusedPersistentSurfaceId"
                      value: decoratedWindow.surface ? decoratedWindow.surface.persistentId : "x"
+                 }
 === modified file 'tests/qmltests/Stage/tst_DesktopStage.qml'
 --- tests/qmltests/Stage/tst_DesktopStage.qml	2017-03-24 14:04:50 +0000
 +++ tests/qmltests/Stage/tst_DesktopStage.qml	2017-03-31 15:02:41 +0000
@@ -103,11 +103,12 @@
                  availableDesktopArea: availableDesktopAreaItem
                  interactive: true
                  mode: "windowed"
++                panelState: PanelState {}
                  Item {
                      id: availableDesktopAreaItem
                      anchors.fill: parent
--                    anchors.topMargin: PanelState.panelHeight
++                    anchors.topMargin: parent.panelState.panelHeight
+                 }
+             }
+         }
@@ -180,6 +181,7 @@
          stage: stageLoader.status === Loader.Ready ? stageLoader.item : null
          topLevelSurfaceList: topSurfaceList
++        property var panelState: stage ? stage.panelState : null
          function init() {
              // wait until unity8-dash is up and running.
@@ -638,19 +640,19 @@
              maximizeDelegate(facebookAppDelegate);
              // verify the drop shadow is still not visible
--            verify(PanelState.dropShadow == false);
++            verify(panelState.dropShadow == false);
              // start a foreground app, not maximized
              var dialerAppDelegate = startApplication("dialer-app");
              // verify the drop shadow becomes visible
--            tryCompareFunction(function() { return PanelState.dropShadow; }, true);
++            tryCompareFunction(function() { return panelState.dropShadow; }, true);
              // close the maximized app
              ApplicationManager.stopApplication("facebook-webapp");
              // verify the drop shadow is gone
--            tryCompare(PanelState, "dropShadow", false);
++            tryCompare(panelState, "dropShadow", false);
+         }
          function test_threeFingerTapShowsWindowControls_data() {
 === modified file 'tests/qmltests/Stage/tst_PhoneStage.qml'
 --- tests/qmltests/Stage/tst_PhoneStage.qml	2017-03-24 14:04:50 +0000
 +++ tests/qmltests/Stage/tst_PhoneStage.qml	2017-03-31 15:02:41 +0000
@@ -19,6 +19,7 @@
  import Unity.Test 0.1 as UT
  import ".."
  import "../../../qml/Components"
++import "../../../qml/Components/PanelState"
  import "../../../qml/Stage"
  import Ubuntu.Components 1.3
  import Unity.Application 0.1
@@ -60,6 +61,7 @@
          Component.onCompleted: {
              ApplicationManager.startApplication("unity8-dash");
+         }
++        panelState: PanelState {}
+     }
      Flickable {
 === modified file 'tests/qmltests/Stage/tst_WindowResizeArea.qml'
 --- tests/qmltests/Stage/tst_WindowResizeArea.qml	2017-01-26 11:10:01 +0000
 +++ tests/qmltests/Stage/tst_WindowResizeArea.qml	2017-03-31 15:02:41 +0000
@@ -19,7 +19,6 @@
  import QtTest 1.0
  import Unity.Test 0.1
  import ".."
--import "../../../qml/Components/PanelState"
  import "../../../qml/Stage"
  import Ubuntu.Components 1.3
  import Ubuntu.Components.ListItems 1.3 as ListItem
@@ -31,12 +30,6 @@
      height: units.gu(60)
      width: units.gu(85)
--    Binding {
--        target: PanelState
--        property: "panelHeight"
--        value: units.gu(3)
--    }
--
      Component {
          id: fakeWindowComponent
@@ -362,7 +355,7 @@
              // Make sure it's again where we left it in normal state before destroying
              compare(fakeWindow.requestedX >= 0, true)
--            compare(fakeWindow.requestedY >= PanelState.panelHeight, true)
++            compare(fakeWindow.requestedY >= 0, true)
              compare(fakeWindow.requestedX + fakeWindow.width <= root.width, true)
              compare(fakeWindow.requestedY + fakeWindow.height <= root.height, true)
 === modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
 --- tests/qmltests/Tutorial/tst_Tutorial.qml	2017-02-21 13:39:30 +0000
 +++ tests/qmltests/Tutorial/tst_Tutorial.qml	2017-03-31 15:02:41 +0000
@@ -37,20 +37,10 @@
      height: units.gu(71)
      QtObject {
--        id: applicationArguments
--
--        function hasGeometry() {
--            return false;
--        }
--
--        function width() {
--            return 0;
--        }
--
--        function height() {
--            return 0;
--        }
++        id: _screenWindow
++        property bool primary: true
+     }
++    property alias screenWindow: _screenWindow
      Telephony.CallEntry {
          id: phoneCall
@@ -154,6 +144,10 @@
                      Component.onDestruction: {
                          shellLoader.itemDestroyed = true;
+                     }
++                    SurfaceManager {
++                        id: surfaceMan
++                    }
++                    surfaceManager: surfaceMan
+                 }
+             }
+         }
@@ -238,7 +232,7 @@
+             }
              ItemSelector {
--                id: modeSelector
++                    id: modeSelector
                  anchors { left: parent.left; right: parent.right }
                  activeFocusOnPress: false
                  text: "Mode"
@@ -327,9 +321,7 @@
+         }
          function ensureInputMethodSurface() {
--            var surfaceManager = findInvisibleChild(shell, "surfaceManager");
--            verify(surfaceManager);
--            surfaceManager.createInputMethodSurface();
++            shell.surfaceManager.createInputMethodSurface();
              tryCompareFunction(function() { return topLevelSurfaceList.inputMethodSurface !== null }, true);
+         }
 === modified file 'tests/qmltests/tst_OrientedShell.qml'
 --- tests/qmltests/tst_OrientedShell.qml	2017-03-08 09:50:45 +0000
 +++ tests/qmltests/tst_OrientedShell.qml	2017-03-31 15:02:41 +0000
@@ -30,7 +30,6 @@
  import "../../qml"
  import "../../qml/Components"
--import "../../qml/Components/PanelState"
  import "Stage"
  Rectangle {
@@ -82,6 +81,12 @@
          deviceFilter: InputInfo.Keyboard
+     }
++    QtObject {
++        id: _screenWindow
++        property bool primary: true
++    }
++    property alias screenWindow: _screenWindow
++
      property int physicalOrientation0
      property int physicalOrientation90
      property int physicalOrientation180
@@ -174,6 +179,11 @@
                  Component.onDestruction: {
                      orientedShellLoader.itemDestroyed = true;
+                 }
++
++                SurfaceManager {
++                    id: surfaceMan
++                }
++                surfaceManager: surfaceMan
+             }
+         }
+     }
@@ -446,6 +456,15 @@
          property Item orientedShell: orientedShellLoader.status === Loader.Ready ? orientedShellLoader.item : null
          property Item shell
          property QtObject topLevelSurfaceList
++        property var panelState: undefined
++
++        onOrientedShellChanged: {
++            if (orientedShell) {
++                panelState = findInvisibleChild(orientedShell, "panelState");
++            } else {
++                panelState = undefined;
++            }
++        }
          SignalSpy { id: signalSpy }
          SignalSpy { id: signalSpy2 }
@@ -1463,6 +1482,7 @@
              removeTimeConstraintsFromSwipeAreas(orientedShellLoader.item);
              shell = findChild(orientedShell, "shell");
++            verify(shell);
              topLevelSurfaceList = findInvisibleChild(shell, "topLevelSurfaceList");
              verify(topLevelSurfaceList);
@@ -1512,13 +1532,13 @@
              print("exptectedAngle", expectedAngle, point.x, point.y)
              switch (expectedAngle) {
              case 0:
--                return point.x === 0 && point.y === PanelState.panelHeight;
++                return point.x === 0 && point.y === panelState.panelHeight;
              case 90:
--                return point.x === orientedShell.width - PanelState.panelHeight && point.y === 0;
++                return point.x === orientedShell.width - panelState.panelHeight && point.y === 0;
              case 180:
--                return point.x === orientedShell.width && point.y === orientedShell.height - PanelState.panelHeight;
++                return point.x === orientedShell.width && point.y === orientedShell.height - panelState.panelHeight;
              default: // 270
--                return point.x === PanelState.panelHeight && point.y === orientedShell.height;
++                return point.x === panelState.panelHeight && point.y === orientedShell.height;
+             }
+         }
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2017-03-24 11:08:11 +0000
 +++ tests/qmltests/tst_Shell.qml	2017-03-31 15:02:41 +0000
@@ -38,7 +38,6 @@
  import "../../qml"
  import "../../qml/Components"
--import "../../qml/Components/PanelState"
  import "Stage"
  Rectangle {
@@ -61,14 +60,23 @@
      onShellChanged: {
          if (shell) {
              topLevelSurfaceList = testCase.findInvisibleChild(shell, "topLevelSurfaceList");
--            appMenuData.surfaceManager = testCase.findInvisibleChild(shell, "surfaceManager");
++            appMenuData.surfaceManager = shell.surfaceManager;
++            panelState = testCase.findInvisibleChild(shell, "panelState");
          } else {
              topLevelSurfaceList = null;
              appMenuData.surfaceManager = null;
++            panelState = null;
+         }
+     }
      property var topLevelSurfaceList: null
++    property var panelState: null
++
++    QtObject {
++        id: _screenWindow
++        property bool primary: true
++    }
++    property alias screenWindow: _screenWindow
      Item {
          id: shellContainer
@@ -144,6 +152,11 @@
                      Component.onDestruction: {
                          shellLoader.itemDestroyed = true;
+                     }
++
++                    SurfaceManager {
++                        id: surfaceMan
++                    }
++                    surfaceManager: surfaceMan
+                 }
+             }
+         }
@@ -678,7 +691,7 @@
+         }
          function ensureInputMethodSurface() {
--            var surfaceManager = findInvisibleChild(shell, "surfaceManager");
++            var surfaceManager = shell.surfaceManager;
              verify(surfaceManager);
              surfaceManager.createInputMethodSurface();
@@ -1885,21 +1898,21 @@
              var maximizeButton = findChild(appDelegate, "maximizeWindowButton");
              tryCompare(appDelegate, "state", "normal");
--            tryCompare(PanelState, "decorationsVisible", false)
++            tryCompare(panelState, "decorationsVisible", false)
              mouseClick(maximizeButton, maximizeButton.width / 2, maximizeButton.height / 2);
              tryCompare(appDelegate, "state", "maximized");
--            tryCompare(PanelState, "decorationsVisible", true)
++            tryCompare(panelState, "decorationsVisible", true)
              ApplicationManager.stopApplication(application.appId);
--            tryCompare(PanelState, "decorationsVisible", false)
++            tryCompare(panelState, "decorationsVisible", false)
              // wait until all zombie surfaces are gone. As MirSurfaceItems hold references over them.
              // They won't be gone until those surface items are destroyed.
              tryCompareFunction(function() { return application.surfaceList.count }, 0);
              ApplicationManager.startApplication(application.appId);
--            tryCompare(PanelState, "decorationsVisible", true)
++            tryCompare(panelState, "decorationsVisible", true)
+         }
          function test_newAppHasValidGeometry() {
@@ -1956,7 +1969,7 @@
              mousePress(appDelegate, appDelegate.width / 2, units.gu(1))
              mouseMove(appDelegate, appDelegate.width / 2, -units.gu(100))
--            compare(appDelegate.y >= PanelState.panelHeight, true);
++            compare(appDelegate.y >= panelState.panelHeight, true);
+         }
          function test_cantResizeWindowUnderPanel() {
@@ -1984,7 +1997,7 @@
              mouseMove(decoration, decoration.width/2, -units.gu(100));
              // verify we don't go past the panel
--            compare(appDelegate.y >= PanelState.panelHeight, true);
++            compare(appDelegate.y >= panelState.panelHeight, true);
+         }
          function test_restoreWindowStateFixesIfUnderPanel() {
@@ -2008,7 +2021,7 @@
              tryCompareFunction(function () { return topLevelSurfaceList.applicationAt(0).appId; }, application.appId);
              appDelegate = appRepeater.itemAt(0);
--            compare(appDelegate.y >= PanelState.panelHeight, true);
++            compare(appDelegate.y >= panelState.panelHeight, true);
+         }
          function test_lifecyclePolicyForNonTouchApp_data() {
@@ -2671,9 +2684,9 @@
          function test_oskDisplacesWindow_data() {
              return [
--                {tag: "no need to displace", windowHeight: units.gu(10), windowY: units.gu(5), targetDisplacement: units.gu(5), oskEnabled: true},
--                {tag: "displace to top", windowHeight: units.gu(50), windowY: units.gu(10), targetDisplacement: PanelState.panelHeight, oskEnabled: true},
--                {tag: "osk not on this screen", windowHeight: units.gu(40), windowY: units.gu(10), targetDisplacement: units.gu(10), oskEnabled: false},
++                {tag: "no need to displace", windowHeight: units.gu(10), windowY: units.gu(5), targetDisplacement: function() { return units.gu(5); }, oskEnabled: true},
++                {tag: "displace to top", windowHeight: units.gu(50), windowY: units.gu(10), targetDisplacement: function() { return panelState.panelHeight; }, oskEnabled: true},
++                {tag: "osk not on this screen", windowHeight: units.gu(40), windowY: units.gu(10), targetDisplacement: function() { return units.gu(10); }, oskEnabled: false},
+             ]
+         }
@@ -2695,11 +2708,11 @@
              dashAppDelegate.windowedY = data.windowY;
              topLevelSurfaceList.inputMethodSurface.setInputBounds(Qt.rect(0, 0, 0, 0));
              var initialY = dashAppDelegate.y;
--            print("intial", initialY, "panel", PanelState.panelHeight);
--            verify(initialY > PanelState.panelHeight);
++            print("intial", initialY, "panel", panelState.panelHeight);
++            verify(initialY > panelState.panelHeight);
              topLevelSurfaceList.inputMethodSurface.setInputBounds(Qt.rect(0, root.height / 2, root.width, root.height / 2));
--            tryCompare(dashAppDelegate, "y", data.targetDisplacement);
++            tryCompare(dashAppDelegate, "y", data.targetDisplacement());
              topLevelSurfaceList.inputMethodSurface.setInputBounds(Qt.rect(0, 0, 0, 0));
              tryCompare(dashAppDelegate, "y", initialY);
@@ -3132,7 +3145,7 @@
              // double click the panel
              var panel = findChild(shell, "panel");
              verify(panel);
--            mouseDoubleClickSequence(panel, panel.width/2, PanelState.panelHeight/2, Qt.LeftButton, Qt.NoModifier, 300);
++            mouseDoubleClickSequence(panel, panel.width/2, panelState.panelHeight/2, Qt.LeftButton, Qt.NoModifier, 300);
              tryCompare(appDelegate, "state", "restored");
+         }
 === modified file 'tests/qmltests/tst_ShellWithPin.qml'
 --- tests/qmltests/tst_ShellWithPin.qml	2017-03-22 20:14:44 +0000
 +++ tests/qmltests/tst_ShellWithPin.qml	2017-03-31 15:02:41 +0000
@@ -40,20 +40,10 @@
+     }
      QtObject {
--        id: applicationArguments
--
--        function hasGeometry() {
--            return false;
--        }
--
--        function width() {
--            return 0;
--        }
--
--        function height() {
--            return 0;
--        }
++        id: _screenWindow
++        property bool primary: true
+     }
++    property alias screenWindow: _screenWindow
      Row {
          id: contentRow
@@ -72,6 +62,10 @@
                      Component.onDestruction: {
                          shellLoader.itemDestroyed = true
+                     }
++                    SurfaceManager {
++                        id: surfaceMan
++                    }
++                    surfaceManager: surfaceMan
+                 }
+             }
+         }
 === modified file 'tests/uqmlscene/main.cpp'
 --- tests/uqmlscene/main.cpp	2017-01-10 14:46:09 +0000
 +++ tests/uqmlscene/main.cpp	2017-03-31 15:02:41 +0000
@@ -479,6 +479,8 @@
              // TODO: as soon as the engine construction completes, the debug service is
              // listening for connections.  But actually we aren't ready to debug anything.
              QQmlEngine engine;
++            engine.rootContext()->setContextProperty("DebuggingController", new DebuggingController(&app));
++
              QQmlComponent *component = new QQmlComponent(&engine);
              for (int i = 0; i < imports.size(); ++i)
                  engine.addImportPath(imports.at(i));