Unity 8

Merge lp:~dandrader/unity8/miral into lp:unity8

miral
Merge into trunk

Proposed by Daniel d'Andrada on 2016-11-23

Status:

Superseded

Proposed branch:

lp:~dandrader/unity8/miral

Merge into:

lp:unity8

Prerequisite:

lp:~dandrader/unity8/refactorWindowDecoration

Diff against target:

5347 lines (+2203/-1403)

42 files modified

CMakeLists.txt (+1/-1)
debian/control (+3/-3)
plugins/WindowManager/CMakeLists.txt (+3/-1)
plugins/WindowManager/TopLevelSurfaceList.cpp (+0/-481)
plugins/WindowManager/TopLevelSurfaceList.h (+0/-223)
plugins/WindowManager/TopLevelWindowModel.cpp (+644/-0)
plugins/WindowManager/TopLevelWindowModel.h (+258/-0)
plugins/WindowManager/Window.cpp (+234/-0)
plugins/WindowManager/Window.h (+161/-0)
plugins/WindowManager/WindowManagerPlugin.cpp (+5/-2)
qml/Components/InputMethod.qml (+5/-4)
qml/Components/KeymapSwitcher.qml (+4/-1)
qml/Shell.qml (+14/-6)
qml/Stage/FakeMaximizeDelegate.qml (+7/-7)
qml/Stage/MoveHandler.qml (+1/-1)
qml/Stage/Stage.qml (+126/-119)
qml/Stage/StagedFullscreenPolicy.qml (+4/-4)
qml/Stage/TopLevelSurfaceRepeater.qml (+0/-67)
qml/Stage/WindowControlsOverlay.qml (+1/-1)
qml/Stage/WindowedFullscreenPolicy.qml (+1/-1)
tests/mocks/Unity/Application/ApplicationInfo.cpp (+48/-24)
tests/mocks/Unity/Application/ApplicationInfo.h (+2/-2)
tests/mocks/Unity/Application/ApplicationManager.cpp (+92/-63)
tests/mocks/Unity/Application/ApplicationManager.h (+31/-4)
tests/mocks/Unity/Application/CMakeLists.txt (+1/-1)
tests/mocks/Unity/Application/MirSurface.cpp (+85/-98)
tests/mocks/Unity/Application/MirSurface.h (+25/-27)
tests/mocks/Unity/Application/MirSurfaceItem.cpp (+4/-4)
tests/mocks/Unity/Application/MirSurfaceItem.h (+1/-2)
tests/mocks/Unity/Application/MirSurfaceListModel.cpp (+12/-34)
tests/mocks/Unity/Application/MirSurfaceListModel.h (+2/-7)
tests/mocks/Unity/Application/SurfaceManager.cpp (+169/-26)
tests/mocks/Unity/Application/SurfaceManager.h (+28/-10)
tests/mocks/Unity/Application/plugin.cpp (+2/-31)
tests/plugins/Unity/Launcher/launchermodeltest.cpp (+4/-0)
tests/qmltests/Stage/ApplicationCheckBox.qml (+1/-1)
tests/qmltests/Stage/tst_ApplicationWindow.qml (+12/-30)
tests/qmltests/Stage/tst_DesktopStage.qml (+50/-40)
tests/qmltests/Stage/tst_PhoneStage.qml (+18/-12)
tests/qmltests/Stage/tst_TabletStage.qml (+16/-10)
tests/qmltests/tst_Shell.qml (+124/-50)
tests/utils/modules/Unity/Test/UnityTestCase.qml (+4/-5)

To merge this branch:

bzr merge lp:~dandrader/unity8/miral

Undecided

Won't Fix

Link a bug report

Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)			Needs Fixing on 2016-11-29
Unity8 CI Bot	continuous-integration	2016-11-23	Needs Fixing on 2016-11-24
Michael Zanetti		2016-11-23	Pending
Review via email: mp+311626@code.launchpad.net

This proposal supersedes a proposal from 2016-11-01.

This proposal has been superseded by a proposal from 2016-11-30.

Commit message

Let the model deal with some window management decisions

eg: which window to focus, whether to change surface state

unity8 requests and reacts to changes in the model instead of applying them

Description of the change

Prereq-archive: ppa:ci-train-ppa-service/ubuntu/2160

For the upcoming, miral-powered, qtmir.

One notable introduction is the Window object, which is a sligthly higher level abstraction of a MirSurface (and a drop-in replacement for it) to be used by Stage.qml. Window always exists in a TopLevelWindowModel entry so that QML code no longer has to if(){}else{} for the existence of a MirSurface (because of the splash screen case)

* Are there any related MPs required for this MP to build/function as expected? Please list.

https://code.launchpad.net/~unity-team/unity-api/miral/+merge/309938
https://code.launchpad.net/~unity-team/qtmir/miral-qt-integration/+merge/310001

It's all in this silo: https://bileto.ubuntu.com/#/ticket/2160

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes.

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable

* If you changed the UI, has there been a design review?
Not applicable

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-01: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-07: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-14: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-14: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-11-18: Posted in a previous version of this proposal

* See a bunch of inline comments

* I think we should not give up on the differntiation between claimFocus() and requestFocus(). One of them says the stage wants to actually focus something *now* while the other indicates that the app requested focus on its own (or perhaps u-a-l did). IMO claimFocus() should not be dropped and still do the raisId() call on the model. requestfocus() instead should end up in the shell, and if the shell is ok with doing so, it should call claimFocus() itself.

* IMO you're exaggerating with the debug messages. unity8.toplevelsurfacelist was already very annoying and this seems to have even more prints. Sure, you can argue that I could turn them off with the debug filter, which is what I do, but then I get none any more while the most important ones like raise() added() and removed() would still make sense.

This has been a code review for the code up until the mocks. Still needs review for tests/mocks and especially in depth testing.

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-11-18: Posted in a previous version of this proposal

Not yet sure if just an issue in the mocks or not, but this breaks:

- open an app
- click the minimize button in the window decoration
- click the app again in the launcher to restore it
- now click the minimize button again
=> button doesn't work any more

review: Needs Fixing

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-18: Posted in a previous version of this proposal

On 18/11/2016 12:29, Michael Zanetti wrote:
> * IMO you're exaggerating with the debug messages. unity8.toplevelsurfacelist was already very annoying and this seems to have even more prints. Sure, you can argue that I could turn them off with the debug filter, which is what I do, but then I get none any more while the most important ones like raise() added() and removed() would still make sense.

Reduced the logging output. Should be the way you prefer now.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-11-18: Posted in a previous version of this proposal

- have 3 apps (a, b and c), make them overlap a bit for better visibility
- focus a by clicking it
- focus b by clicking it
- focus c by clicking it
- minimize c
=> a will be focused

expected: after minimizing c, b should be focused

review: Needs Fixing

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-18: Posted in a previous version of this proposal

On 18/11/2016 12:29, Michael Zanetti wrote:
> * I think we should not give up on the differntiation between claimFocus() and requestFocus(). One of them says the stage wants to actually focus something*now* while the other indicates that the app requested focus on its own (or perhaps u-a-l did). IMO claimFocus() should not be dropped and still do the raisId() call on the model. requestfocus() instead should end up in the shell, and if the shell is ok with doing so, it should call claimFocus() itself.

What you are explaining effectively is that: leave things as they are
currently with regards to focus. Which means focus lives in unity8 and
miral has no say over it.

The whole point of this miral effort is exactly to move such window
management decisions down to Mir, as dictated by our high-profile
stakeholder.

On the bright side, focus requests made by unity8 should naturally
always be sensible (since it knows the situation pretty well) and
therefore miral should always swiftly comply. So in terms of end
results, those requests will work just like imperative assignments.

Focus is a central piece of window management and if miral is to do
anything useful it has to have a say in it. And we cannot have two
entities making decisions on focus (unity8 and miral) as it will
inevitably be racy and conflictive.

As for the origin of the focus change request (shell vs. application),
it doesn't matter from miral's standpoint. It will comply to either as
long the change is valid and makes sense. Eg.: it should never allow a
window blocked by a child modal dialog to be focused. So it's mostly
sanity checking. I don't see miral ignoring requests on a whim. :)

Besides, having two separate code paths would make unity8 code more
complex. Eg: Having both code that sets surface state and code that
responds to surface state changes. "If surface state change was done in
response my your own set(), do nothing, else, ponder and respond."

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-18: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-18: Posted in a previous version of this proposal

On 18/11/2016 12:29, Michael Zanetti wrote:
>> +int TopLevelWindowModel::nextFreeId(int candidateId)
>> >+{
>> >+ if (candidateId > m_maxId) {
>> >+ return nextFreeId(1);
>> >+ } else {
>> >+ if (indexForId(candidateId) == -1) {
>> >+ // it's indeed free
>> >+ return candidateId;
>> >+ } else {
>> >+ return nextFreeId(candidateId + 1);
>> >+ }
>> >+ }
>> >+}
> In the very unlikely event that we'd run out of free ids, this would crash with a stack overflow. Think it makes sense to write this in a non-recursive manner and perhaps add some way to actually handle failures?
>
If we run out of free ids it's because there's already a bug somewhere.
There's no way there's a valid situation where we would have literally a
million windows lying around.

But a non-recursive version is indeed lighter-weight on resources if it
ever has to traverse a long stretch of taken ids. Done.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-18: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-18: Posted in a previous version of this proposal

On 18/11/2016 12:29, Michael Zanetti wrote:
>> +QString TopLevelWindowModel::toString()
>> >+{
>> >+ QString str;
>> >+ for (int i = 0; i < m_windowModel.count(); ++i) {
>> >+ auto item = m_windowModel.at(i);
>> >+
>> >+ QString itemStr = QString("(index=%1,appId=%2,surface=0x%3,id=%4)")
>> >+ .arg(i)
>> >+ .arg(item.application->appId())
>> >+ .arg((qintptr)item.window->surface(), 0, 16)
>> >+ .arg(item.window->id());
> it would be slightly more performant if you'd use QString::arg(QString, QString, QSttring, QString) instead as it has to walk the string only once with that...
>
Done.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-18: Posted in a previous version of this proposal

On 18/11/2016 12:29, Michael Zanetti wrote:
>> +public Q_SLOTS:
>> >+ /**
>> >+ * @brief Returns the surface at the given index
>> >+ *
>> >+ * It will be a nullptr if the application is still starting up and thus hasn't yet created
>> >+ * and drawn into a surface.
>> >+ *
>> >+ * Same as windowAt(index).surface()
>> >+ */
>> >+ unity::shell::application::MirSurfaceInterface *surfaceAt(int index) const;
>> >+
>> >+ /**
>> >+ * @brief Returns the window at the given index
>> >+ *
>> >+ * Will always be valid
>> >+ */
>> >+ Window *windowAt(int index) const;
>> >+
>> >+ /**
>> >+ * @brief Returns the application at the given index
>> >+ */
>> >+ unity::shell::application::ApplicationInfoInterface *applicationAt(int index) const;
>> >+
>> >+ /**
>> >+ * @brief Returns the unique id of the element at the given index
>> >+ */
>> >+ int idAt(int index) const;
>> >+
>> >+ /**
>> >+ * @brief Returns the index where the row with the given id is located
>> >+ *
>> >+ * Returns -1 if there's no row with the given id.
>> >+ */
>> >+ int indexForId(int id) const;
> slots with return value are weird. All the above should be public Q_INVOKABLE instead IMO.

Which uglifies the header file. Not great either.

Done.

>
>> >+
>> >+ /**
>> >+ * @brief Raises the row with the given id to the top of the window stack (index == count-1)
>> >+ */
>> >+ void raiseId(int id);
> this makes sense as slot indeed
>
But it's only a slot so it can be called from QML. Made it a Q_INVOKABLE
as well to match the others.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-18: Posted in a previous version of this proposal

On 18/11/2016 12:29, Michael Zanetti wrote:
>> +Window::Window(int id)
>> >+ : QObject(nullptr)
>> >+ , m_id(id)
>> >+{
>> >+ DEBUG_MSG << "()";
>> >+ QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
> is there a reason why you can't use QObject's parent instead?

Laziness. Done.

>
> Would make sense in any case to parent the Window objects properly IMO
>
Yes, that's a nice safety net.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-18: Posted in a previous version of this proposal

On 18/11/2016 12:29, Michael Zanetti wrote:
>> +QString Window::toString() const
>> >+{
>> >+ if (surface()) {
>> >+ return QString("Window[0x%1, id=%2, MirSurface[0x%3,\"%4\"]]")
>> >+ .arg((quintptr)this, 0, 16)
>> >+ .arg(id())
>> >+ .arg((quintptr)surface(), 0, 16)
>> >+ .arg(surface()->name());
> same here... if this is only ever executed in certain debug modes, ok with me, but if this is executed in production code too, please use the single .arg(..., ..., ...) call for better performance.
>
Done.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-18: Posted in a previous version of this proposal

On 18/11/2016 12:29, Michael Zanetti wrote:
>> + Q_PROPERTY(unity::shell::application::MirSurfaceInterface* surface READ surface NOTIFY surfaceChanged)
> gah I despise this overly excessive namespacing...

Me too! Nested namespaces are an eyesore.

> IMO you could just do "using namespace unity::shell::application;" and be done with this, really... It's not like we'd ever have a conflicting MirSurfaceInterface class somewhere else...
>
Not in a header file though. I think that's bad form. A .cpp file
#including this header would inadvertently get the
unity::shell::application namespace included in their main one.

I'm also scared of doing namespace manipulations in Qt macros. That
might go wrong.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-18: Posted in a previous version of this proposal

On 18/11/2016 12:29, Michael Zanetti wrote:
>> + qRegisterMetaType<Window*>("Window*");
> think it would make sense to qmlRegisterUncreatableType<Window>(...) too? Seems it would be useful API to be able to access Window from QML
>

Not sure. qmlRegisterUncreatableType() documentation says: "This is
useful where the type is only intended for providing attached properties
or enum values."
Not the case here.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-18: Posted in a previous version of this proposal

On 18/11/2016 12:29, Michael Zanetti wrote:
>> - onMinimizeClicked: root.minimizeClicked();
>> >+ onMinimizeClicked: {
>> >+ if (applicationWindow.surface) {
>> >+ applicationWindow.surface.requestState(Mir.MinimizedState);
>> >+ }
>> >+ }
> this seems odd... why would you refactor DecoratedWindow to not directly operate on the data any more but instead pass everything outside with signals in a earlier branch, but now start introducing this somewhat messy behavior here again? IMO this should also be passed to outside to the Stage, and only the stage being in charge to actually execute things on the surfaces.
>
That's some old change that pre-dates that branch you mentioned.
Reverted.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-18: Posted in a previous version of this proposal

On 18/11/2016 12:29, Michael Zanetti wrote:
>> - function focusNext() {
> same as I mentioned earlier. I'm still a bit scared of dropping control over this from the qml part, but lets see how it works... At least now that the model is part of unity8 again, it seems easier to change that back or modify in yet another way if we need to.
>
This is a perfect case where it makes sense to delegate to the C++
model. Choosing the next window do be focused when the current one is
minimized is a bunch of imperative code (and WM policy) that fits better
in C++ and not mixed with animation code in QML.

Particularly now that the model knows everything (who's focused and the
position and state of all surfaces).

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-18: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-18: Posted in a previous version of this proposal

On 18/11/2016 12:29, Michael Zanetti wrote:
>> if (!shown && priv.mainStageDelegate && !root.spreadShown) {
>> >- priv.mainStageDelegate.claimFocus();
>> >+ priv.mainStageDelegate.requestFocus();
> ok... given that requestFocus() effectively does claimFocus() now, this change totally makes sense... but we're losing the distinction between "the stage wants to focus something" and "an app requests focus by itsel (or something else than the stage)".
>
> Can you think of a way to keep that separation perhaps?
>
Heh, I actually think it is a good thing to handle them the same way (as
I said in some other comment).

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-18: Posted in a previous version of this proposal

On 18/11/2016 12:29, Michael Zanetti wrote:
>> + function updateQmlFocusFromMirSurfaceFocus() {
>> >+ if (model.window.focused) {
>> > claimFocus();
>> >+ priv.focusedAppDelegate = appDelegate;
>> >+ //} else if (priv.focusedAppDelegate === appDelegate && root.state != "spread") {
>> >+ // priv.focusedAppDelegate = null;
> leftover?
>
Yes, removed.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-18: Posted in a previous version of this proposal

On 18/11/2016 12:29, Michael Zanetti wrote:
>> + onMaximizeHorizontallyClicked: {
>> >+ if (appDelegate.maximizedHorizontally)
>> >+ appDelegate.requestRestore();
>> >+ else
>> >+ appDelegate.requestMaximizeHorizontally();
>> >+ }
> {} missing
>
>> >+ onMaximizeVerticallyClicked: {
>> >+ if (appDelegate.maximizedVertically)
>> >+ appDelegate.requestRestore();
>> >+ else
>> >+ appDelegate.requestMaximizeVertically();
>> >+ }
> {} missing
>

Not sure if that's in our coding style but ok, added.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-18: Posted in a previous version of this proposal

On 18/11/2016 14:16, Michael Zanetti wrote:
> Review: Needs Fixing
>
> Not yet sure if just an issue in the mocks or not, but this breaks:
>
> - open an app
> - click the minimize button in the window decoration
> - click the app again in the launcher to restore it
> - now click the minimize button again
> => button doesn't work any more

Bug in the mock. Works with qtmir.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-18: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-18: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2016-11-21: Posted in a previous version of this proposal

>>>> - priv.mainStageDelegate.claimFocus();
>>>> >> >+ priv.mainStageDelegate.requestFocus();
>> > ok... given that requestFocus() effectively does claimFocus() now, this change totally makes sense... but we're losing the distinction between "the stage wants to focus something" and "an app requests focus by itsel (or something else than the stage)".
>> >
>> > Can you think of a way to keep that separation perhaps?
>> >
> Heh, I actually think it is a good thing to handle them the same way (as
> I said in some other comment).

How does focus stealing prevention come into play here? I believe the
plan was to only grant focus to apps that send along a ~MirCookie based
on a timestamp. I believe it's described here:

https://docs.google.com/document/d/1L85DdfDd3lDbvchYbgQ45C_lJ1IeTMG4uc7Nuq_XdAE/edit#heading=h.nlenkblnkaqq

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-11-21: Posted in a previous version of this proposal

On 18.11.2016 21:09, Daniel d'Andrada wrote:
> On 18/11/2016 12:29, Michael Zanetti wrote:
>>> + qRegisterMetaType<Window*>("Window*");
>> think it would make sense to qmlRegisterUncreatableType<Window>(...) too? Seems it would be useful API to be able to access Window from QML
>>
>
> Not sure. qmlRegisterUncreatableType() documentation says: "This is
> useful where the type is only intended for providing attached properties
> or enum values."
> Not the case here.

I'm more thinking about being able to access the Window type in QML
altogether. Not really about providing attached properties etc, but it
could make sense to do pass the Window object to somewhere in QML and
access its property there without having access to the model.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-11-21: Posted in a previous version of this proposal

> On 18/11/2016 12:29, Michael Zanetti wrote:
> > * I think we should not give up on the differntiation between claimFocus()
> and requestFocus(). One of them says the stage wants to actually focus
> something*now* while the other indicates that the app requested focus on its
> own (or perhaps u-a-l did). IMO claimFocus() should not be dropped and still
> do the raisId() call on the model. requestfocus() instead should end up in the
> shell, and if the shell is ok with doing so, it should call claimFocus()
> itself.
>
> What you are explaining effectively is that: leave things as they are
> currently with regards to focus. Which means focus lives in unity8 and
> miral has no say over it.
>
> The whole point of this miral effort is exactly to move such window
> management decisions down to Mir, as dictated by our high-profile
> stakeholder.

There's a bunch of other stakeholders though that want to have it pixel perfect when it comes to animations and transitions. I am not saying miral should not have any say, but miral should send a requestFocus() to the shell and the shell will do it.
What I'm saying is that miral can tell unity to change the focus, and unity will follow that (unless it's in the middle of a transition or something). What you're proposing is that miral has all the say on when to change focus, and unity8 cannot do any course correction if the moment is bad.

> Focus is a central piece of window management and if miral is to do
> anything useful it has to have a say in it. And we cannot have two
> entities making decisions on focus (unity8 and miral) as it will
> inevitably be racy and conflictive.

which is exactly what we have now... unity8 thinks it is in charge, but miral can just jump in and trash it. I'm really just trying to avoid that.

>
> As for the origin of the focus change request (shell vs. application),
> it doesn't matter from miral's standpoint. It will comply to either as
> long the change is valid and makes sense. Eg.: it should never allow a
> window blocked by a child modal dialog to be focused. So it's mostly
> sanity checking. I don't see miral ignoring requests on a whim. :)
>
> Besides, having two separate code paths would make unity8 code more
> complex. Eg: Having both code that sets surface state and code that
> responds to surface state changes. "If surface state change was done in
> response my your own set(), do nothing, else, ponder and respond."

And I'm also not talking about 2 separate code paths. I'm saying the one code path should go through unity8 and not just manipulate the model at random.

Therefore I think only unity8 should manipulate the model, taking miral as consultant on how to manipulate it. This current approach is really the one that creates multiple entities fighting over the state of the model.

> On 18/11/2016 12:29, Michael Zanetti wrote:
> > * I think we should not give up on the differntiation between claimFocus()
> and requestFocus(). One of them says the stage wants to actually focus
> something*now*  while the other indicates that the app requested focus on its
> own (or perhaps u-a-l did). IMO claimFocus() should not be dropped and still
> do the raisId() call on the model. requestfocus() instead should end up in the
> shell, and if the shell is ok with doing so, it should call claimFocus()
> itself.
> 
> What you are explaining effectively is that: leave things as they are
> currently with regards to focus. Which means focus lives in unity8 and
> miral has no say over it.
> 
> The whole point of this miral effort is exactly to move such window
> management decisions down to Mir, as dictated by our high-profile
> stakeholder.

which is exactly what we have now... unity8 thinks it is in charge, but miral can just jump in and trash it. I'm really just trying to avoid that.

> 
> As for the origin of the focus change request (shell vs. application),
> it doesn't matter from miral's standpoint. It will comply to either as
> long the change is valid and makes sense. Eg.: it should never allow a
> window blocked by a child modal dialog to be focused. So it's mostly
> sanity checking. I don't see miral ignoring requests on a whim. :)
> 
> Besides, having two separate code paths would make unity8 code more
> complex. Eg: Having both code that sets surface state and code that
> responds to surface state changes. "If surface state change was done in
> response my your own set(), do nothing, else, ponder and respond."

And I'm also not talking about 2 separate code paths. I'm saying the one code path should go through unity8 and not just manipulate the model at random.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-21: Posted in a previous version of this proposal

On 18/11/2016 14:21, Michael Zanetti wrote:
> Review: Needs Fixing
>
> - have 3 apps (a, b and c), make them overlap a bit for better visibility
> - focus a by clicking it
> - focus b by clicking it
> - focus c by clicking it
> - minimize c
> => a will be focused
>
> expected: after minimizing c, b should be focused

Can't reproduce in "make tryDesktopStage". Need more specific steps
(like exact test and apps launched).

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-21: Posted in a previous version of this proposal

On 21/11/2016 07:27, Michael Zanetti wrote:
>
> On 18.11.2016 21:09, Daniel d'Andrada wrote:
>> On 18/11/2016 12:29, Michael Zanetti wrote:
>>>> + qRegisterMetaType<Window*>("Window*");
>>> think it would make sense to qmlRegisterUncreatableType<Window>(...) too? Seems it would be useful API to be able to access Window from QML
>>>
>> Not sure. qmlRegisterUncreatableType() documentation says: "This is
>> useful where the type is only intended for providing attached properties
>> or enum values."
>> Not the case here.
> I'm more thinking about being able to access the Window type in QML
> altogether. Not really about providing attached properties etc, but it
> could make sense to do pass the Window object to somewhere in QML and
> access its property there without having access to the model.
>
>
This already happens in Stage.qml:

"""
x: model.window.position.x - decoratedWindow.contentX
y: model.window.position.y - decoratedWindow.contentY
"""

Looks like qmlRegisterUncreatableType() is not needed for that. If think
you only need it for Window.foo type of constructs.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-21: Posted in a previous version of this proposal

On 21/11/2016 06:48, Michał Sawicz wrote:
>>>>> - priv.mainStageDelegate.claimFocus();
>>>>>>>> + priv.mainStageDelegate.requestFocus();
>>>> ok... given that requestFocus() effectively does claimFocus() now, this change totally makes sense... but we're losing the distinction between "the stage wants to focus something" and "an app requests focus by itsel (or something else than the stage)".
>>>>
>>>> Can you think of a way to keep that separation perhaps?
>>>>
>> Heh, I actually think it is a good thing to handle them the same way (as
>> I said in some other comment).
> How does focus stealing prevention come into play here? I believe the
> plan was to only grant focus to apps that send along a ~MirCookie based
> on a timestamp. I believe it's described here:
>
> https://docs.google.com/document/d/1L85DdfDd3lDbvchYbgQ45C_lJ1IeTMG4uc7Nuq_XdAE/edit#heading=h.nlenkblnkaqq
>
>
This happens at a level lower than unity8. All unity8 knows and cares
about is that some surface in the model got focus.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-11-21: Posted in a previous version of this proposal

On 21.11.2016 12:09, Daniel d'Andrada wrote:
> On 21/11/2016 07:27, Michael Zanetti wrote:
>>
>> On 18.11.2016 21:09, Daniel d'Andrada wrote:
>>> On 18/11/2016 12:29, Michael Zanetti wrote:
>>>>> + qRegisterMetaType<Window*>("Window*");
>>>> think it would make sense to qmlRegisterUncreatableType<Window>(...) too? Seems it would be useful API to be able to access Window from QML
>>>>
>>> Not sure. qmlRegisterUncreatableType() documentation says: "This is
>>> useful where the type is only intended for providing attached properties
>>> or enum values."
>>> Not the case here.
>> I'm more thinking about being able to access the Window type in QML
>> altogether. Not really about providing attached properties etc, but it
>> could make sense to do pass the Window object to somewhere in QML and
>> access its property there without having access to the model.
>>
>>
> This already happens in Stage.qml:
>
> """
> x: model.window.position.x - decoratedWindow.contentX
> y: model.window.position.y - decoratedWindow.contentY
> """
>
> Looks like qmlRegisterUncreatableType() is not needed for that. If think
> you only need it for Window.foo type of constructs.

Hmm, ok... fine then.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-21: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-11-21: Posted in a previous version of this proposal

> On 18/11/2016 14:21, Michael Zanetti wrote:
> > Review: Needs Fixing
> >
> > - have 3 apps (a, b and c), make them overlap a bit for better visibility
> > - focus a by clicking it
> > - focus b by clicking it
> > - focus c by clicking it
> > - minimize c
> > => a will be focused
> >
> > expected: after minimizing c, b should be focused
>
>
> Can't reproduce in "make tryDesktopStage". Need more specific steps
> (like exact test and apps launched).

Hmm... I can't reproduce it any more either after your latest changes.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-11-21: Posted in a previous version of this proposal

> On 18/11/2016 14:16, Michael Zanetti wrote:
> > Review: Needs Fixing
> >
> > Not yet sure if just an issue in the mocks or not, but this breaks:
> >
> > - open an app
> > - click the minimize button in the window decoration
> > - click the app again in the launcher to restore it
> > - now click the minimize button again
> > => button doesn't work any more
>
> Bug in the mock. Works with qtmir.

This is really why I think we need to move all those models to unity8, put unity8 in control of them and mock things at a lower level. All our tests regarding window management are just useless right now... they can perfectly pass while the real thing can be broken really badly.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-21: Posted in a previous version of this proposal

On 21/11/2016 10:08, Michael Zanetti wrote:
>> On 18/11/2016 14:16, Michael Zanetti wrote:
>>> Review: Needs Fixing
>>>
>>> Not yet sure if just an issue in the mocks or not, but this breaks:
>>>
>>> - open an app
>>> - click the minimize button in the window decoration
>>> - click the app again in the launcher to restore it
>>> - now click the minimize button again
>>> => button doesn't work any more
>> Bug in the mock. Works with qtmir.
> This is really why I think we need to move all those models to unity8, put unity8 in control of them and mock things at a lower level. All our tests regarding window management are just useless right now... they can perfectly pass while the real thing can be broken really badly.

Window management policy things like "if currently focused window gets
minimized, focus the most recently focused window that is not hidden or
minimized" will now belong to a lower level (miral) and as such they get
mock implementations in our tests.

Thus qml tests that strictly check window management policy will indeed
get redundant. Test of this nature now belong to miral's own test suite.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-11-21: Posted in a previous version of this proposal

> On 21/11/2016 10:08, Michael Zanetti wrote:
> >> On 18/11/2016 14:16, Michael Zanetti wrote:
> >>> Review: Needs Fixing
> >>>
> >>> Not yet sure if just an issue in the mocks or not, but this breaks:
> >>>
> >>> - open an app
> >>> - click the minimize button in the window decoration
> >>> - click the app again in the launcher to restore it
> >>> - now click the minimize button again
> >>> => button doesn't work any more
> >> Bug in the mock. Works with qtmir.
> > This is really why I think we need to move all those models to unity8, put
> unity8 in control of them and mock things at a lower level. All our tests
> regarding window management are just useless right now... they can perfectly
> pass while the real thing can be broken really badly.
>
>
> Window management policy things like "if currently focused window gets
> minimized, focus the most recently focused window that is not hidden or
> minimized" will now belong to a lower level (miral) and as such they get
> mock implementations in our tests.
>
> Thus qml tests that strictly check window management policy will indeed
> get redundant. Test of this nature now belong to miral's own test suite.

Right, but we would still need tests that make sure that the QML part works together with the model as we expect it. And right now we don't have such tests... Anyhow, this is a different discussion than this particular merge proposal. It just once again popped up here. Also this isn't a new problem, we already had this since forever, but as long as we only had the one ApplicationManager model which would not even do much except moving things when unity8 said so, it was still easy enough to keep the mock close enough to the real thing. Now this seems to grow out of a manageable size.

Revision history for this message

Gerry Boland (gerboland) wrote on 2016-11-21: Posted in a previous version of this proposal

Download full text (3.3 KiB)

> > On 18/11/2016 12:29, Michael Zanetti wrote:
> > > * I think we should not give up on the differntiation between claimFocus()
> > and requestFocus(). One of them says the stage wants to actually focus
> > something*now* while the other indicates that the app requested focus on
> its
> > own (or perhaps u-a-l did). IMO claimFocus() should not be dropped and still
> > do the raisId() call on the model. requestfocus() instead should end up in
> the
> > shell, and if the shell is ok with doing so, it should call claimFocus()
> > itself.
> >
> > What you are explaining effectively is that: leave things as they are
> > currently with regards to focus. Which means focus lives in unity8 and
> > miral has no say over it.
> >
> > The whole point of this miral effort is exactly to move such window
> > management decisions down to Mir, as dictated by our high-profile
> > stakeholder.
>
> There's a bunch of other stakeholders though that want to have it pixel
> perfect when it comes to animations and transitions. I am not saying miral
> should not have any say, but miral should send a requestFocus() to the shell
> and the shell will do it.
> What I'm saying is that miral can tell unity to change the focus, and unity
> will follow that (unless it's in the middle of a transition or something).
> What you're proposing is that miral has all the say on when to change focus,
> and unity8 cannot do any course correction if the moment is bad.
>
> > Focus is a central piece of window management and if miral is to do
> > anything useful it has to have a say in it. And we cannot have two
> > entities making decisions on focus (unity8 and miral) as it will
> > inevitably be racy and conflictive.
>
> which is exactly what we have now... unity8 thinks it is in charge, but miral
> can just jump in and trash it. I'm really just trying to avoid that.
>
> >
> > As for the origin of the focus change request (shell vs. application),
> > it doesn't matter from miral's standpoint. It will comply to either as
> > long the change is valid and makes sense. Eg.: it should never allow a
> > window blocked by a child modal dialog to be focused. So it's mostly
> > sanity checking. I don't see miral ignoring requests on a whim. :)
> >
> > Besides, having two separate code paths would make unity8 code more
> > complex. Eg: Having both code that sets surface state and code that
> > responds to surface state changes. "If surface state change was done in
> > response my your own set(), do nothing, else, ponder and respond."
>
> And I'm also not talking about 2 separate code paths. I'm saying the one code
> path should go through unity8 and not just manipulate the model at random.
>
> Therefore I think only unity8 should manipulate the model, taking miral as
> consultant on how to manipulate it. This current approach is really the one
> that creates multiple entities fighting over the state of the model.

This is a valid concern. The model must only have one owner. I think it safest that Unity8 has total ownership of the model and uses MirAL's recommendations only when it can.

MirAL has no concept of intermediary-states (like transitions/animations cause), so cannot advise Unit...

> > On 18/11/2016 12:29, Michael Zanetti wrote:
> > > * I think we should not give up on the differntiation between claimFocus()
> > and requestFocus(). One of them says the stage wants to actually focus
> > something*now*  while the other indicates that the app requested focus on
> its
> > own (or perhaps u-a-l did). IMO claimFocus() should not be dropped and still
> > do the raisId() call on the model. requestfocus() instead should end up in
> the
> > shell, and if the shell is ok with doing so, it should call claimFocus()
> > itself.
> >
> > What you are explaining effectively is that: leave things as they are
> > currently with regards to focus. Which means focus lives in unity8 and
> > miral has no say over it.
> >
> > The whole point of this miral effort is exactly to move such window
> > management decisions down to Mir, as dictated by our high-profile
> > stakeholder.
> 
> There's a bunch of other stakeholders though that want to have it pixel
> perfect when it comes to animations and transitions. I am not saying miral
> should not have any say, but miral should send a requestFocus() to the shell
> and the shell will do it.
> What I'm saying is that miral can tell unity to change the focus, and unity
> will follow that (unless it's in the middle of a transition or something).
> What you're proposing is that miral has all the say on when to change focus,
> and unity8 cannot do any course correction if the moment is bad.
> 
> > Focus is a central piece of window management and if miral is to do
> > anything useful it has to have a say in it. And we cannot have two
> > entities making decisions on focus (unity8 and miral) as it will
> > inevitably be racy and conflictive.
> 
> which is exactly what we have now... unity8 thinks it is in charge, but miral
> can just jump in and trash it. I'm really just trying to avoid that.
> 
> >
> > As for the origin of the focus change request (shell vs. application),
> > it doesn't matter from miral's standpoint. It will comply to either as
> > long the change is valid and makes sense. Eg.: it should never allow a
> > window blocked by a child modal dialog to be focused. So it's mostly
> > sanity checking. I don't see miral ignoring requests on a whim. :)
> >
> > Besides, having two separate code paths would make unity8 code more
> > complex. Eg: Having both code that sets surface state and code that
> > responds to surface state changes. "If surface state change was done in
> > response my your own set(), do nothing, else, ponder and respond."
> 
> And I'm also not talking about 2 separate code paths. I'm saying the one code
> path should go through unity8 and not just manipulate the model at random.
> 
> Therefore I think only unity8 should manipulate the model, taking miral as
> consultant on how to manipulate it. This current approach is really the one
> that creates multiple entities fighting over the state of the model.

This is a valid concern. The model must only have one owner. I think it safest that Unity8 has total ownership of the model and uses MirAL's recommendations only when it can.

MirAL has no concept of intermediary-states (like transitions/animations cause), so cannot advise Unity8 correctly in those cases. But in states outside transitions, MirAL's guidance should be respected by Unity8. If not, it's a Unity8 bug.

This is a fine line, and I'm pretty sure we'll struggle with it again & again.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-22: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-22: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-22: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-11-23: Posted in a previous version of this proposal

Thanks a lot for the activate() thing. Makes me feel much more comfy with the whole thing.

One minor thing (see inline comments) which I missed last time.

I'll give it another test with the latest changes, but it looks like we're getting close to an approval now.

review: Needs Fixing

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-23: Posted in a previous version of this proposal

On 23/11/2016 09:24, Michael Zanetti wrote:
>> readonly property Item clientAreaItem: applicationWindow
>> >
>> >+ readonly property real contentX: applicationWindow.x
>> >+ readonly property real contentY: applicationWindow.y
> afaict, you're only using that for knowing how much to add/remove for the decoration height. There is already a property "decorationHeight" you can use so this would be not needed, esp as applicationWindow.y will always be 0 at this point too.
>
Actually I can just use the existing clientAreaItem property right above
them. Fixed.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-23: Posted in a previous version of this proposal

On 23/11/2016 09:24, Michael Zanetti wrote:
> Qt.point(appDelegate.requestedX + decoratedWindow.decorationHeight, appDelegate.requestedY)
>
> should be enough

I would rather not assume that decorations only affect the Y coordinate.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-23: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-23: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-24:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-24:

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/miral updated on 2016-11-29

2705. By Andrea Cimitan on 2016-11-29

Fix white text (LP: #1644468)

Approved by: Albert Astals Cid, Unity8 CI Bot

2706. By Andrea Cimitan on 2016-11-29

Make MascotLoader in CardCreator flat

Approved by: Albert Astals Cid, Unity8 CI Bot

2707. By Andrea Cimitan on 2016-11-29

Make the remaining UbuntuShape flat

Approved by: Albert Astals Cid, Unity8 CI Bot

2708. By Andrea Cimitan on 2016-11-29

added dropshadow from panel indicators to dash page header extra panel, so there is right shadow when the extra panel is narrow

Approved by: Albert Astals Cid, Unity8 CI Bot

2709. By Andrea Cimitan on 2016-11-29

Look up for expandable template dash category flag

Approved by: Albert Astals Cid, Unity8 CI Bot

2710. By Albert Astals Cid on 2016-11-29

Fix PreviewProgress implicitHeight

We actually want this to be the height of the progressbar that we fix so use that and not the implicitHeight (LP: #1641943)

Approved by: Andrea Cimitan, Unity8 CI Bot

2711. By Andrea Azzarone on 2016-11-29

Set Mir.cursorName to "grabbing" on first mouse press on a window decoration. Don't wait for press+motion. (LP: #1618078)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2712. By Andrea Azzarone on 2016-11-29

Do not show a divider between each quicklist entry but just between each section, similar to how unity7 does. (LP: #1637478)

Approved by: Albert Astals Cid, Unity8 CI Bot

2713. By Daniel d'Andrada on 2016-11-29

There's no need for WindowDecoration to access the appDelegate

It damages modularity.

Approved by: Michael Zanetti, Unity8 CI Bot

2714. By Brian Douglass on 2016-11-29

Added a setting to enable/disable the indicator dropdown menu.

Approved by: Michael Zanetti, Unity8 CI Bot

2715. By Michael Zanetti on 2016-11-29

disable spread interaction while locked (LP: #1641578)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2716. By Olivier Tilloy on 2016-11-29

Remove dependency on transitional package. (LP: #1583079)

Approved by: Albert Astals Cid, Unity8 CI Bot

2717. By Lukáš Tinkl on 2016-11-29

Enable brightness (laptop backlight) handling on desktop/laptop PCs (LP: #1595947)

Approved by: Michael Zanetti, Unity8 CI Bot

2718. By Andrea Azzarone on 2016-11-29

Implement launcher tooltips.

Approved by: Michał Sawicz

2719. By Albert Astals Cid on 2016-11-29

Adapt to dummy notification being gone

and warning fix as bonus

Approved by: Lukáš Tinkl, Unity8 CI Bot

2720. By Albert Astals Cid on 2016-11-29

Fix autopilot test_lock_screen tests

Approved by: Andrea Cimitan, Unity8 CI Bot

2721. By Albert Astals Cid on 2016-11-29

Autopilot: Add more applications to the list for wider screens

Otherwise the test was failing because available_applications was too short

Approved by: Andrea Cimitan, Unity8 CI Bot

2722. By Albert Astals Cid on 2016-11-29

Fix autopilot DashHelperTestCase.test_search

Approved by: Andrea Cimitan, Unity8 CI Bot

2723. By Albert Astals Cid on 2016-11-29

Also install the Screens mock

This way we can run some more autopilot tests in X11

Approved by: Lukáš Tinkl, Unity8 CI Bot

2724. By Albert Astals Cid on 2016-11-29

Give default value to gu-px size

Fixes some of the autopilot greeter tests when run under X11

Approved by: Andrea Cimitan, Unity8 CI Bot

2725. By CI Train Bot Account on 2016-11-29

Releasing 8.15+17.04.20161129-0ubuntu1

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-11-29:

New instances of the same app do not cascade:

0. make tryShell
1. Launch dialer
2. Click the "+" button to launch a second instance
3. The new window doesn't cascade

review: Needs Fixing

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-11-29:

If you add a trust prompt to a window and launch a second instance of the same app, the newly created window is not focused

review: Needs Fixing

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-11-29:

Windows are not restored properly:

1. Maximize dash
2. Minimize it
3. Click the bfb icon
4. The dash window is restored to "normal" size, not to the maximized from step 1.

review: Needs Fixing

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-29:

On 29/11/2016 15:35, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> New instances of the same app do not cascade:
>
> 0. make tryShell
> 1. Launch dialer
> 2. Click the "+" button to launch a second instance
> 3. The new window doesn't cascade

Same happens in trunk

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-11-29:

Double click to maximize breaks:

1. Double click the dash decoration to maximize the window
2. Drag it down from the panel to restore it
3. Double click again to maximize -> no longer works

review: Needs Fixing

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-11-29:

In tablet mode, if you put a fullscreen app into side stage (like camera), the main app (dash usually) has its decoration cut at the top.

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-11-29:

> In tablet mode, if you put a fullscreen app into side stage (like camera), the
> main app (dash usually) has its decoration cut at the top.

This happens in trunk too

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-29:

On 29/11/2016 15:37, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> If you add a trust prompt to a window and launch a second instance of the same app, the newly created window is not focused

Fixed. Bug in the Unity.Application mock.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-29:

On 29/11/2016 15:39, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> Windows are not restored properly:
>
> 1. Maximize dash
> 2. Minimize it
> 3. Click the bfb icon
> 4. The dash window is restored to "normal" size, not to the maximized from step 1.

That's due to the simplicity of the Unity.Application mock. It doesn't
have a full blown implementation of the window management bits/policy
that have been now moved to a lower level, behind
Unity.Application/qtmir API. This use case works with the real
Unity.Application/qtmir.

Unfortunately this means that right now we can no longer test everything
window management related in our qmltests. For some things untiy8 just
sits back and expects to get the correct changes to the model for free,
which it will then respond to by updating the qml items and animating
the qml scene (the view).

To be more specific, in response to the click on step 3 unity8 just
calls MirSurface->activate(). qtmir/miral will take care of noticing
that this surface is minimized and will restore it to its previous state
before finally focusing and raising it.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-11-30:

On 29/11/2016 15:50, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> Double click to maximize breaks:
>
> 1. Double click the dash decoration to maximize the window
> 2. Drag it down from the panel to restore it
> 3. Double click again to maximize -> no longer works

Fixed.

lp:~dandrader/unity8/miral updated on 2016-12-12

2726. By Launchpad Translations on behalf of unity-team on 2016-12-01

Launchpad automatic translations update.

2727. By Lukáš Tinkl on 2016-12-07

Fix the Super key not invoking the dash scope home (LP: #1607427)

Approved by: Daniel d'Andrada, Unity8 CI Bot

2728. By Albert Astals Cid on 2016-12-07

Add the Wsuggest-override flag to gcc

While at it mark system includes as such so we don't get warnings we can not fix

Approved by: Michael Zanetti, Unity8 CI Bot

2729. By Albert Astals Cid on 2016-12-07

Add support for compiler sanitizers via ECM

2730. By Albert Astals Cid on 2016-12-07

Use timeStep as delay time

Passing iterations / speed didn't make much sense since that parameter is a delay in milliseconds and the default parameters would give a value of 5 / units.gu(10) that is smaller than 1 millisecond.

Qt 5.7 calculation for velocity was very unhappy if we moved things so fast in less than 1ms and ignored the movements, so this also makes tests pass on Qt 5.7 (LP: #1642919)

Approved by: Josh Arenson, Unity8 CI Bot

2731. By Michael Zanetti on 2016-12-07

Add the ApplicationDrawer

Approved by: Lukáš Tinkl, Unity8 CI Bot

2732. By Michael Zanetti on 2016-12-07

tune right edge push

make it less intrusive when accidentally hitting the edge with the mouse
tweak visuals for the mouse case (LP: #1646094)

Approved by: Unity8 CI Bot

2733. By Michael Zanetti on 2016-12-07

improve close button visiblity when hovering with the mouse

Approved by: Albert Astals Cid, Unity8 CI Bot

2734. By Albert Astals Cid on 2016-12-07

Bring back fix for 1517830

Now with autotest \o/ (LP: #1517830)

Approved by: Andrea Cimitan, Unity8 CI Bot

2735. By Daniel d'Andrada on 2016-12-07

Fix "make tryApplicationWindow"

No surface was showing up on the screen
Also remove outdated button (feature is no longer there)

Approved by: Albert Astals Cid, Unity8 CI Bot

2736. By Albert Astals Cid on 2016-12-07

Fix compile warnings in mocks

Approved by: Daniel d'Andrada, Unity8 CI Bot

2737. By Josh Arenson on 2016-12-07

Enable the greeter to remember which session the user last logged into

This also fixes a small issue with how the default session was handled. (LP: #1631365)

Approved by: Albert Astals Cid, Unity8 CI Bot

2738. By Daniel d'Andrada on 2016-12-07

Take save/restore functions out of WindowResizeArea

They've no relationship with resizing whatsoever.

Approved by: Lukáš Tinkl, Unity8 CI Bot

2739. By Michael Zanetti on 2016-12-07

Update virtual touchpad visuals and add a tutorial. (LP: #1585220)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2740. By Albert Astals Cid on 2016-12-07

Do not hide panel when launching an application if the mouse is on the panel

Need Functions.itemUnderMouse because MouseArea.containsMouse returns true when tapping (i.e. no mouse used) on it.

Unfortunately the QML testlib do not set the proper value when issueing a mouseMove so i can't add a test that proofs it works, i'll try to propose something upstream and then add the test at a later MR (LP: #1591311)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2741. By Pete Woods on 2016-12-07

MenuItemFactory: Add subtitle support to SwitchItem widget

Approved by: Marco Trevisan (Treviño), Michał Sawicz, Unity8 CI Bot

2742. By CI Train Bot Account on 2016-12-07

Releasing 8.15+17.04.20161207.1-0ubuntu1

2743. By Daniel d'Andrada on 2016-12-12

Let the model deal with some window management decisions

eg: which window to focus, whether to change surface state

unit8 requests and reacts to changes in the model instead of applying them

Unmerged revisions

Preview Diff

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

The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Mohammad Rakibul Hasan

Unity Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-10-24 11:34:08 +0000
 +++ CMakeLists.txt	2016-11-30 19:24:53 +0000
@@ -57,7 +57,7 @@
  find_package(Qt5Concurrent 5.4 REQUIRED)
  find_package(Qt5Sql 5.4 REQUIRED)
--pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=22)
++pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=23)
  pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
  pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
  pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
 === modified file 'debian/control'
 --- debian/control	2016-11-29 09:40:16 +0000
 +++ debian/control	2016-11-30 19:24:53 +0000
@@ -38,7 +38,7 @@
                 libubuntugestures5-private-dev (>= 1.3.2030),
                 libudev-dev,
                 libudm-common-dev,
--               libunity-api-dev (>= 7.120),
++               libunity-api-dev (>= 8.0),
                 libusermetricsoutput1-dev,
  # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                 libx11-dev[!arm64 !armhf],
@@ -160,7 +160,7 @@
           qttranslations5-l10n,
           ubuntu-thumbnailer-impl-0,
           ubuntu-wallpapers,
--         unity-application-impl-22,
++         unity-application-impl-23,
           unity-notifications-impl-3,
           unity-plugin-scopes | unity-scopes-impl,
           unity-scopes-impl-12,
@@ -206,7 +206,7 @@
  Depends: ${misc:Depends},
           ${shlibs:Depends},
  Provides: unity-application-impl,
--          unity-application-impl-22,
++          unity-application-impl-23,
  Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
  Description: Fake environment for running Unity 8 shell
   Provides fake implementations of some QML modules used by Unity 8 shell
 === modified file 'plugins/WindowManager/CMakeLists.txt'
 --- plugins/WindowManager/CMakeLists.txt	2016-06-20 09:43:38 +0000
 +++ plugins/WindowManager/CMakeLists.txt	2016-11-30 19:24:53 +0000
@@ -1,10 +1,12 @@
  set(WINDOWMANAGER_SRC
--    TopLevelSurfaceList.cpp
++    TopLevelWindowModel.cpp
++    Window.cpp
      WindowManagerPlugin.cpp
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h
++    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/SurfaceManagerInterface.h
+    )
  add_library(windowmanager-qml SHARED ${WINDOWMANAGER_SRC})
 === removed file 'plugins/WindowManager/TopLevelSurfaceList.cpp'
 --- plugins/WindowManager/TopLevelSurfaceList.cpp	2016-09-14 15:02:01 +0000
 +++ plugins/WindowManager/TopLevelSurfaceList.cpp	1970-01-01 00:00:00 +0000
@@ -1,481 +0,0 @@
--/*
-- * 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/>.
-- */
--
--#include "TopLevelSurfaceList.h"
--
--// unity-api
--#include <unity/shell/application/ApplicationInfoInterface.h>
--#include <unity/shell/application/MirSurfaceInterface.h>
--#include <unity/shell/application/MirSurfaceListInterface.h>
--
--#include <QMetaObject>
--
--Q_LOGGING_CATEGORY(UNITY_TOPSURFACELIST, "unity.topsurfacelist", QtDebugMsg)
--
--#define DEBUG_MSG qCDebug(UNITY_TOPSURFACELIST).nospace().noquote() << __func__
--
--using namespace unity::shell::application;
--
--TopLevelSurfaceList::TopLevelSurfaceList(QObject *parent) :
--    QAbstractListModel(parent)
--{
--    DEBUG_MSG << "()";
--}
--
--TopLevelSurfaceList::~TopLevelSurfaceList()
--{
--    DEBUG_MSG << "()";
--}
--
--int TopLevelSurfaceList::rowCount(const QModelIndex &parent) const
--{
--    return !parent.isValid() ? m_surfaceList.size() : 0;
--}
--
--QVariant TopLevelSurfaceList::data(const QModelIndex& index, int role) const
--{
--    if (index.row() < 0 || index.row() >= m_surfaceList.size())
--        return QVariant();
--
--    if (role == SurfaceRole) {
--        MirSurfaceInterface *surface = m_surfaceList.at(index.row()).surface;
--        return QVariant::fromValue(surface);
--    } else if (role == ApplicationRole) {
--        return QVariant::fromValue(m_surfaceList.at(index.row()).application);
--    } else if (role == IdRole) {
--        return QVariant::fromValue(m_surfaceList.at(index.row()).id);
--    } else {
--        return QVariant();
--    }
--}
--
--void TopLevelSurfaceList::raise(MirSurfaceInterface *surface)
--{
--    if (!surface)
--        return;
--
--    DEBUG_MSG << "(MirSurface[" << (void*)surface << "])";
--
--    int i = indexOf(surface);
--    if (i != -1) {
--        raiseId(m_surfaceList.at(i).id);
--    }
--}
--
--void TopLevelSurfaceList::appendPlaceholder(ApplicationInfoInterface *application)
--{
--    DEBUG_MSG << "(" << application->appId() << ")";
--
--    appendSurfaceHelper(nullptr, application);
--}
--
--void TopLevelSurfaceList::appendSurface(MirSurfaceInterface *surface, ApplicationInfoInterface *application)
--{
--    Q_ASSERT(surface != nullptr);
--
--    bool filledPlaceholder = false;
--    for (int i = 0; i < m_surfaceList.count() && !filledPlaceholder; ++i) {
--        ModelEntry &entry = m_surfaceList[i];
--        if (entry.application == application && entry.surface == nullptr) {
--            entry.surface = surface;
--            connectSurface(surface);
--            DEBUG_MSG << " appId=" << application->appId() << " surface=" << surface
--                      << ", filling out placeholder. after: " << toString();
--            Q_EMIT dataChanged(index(i) /* topLeft */, index(i) /* bottomRight */, QVector<int>() << SurfaceRole);
--            filledPlaceholder = true;
--        }
--    }
--
--    if (!filledPlaceholder) {
--        DEBUG_MSG << " appId=" << application->appId() << " surface=" << surface << ", adding new row";
--        appendSurfaceHelper(surface, application);
--    }
--}
--
--void TopLevelSurfaceList::appendSurfaceHelper(MirSurfaceInterface *surface, ApplicationInfoInterface *application)
--{
--    if (m_modelState == IdleState) {
--        m_modelState = InsertingState;
--        beginInsertRows(QModelIndex(), m_surfaceList.size() /*first*/, m_surfaceList.size() /*last*/);
--    } else {
--        Q_ASSERT(m_modelState == ResettingState);
--        // No point in signaling anything if we're resetting the whole model
--    }
--
--    int id = generateId();
--    m_surfaceList.append(ModelEntry(surface, application, id));
--    if (surface) {
--        connectSurface(surface);
--    }
--
--    if (m_modelState == InsertingState) {
--        endInsertRows();
--        Q_EMIT countChanged();
--        Q_EMIT listChanged();
--        m_modelState = IdleState;
--    }
--
--    DEBUG_MSG << " after " << toString();
--}
--
--void TopLevelSurfaceList::connectSurface(MirSurfaceInterface *surface)
--{
--    connect(surface, &MirSurfaceInterface::liveChanged, this, [this, surface](bool live){
--            if (!live) {
--                onSurfaceDied(surface);
--            }
--        });
--    connect(surface, &QObject::destroyed, this, [this, surface](){ this->onSurfaceDestroyed(surface); });
--}
--
--void TopLevelSurfaceList::onSurfaceDied(MirSurfaceInterface *surface)
--{
--    int i = indexOf(surface);
--    if (i == -1) {
--        return;
--    }
--
--    auto application = m_surfaceList[i].application;
--
--    // can't be starting if it already has a surface
--    Q_ASSERT(application->state() != ApplicationInfoInterface::Starting);
--
--    if (application->state() == ApplicationInfoInterface::Running) {
--        m_surfaceList[i].removeOnceSurfaceDestroyed = true;
--    } else {
--        // assume it got killed by the out-of-memory daemon.
--        //
--        // So leave entry in the model and only remove its surface, so shell can display a screenshot
--        // in its place.
--        m_surfaceList[i].removeOnceSurfaceDestroyed = false;
--    }
--}
--
--void TopLevelSurfaceList::onSurfaceDestroyed(MirSurfaceInterface *surface)
--{
--    int i = indexOf(surface);
--    if (i == -1) {
--        return;
--    }
--
--    if (m_surfaceList[i].removeOnceSurfaceDestroyed) {
--        removeAt(i);
--    } else {
--        m_surfaceList[i].surface = nullptr;
--        Q_EMIT dataChanged(index(i) /* topLeft */, index(i) /* bottomRight */, QVector<int>() << SurfaceRole);
--        DEBUG_MSG << " Removed surface from entry. After: " << toString();
--    }
--}
--
--void TopLevelSurfaceList::removeAt(int index)
--{
--    if (m_modelState == IdleState) {
--        beginRemoveRows(QModelIndex(), index, index);
--        m_modelState = RemovingState;
--    } else {
--        Q_ASSERT(m_modelState == ResettingState);
--        // No point in signaling anything if we're resetting the whole model
--    }
--
--    m_surfaceList.removeAt(index);
--
--    if (m_modelState == RemovingState) {
--        endRemoveRows();
--        Q_EMIT countChanged();
--        Q_EMIT listChanged();
--        m_modelState = IdleState;
--    }
--
--    DEBUG_MSG << " after " << toString();
--}
--
--int TopLevelSurfaceList::indexOf(MirSurfaceInterface *surface)
--{
--    for (int i = 0; i < m_surfaceList.count(); ++i) {
--        if (m_surfaceList.at(i).surface == surface) {
--            return i;
--        }
--    }
--    return -1;
--}
--
--void TopLevelSurfaceList::move(int from, int to)
--{
--    if (from == to) return;
--    DEBUG_MSG << " from=" << from << " to=" << to;
--
--    if (from >= 0 && from < m_surfaceList.size() && to >= 0 && to < m_surfaceList.size()) {
--        QModelIndex parent;
--        /* When moving an item down, the destination index needs to be incremented
--           by one, as explained in the documentation:
--           http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
--
--        Q_ASSERT(m_modelState == IdleState);
--        m_modelState = MovingState;
--
--        beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
--        m_surfaceList.move(from, to);
--        endMoveRows();
--        Q_EMIT listChanged();
--
--        m_modelState = IdleState;
--
--        DEBUG_MSG << " after " << toString();
--    }
--}
--
--MirSurfaceInterface *TopLevelSurfaceList::surfaceAt(int index) const
--{
--    if (index >=0 && index < m_surfaceList.count()) {
--        return m_surfaceList[index].surface;
--    } else {
--        return nullptr;
--    }
--}
--
--ApplicationInfoInterface *TopLevelSurfaceList::applicationAt(int index) const
--{
--    if (index >=0 && index < m_surfaceList.count()) {
--        return m_surfaceList[index].application;
--    } else {
--        return nullptr;
--    }
--}
--
--int TopLevelSurfaceList::idAt(int index) const
--{
--    if (index >=0 && index < m_surfaceList.count()) {
--        return m_surfaceList[index].id;
--    } else {
--        return 0;
--    }
--}
--
--int TopLevelSurfaceList::indexForId(int id) const
--{
--    for (int i = 0; i < m_surfaceList.count(); ++i) {
--        if (m_surfaceList[i].id == id) {
--            return i;
--        }
--    }
--    return -1;
--}
--
--void TopLevelSurfaceList::doRaiseId(int id)
--{
--    int fromIndex = indexForId(id);
--    if (fromIndex != -1) {
--        move(fromIndex, 0 /* toIndex */);
--    }
--}
--
--void TopLevelSurfaceList::raiseId(int id)
--{
--    if (m_modelState == IdleState) {
--        DEBUG_MSG << "(id=" << id << ") - do it now.";
--        doRaiseId(id);
--    } else {
--        DEBUG_MSG << "(id=" << id << ") - Model busy (modelState=" << m_modelState << "). Try again in the next event loop.";
--        // The model has just signalled some change. If we have a Repeater responding to this update, it will get nuts
--        // if we perform yet another model change straight away.
--        //
--        // A bad sympton of this problem is a Repeater.itemAt(index) call returning null event though Repeater.count says
--        // the index is definitely within bounds.
--        QMetaObject::invokeMethod(this, "raiseId", Qt::QueuedConnection, Q_ARG(int, id));
--    }
--}
--
--int TopLevelSurfaceList::generateId()
--{
--    int id = m_nextId;
--    m_nextId = nextFreeId(m_nextId + 1);
--    Q_EMIT nextIdChanged();
--    return id;
--}
--
--int TopLevelSurfaceList::nextFreeId(int candidateId)
--{
--    if (candidateId > m_maxId) {
--        return nextFreeId(1);
--    } else {
--        if (indexForId(candidateId) == -1) {
--            // it's indeed free
--            return candidateId;
--        } else {
--            return nextFreeId(candidateId + 1);
--        }
--    }
--}
--
--QString TopLevelSurfaceList::toString()
--{
--    QString str;
--    for (int i = 0; i < m_surfaceList.count(); ++i) {
--        auto item = m_surfaceList.at(i);
--
--        QString itemStr = QString("(index=%1,appId=%2,surface=0x%3,id=%4)")
--            .arg(i)
--            .arg(item.application->appId())
--            .arg((qintptr)item.surface, 0, 16)
--            .arg(item.id);
--
--        if (i > 0) {
--            str.append(",");
--        }
--        str.append(itemStr);
--    }
--    return str;
--}
--
--void TopLevelSurfaceList::addApplication(ApplicationInfoInterface *application)
--{
--    DEBUG_MSG << "(" << application->appId() << ")";
--    Q_ASSERT(!m_applications.contains(application));
--    m_applications.append(application);
--
--    MirSurfaceListInterface *surfaceList = application->surfaceList();
--
--    if (application->state() != ApplicationInfoInterface::Stopped) {
--        if (surfaceList->count() == 0) {
--            appendPlaceholder(application);
--        } else {
--            for (int i = 0; i < surfaceList->count(); ++i) {
--                appendSurface(surfaceList->get(i), application);
--            }
--        }
--    }
--
--    connect(surfaceList, &QAbstractItemModel::rowsInserted, this,
--            [this, application, surfaceList](const QModelIndex & /*parent*/, int first, int last)
--            {
--                for (int i = last; i >= first; --i) {
--                    this->appendSurface(surfaceList->get(i), application);
--                }
--            });
--}
--
--void TopLevelSurfaceList::removeApplication(ApplicationInfoInterface *application)
--{
--    DEBUG_MSG << "(" << application->appId() << ")";
--    Q_ASSERT(m_applications.contains(application));
--
--    MirSurfaceListInterface *surfaceList = application->surfaceList();
--
--    disconnect(surfaceList, 0, this, 0);
--
--    Q_ASSERT(m_modelState == IdleState);
--    m_modelState = RemovingState;
--
--    int i = 0;
--    while (i < m_surfaceList.count()) {
--        if (m_surfaceList.at(i).application == application) {
--            beginRemoveRows(QModelIndex(), i, i);
--            m_surfaceList.removeAt(i);
--            endRemoveRows();
--            Q_EMIT countChanged();
--            Q_EMIT listChanged();
--        } else {
--            ++i;
--        }
--    }
--
--    m_modelState = IdleState;
--
--    DEBUG_MSG << " after " << toString();
--
--    m_applications.removeAll(application);
--}
--
--QAbstractListModel *TopLevelSurfaceList::applicationsModel() const
--{
--    return m_applicationsModel;
--}
--
--void TopLevelSurfaceList::setApplicationsModel(QAbstractListModel* value)
--{
--    if (m_applicationsModel == value) {
--        return;
--    }
--
--    DEBUG_MSG << "(" << value << ")";
--
--    Q_ASSERT(m_modelState == IdleState);
--    m_modelState = ResettingState;
--
--    beginResetModel();
--
--    if (m_applicationsModel) {
--        m_surfaceList.clear();
--        m_applications.clear();
--        disconnect(m_applicationsModel, 0, this, 0);
--    }
--
--    m_applicationsModel = value;
--
--    if (m_applicationsModel) {
--        findApplicationRole();
--
--        connect(m_applicationsModel, &QAbstractItemModel::rowsInserted,
--                this, [this](const QModelIndex &/*parent*/, int first, int last) {
--                    for (int i = first; i <= last; ++i) {
--                        auto application = getApplicationFromModelAt(i);
--                        addApplication(application);
--                    }
--                });
--
--        connect(m_applicationsModel, &QAbstractItemModel::rowsAboutToBeRemoved,
--                this, [this](const QModelIndex &/*parent*/, int first, int last) {
--                    for (int i = first; i <= last; ++i) {
--                        auto application = getApplicationFromModelAt(i);
--                        removeApplication(application);
--                    }
--                });
--
--        for (int i = 0; i < m_applicationsModel->rowCount(); ++i) {
--            auto application = getApplicationFromModelAt(i);
--            addApplication(application);
--        }
--    }
--
--    endResetModel();
--    m_modelState = IdleState;
--}
--
--ApplicationInfoInterface *TopLevelSurfaceList::getApplicationFromModelAt(int index)
--{
--    QModelIndex modelIndex = m_applicationsModel->index(index);
--
--    QVariant variant =  m_applicationsModel->data(modelIndex, m_applicationRole);
--
--    // variant.value<ApplicationInfoInterface*>() returns null for some reason.
--    return static_cast<ApplicationInfoInterface*>(variant.value<QObject*>());
--}
--
--void TopLevelSurfaceList::findApplicationRole()
--{
--    QHash<int, QByteArray> namesHash = m_applicationsModel->roleNames();
--
--    m_applicationRole = -1;
--    for (auto i = namesHash.begin(); i != namesHash.end() && m_applicationRole == -1; ++i) {
--        if (i.value() == "application") {
--            m_applicationRole = i.key();
--        }
--    }
--
--    if (m_applicationRole == -1) {
--        qFatal("TopLevelSurfaceList: applicationsModel must have a \"application\" role.");
--    }
--}
 === removed file 'plugins/WindowManager/TopLevelSurfaceList.h'
 --- plugins/WindowManager/TopLevelSurfaceList.h	2016-04-04 13:39:44 +0000
 +++ plugins/WindowManager/TopLevelSurfaceList.h	1970-01-01 00:00:00 +0000
@@ -1,223 +0,0 @@
--/*
-- * 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/>.
-- */
--
--#ifndef TOPLEVELSURFACELIST_H
--#define TOPLEVELSURFACELIST_H
--
--#include <QAbstractListModel>
--#include <QList>
--#include <QLoggingCategory>
--
--Q_DECLARE_LOGGING_CATEGORY(UNITY_TOPSURFACELIST)
--
--namespace unity {
--    namespace shell {
--        namespace application {
--            class ApplicationInfoInterface;
--            class MirSurfaceInterface;
--        }
--    }
--}
--
--/**
-- * @brief A model of top-level surfaces
-- *
-- * It's an abstraction of top-level application windows.
-- *
-- * When an entry first appears, it normaly doesn't have a surface yet, meaning that the application is
-- * still starting up. A shell should then display a splash screen or saved screenshot of the application
-- * until its surface comes up.
-- *
-- * As applications can have multiple surfaces and you can also have entries without surfaces at all,
-- * the only way to unambiguously refer to an entry in this model is through its id.
-- */
--class TopLevelSurfaceList : public QAbstractListModel
--{
--
--    Q_OBJECT
--
--    /**
--     * @brief A list model of applications.
--     *
--     * It's expected to have a role called "application" which returns a ApplicationInfoInterface
--     */
--    Q_PROPERTY(QAbstractListModel* applicationsModel READ applicationsModel
--                                                     WRITE setApplicationsModel
--                                                     NOTIFY applicationsModelChanged)
--
--    /**
--     * @brief Number of top-level surfaces in this model
--     *
--     * This is the same as rowCount, added in order to keep compatibility with QML ListModels.
--     */
--    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
--
--    /**
--      The id to be used on the next entry created
--      Useful for tests
--     */
--    Q_PROPERTY(int nextId READ nextId NOTIFY nextIdChanged)
--public:
--
--    /**
--     * @brief The Roles supported by the model
--     *
--     * SurfaceRole - A MirSurfaceInterface. It will be null if the application is still starting up
--     * ApplicationRole - An ApplicationInfoInterface
--     * IdRole - A unique identifier for this entry. Useful to unambiguosly track elements as they move around in the list
--     */
--    enum Roles {
--        SurfaceRole = Qt::UserRole,
--        ApplicationRole = Qt::UserRole + 1,
--        IdRole = Qt::UserRole + 2,
--    };
--
--    explicit TopLevelSurfaceList(QObject *parent = nullptr);
--    virtual ~TopLevelSurfaceList();
--
--    // QAbstractItemModel methods
--    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
--    QVariant data(const QModelIndex& index, int role) const override;
--    QHash<int, QByteArray> roleNames() const override {
--        QHash<int, QByteArray> roleNames { {SurfaceRole, "surface"},
--                                           {ApplicationRole, "application"},
--                                           {IdRole, "id"} };
--        return roleNames;
--    }
--
--    int nextId() const { return m_nextId; }
--
--    QAbstractListModel *applicationsModel() const;
--    void setApplicationsModel(QAbstractListModel*);
--
--public Q_SLOTS:
--    /**
--     * @brief Returns the surface at the given index
--     *
--     * It will be a nullptr if the application is still starting up and thus hasn't yet created
--     * and drawn into a surface.
--     */
--    unity::shell::application::MirSurfaceInterface *surfaceAt(int index) const;
--
--    /**
--     * @brief Returns the application at the given index
--     */
--    unity::shell::application::ApplicationInfoInterface *applicationAt(int index) const;
--
--    /**
--     * @brief Returns the unique id of the element at the given index
--     */
--    int idAt(int index) const;
--
--    /**
--     * @brief Returns the index where the row with the given id is located
--     *
--     * Returns -1 if there's no row with the given id.
--     */
--    int indexForId(int id) const;
--
--    /**
--     * @brief Raises the row with the given id to index 0
--     */
--    void raiseId(int id);
--
--    void doRaiseId(int id);
--
--Q_SIGNALS:
--    void countChanged();
--
--    /**
--     * @brief Emitted when the list changes
--     *
--     * Emitted when model gains an element, loses an element or when elements exchange positions.
--     */
--    void listChanged();
--
--    void nextIdChanged();
--
--    void applicationsModelChanged();
--
--private:
--    void addApplication(unity::shell::application::ApplicationInfoInterface *application);
--    void removeApplication(unity::shell::application::ApplicationInfoInterface *application);
--
--    int indexOf(unity::shell::application::MirSurfaceInterface *surface);
--    void raise(unity::shell::application::MirSurfaceInterface *surface);
--    void move(int from, int to);
--    void appendSurfaceHelper(unity::shell::application::MirSurfaceInterface *surface,
--                              unity::shell::application::ApplicationInfoInterface *application);
--    void connectSurface(unity::shell::application::MirSurfaceInterface *surface);
--    int generateId();
--    int nextFreeId(int candidateId);
--    QString toString();
--    void onSurfaceDestroyed(unity::shell::application::MirSurfaceInterface *surface);
--    void onSurfaceDied(unity::shell::application::MirSurfaceInterface *surface);
--    void removeAt(int index);
--    void findApplicationRole();
--
--    unity::shell::application::ApplicationInfoInterface *getApplicationFromModelAt(int index);
--
--    /*
--        Placeholder for a future surface from a starting or running application.
--        Enables shell to give immediate feedback to the user by showing, eg,
--        a splash screen.
--
--        It's a model row containing a null surface and the given application.
--     */
--    void appendPlaceholder(unity::shell::application::ApplicationInfoInterface *application);
--
--    /*
--        Adds a model row with the given surface and application
--
--        Alternatively, if a placeholder exists for the given application it's
--        filled with the given surface instead.
--     */
--    void appendSurface(unity::shell::application::MirSurfaceInterface *surface,
--            unity::shell::application::ApplicationInfoInterface *application);
--
--    struct ModelEntry {
--        ModelEntry(unity::shell::application::MirSurfaceInterface *surface, unity::shell::application::ApplicationInfoInterface *application, int id)
--            : surface(surface), application(application), id(id) {}
--        unity::shell::application::MirSurfaceInterface *surface;
--        unity::shell::application::ApplicationInfoInterface *application;
--        int id;
--        bool removeOnceSurfaceDestroyed{false};
--    };
--
--    QList<ModelEntry> m_surfaceList;
--    int m_nextId{1};
--    static const int m_maxId{1000000};
--
--    // applications that are being monitored
--    QList<unity::shell::application::ApplicationInfoInterface *> m_applications;
--
--    QAbstractListModel* m_applicationsModel{nullptr};
--    int m_applicationRole{-1};
--
--    enum ModelState {
--        IdleState,
--        InsertingState,
--        RemovingState,
--        MovingState,
--        ResettingState
--    };
--    ModelState m_modelState{IdleState};
--};
--
--Q_DECLARE_METATYPE(TopLevelSurfaceList*)
--Q_DECLARE_METATYPE(QAbstractListModel*)
--
--#endif // TOPLEVELSURFACELIST_H
 === added file 'plugins/WindowManager/TopLevelWindowModel.cpp'
 --- plugins/WindowManager/TopLevelWindowModel.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/WindowManager/TopLevelWindowModel.cpp	2016-11-30 19:24:53 +0000
@@ -0,0 +1,644 @@
++/*
++ * 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 "TopLevelWindowModel.h"
++
++// unity-api
++#include <unity/shell/application/ApplicationInfoInterface.h>
++#include <unity/shell/application/ApplicationManagerInterface.h>
++#include <unity/shell/application/MirSurfaceInterface.h>
++#include <unity/shell/application/MirSurfaceListInterface.h>
++#include <unity/shell/application/SurfaceManagerInterface.h>
++
++// Qt
++#include <QGuiApplication>
++#include <QDebug>
++
++// local
++#include "Window.h"
++
++Q_LOGGING_CATEGORY(TOPLEVELWINDOWMODEL, "toplevelwindowmodel", QtInfoMsg)
++
++#define DEBUG_MSG qCDebug(TOPLEVELWINDOWMODEL).nospace().noquote() << __func__
++#define INFO_MSG qCInfo(TOPLEVELWINDOWMODEL).nospace().noquote() << __func__
++
++namespace unityapi = unity::shell::application;
++
++TopLevelWindowModel::TopLevelWindowModel()
++{
++}
++
++void TopLevelWindowModel::setApplicationManager(unityapi::ApplicationManagerInterface* value)
++{
++    if (m_applicationManager == value) {
++        return;
++    }
++
++    DEBUG_MSG << "(" << value << ")";
++
++    Q_ASSERT(m_modelState == IdleState);
++    m_modelState = ResettingState;
++
++    beginResetModel();
++
++    if (m_applicationManager) {
++        m_windowModel.clear();
++        disconnect(m_applicationManager, 0, this, 0);
++    }
++
++    m_applicationManager = value;
++
++    if (m_applicationManager) {
++        connect(m_applicationManager, &QAbstractItemModel::rowsInserted,
++                this, [this](const QModelIndex &/*parent*/, int first, int last) {
++                    for (int i = first; i <= last; ++i) {
++                        auto application = m_applicationManager->get(i);
++                        addApplication(application);
++                    }
++                });
++
++        connect(m_applicationManager, &QAbstractItemModel::rowsAboutToBeRemoved,
++                this, [this](const QModelIndex &/*parent*/, int first, int last) {
++                    for (int i = first; i <= last; ++i) {
++                        auto application = m_applicationManager->get(i);
++                        removeApplication(application);
++                    }
++                });
++
++        for (int i = 0; i < m_applicationManager->rowCount(); ++i) {
++            auto application = m_applicationManager->get(i);
++            addApplication(application);
++        }
++    }
++
++    endResetModel();
++    m_modelState = IdleState;
++}
++
++void TopLevelWindowModel::setSurfaceManager(unityapi::SurfaceManagerInterface *surfaceManager)
++{
++    if (surfaceManager == m_surfaceManager) {
++        return;
++    }
++
++    DEBUG_MSG << "(" << surfaceManager << ")";
++
++    if (m_surfaceManager) {
++        disconnect(m_surfaceManager, 0, this, 0);
++    }
++
++    m_surfaceManager = surfaceManager;
++
++    if (m_surfaceManager) {
++        connect(m_surfaceManager, &unityapi::SurfaceManagerInterface::surfaceCreated, this, &TopLevelWindowModel::onSurfaceCreated);
++        connect(m_surfaceManager, &unityapi::SurfaceManagerInterface::surfacesRaised, this, &TopLevelWindowModel::onSurfacesRaised);
++        connect(m_surfaceManager, &unityapi::SurfaceManagerInterface::modificationsStarted, this, &TopLevelWindowModel::onModificationsStarted);
++        connect(m_surfaceManager, &unityapi::SurfaceManagerInterface::modificationsEnded, this, &TopLevelWindowModel::onModificationsEnded);
++    }
++
++    Q_EMIT surfaceManagerChanged(m_surfaceManager);
++}
++
++void TopLevelWindowModel::addApplication(unityapi::ApplicationInfoInterface *application)
++{
++    DEBUG_MSG << "(" << application->appId() << ")";
++
++    if (application->state() != unityapi::ApplicationInfoInterface::Stopped && application->surfaceList()->count() == 0) {
++        prependPlaceholder(application);
++    }
++}
++
++void TopLevelWindowModel::removeApplication(unityapi::ApplicationInfoInterface *application)
++{
++    DEBUG_MSG << "(" << application->appId() << ")";
++
++    Q_ASSERT(m_modelState == IdleState);
++
++    int i = 0;
++    while (i < m_windowModel.count()) {
++        if (m_windowModel.at(i).application == application) {
++            removeAt(i);
++        } else {
++            ++i;
++        }
++    }
++}
++
++void TopLevelWindowModel::prependPlaceholder(unityapi::ApplicationInfoInterface *application)
++{
++    INFO_MSG << "(" << application->appId() << ")";
++
++    prependSurfaceHelper(nullptr, application);
++}
++
++void TopLevelWindowModel::prependSurface(unityapi::MirSurfaceInterface *surface, unityapi::ApplicationInfoInterface *application)
++{
++    Q_ASSERT(surface != nullptr);
++
++    bool filledPlaceholder = false;
++    for (int i = 0; i < m_windowModel.count() && !filledPlaceholder; ++i) {
++        ModelEntry &entry = m_windowModel[i];
++        if (entry.application == application && entry.window->surface() == nullptr) {
++            entry.window->setSurface(surface);
++            connectSurface(surface);
++            INFO_MSG << " appId=" << application->appId() << " surface=" << surface
++                      << ", filling out placeholder. after: " << toString();
++            filledPlaceholder = true;
++        }
++    }
++
++    if (!filledPlaceholder) {
++        INFO_MSG << " appId=" << application->appId() << " surface=" << surface << ", adding new row";
++        prependSurfaceHelper(surface, application);
++    }
++}
++
++void TopLevelWindowModel::prependSurfaceHelper(unityapi::MirSurfaceInterface *surface, unityapi::ApplicationInfoInterface *application)
++{
++    if (m_modelState == IdleState) {
++        m_modelState = InsertingState;
++        beginInsertRows(QModelIndex(), 0 /*first*/, 0 /*last*/);
++    } else {
++        Q_ASSERT(m_modelState == ResettingState);
++        // No point in signaling anything if we're resetting the whole model
++    }
++
++    int id = generateId();
++    Window *window = new Window(id, this);
++    if (surface) {
++        window->setSurface(surface);
++    }
++    m_windowModel.prepend(ModelEntry(window, application));
++    if (surface) {
++        connectSurface(surface);
++    }
++
++    connectWindow(window);
++
++    if (m_modelState == InsertingState) {
++        endInsertRows();
++        Q_EMIT countChanged();
++        Q_EMIT listChanged();
++        m_modelState = IdleState;
++    }
++
++    if (!surface) {
++        // focus the newly added window. miral can't help with that as it doesn't know about it.
++        window->setFocused(true);
++        if (m_focusedWindow && m_focusedWindow->surface()) {
++            m_surfaceManager->activate(nullptr);
++        }
++    }
++
++    INFO_MSG << " after " << toString();
++}
++
++void TopLevelWindowModel::connectWindow(Window *window)
++{
++    connect(window, &Window::focusRequested, this, [this, window]() {
++        if (!window->surface()) {
++            activateEmptyWindow(window);
++        }
++    });
++
++    connect(window, &Window::focusedChanged, this, [this, window](bool focused) {
++        if (window->surface()) {
++            // Condense changes to the focused window
++            // eg: Do focusedWindow=A to focusedWindow=B instead of
++            // focusedWindow=A to focusedWindow=null to focusedWindow=B
++            m_focusedWindowChanged = true;
++            if (focused) {
++                Q_ASSERT(m_newlyFocusedWindow == nullptr);
++                m_newlyFocusedWindow = window;
++            }
++        }
++    });
++
++    connect(window, &Window::closeRequested, this, [this, window]() {
++        if (!window->surface()) {
++            int index = indexForId(window->id());
++            Q_ASSERT(index >= 0);
++            m_windowModel[index].application->close();
++        }
++    });
++
++    connect(window, &Window::emptyWindowActivated, this, [this, window]() {
++        activateEmptyWindow(window);
++    });
++}
++
++void TopLevelWindowModel::activateEmptyWindow(Window *window)
++{
++    Q_ASSERT(!window->surface());
++
++    // miral doesn't know about empty windows (ie, windows that are not backed up by MirSurfaces)
++    // So we have to activate them ourselves (instead of asking SurfaceManager to do it for us).
++
++    window->setFocused(true);
++    raiseId(window->id());
++    Window *previousWindow = m_focusedWindow;
++    setFocusedWindow(window);
++    if (previousWindow && previousWindow->surface() && previousWindow->surface()->focused()) {
++        m_surfaceManager->activate(nullptr);
++    }
++}
++
++void TopLevelWindowModel::connectSurface(unityapi::MirSurfaceInterface *surface)
++{
++    connect(surface, &unityapi::MirSurfaceInterface::liveChanged, this, [this, surface](bool live){
++            if (!live) {
++                onSurfaceDied(surface);
++            }
++        });
++    connect(surface, &QObject::destroyed, this, [this, surface](){ this->onSurfaceDestroyed(surface); });
++}
++
++void TopLevelWindowModel::onSurfaceDied(unityapi::MirSurfaceInterface *surface)
++{
++    if (surface->type() == Mir::InputMethodType) {
++        removeInputMethodWindow();
++        return;
++    }
++
++    int i = indexOf(surface);
++    if (i == -1) {
++        return;
++    }
++
++    auto application = m_windowModel[i].application;
++
++    // can't be starting if it already has a surface
++    Q_ASSERT(application->state() != unityapi::ApplicationInfoInterface::Starting);
++
++    if (application->state() == unityapi::ApplicationInfoInterface::Running) {
++        m_windowModel[i].removeOnceSurfaceDestroyed = true;
++    } else {
++        // assume it got killed by the out-of-memory daemon.
++        //
++        // So leave entry in the model and only remove its surface, so shell can display a screenshot
++        // in its place.
++        m_windowModel[i].removeOnceSurfaceDestroyed = false;
++    }
++}
++
++void TopLevelWindowModel::onSurfaceDestroyed(unityapi::MirSurfaceInterface *surface)
++{
++    int i = indexOf(surface);
++    if (i == -1) {
++        return;
++    }
++
++    if (m_windowModel[i].removeOnceSurfaceDestroyed) {
++        removeAt(i);
++    } else {
++        auto window = m_windowModel[i].window;
++        window->setSurface(nullptr);
++        window->setFocused(false);
++        INFO_MSG << " Removed surface from entry. After: " << toString();
++    }
++}
++
++void TopLevelWindowModel::onSurfaceCreated(unityapi::MirSurfaceInterface *surface)
++{
++    DEBUG_MSG << "(" << surface << ")";
++    if (surface->type() == Mir::InputMethodType) {
++        int id = generateId();
++        Window *qmlWindow = new Window(id, this);
++        connectWindow(qmlWindow);
++        qmlWindow->setSurface(surface);
++        setInputMethodWindow(qmlWindow);
++    } else {
++        auto application = m_applicationManager->findApplicationWithSurface(surface);
++        if (application) {
++            prependSurface(surface, application);
++        } else {
++            // Must be a prompt session. No need to do add it as a prompt surface is not top-level.
++            // It will show up in the ApplicationInfoInterface::promptSurfaceList of some application.
++            // Still wrap it in a Window though, so that we keep focusedWindow() up to date.
++            int id = generateId();
++            Window *promptWindow = new Window(id, this);
++            connectWindow(promptWindow);
++            promptWindow->setSurface(surface);
++            connect(surface, &QObject::destroyed, promptWindow, [=](){
++                promptWindow->setSurface(nullptr);
++                promptWindow->deleteLater();
++            });
++        }
++    }
++    // TODO: handle surfaces that are neither top-level windows nor input method. eg: child dialogs, popups, menus
++}
++
++void TopLevelWindowModel::removeAt(int index)
++{
++    if (m_modelState == IdleState) {
++        beginRemoveRows(QModelIndex(), index, index);
++        m_modelState = RemovingState;
++    } else {
++        Q_ASSERT(m_modelState == ResettingState);
++        // No point in signaling anything if we're resetting the whole model
++    }
++
++    auto window = m_windowModel[index].window;
++
++    window->setSurface(nullptr);
++    window->setFocused(false);
++
++    m_windowModel.removeAt(index);
++
++    if (m_modelState == RemovingState) {
++        endRemoveRows();
++        Q_EMIT countChanged();
++        Q_EMIT listChanged();
++        m_modelState = IdleState;
++    }
++
++    disconnect(window, 0, this, 0);
++    if (m_focusedWindow == window) {
++        setFocusedWindow(nullptr);
++    }
++    delete window;
++
++    INFO_MSG << " after " << toString();
++}
++
++void TopLevelWindowModel::setInputMethodWindow(Window *window)
++{
++    if (m_inputMethodWindow) {
++        qWarning("Multiple Input Method Surfaces created, removing the old one!");
++        delete m_inputMethodWindow;
++    }
++    m_inputMethodWindow = window;
++    Q_EMIT inputMethodSurfaceChanged(m_inputMethodWindow->surface());
++}
++
++void TopLevelWindowModel::removeInputMethodWindow()
++{
++    if (m_inputMethodWindow) {
++        delete m_inputMethodWindow;
++        m_inputMethodWindow = nullptr;
++        Q_EMIT inputMethodSurfaceChanged(nullptr);
++    }
++}
++
++void TopLevelWindowModel::onSurfacesRaised(const QVector<unityapi::MirSurfaceInterface*> &surfaces)
++{
++    DEBUG_MSG << "(" << surfaces << ")";
++    const int raiseCount = surfaces.size();
++    for (int i = 0; i < raiseCount; i++) {
++        int fromIndex = findIndexOf(surfaces[i]);
++        if (fromIndex != -1) {
++            move(fromIndex, 0);
++        }
++    }
++}
++
++int TopLevelWindowModel::rowCount(const QModelIndex &/*parent*/) const
++{
++    return m_windowModel.count();
++}
++
++QVariant TopLevelWindowModel::data(const QModelIndex& index, int role) const
++{
++    if (index.row() < 0 || index.row() >= m_windowModel.size())
++        return QVariant();
++
++    if (role == WindowRole) {
++        Window *window = m_windowModel.at(index.row()).window;
++        return QVariant::fromValue(window);
++    } else if (role == ApplicationRole) {
++        return QVariant::fromValue(m_windowModel.at(index.row()).application);
++    } else {
++        return QVariant();
++    }
++}
++
++int TopLevelWindowModel::findIndexOf(const unityapi::MirSurfaceInterface *surface) const
++{
++    for (int i=0; i<m_windowModel.count(); i++) {
++        if (m_windowModel[i].window->surface() == surface) {
++            return i;
++        }
++    }
++    return -1;
++}
++
++int TopLevelWindowModel::generateId()
++{
++    int id = m_nextId;
++    m_nextId = nextFreeId(nextId(id), id);
++    return id;
++}
++
++int TopLevelWindowModel::nextId(int id) const
++{
++    if (id == m_maxId) {
++        return id = 1;
++    } else {
++        return id + 1;
++    }
++}
++
++int TopLevelWindowModel::nextFreeId(int candidateId, const int latestId)
++{
++    int firstCandidateId = candidateId;
++
++    while (indexForId(candidateId) != -1 || candidateId == latestId) {
++        candidateId = nextId(candidateId);
++
++        if (candidateId == firstCandidateId) {
++            qFatal("TopLevelWindowModel: run out of window ids.");
++        }
++    }
++
++    return candidateId;
++}
++
++QString TopLevelWindowModel::toString()
++{
++    QString str;
++    for (int i = 0; i < m_windowModel.count(); ++i) {
++        auto item = m_windowModel.at(i);
++
++        QString itemStr = QString("(index=%1,appId=%2,surface=0x%3,id=%4)")
++            .arg(QString::number(i),
++                 item.application->appId(),
++                 QString::number((qintptr)item.window->surface(), 16),
++                 QString::number(item.window->id()));
++
++        if (i > 0) {
++            str.append(",");
++        }
++        str.append(itemStr);
++    }
++    return str;
++}
++
++int TopLevelWindowModel::indexOf(unityapi::MirSurfaceInterface *surface)
++{
++    for (int i = 0; i < m_windowModel.count(); ++i) {
++        if (m_windowModel.at(i).window->surface() == surface) {
++            return i;
++        }
++    }
++    return -1;
++}
++
++int TopLevelWindowModel::indexForId(int id) const
++{
++    for (int i = 0; i < m_windowModel.count(); ++i) {
++        if (m_windowModel[i].window->id() == id) {
++            return i;
++        }
++    }
++    return -1;
++}
++
++Window *TopLevelWindowModel::windowAt(int index) const
++{
++    if (index >=0 && index < m_windowModel.count()) {
++        return m_windowModel[index].window;
++    } else {
++        return nullptr;
++    }
++}
++
++unityapi::MirSurfaceInterface *TopLevelWindowModel::surfaceAt(int index) const
++{
++    if (index >=0 && index < m_windowModel.count()) {
++        return m_windowModel[index].window->surface();
++    } else {
++        return nullptr;
++    }
++}
++
++unityapi::ApplicationInfoInterface *TopLevelWindowModel::applicationAt(int index) const
++{
++    if (index >=0 && index < m_windowModel.count()) {
++        return m_windowModel[index].application;
++    } else {
++        return nullptr;
++    }
++}
++
++int TopLevelWindowModel::idAt(int index) const
++{
++    if (index >=0 && index < m_windowModel.count()) {
++        return m_windowModel[index].window->id();
++    } else {
++        return 0;
++    }
++}
++
++void TopLevelWindowModel::raiseId(int id)
++{
++    if (m_modelState == IdleState) {
++        DEBUG_MSG << "(id=" << id << ") - do it now.";
++        doRaiseId(id);
++    } else {
++        DEBUG_MSG << "(id=" << id << ") - Model busy (modelState=" << m_modelState << "). Try again in the next event loop.";
++        // The model has just signalled some change. If we have a Repeater responding to this update, it will get nuts
++        // if we perform yet another model change straight away.
++        //
++        // A bad sympton of this problem is a Repeater.itemAt(index) call returning null event though Repeater.count says
++        // the index is definitely within bounds.
++        QMetaObject::invokeMethod(this, "raiseId", Qt::QueuedConnection, Q_ARG(int, id));
++    }
++}
++
++void TopLevelWindowModel::doRaiseId(int id)
++{
++    int fromIndex = indexForId(id);
++    if (fromIndex != -1) {
++        auto surface = m_windowModel[fromIndex].window->surface();
++        if (surface) {
++            m_surfaceManager->raise(surface);
++        } else {
++            // move it ourselves. Since there's no mir::scene::Surface/miral::Window, there's nothing
++            // miral can do about it.
++            move(fromIndex, 0);
++        }
++    }
++}
++
++void TopLevelWindowModel::setFocusedWindow(Window *window)
++{
++    if (window != m_focusedWindow) {
++        INFO_MSG << "(" << window << ")";
++
++        Window* previousWindow = m_focusedWindow;
++
++        m_focusedWindow = window;
++        Q_EMIT focusedWindowChanged(m_focusedWindow);
++
++        if (previousWindow && previousWindow->focused() && !previousWindow->surface()) {
++            // do it ourselves. miral doesn't know about this window
++            previousWindow->setFocused(false);
++        }
++    }
++}
++
++unityapi::MirSurfaceInterface* TopLevelWindowModel::inputMethodSurface() const
++{
++    return m_inputMethodWindow ? m_inputMethodWindow->surface() : nullptr;
++}
++
++Window* TopLevelWindowModel::focusedWindow() const
++{
++    return m_focusedWindow;
++}
++
++void TopLevelWindowModel::move(int from, int to)
++{
++    if (from == to) return;
++    DEBUG_MSG << " from=" << from << " to=" << to;
++
++    if (from >= 0 && from < m_windowModel.size() && to >= 0 && to < m_windowModel.size()) {
++        QModelIndex parent;
++        /* When moving an item down, the destination index needs to be incremented
++           by one, as explained in the documentation:
++           http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
++
++        Q_ASSERT(m_modelState == IdleState);
++        m_modelState = MovingState;
++
++        beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
++#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
++        const auto &window = m_windowModel.takeAt(from);
++        m_windowModel.insert(to, window);
++#else
++        m_windowModel.move(from, to);
++#endif
++        endMoveRows();
++
++        Q_EMIT listChanged();
++        m_modelState = IdleState;
++
++        INFO_MSG << " after " << toString();
++    }
++}
++void TopLevelWindowModel::onModificationsStarted()
++{
++}
++
++void TopLevelWindowModel::onModificationsEnded()
++{
++    if (m_focusedWindowChanged) {
++        setFocusedWindow(m_newlyFocusedWindow);
++    }
++    // reset
++    m_focusedWindowChanged = false;
++    m_newlyFocusedWindow = nullptr;
++}
 === added file 'plugins/WindowManager/TopLevelWindowModel.h'
 --- plugins/WindowManager/TopLevelWindowModel.h	1970-01-01 00:00:00 +0000
 +++ plugins/WindowManager/TopLevelWindowModel.h	2016-11-30 19:24:53 +0000
@@ -0,0 +1,258 @@
++/*
++ * 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 TOPLEVELWINDOWMODEL_H
++#define TOPLEVELWINDOWMODEL_H
++
++#include <QAbstractListModel>
++#include <QLoggingCategory>
++
++Q_DECLARE_LOGGING_CATEGORY(TOPLEVELWINDOWMODEL)
++
++class Window;
++
++namespace unity {
++    namespace shell {
++        namespace application {
++            class ApplicationInfoInterface;
++            class ApplicationManagerInterface;
++            class MirSurfaceInterface;
++            class SurfaceManagerInterface;
++        }
++    }
++}
++
++/**
++ * @brief A model of top-level surfaces
++ *
++ * It's an abstraction of top-level application windows.
++ *
++ * When an entry first appears, it normaly doesn't have a surface yet, meaning that the application is
++ * still starting up. A shell should then display a splash screen or saved screenshot of the application
++ * until its surface comes up.
++ *
++ * As applications can have multiple surfaces and you can also have entries without surfaces at all,
++ * the only way to unambiguously refer to an entry in this model is through its id.
++ */
++class TopLevelWindowModel : public QAbstractListModel
++{
++    Q_OBJECT
++
++    /**
++     * @brief Number of top-level surfaces in this model
++     *
++     * This is the same as rowCount, added in order to keep compatibility with QML ListModels.
++     */
++    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
++
++    /**
++     * @brief The input method surface, if any
++     *
++     * The surface of a onscreen keyboard (akak "virtual keyboard") would be kept here and not in the model itself.
++     */
++    Q_PROPERTY(unity::shell::application::MirSurfaceInterface* inputMethodSurface READ inputMethodSurface NOTIFY inputMethodSurfaceChanged)
++
++    /**
++     * @brief The currently focused window, if any
++     */
++    Q_PROPERTY(Window* focusedWindow READ focusedWindow NOTIFY focusedWindowChanged)
++
++    Q_PROPERTY(unity::shell::application::SurfaceManagerInterface* surfaceManager
++            READ surfaceManager
++            WRITE setSurfaceManager
++            NOTIFY surfaceManagerChanged)
++
++    Q_PROPERTY(unity::shell::application::ApplicationManagerInterface* applicationManager
++            READ applicationManager
++            WRITE setApplicationManager
++            NOTIFY applicationManagerChanged)
++
++    /**
++      The id to be used on the next entry created
++      Useful for tests
++     */
++    Q_PROPERTY(int nextId READ nextId NOTIFY nextIdChanged)
++
++public:
++    /**
++     * @brief The Roles supported by the model
++     *
++     * WindowRole - A Window.
++     * ApplicationRole - An ApplicationInfoInterface
++     */
++    enum Roles {
++        WindowRole = Qt::UserRole,
++        ApplicationRole = Qt::UserRole + 1,
++    };
++
++    TopLevelWindowModel();
++
++    // From QAbstractItemModel
++    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
++    QVariant data(const QModelIndex& index, int role) const override;
++    QHash<int, QByteArray> roleNames() const override {
++        QHash<int, QByteArray> roleNames { {WindowRole, "window"},
++                                           {ApplicationRole, "application"} };
++        return roleNames;
++    }
++
++    // Own API
++
++    unity::shell::application::MirSurfaceInterface* inputMethodSurface() const;
++    Window* focusedWindow() const;
++
++    unity::shell::application::ApplicationManagerInterface *applicationManager() const { return m_applicationManager; }
++    void setApplicationManager(unity::shell::application::ApplicationManagerInterface*);
++
++    unity::shell::application::SurfaceManagerInterface *surfaceManager() const { return m_surfaceManager; }
++    void setSurfaceManager(unity::shell::application::SurfaceManagerInterface*);
++
++    int nextId() const { return m_nextId; }
++
++public:
++    /**
++     * @brief Returns the surface at the given index
++     *
++     * It will be a nullptr if the application is still starting up and thus hasn't yet created
++     * and drawn into a surface.
++     *
++     * Same as windowAt(index).surface()
++     */
++    Q_INVOKABLE unity::shell::application::MirSurfaceInterface *surfaceAt(int index) const;
++
++    /**
++     * @brief Returns the window at the given index
++     *
++     * Will always be valid
++     */
++    Q_INVOKABLE Window *windowAt(int index) const;
++
++    /**
++     * @brief Returns the application at the given index
++     */
++    Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *applicationAt(int index) const;
++
++    /**
++     * @brief Returns the unique id of the element at the given index
++     */
++    Q_INVOKABLE int idAt(int index) const;
++
++    /**
++     * @brief Returns the index where the row with the given id is located
++     *
++     * Returns -1 if there's no row with the given id.
++     */
++    Q_INVOKABLE int indexForId(int id) const;
++
++    /**
++     * @brief Raises the row with the given id to the top of the window stack (index == count-1)
++     */
++    Q_INVOKABLE void raiseId(int id);
++
++Q_SIGNALS:
++    void countChanged();
++    void inputMethodSurfaceChanged(unity::shell::application::MirSurfaceInterface* inputMethodSurface);
++    void focusedWindowChanged(Window *focusedWindow);
++    void applicationManagerChanged(unity::shell::application::ApplicationManagerInterface*);
++    void surfaceManagerChanged(unity::shell::application::SurfaceManagerInterface*);
++
++    /**
++     * @brief Emitted when the list changes
++     *
++     * Emitted when model gains an element, loses an element or when elements exchange positions.
++     */
++    void listChanged();
++
++    void nextIdChanged();
++
++private Q_SLOTS:
++    void onSurfaceCreated(unity::shell::application::MirSurfaceInterface *surface);
++    void onSurfacesRaised(const QVector<unity::shell::application::MirSurfaceInterface*> &surfaces);
++
++    void onModificationsStarted();
++    void onModificationsEnded();
++
++private:
++    void doRaiseId(int id);
++    int generateId();
++    int nextFreeId(int candidateId, const int latestId);
++    int nextId(int id) const;
++    QString toString();
++    int indexOf(unity::shell::application::MirSurfaceInterface *surface);
++
++    void setInputMethodWindow(Window *window);
++    void setFocusedWindow(Window *window);
++    void removeInputMethodWindow();
++    int findIndexOf(const unity::shell::application::MirSurfaceInterface *surface) const;
++    void removeAt(int index);
++
++    void addApplication(unity::shell::application::ApplicationInfoInterface *application);
++    void removeApplication(unity::shell::application::ApplicationInfoInterface *application);
++
++    void prependPlaceholder(unity::shell::application::ApplicationInfoInterface *application);
++    void prependSurface(unity::shell::application::MirSurfaceInterface *surface,
++                        unity::shell::application::ApplicationInfoInterface *application);
++    void prependSurfaceHelper(unity::shell::application::MirSurfaceInterface *surface,
++                              unity::shell::application::ApplicationInfoInterface *application);
++
++    void connectWindow(Window *window);
++    void connectSurface(unity::shell::application::MirSurfaceInterface *surface);
++
++    void onSurfaceDied(unity::shell::application::MirSurfaceInterface *surface);
++    void onSurfaceDestroyed(unity::shell::application::MirSurfaceInterface *surface);
++
++    void move(int from, int to);
++
++    void activateEmptyWindow(Window *window);
++
++    struct ModelEntry {
++        ModelEntry() {}
++        ModelEntry(Window *window,
++                   unity::shell::application::ApplicationInfoInterface *application)
++            : window(window), application(application) {}
++        Window *window{nullptr};
++        unity::shell::application::ApplicationInfoInterface *application{nullptr};
++        bool removeOnceSurfaceDestroyed{false};
++    };
++
++    QVector<ModelEntry> m_windowModel;
++    Window* m_inputMethodWindow{nullptr};
++    Window* m_focusedWindow{nullptr};
++
++    int m_nextId{1};
++    // Just something big enough that we don't risk running out of unused id numbers.
++    // Not sure if QML int type supports something close to std::numeric_limits<int>::max() and
++    // there's no reason to try out its limits.
++    static const int m_maxId{1000000};
++
++    unity::shell::application::ApplicationManagerInterface* m_applicationManager{nullptr};
++    unity::shell::application::SurfaceManagerInterface *m_surfaceManager{nullptr};
++
++    enum ModelState {
++        IdleState,
++        InsertingState,
++        RemovingState,
++        MovingState,
++        ResettingState
++    };
++    ModelState m_modelState{IdleState};
++
++    // Valid between modificationsStarted and modificationsEnded
++    bool m_focusedWindowChanged{false};
++    Window *m_newlyFocusedWindow{nullptr};
++};
++
++#endif // TOPLEVELWINDOWMODEL_H
 === added file 'plugins/WindowManager/Window.cpp'
 --- plugins/WindowManager/Window.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/WindowManager/Window.cpp	2016-11-30 19:24:53 +0000
@@ -0,0 +1,234 @@
++/*
++ * 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/>.
++ */
++
++#include "Window.h"
++
++// unity-api
++#include <unity/shell/application/MirSurfaceInterface.h>
++
++#include <QQmlEngine>
++
++namespace unityapi = unity::shell::application;
++
++Q_LOGGING_CATEGORY(UNITY_WINDOW, "unity.window", QtWarningMsg)
++
++#define DEBUG_MSG qCDebug(UNITY_WINDOW).nospace() << qPrintable(toString()) << "::" << __func__
++
++Window::Window(int id, QObject *parent)
++    : QObject(parent)
++    , m_id(id)
++{
++    DEBUG_MSG << "()";
++    QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
++}
++
++Window::~Window()
++{
++    DEBUG_MSG << "()";
++}
++
++QPoint Window::position() const
++{
++    return m_position;
++}
++
++QPoint Window::requestedPosition() const
++{
++    return m_requestedPosition;
++}
++
++void Window::setRequestedPosition(const QPoint &value)
++{
++    m_positionRequested = true;
++    if (value != m_requestedPosition) {
++        m_requestedPosition = value;
++        Q_EMIT requestedPositionChanged(m_requestedPosition);
++        if (m_surface) {
++            m_surface->setRequestedPosition(value);
++        } else {
++            // fake-miral: always comply
++            m_position = m_requestedPosition;
++            Q_EMIT positionChanged(m_position);
++        }
++    }
++}
++
++Mir::State Window::state() const
++{
++    return m_state;
++}
++
++bool Window::focused() const
++{
++    return m_focused;
++}
++
++bool Window::confinesMousePointer() const
++{
++    if (m_surface) {
++        return m_surface->confinesMousePointer();
++    } else {
++        return false;
++    }
++}
++
++int Window::id() const
++{
++    return m_id;
++}
++
++unityapi::MirSurfaceInterface* Window::surface() const
++{
++    return m_surface;
++}
++
++void Window::requestState(Mir::State state)
++{
++    m_stateRequested = true;
++    if (m_surface) {
++        m_surface->requestState(state);
++    } else if (m_state != state) {
++        m_state = state;
++        Q_EMIT stateChanged(m_state);
++    }
++}
++
++void Window::close()
++{
++    if (m_surface) {
++        m_surface->close();
++    } else {
++        Q_EMIT closeRequested();
++    }
++}
++
++void Window::activate()
++{
++    if (m_surface) {
++        m_surface->activate();
++    } else {
++        Q_EMIT emptyWindowActivated();
++    }
++}
++
++void Window::setSurface(unityapi::MirSurfaceInterface *surface)
++{
++    DEBUG_MSG << "(" << surface << ")";
++    if (m_surface) {
++        disconnect(m_surface, 0, this, 0);
++    }
++
++    m_surface = surface;
++
++    if (m_surface) {
++        connect(surface, &unityapi::MirSurfaceInterface::focusRequested, this, [this]() {
++            Q_EMIT focusRequested();
++        });
++
++        connect(surface, &unityapi::MirSurfaceInterface::closeRequested, this, &Window::closeRequested);
++
++        connect(surface, &unityapi::MirSurfaceInterface::positionChanged, this, [this]() {
++            updatePosition();
++        });
++
++        connect(surface, &unityapi::MirSurfaceInterface::stateChanged, this, [this]() {
++            updateState();
++        });
++
++        connect(surface, &unityapi::MirSurfaceInterface::focusedChanged, this, [this]() {
++            updateFocused();
++        });
++
++        // bring it up to speed
++        if (m_positionRequested) {
++            m_surface->setRequestedPosition(m_requestedPosition);
++        }
++        if (m_stateRequested) {
++            m_surface->requestState(m_state);
++        }
++
++        // and sync with surface
++        updatePosition();
++        updateState();
++        updateFocused();
++    }
++
++    Q_EMIT surfaceChanged(surface);
++}
++
++void Window::updatePosition()
++{
++    if (m_surface->position() != m_position) {
++        m_position = m_surface->position();
++        Q_EMIT positionChanged(m_position);
++    }
++}
++
++void Window::updateState()
++{
++    if (m_surface->state() != m_state) {
++        m_state = m_surface->state();
++        Q_EMIT stateChanged(m_state);
++    }
++}
++
++void Window::updateFocused()
++{
++    if (m_surface->focused() != m_focused) {
++        m_focused = m_surface->focused();
++        Q_EMIT focusedChanged(m_focused);
++    }
++}
++
++void Window::setFocused(bool value)
++{
++    if (value != m_focused) {
++        DEBUG_MSG << "(" << value << ")";
++        m_focused = value;
++        Q_EMIT focusedChanged(m_focused);
++        // when we have a surface we get focus changes from updateFocused() instead
++        Q_ASSERT(!m_surface);
++    }
++}
++
++QString Window::toString() const
++{
++    if (surface()) {
++    return QString("Window[0x%1, id=%2, MirSurface[0x%3,\"%4\"]]").arg(
++            QString::number((quintptr)this, 16),
++            QString::number(id()),
++            QString::number((quintptr)surface(), 16),
++            surface()->name());
++    } else {
++        return QString("Window[0x%1, id=%2, null]").arg(
++            QString::number((quintptr)this, 0, 16),
++            QString::number(id()));
++    }
++}
++
++QDebug operator<<(QDebug dbg, const Window *window)
++{
++    QDebugStateSaver saver(dbg);
++    dbg.nospace();
++
++    if (window) {
++        dbg << qPrintable(window->toString());
++    } else {
++        dbg << (void*)(window);
++    }
++
++    return dbg;
++}
 === added file 'plugins/WindowManager/Window.h'
 --- plugins/WindowManager/Window.h	1970-01-01 00:00:00 +0000
 +++ plugins/WindowManager/Window.h	2016-11-30 19:24:53 +0000
@@ -0,0 +1,161 @@
++/*
++ * 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/>.
++ */
++
++#ifndef UNITY_WINDOW_H
++#define UNITY_WINDOW_H
++
++#include <QLoggingCategory>
++#include <QObject>
++#include <QPoint>
++
++// Unity API
++#include <unity/shell/application/Mir.h>
++
++namespace unity {
++    namespace shell {
++        namespace application {
++            class MirSurfaceInterface;
++        }
++    }
++}
++
++
++Q_DECLARE_LOGGING_CATEGORY(UNITY_WINDOW)
++
++/**
++   @brief A slightly higher concept than MirSurface
++
++   A Window exists before its MirSurface gets created (for splashscreen purposes)
++   and might also hang around after the backing surface is gone (In case the application
++   was killed to free up memory, as it should still remain in the window list since the user
++   did not explicitly close it).
++ */
++class Window : public QObject
++{
++    Q_OBJECT
++
++    /**
++     * @brief Position of the current surface buffer, in pixels.
++     */
++    Q_PROPERTY(QPoint position READ position NOTIFY positionChanged)
++
++    /**
++     * @brief Requested position of the current surface buffer, in pixels.
++     */
++    Q_PROPERTY(QPoint requestedPosition READ requestedPosition WRITE setRequestedPosition NOTIFY requestedPositionChanged)
++
++    /**
++     * @brief State of the surface
++     */
++    Q_PROPERTY(Mir::State state READ state NOTIFY stateChanged)
++
++    /**
++     * @brief Whether the surface is focused
++     *
++     * It will be true if this surface is MirFocusControllerInterface::focusedSurface
++     */
++    Q_PROPERTY(bool focused READ focused NOTIFY focusedChanged)
++
++    /**
++     * @brief Whether the surface wants to confine the mouse pointer within its boundaries
++     *
++     * If true, the surface doesn't want the mouse pointer to leave its boundaries while it's focused.
++     */
++    Q_PROPERTY(bool confinesMousePointer READ confinesMousePointer NOTIFY confinesMousePointerChanged)
++
++    /**
++     * @brief A unique identifier for this window.
++     * Useful for telling windows apart in a list model as they get moved around
++     */
++    Q_PROPERTY(int id READ id CONSTANT)
++
++    /**
++     * @brief Surface backing up this window
++     * It might be null if a surface hasn't been created yet (application is starting up) or if
++     * the corresponding application has been killed (but can still get restarted to continue from
++     * where it left)
++     */
++    Q_PROPERTY(unity::shell::application::MirSurfaceInterface* surface READ surface NOTIFY surfaceChanged)
++
++public:
++    Window(int id, QObject *parent = nullptr);
++    virtual ~Window();
++    QPoint position() const;
++    QPoint requestedPosition() const;
++    void setRequestedPosition(const QPoint &);
++    Mir::State state() const;
++    bool focused() const;
++    bool confinesMousePointer() const;
++    int id() const;
++    unity::shell::application::MirSurfaceInterface* surface() const;
++
++    void setSurface(unity::shell::application::MirSurfaceInterface *surface);
++    void setFocused(bool value);
++
++    QString toString() const;
++
++public Q_SLOTS:
++    /**
++     * @brief Requests a change to the specified state
++     */
++    void requestState(Mir::State state);
++
++    /**
++     * @brief Sends a close request
++     *
++     */
++    void close();
++
++    /**
++     * @brief Focuses and raises the window
++     */
++    void activate();
++
++Q_SIGNALS:
++    void closeRequested();
++    void emptyWindowActivated();
++
++    void positionChanged(QPoint position);
++    void requestedPositionChanged(QPoint position);
++    void stateChanged(Mir::State value);
++    void focusedChanged(bool value);
++    void confinesMousePointerChanged(bool value);
++    void surfaceChanged(unity::shell::application::MirSurfaceInterface *surface);
++
++    /**
++     * @brief Emitted when focus for this window is requested by an external party
++     */
++    void focusRequested();
++
++private:
++    void updatePosition();
++    void updateState();
++    void updateFocused();
++
++    QPoint m_position;
++    QPoint m_requestedPosition;
++    bool m_positionRequested{false};
++    bool m_focused{false};
++    int m_id;
++    Mir::State m_state{Mir::RestoredState};
++    bool m_stateRequested{false};
++    unity::shell::application::MirSurfaceInterface *m_surface{nullptr};
++};
++
++QDebug operator<<(QDebug dbg, const Window *window);
++
++Q_DECLARE_METATYPE(Window*)
++#endif // UNITY_WINDOW_H
 === modified file 'plugins/WindowManager/WindowManagerPlugin.cpp'
 --- plugins/WindowManager/WindowManagerPlugin.cpp	2016-04-04 13:37:49 +0000
 +++ plugins/WindowManager/WindowManagerPlugin.cpp	2016-11-30 19:24:53 +0000
@@ -16,13 +16,16 @@
  #include "WindowManagerPlugin.h"
--#include "TopLevelSurfaceList.h"
++#include "TopLevelWindowModel.h"
++#include "Window.h"
  #include <QtQml>
  void WindowManagerPlugin::registerTypes(const char *uri)
+ {
--    qmlRegisterType<TopLevelSurfaceList>(uri, 0, 1, "TopLevelSurfaceList");
++    qmlRegisterType<TopLevelWindowModel>(uri, 1, 0, "TopLevelWindowModel");
++
++    qRegisterMetaType<Window*>("Window*");
      qRegisterMetaType<QAbstractListModel*>("QAbstractListModel*");
+ }
 === modified file 'qml/Components/InputMethod.qml'
 --- qml/Components/InputMethod.qml	2016-10-06 13:06:31 +0000
 +++ qml/Components/InputMethod.qml	2016-11-30 19:24:53 +0000
@@ -23,6 +23,8 @@
      readonly property rect visibleRect: surfaceItem.surface && visible ? surfaceItem.surface.inputBounds : Qt.rect(0, 0, 0, 0)
++    property var surface
++
      MirSurfaceItem {
          id: surfaceItem
          anchors.fill: parent
@@ -31,7 +33,7 @@
          surfaceWidth: root.enabled ? width : -1
          surfaceHeight: root.enabled ? height : -1
--        surface: SurfaceManager.inputMethodSurface
++        surface: root.surface
          onLiveChanged: {
              if (surface !== null && !live) {
@@ -50,7 +52,6 @@
+     }
      visible: surfaceItem.surface &&
--              surfaceItem.surfaceState != Mir.HiddenState &&
--              surfaceItem.surfaceState != Mir.MinimizedState &&
--              root.enabled
++             surfaceItem.surface.visible &&
++             root.enabled
+ }
 === modified file 'qml/Components/KeymapSwitcher.qml'
 --- qml/Components/KeymapSwitcher.qml	2016-07-11 14:40:56 +0000
 +++ qml/Components/KeymapSwitcher.qml	2016-11-30 19:24:53 +0000
@@ -23,6 +23,9 @@
  QtObject {
      id: root
++    // to be set from outside
++    property var focusedSurface: null
++
      property GlobalShortcut shortcutNext: GlobalShortcut {
          shortcut: Qt.MetaModifier|Qt.Key_Space
          onTriggered: root.nextKeymap()
@@ -60,7 +63,7 @@
+     }
      property Binding surfaceKeymapBinding: Binding {
--        target: MirFocusController.focusedSurface
++        target: root.focusedSurface
          property: "keymap"
          value: root.currentKeymap
+     }
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2016-11-29 09:39:56 +0000
 +++ qml/Shell.qml	2016-11-30 19:24:53 +0000
@@ -43,7 +43,7 @@
  import Unity.DashCommunicator 0.1
  import Unity.Indicators 0.1 as Indicators
  import Cursor 1.1
--import WindowManager 0.1
++import WindowManager 1.0
  StyledItem {
@@ -264,10 +264,15 @@
          width: parent.width
          height: parent.height
--        TopLevelSurfaceList {
++        SurfaceManager {
++            id: surfaceMan
++            objectName: "surfaceManager"
++        }
++        TopLevelWindowModel {
              id: topLevelSurfaceList
              objectName: "topLevelSurfaceList"
--            applicationsModel: ApplicationManager
++            applicationManager: ApplicationManager // it's a singleton
++            surfaceManager: surfaceMan
+         }
          Stage {
@@ -318,6 +323,7 @@
      InputMethod {
          id: inputMethod
          objectName: "inputMethod"
++        surface: topLevelSurfaceList.inputMethodSurface
          anchors {
              fill: parent
              topMargin: panel.panelHeight
@@ -485,8 +491,8 @@
                  greeterShown: greeter.shown
+             }
--            readonly property bool focusedSurfaceIsFullscreen: MirFocusController.focusedSurface
--                ? MirFocusController.focusedSurface.state === Mir.FullscreenState
++            readonly property bool focusedSurfaceIsFullscreen: topLevelSurfaceList.focusedWindow
++                ? topLevelSurfaceList.focusedWindow.state === Mir.FullscreenState
                  : false
              fullscreenMode: (focusedSurfaceIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0)
                              || greeter.hasLockedApp
@@ -786,7 +792,9 @@
+     }
      // non-visual objects
--    KeymapSwitcher {}
++    KeymapSwitcher {
++        focusedSurface: topLevelSurfaceList.focusedWindow ? topLevelSurfaceList.focusedWindow.surface : null
++    }
      BrightnessControl {}
      Rectangle {
 === modified file 'qml/Stage/FakeMaximizeDelegate.qml'
 --- qml/Stage/FakeMaximizeDelegate.qml	2016-09-13 11:53:40 +0000
 +++ qml/Stage/FakeMaximizeDelegate.qml	2016-11-30 19:24:53 +0000
@@ -98,19 +98,19 @@
      function commit() {
          if (progress > hintThreshold && edge != -1) {
              if (edge == Item.Top) {
--                target.maximize();
++                target.requestMaximize();
              } else if (edge == Item.Left) {
--                target.maximizeLeft();
++                target.requestMaximizeLeft();
              } else if (edge == Item.Right) {
--                target.maximizeRight();
++                target.requestMaximizeRight();
              } else if (edge == Item.TopLeft) {
--                target.maximizeTopLeft();
++                target.requestMaximizeTopLeft();
              } else if (edge == Item.TopRight) {
--                target.maximizeTopRight();
++                target.requestMaximizeTopRight();
              } else if (edge == Item.BottomLeft) {
--                target.maximizeBottomLeft();
++                target.requestMaximizeBottomLeft();
              } else if (edge == Item.BottomRight) {
--                target.maximizeBottomRight();
++                target.requestMaximizeBottomRight();
+             }
          } else {
              stop();
 === modified file 'qml/Stage/MoveHandler.qml'
 --- qml/Stage/MoveHandler.qml	2016-10-28 12:28:49 +0000
 +++ qml/Stage/MoveHandler.qml	2016-11-30 19:24:53 +0000
@@ -114,7 +114,7 @@
              // restore from maximized when dragging away from edges/corners; guard against inadvertent changes when going into maximized state
              if (target.anyMaximized && !target.windowedTransitionRunning) {
                  priv.progress = 0;
--                target.restore(false, WindowStateStorage.WindowStateNormal);
++                target.requestRestore();
+             }
              var pos = mapToItem(target.parent, mouse.x, mouse.y);
 === modified file 'qml/Stage/Stage.qml'
 --- qml/Stage/Stage.qml	2016-11-29 09:39:25 +0000
 +++ qml/Stage/Stage.qml	2016-11-30 19:24:53 +0000
@@ -119,8 +119,7 @@
+         }
+     }
--    property Item itemConfiningMouseCursor: !spreadShown && priv.focusedAppDelegate && priv.focusedAppDelegate.surface &&
--                              priv.focusedAppDelegate.surface.confinesMousePointer ?
++    property Item itemConfiningMouseCursor: !spreadShown && priv.focusedAppDelegate && priv.focusedAppDelegate.window.confinesMousePointer ?
                                priv.focusedAppDelegate.clientAreaItem : null;
      signal itemSnapshotRequested(Item item)
@@ -186,29 +185,34 @@
      GlobalShortcut {
          id: maximizeWindowShortcut
          shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Up
--        onTriggered: priv.focusedAppDelegate.maximize()
++        onTriggered: priv.focusedAppDelegate.requestMaximize()
          active: root.state == "windowed" && priv.focusedAppDelegate && priv.focusedAppDelegate.canBeMaximized
+     }
      GlobalShortcut {
          id: maximizeWindowLeftShortcut
          shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Left
--        onTriggered: priv.focusedAppDelegate.maximizeLeft()
++        onTriggered: priv.focusedAppDelegate.requestMaximizeLeft()
          active: root.state == "windowed" && priv.focusedAppDelegate && priv.focusedAppDelegate.canBeMaximizedLeftRight
+     }
      GlobalShortcut {
          id: maximizeWindowRightShortcut
          shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Right
--        onTriggered: priv.focusedAppDelegate.maximizeRight()
++        onTriggered: priv.focusedAppDelegate.requestMaximizeRight()
          active: root.state == "windowed" && priv.focusedAppDelegate && priv.focusedAppDelegate.canBeMaximizedLeftRight
+     }
      GlobalShortcut {
          id: minimizeRestoreShortcut
          shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Down
--        onTriggered: priv.focusedAppDelegate.anyMaximized
--                     ? priv.focusedAppDelegate.restoreFromMaximized() : priv.focusedAppDelegate.minimize()
++        onTriggered: {
++            if (priv.focusedAppDelegate.anyMaximized) {
++                priv.focusedAppDelegate.requestRestore();
++            } else {
++                priv.focusedAppDelegate.requestMinimize();
++            }
++        }
          active: root.state == "windowed" && priv.focusedAppDelegate
+     }
@@ -244,20 +248,10 @@
+         }
          function minimizeAllWindows() {
--            for (var i = 0; i < appRepeater.count; i++) {
--                var appDelegate = appRepeater.itemAt(i);
--                if (appDelegate && !appDelegate.minimized) {
--                    appDelegate.minimize();
--                }
--            }
--        }
--
--        function focusNext() {
--            for (var i = 0; i < appRepeater.count; i++) {
--                var appDelegate = appRepeater.itemAt(i);
--                if (appDelegate && !appDelegate.minimized) {
--                    appDelegate.focus = true;
--                    return;
++            for (var i = appRepeater.count - 1; i >= 0; i--) {
++                var appDelegate = appRepeater.itemAt(i);
++                if (appDelegate && !appDelegate.minimized) {
++                    appDelegate.requestMinimize();
+                 }
+             }
+         }
@@ -358,8 +352,8 @@
      Connections {
          target: PanelState
          onCloseClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.close(); } }
--        onMinimizeClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.minimize(); } }
--        onRestoreClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.restoreFromMaximized(); } }
++        onMinimizeClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.requestMinimize(); } }
++        onRestoreClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.requestRestore(); } }
+     }
      Binding {
@@ -434,13 +428,6 @@
+         }
+     }
--    Binding {
--        target: MirFocusController
--        property: "focusedSurface"
--        value: priv.focusedAppDelegate ? priv.focusedAppDelegate.focusedSurface : null
--        when: !appRepeater.startingUp && root.parent
--    }
--
      states: [
          State {
              name: "spread"; when: priv.goneToSpread
@@ -633,7 +620,7 @@
              onShownChanged: {
                  if (!shown && priv.mainStageDelegate && !root.spreadShown) {
--                    priv.mainStageDelegate.claimFocus();
++                    priv.mainStageDelegate.activate();
+                 }
+             }
@@ -666,14 +653,23 @@
+             }
+         }
--        TopLevelSurfaceRepeater {
++        Repeater {
              id: appRepeater
              model: topLevelSurfaceList
              objectName: "appRepeater"
++            function indexOf(delegateItem) {
++                for (var i = 0; i < count; i++) {
++                    if (itemAt(i) === delegateItem) {
++                        return i;
++                    }
++                }
++                return -1;
++            }
++
              delegate: FocusScope {
                  id: appDelegate
--                objectName: "appDelegate_" + model.id
++                objectName: "appDelegate_" + model.window.id
                  property int itemIndex: index // We need this from outside the repeater
                  // z might be overriden in some cases by effects, but we need z ordering
                  // to calculate occlusion detection
@@ -685,11 +681,11 @@
+                 }
                  z: normalZ
--                // Normally we want x/y where we request it to be. Width/height of our delegate will
++                // Normally we want x/y where the surface thinks it is. Width/height of our delegate will
                  // match what the actual surface size is.
                  // Don't write to those, they will be set by states
--                x: requestedX
--                y: requestedY
++                x: model.window.position.x - clientAreaItem.x
++                y: model.window.position.y - clientAreaItem.y
                  width: decoratedWindow.implicitWidth
                  height: decoratedWindow.implicitHeight
@@ -699,6 +695,12 @@
                  property real requestedY: windowedY
                  property real requestedWidth: windowedWidth
                  property real requestedHeight: windowedHeight
++                Binding {
++                    target: model.window; property: "requestedPosition"
++                    // miral doesn't know about our window decorations. So we have to deduct them
++                    value: Qt.point(appDelegate.requestedX + appDelegate.clientAreaItem.x,
++                                    appDelegate.requestedY + appDelegate.clientAreaItem.y)
++                }
                  // In those are for windowed mode. Those values basically store the window's properties
                  // when having a floating window. If you want to move/resize a window in normal mode, this is what you want to write to.
@@ -767,7 +769,7 @@
                                                       maximizedTopLeft || maximizedTopRight || maximizedBottomLeft || maximizedBottomRight
                  readonly property bool minimized: windowState & WindowStateStorage.WindowStateMinimized
--                readonly property bool fullscreen: surface ? surface.state === Mir.FullscreenState : application.fullscreen
++                readonly property bool fullscreen: window.state === Mir.FullscreenState
                  readonly property bool canBeMaximized: canBeMaximizedHorizontally && canBeMaximizedVertically
                  readonly property bool canBeMaximizedLeftRight: (maximumWidth == 0 || maximumWidth >= appContainer.width/2) &&
@@ -793,7 +795,9 @@
                      priv.updateMainAndSideStageIndexes()
+                 }
--                readonly property var surface: model.surface
++                readonly property var surface: model.window.surface
++                readonly property var window: model.window
++
                  readonly property alias resizeArea: resizeArea
                  readonly property alias focusedSurface: decoratedWindow.focusedSurface
                  readonly property bool dragging: touchControls.overlayShown ? touchControls.dragging : decoratedWindow.dragging
@@ -802,6 +806,25 @@
                  readonly property bool isDash: appId == "unity8-dash"
                  readonly property alias clientAreaItem: decoratedWindow.clientAreaItem
++                function activate() {
++                    if (model.window.focused) {
++                        updateQmlFocusFromMirSurfaceFocus();
++                    } else {
++                        model.window.activate();
++                    }
++                }
++                function requestMaximize() { model.window.requestState(Mir.MaximizedState); }
++                function requestMaximizeVertically() { model.window.requestState(Mir.VertMaximizedState); }
++                function requestMaximizeHorizontally() { model.window.requestState(Mir.HorizMaximizedState); }
++                function requestMaximizeLeft() { model.window.requestState(Mir.MaximizedLeftState); }
++                function requestMaximizeRight() { model.window.requestState(Mir.MaximizedRightState); }
++                function requestMaximizeTopLeft() { model.window.requestState(Mir.MaximizedTopLeftState); }
++                function requestMaximizeTopRight() { model.window.requestState(Mir.MaximizedTopRightState); }
++                function requestMaximizeBottomLeft() { model.window.requestState(Mir.MaximizedBottomLeftState); }
++                function requestMaximizeBottomRight() { model.window.requestState(Mir.MaximizedBottomRightState); }
++                function requestMinimize() { model.window.requestState(Mir.MinimizedState); }
++                function requestRestore() { model.window.requestState(Mir.RestoredState); }
++
                  function claimFocus() {
                      if (root.state == "spread") {
                          spreadItem.highlightedIndex = index
@@ -813,45 +836,60 @@
+                         }
                          priv.updateMainAndSideStageIndexes();
+                     }
--
                      if (root.mode == "windowed") {
                          appDelegate.restore(true /* animated */, appDelegate.windowState);
--                    } else {
--                        appDelegate.focus = true;
+                     }
++                    appDelegate.focus = true;
+                 }
--                Connections {
--                    target: model.surface
--                    onFocusRequested: {
++
++                function updateQmlFocusFromMirSurfaceFocus() {
++                    if (model.window.focused) {
                          claimFocus();
--                    }
--                }
--                Connections {
--                    target: model.application
--                    onFocusRequested: {
--                        if (!model.surface) {
--                            // when an app has no surfaces, we assume there's only one entry representing it:
--                            // this delegate.
--                            claimFocus();
--                        } else {
--                            // if the application has surfaces, focus request should be at surface-level.
--                        }
--                    }
--                }
--
--                onFocusChanged: {
--                    if (appRepeater.startingUp)
--                        return;
--
--                    if (focus) {
--                        topLevelSurfaceList.raiseId(model.id);
                          priv.focusedAppDelegate = appDelegate;
--                    } else if (!focus && priv.focusedAppDelegate === appDelegate && root.state != "spread") {
--                        priv.focusedAppDelegate = null;
--                        // FIXME: No idea why the Binding{} doens't update when focusedAppDelegate turns null
--                        MirFocusController.focusedSurface = null;
--                    }
--                }
++                    }
++                }
++
++                Connections {
++                    target: model.window
++                    onFocusedChanged: {
++                        updateQmlFocusFromMirSurfaceFocus();
++                    }
++                    onFocusRequested: {
++                        appDelegate.activate();
++                    }
++                    onStateChanged: {
++                        if (model.window.state === Mir.MinimizedState) {
++                            appDelegate.minimize();
++                        } else if (model.window.state === Mir.MaximizedState) {
++                            appDelegate.maximize();
++                        } else if (model.window.state === Mir.VertMaximizedState) {
++                            appDelegate.maximizeVertically();
++                        } else if (model.window.state === Mir.HorizMaximizedState) {
++                            appDelegate.maximizeHorizontally();
++                        } else if (model.window.state === Mir.MaximizedLeftState) {
++                            appDelegate.maximizeLeft();
++                        } else if (model.window.state === Mir.MaximizedRightState) {
++                            appDelegate.maximizeRight();
++                        } else if (model.window.state === Mir.MaximizedTopLeftState) {
++                            appDelegate.maximizeTopLeft();
++                        } else if (model.window.state === Mir.MaximizedTopRightState) {
++                            appDelegate.maximizeTopRight();
++                        } else if (model.window.state === Mir.MaximizedBottomLeftState) {
++                            appDelegate.maximizeBottomLeft();
++                        } else if (model.window.state === Mir.MaximizedBottomRightState) {
++                            appDelegate.maximizeBottomRight();
++                        } else if (model.window.state === Mir.RestoredState) {
++                            if (decoratedWindow.dragging) {
++                                appDelegate.restore(false, WindowStateStorage.WindowStateNormal);
++                            } else if (appDelegate.anyMaximized) {
++                                appDelegate.restoreFromMaximized()
++                            } else {
++                                appDelegate.restore();
++                            }
++                        }
++                    }
++                }
++
                  Component.onCompleted: {
                      if (application && application.rotatesWindowContents) {
                          decoratedWindow.surfaceOrientationAngle = shellOrientationAngle;
@@ -865,16 +903,7 @@
                      // Now load any saved state. This needs to happen *after* the cascading!
                      resizeArea.loadWindowState();
--                    // NB: We're differentiating if this delegate was created in response to a new entry in the model
--                    //     or if the Repeater is just populating itself with delegates to match the model it received.
--                    if (!appRepeater.startingUp) {
--                        // a top level window is always the focused one when it first appears, unfocusing
--                        // any preexisting one
--                        if (root.state == "spread") {
--                            spreadItem.highlightedIndex = index;
--                        }
--                        claimFocus();
--                    }
++                    updateQmlFocusFromMirSurfaceFocus();
                      refreshStage();
                      _constructing = false;
@@ -889,16 +918,6 @@
                          priv.updateForegroundMaximizedApp();
+                     }
--                    if (focus) {
--                        // focus some other window
--                        for (var i = 0; i < appRepeater.count; i++) {
--                            var appDelegate = appRepeater.itemAt(i);
--                            if (appDelegate && !appDelegate.minimized && i != index) {
--                                appDelegate.focus = true;
--                                return;
--                            }
--                        }
--                    }
+                 }
                  onVisuallyMaximizedChanged: priv.updateForegroundMaximizedApp()
@@ -919,7 +938,7 @@
                           || focusAnimation.running || rightEdgeFocusAnimation.running || hidingAnimation.running
                  function close() {
--                    model.surface.close();
++                    model.window.close();
+                 }
                  function maximize(animated) {
@@ -970,7 +989,6 @@
                      animationsEnabled = (animated === undefined) || animated;
                      windowState = state || WindowStateStorage.WindowStateRestored;
                      windowState &= ~WindowStateStorage.WindowStateMinimized; // clear the minimized bit
--                    focus = true;
+                 }
                  function playFocusAnimation() {
@@ -984,7 +1002,7 @@
                              rightEdgeFocusAnimation.start()
+                         }
                      } else if (state == "windowedRightEdge" || state == "windowed") {
--                        claimFocus();
++                        activate();
                      } else {
                          focusAnimation.start()
+                     }
@@ -1022,10 +1040,10 @@
                      to: 1
                      duration: UbuntuAnimation.SnapDuration
                      onStarted: {
--                        topLevelSurfaceList.raiseId(model.id);
++                        topLevelSurfaceList.raiseId(model.window.id);
+                     }
                      onStopped: {
--                        appDelegate.claimFocus();
++                        appDelegate.activate();
+                     }
+                 }
                  ParallelAnimation {
@@ -1035,7 +1053,7 @@
                      UbuntuNumberAnimation { target: decoratedWindow; properties: "angle"; to: 0; duration: priv.animationDuration }
                      UbuntuNumberAnimation { target: decoratedWindow; properties: "itemScale"; to: 1; duration: priv.animationDuration }
                      onStopped: {
--                        appDelegate.focus = true
++                        appDelegate.activate();
+                     }
+                 }
                  ParallelAnimation {
@@ -1399,14 +1417,6 @@
                          SequentialAnimation {
                              UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,opacity,scale,requestedWidth,requestedHeight" }
                              PropertyAction { target: appDelegate; property: "visuallyMinimized" }
--                            ScriptAction {
--                                script: {
--                                    if (appDelegate.minimized) {
--                                        appDelegate.focus = false;
--                                        priv.focusNext();
--                                    }
--                                }
--                            }
+                         }
                      },
                      Transition {
@@ -1497,7 +1507,7 @@
                      visible: enabled
                      onPressed: {
--                        appDelegate.focus = true;
++                        appDelegate.activate();
+                     }
                      Component.onDestruction: {
@@ -1511,7 +1521,7 @@
                      anchors.left: appDelegate.left
                      anchors.top: appDelegate.top
                      application: model.application
--                    surface: model.surface
++                    surface: model.window.surface
                      active: appDelegate.focus
                      focus: true
                      interactive: root.interactive
@@ -1536,21 +1546,21 @@
                      onCloseClicked: { appDelegate.close(); }
                      onMaximizeClicked: {
                          if (appDelegate.canBeMaximized) {
--                            appDelegate.anyMaximized ? appDelegate.restoreFromMaximized() : appDelegate.maximize();
++                            appDelegate.anyMaximized ? appDelegate.requestRestore() : appDelegate.requestMaximize();
+                         }
+                     }
                      onMaximizeHorizontallyClicked: {
                          if (appDelegate.canBeMaximizedHorizontally) {
--                            appDelegate.maximizedHorizontally ? appDelegate.restoreFromMaximized() : appDelegate.maximizeHorizontally()
++                            appDelegate.maximizedHorizontally ? appDelegate.requestRestore() : appDelegate.requestMaximizeHorizontally()
+                         }
+                     }
                      onMaximizeVerticallyClicked: {
                          if (appDelegate.canBeMaximizedVertically) {
--                            appDelegate.maximizedVertically ? appDelegate.restoreFromMaximized() : appDelegate.maximizeVertically()
++                            appDelegate.maximizedVertically ? appDelegate.requestRestore() : appDelegate.requestMaximizeVertically()
+                         }
+                     }
--                    onMinimizeClicked: appDelegate.minimize()
--                    onDecorationPressed: { appDelegate.focus = true; }
++                    onMinimizeClicked: { appDelegate.requestMinimize(); }
++                    onDecorationPressed: { appDelegate.activate(); }
                      onDecorationReleased: fakeRectangle.commit();
                      property real angle: 0
@@ -1597,12 +1607,12 @@
                  WindowedFullscreenPolicy {
                      id: windowedFullscreenPolicy
                      active: root.mode == "windowed"
--                    surface: model.surface
++                    surface: model.window.surface
+                 }
                  StagedFullscreenPolicy {
                      id: stagedFullscreenPolicy
                      active: root.mode == "staged" || root.mode == "stagedWithSideStage"
--                    surface: model.surface
++                    surface: model.window.surface
+                 }
                  SpreadDelegateInputArea {
@@ -1615,16 +1625,13 @@
                      onClicked: {
                          spreadItem.highlightedIndex = index;
                          if (distance == 0) {
++                            model.window.activate();
                              priv.goneToSpread = false;
+                         }
+                     }
                      onClose: {
                          priv.closingIndex = index
--                        if (model.surface) { // could be stopped by OOM
--                            model.surface.close()
--                        } else if (model.application) {
--                            root.applicationManager.stopApplication(model.application.appId);
--                        }
++                        model.window.close();
+                     }
+                 }
 === modified file 'qml/Stage/StagedFullscreenPolicy.qml'
 --- qml/Stage/StagedFullscreenPolicy.qml	2016-04-04 13:41:19 +0000
 +++ qml/Stage/StagedFullscreenPolicy.qml	2016-11-30 19:24:53 +0000
@@ -32,7 +32,7 @@
      onSurfaceChanged: {
          if (!active || !surface) return;
          if (surface.shellChrome === Mir.LowChrome) {
--            surface.state = Mir.FullscreenState;
++            surface.requestState(Mir.FullscreenState);
+         }
+     }
@@ -41,15 +41,15 @@
          onShellChromeChanged: {
              if (!active || !surface) return;
              if (surface.shellChrome === Mir.LowChrome) {
--                surface.state = Mir.FullscreenState;
++                surface.requestState(Mir.FullscreenState);
              } else {
--                surface.state = Mir.RestoredState;
++                surface.requestState(Mir.RestoredState);
+             }
+         }
          onStateChanged: {
              if (!active) return;
              if (surface.state === Mir.RestoredState && surface.shellChrome === Mir.LowChrome) {
--                surface.state = Mir.FullscreenState;
++                surface.requestState(Mir.FullscreenState);
+             }
+         }
+     }
 === removed file 'qml/Stage/TopLevelSurfaceRepeater.qml'
 --- qml/Stage/TopLevelSurfaceRepeater.qml	2016-09-12 17:05:43 +0000
 +++ qml/Stage/TopLevelSurfaceRepeater.qml	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
--/*
-- * 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
--
--Repeater {
--    id: root
--    // FIXME: This is a hack around us not knowing whether the Repeater has finished creating its
--    // delegates on start up.
--    // This is a problem when the stage gets a TopLevelSurfaceList already populated with several
--    // rows.
--    property bool startingUp: true
--    onStartingUpChanged: {
--        if (!startingUp) {
--            // the top-most surface must be the focused one.
--            var topmostDelegate = itemAt(0);
--            if (topmostDelegate.focus) {
--                // Delegate got focused while we were still starting up. Not good.
--                // Force signal handler to run again
--                topmostDelegate.onFocusChanged(true);
--            } else {
--                topmostDelegate.focus = true;
--            }
--        }
--    }
--
--    onItemAdded: {
--        if (startingUp) {
--            checkIfStillStartingUp();
--        }
--    }
--
--    function checkIfStillStartingUp() {
--        var i = 0;
--        var missingDelegate = false;
--        for (i = 0; i < model.count && !missingDelegate; ++i) {
--            if (!itemAt(i)) {
--                missingDelegate = true;
--            }
--        }
--        if (!missingDelegate) {
--            startingUp = false;
--        }
--    }
--
--    function indexOf(delegateItem) {
--        for (var i = 0; i < count; i++) {
--            if (itemAt(i) === delegateItem) {
--                return i;
--            }
--        }
--        return -1;
--    }
--}
 === modified file 'qml/Stage/WindowControlsOverlay.qml'
 --- qml/Stage/WindowControlsOverlay.qml	2016-09-13 11:53:40 +0000
 +++ qml/Stage/WindowControlsOverlay.qml	2016-11-30 19:24:53 +0000
@@ -57,7 +57,7 @@
                                                  touchPoints.length <= maximumTouchPoints
          onRecognizedPressChanged: {
              if (recognizedPress) {
--                target.focus = true;
++                target.activate();
                  overlayTimer.start();
+             }
+         }
 === modified file 'qml/Stage/WindowedFullscreenPolicy.qml'
 --- qml/Stage/WindowedFullscreenPolicy.qml	2016-04-04 13:37:49 +0000
 +++ qml/Stage/WindowedFullscreenPolicy.qml	2016-11-30 19:24:53 +0000
@@ -33,7 +33,7 @@
          _firstTimeSurface = false;
          if (surface.state === Mir.FullscreenState && surface.shellChrome === Mir.LowChrome) {
--            surface.state = Mir.RestoredState;
++            surface.requestState(Mir.RestoredState);
+         }
+     }
+ }
 === modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
 --- tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-09-12 17:05:43 +0000
 +++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-11-30 19:24:53 +0000
@@ -75,6 +75,33 @@
+ {
+ }
++void ApplicationInfo::createPromptSurface()
++{
++    if (state() == ApplicationInfo::Stopped) { return; }
++
++    auto surfaceManager = SurfaceManager::instance();
++    if (!surfaceManager) {
++        WARNING_MSG("No SurfaceManager");
++        return;
++    }
++
++    QStringList screenshotIds = {"gallery", "map", "facebook", "camera", "browser", "music", "twitter"};
++    int i = rand() % screenshotIds.count();
++
++    QUrl screenshotUrl = QString("qrc:///Unity/Application/screenshots/%1@12.png")
++            .arg(screenshotIds[i]);
++
++    auto surface = surfaceManager->createSurface(QString("prompt foo"),
++            Mir::NormalType,
++            Mir::RestoredState,
++            screenshotUrl);
++    surfaceManager->notifySurfaceCreated(surface);
++
++    m_promptSurfaceList->addSurface(surface);
++
++    surfaceManager->activate(surface);
++}
++
  void ApplicationInfo::createSurface()
+ {
      if (state() == ApplicationInfo::Stopped) { return; }
@@ -90,14 +117,16 @@
          return;
+     }
++    bool wasFocused = focused();
++
      auto surface = surfaceManager->createSurface(surfaceName,
             Mir::NormalType,
--           fullscreen() ? Mir::FullscreenState : Mir::MaximizedState,
++           fullscreen() ? Mir::FullscreenState : Mir::RestoredState,
             m_screenshotFileName);
      surface->setShellChrome(m_shellChrome);
--    m_surfaceList->appendSurface(surface);
++    m_surfaceList->addSurface(surface);
      ++m_liveSurfaceCount;
      connect(surface, &MirSurface::liveChanged, this, [this, surface](){
@@ -125,8 +154,19 @@
              setState(Running);
+         }
      });
++    connect(surface, &MirSurfaceInterface::focusedChanged, this, [&](bool /*value*/) {
++        #if APPLICATION_DEBUG
++        qDebug().nospace() << "Application[" << appId() << "].focusedChanged(" << focused() << ")";
++        #endif
++        Q_EMIT focusedChanged(focused());
++    });
++
      connect(surface, &MirSurface::focusRequested, this, &ApplicationInfo::focusRequested);
++    if (wasFocused != focused()) {
++        Q_EMIT focusedChanged(focused());
++    }
++
      if (m_state == Starting) {
          if (m_requestedState == RequestedRunning) {
              setState(Running);
@@ -134,6 +174,9 @@
              setState(Suspended);
+         }
+     }
++
++    surfaceManager->notifySurfaceCreated(surface);
++    surfaceManager->activate(surface);
+ }
  void ApplicationInfo::setIconId(const QString &iconId)
@@ -218,7 +261,7 @@
+ {
      m_fullscreen = value;
      if (m_surfaceList->rowCount() > 0) {
--        m_surfaceList->get(0)->setState(Mir::FullscreenState);
++        m_surfaceList->get(0)->requestState(Mir::FullscreenState);
+     }
+ }
@@ -349,26 +392,6 @@
      return someSurfaceHasFocus;
+ }
--void ApplicationInfo::setFocused(bool value)
--{
--    if (focused() == value) {
--        return;
--    }
--
--    if (value) {
--        if (m_surfaceList->count() > 0) {
--            m_surfaceList->get(0)->requestFocus();
--        }
--    } else {
--        for (int i = 0; i < m_surfaceList->count(); ++i) {
--            MirSurface *surface = static_cast<MirSurface*>(m_surfaceList->get(i));
--            if (surface->focused()) {
--                surface->setFocused(false);
--            }
--        }
--    }
--}
--
  void ApplicationInfo::onSurfaceCountChanged()
+ {
      if (m_surfaceList->count() == 0 && m_state == Running) {
@@ -381,6 +404,7 @@
      if (m_surfaceList->count() == 0) {
          Q_EMIT focusRequested();
      } else {
--        m_surfaceList->get(0)->requestFocus();
++        auto surface = static_cast<MirSurface*>(m_surfaceList->get(0));
++        surface->requestFocus();
+     }
+ }
 === modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
 --- tests/mocks/Unity/Application/ApplicationInfo.h	2016-07-25 14:57:11 +0000
 +++ tests/mocks/Unity/Application/ApplicationInfo.h	2016-11-30 19:24:53 +0000
@@ -51,6 +51,8 @@
      ApplicationInfo(const QString &appId, QObject *parent = nullptr);
      ~ApplicationInfo();
++    Q_INVOKABLE void createPromptSurface();
++
      RequestedState requestedState() const override;
      void setRequestedState(RequestedState) override;
@@ -108,8 +110,6 @@
      MirSurfaceListInterface* promptSurfaceList() const override { return m_promptSurfaceList; }
      int surfaceCount() const override { return m_surfaceList->count(); }
--    void setFocused(bool value);
--
      //////
      // internal mock stuff
      void close();
 === modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
 --- tests/mocks/Unity/Application/ApplicationManager.cpp	2016-08-23 12:04:11 +0000
 +++ tests/mocks/Unity/Application/ApplicationManager.cpp	2016-11-30 19:24:53 +0000
@@ -34,30 +34,24 @@
  #if APPLICATIONMANAGER_DEBUG
  #define DEBUG_MSG(params) qDebug().nospace() << "ApplicationManager::" << __func__  << " " << params
++#define XDEBUG_MSG(params) qDebug().nospace() << "ApplicationManager::" << params
  #else
  #define DEBUG_MSG(params) ((void)0)
++#define XDEBUG_MSG(params) ((void)0)
  #endif
  namespace unityapi = unity::shell::application;
++
  ApplicationManager::ApplicationManager(QObject *parent)
      : ApplicationManagerInterface(parent)
+ {
      DEBUG_MSG("");
++
++    ApplicationManagerNotifier::instance()->setApplicationManager(this);
++
      buildListOfAvailableApplications();
--    // polling to find out when the toplevel window has been created as there's
--    // no signal telling us that
--    connect(&m_windowCreatedTimer, &QTimer::timeout,
--            this, &ApplicationManager::onWindowCreatedTimerTimeout);
--    m_windowCreatedTimer.setSingleShot(false);
--    m_windowCreatedTimer.start(200);
--
--    Q_ASSERT(MirFocusController::instance());
--    connect(MirFocusController::instance(), &MirFocusController::focusedSurfaceChanged,
--        this, &ApplicationManager::updateFocusedApplication, Qt::QueuedConnection);
--
--
      // Emit signal to notify Upstart that Mir is ready to receive client connections
      // see http://upstart.ubuntu.com/cookbook/#expect-stop
      // We do this because some autopilot tests actually use this mock Unity.Application module,
@@ -69,19 +63,7 @@
  ApplicationManager::~ApplicationManager()
+ {
--}
--
--void ApplicationManager::onWindowCreatedTimerTimeout()
--{
--    if (QGuiApplication::topLevelWindows().count() > 0) {
--        m_windowCreatedTimer.stop();
--        onWindowCreated();
--    }
--}
--
--void ApplicationManager::onWindowCreated()
--{
--    startApplication("unity8-dash");
++    ApplicationManagerNotifier::instance()->setApplicationManager(nullptr);
+ }
  int ApplicationManager::rowCount(const QModelIndex& parent) const {
@@ -132,6 +114,17 @@
      return nullptr;
+ }
++unityapi::ApplicationInfoInterface *ApplicationManager::findApplicationWithSurface(unityapi::MirSurfaceInterface* surface)
++{
++    for (ApplicationInfo *app : m_runningApplications) {
++        auto surfaceList = static_cast<MirSurfaceListModel*>(app->surfaceList());
++        if (surfaceList->contains(static_cast<MirSurface*>(surface))) {
++            return app;
++        }
++    }
++    return nullptr;
++}
++
  QModelIndex ApplicationManager::findIndex(ApplicationInfo* application)
+ {
      for (int i = 0; i < m_runningApplications.size(); ++i) {
@@ -158,6 +151,11 @@
          QModelIndex appIndex = findIndex(application);
          if (!appIndex.isValid()) return;
          Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleFocused);
++        XDEBUG_MSG("focusedApplicationId = " << focusedApplicationId());
++        Q_EMIT focusedApplicationIdChanged();
++        if (application->focused()) {
++            raiseApp(application->appId());
++        }
      });
      connect(application, &ApplicationInfo::stateChanged, this, [application, this]() {
          QModelIndex appIndex = findIndex(application);
@@ -181,15 +179,40 @@
  void ApplicationManager::remove(ApplicationInfo *application) {
      int i = m_runningApplications.indexOf(application);
++    application->disconnect(this);
      if (i != -1) {
          DEBUG_MSG(application->appId());
++        Q_ASSERT(!m_modelBusy);
++        m_modelBusy = true;
          beginRemoveRows(QModelIndex(), i, i);
          m_runningApplications.removeAt(i);
          endRemoveRows();
++        m_modelBusy = false;
          Q_EMIT countChanged();
          if (isEmpty()) Q_EMIT emptyChanged(isEmpty());
--    }
--    application->disconnect(this);
++        DEBUG_MSG(application->appId() << " after: " << qPrintable(toString()));
++    }
++}
++
++void ApplicationManager::raiseApp(const QString &appId)
++{
++
++    int index = -1;
++    for (int i = 0; i < m_runningApplications.count() && index == -1; ++i) {
++        if (m_runningApplications[i]->appId() == appId) {
++            index = i;
++        }
++    }
++
++    if (index >= 0) {
++        if (m_modelBusy) {
++            DEBUG_MSG(appId << " - model busy. Try again later.");
++            QMetaObject::invokeMethod(this, "raiseApp", Qt::QueuedConnection, Q_ARG(QString, appId));
++        } else {
++            DEBUG_MSG(appId);
++            move(index, 0);
++        }
++    }
+ }
  void ApplicationManager::move(int from, int to) {
@@ -197,12 +220,15 @@
      if (from >= 0 && from < m_runningApplications.size() && to >= 0 && to < m_runningApplications.size()) {
          QModelIndex parent;
++        Q_ASSERT(!m_modelBusy);
++        m_modelBusy = true;
          /* When moving an item down, the destination index needs to be incremented
           * by one, as explained in the documentation:
           * http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
          beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
          m_runningApplications.move(from, to);
          endMoveRows();
++        m_modelBusy = false;
+     }
+ }
@@ -224,8 +250,6 @@
      if (!application)
          return nullptr;
--    Q_EMIT application->focusRequested(); // we assume that an application that's starting up wants focus
--
      return application;
+ }
@@ -473,40 +497,6 @@
      return m_runningApplications.isEmpty();
+ }
--void ApplicationManager::updateFocusedApplication()
--{
--    ApplicationInfo *focusedApplication = nullptr;
--    ApplicationInfo *previouslyFocusedApplication = nullptr;
--
--    auto controller = MirFocusController::instance();
--    if (!controller) {
--        return;
--    }
--
--    MirSurface *surface = static_cast<MirSurface*>(controller->focusedSurface());
--    if (surface) {
--        focusedApplication = findApplication(surface);
--    }
--
--    surface = static_cast<MirSurface*>(controller->previouslyFocusedSurface());
--    if (surface) {
--        previouslyFocusedApplication = findApplication(surface);
--    }
--
--    if (focusedApplication != previouslyFocusedApplication) {
--        if (focusedApplication) {
--            DEBUG_MSG("focused " << focusedApplication->appId());
--            Q_EMIT focusedApplication->focusedChanged(true);
--            this->move(this->m_runningApplications.indexOf(focusedApplication), 0);
--        }
--        if (previouslyFocusedApplication) {
--            DEBUG_MSG("unfocused " << previouslyFocusedApplication->appId());
--            Q_EMIT previouslyFocusedApplication->focusedChanged(false);
--        }
--        Q_EMIT focusedApplicationIdChanged();
--    }
--}
--
  ApplicationInfo *ApplicationManager::findApplication(MirSurface* surface)
+ {
      for (ApplicationInfo *app : m_runningApplications) {
@@ -517,3 +507,42 @@
+     }
      return nullptr;
+ }
++
++QString ApplicationManager::toString()
++{
++    QString str;
++    for (int i = 0; i < m_runningApplications.count(); ++i) {
++        auto *application = m_runningApplications.at(i);
++
++        QString itemStr = QString("(index=%1,appId=%2)")
++            .arg(i)
++            .arg(application->appId());
++
++        if (i > 0) {
++            str.append(",");
++        }
++        str.append(itemStr);
++    }
++    return str;
++}
++
++///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
++// ApplicationManagerNotifier
++
++ApplicationManagerNotifier *ApplicationManagerNotifier::m_instance = nullptr;
++
++ApplicationManagerNotifier *ApplicationManagerNotifier::instance()
++{
++    if (!m_instance) {
++        m_instance = new ApplicationManagerNotifier;
++    }
++    return m_instance;
++}
++
++void ApplicationManagerNotifier::setApplicationManager(ApplicationManager *appMan)
++{
++    if (appMan != m_applicationManager) {
++        m_applicationManager = appMan;
++        Q_EMIT applicationManagerChanged(m_applicationManager);
++    }
++}
 === modified file 'tests/mocks/Unity/Application/ApplicationManager.h'
 --- tests/mocks/Unity/Application/ApplicationManager.h	2016-04-27 15:01:10 +0000
 +++ tests/mocks/Unity/Application/ApplicationManager.h	2016-11-30 19:24:53 +0000
@@ -50,8 +50,11 @@
      // QAbstractItemModel methods.
      int rowCount(const QModelIndex& parent = QModelIndex()) const override;
      QVariant data(const QModelIndex& index, int role) const override;
++
++    // ApplicationManagerInterface methods
      Q_INVOKABLE ApplicationInfo *get(int index) const override;
      Q_INVOKABLE ApplicationInfo *findApplication(const QString &appId) const override;
++    unity::shell::application::ApplicationInfoInterface *findApplicationWithSurface(unity::shell::application::MirSurfaceInterface* surface) override;
      Q_INVOKABLE void move(int from, int to);
@@ -76,18 +79,42 @@
      void availableApplicationsChanged(QStringList list);
   private Q_SLOTS:
--    void onWindowCreatedTimerTimeout();
--    void updateFocusedApplication();
++    void raiseApp(const QString &appId);
   private:
      bool add(ApplicationInfo *application);
      void remove(ApplicationInfo* application);
      void buildListOfAvailableApplications();
--    void onWindowCreated();
++    QString toString();
      ApplicationInfo *findApplication(MirSurface* surface);
      QList<ApplicationInfo*> m_runningApplications;
      QList<ApplicationInfo*> m_availableApplications;
--    QTimer m_windowCreatedTimer;
++    bool m_modelBusy{false};
++};
++
++/*
++    Lifecycle of the ApplicationManager instance belongs to the QML plugin.
++    So this guy here is used to notify other parts of the system when the plugin creates and destroys
++    the ApplicationManager.
++
++    Unlike ApplicationManager, we create ApplicationManagerNotifier whenever we want.
++ */
++class ApplicationManagerNotifier : public QObject {
++    Q_OBJECT
++public:
++    static ApplicationManagerNotifier *instance();
++
++    ApplicationManager *applicationManager() { return m_applicationManager; }
++
++Q_SIGNALS:
++    void applicationManagerChanged(ApplicationManager *applicationManager);
++
++private:
++    void setApplicationManager(ApplicationManager *);
++    static ApplicationManagerNotifier *m_instance;
++    ApplicationManager *m_applicationManager{nullptr};
++
++friend class ApplicationManager;
  };
  Q_DECLARE_METATYPE(ApplicationManager*)
 === modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
 --- tests/mocks/Unity/Application/CMakeLists.txt	2016-10-20 14:37:34 +0000
 +++ tests/mocks/Unity/Application/CMakeLists.txt	2016-11-30 19:24:53 +0000
@@ -15,7 +15,7 @@
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceItemInterface.h
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h
--    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirFocusControllerInterface.h
++    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/SurfaceManagerInterface.h
      resources/surfaces.qrc
+ )
 === modified file 'tests/mocks/Unity/Application/MirSurface.cpp'
 --- tests/mocks/Unity/Application/MirSurface.cpp	2016-09-26 12:25:19 +0000
 +++ tests/mocks/Unity/Application/MirSurface.cpp	2016-11-30 19:24:53 +0000
@@ -19,14 +19,18 @@
  #include <QDebug>
  #include <QQmlEngine>
++// local
++#include "SurfaceManager.h"
++
  #define MIRSURFACE_DEBUG 0
  #if MIRSURFACE_DEBUG
  #define DEBUG_MSG(params) qDebug().nospace() << "MirSurface[" << (void*)this << "," << m_name << "]::" << __func__  << " " << params
++#define XDEBUG_MSG(params) qDebug().nospace() << "MirSurface[" << (void*)this << "," << m_name << "]::" << params
  const char *stateToStr(Mir::State state)
+ {
--    switch(state) {
++    switch (state) {
      case Mir::UnknownState:
          return "unknown";
      case Mir::RestoredState:
@@ -36,26 +40,37 @@
      case Mir::MaximizedState:
          return "maximized";
      case Mir::VertMaximizedState:
--        return "vert-maximized";
++        return "vertMaximized";
      case Mir::FullscreenState:
          return "fullscreen";
      case Mir::HorizMaximizedState:
--        return "horiz-maximized";
++        return "horizMaximized";
++    case Mir::MaximizedLeftState:
++        return "maximizedLeft";
++    case Mir::MaximizedRightState:
++        return "maximizedRight";
++    case Mir::MaximizedTopLeftState:
++        return "maximizedTopLeft";
++    case Mir::MaximizedTopRightState:
++        return "maximizedTopRight";
++    case Mir::MaximizedBottomLeftState:
++        return "maximizedBottomLeft";
++    case Mir::MaximizedBottomRightState:
++        return "maximizedBottomRight";
      case Mir::HiddenState:
          return "hidden";
      default:
          return "???";
--    };
++    }
+ }
  #else
  #define DEBUG_MSG(params) ((void)0)
++#define XDEBUG_MSG(params) ((void)0)
  #endif
  using namespace unity::shell::application;
--MirFocusController *MirFocusController::m_instance = nullptr;
--
  MirSurface::MirSurface(const QString& name,
          Mir::Type type,
          Mir::State state,
@@ -69,7 +84,7 @@
      , m_screenshotUrl(screenshot)
      , m_qmlFilePath(qmlFilePath)
      , m_live(true)
--    , m_visible(true)
++    , m_focused(false)
      , m_activeFocus(false)
      , m_width(-1)
      , m_height(-1)
@@ -95,11 +110,8 @@
+ {
      DEBUG_MSG("");
--    // controller instance might have been already destroyed by QQmlEngine destructor
--    auto controller = MirFocusController::instance();
--    if (controller && controller->focusedSurface() == this) {
--        controller->clear();
--    }
++    // Early warning, while MirSurface methods can still be accessed.
++    Q_EMIT destroyed(this);
+ }
  QString MirSurface::name() const
@@ -122,14 +134,31 @@
      return m_state;
+ }
++void MirSurface::requestState(Mir::State state)
++{
++    if (state == m_state) {
++        return;
++    }
++    DEBUG_MSG(stateToStr(state));
++    Q_EMIT stateRequested(state);
++}
++
  void MirSurface::setState(Mir::State state)
+ {
--    if (state == m_state)
++    if (state == m_state) {
          return;
--
++    }
      DEBUG_MSG(stateToStr(state));
++
++    bool oldVisible = visible();
++
      m_state = state;
      Q_EMIT stateChanged(state);
++
++    if (visible() != oldVisible) {
++        XDEBUG_MSG("visibleChanged("<<visible()<<")");
++        Q_EMIT visibleChanged(visible());
++    }
+ }
  bool MirSurface::live() const
@@ -139,7 +168,7 @@
  bool MirSurface::visible() const
+ {
--    return m_visible;
++    return m_state != Mir::MinimizedState && m_state != Mir::HiddenState;
+ }
  void MirSurface::setLive(bool live)
@@ -231,31 +260,30 @@
      if (!m_live && m_views.count() == 0) {
          deleteLater();
+     }
--    updateVisibility();
++    updateExposure();
+ }
--void MirSurface::setViewVisibility(qintptr viewId, bool visible)
++void MirSurface::setViewExposure(qintptr viewId, bool visible)
+ {
      if (!m_views.contains(viewId)) return;
      m_views[viewId].visible = visible;
--    updateVisibility();
++    updateExposure();
+ }
--void MirSurface::updateVisibility()
++void MirSurface::updateExposure()
+ {
--    bool newVisible = false;
++    bool newExposure = false;
      QHashIterator<qintptr, View> i(m_views);
      while (i.hasNext()) {
          i.next();
--        newVisible |= i.value().visible;
++        newExposure |= i.value().visible;
+     }
--    if (newVisible != visible()) {
--//        qDebug().nospace() << "MirSurface[" << name() << "]::updateVisibility(" << newVisible << ")";
--
--        m_visible = newVisible;
--        Q_EMIT visibleChanged(m_visible);
++    if (newExposure != m_exposed) {
++        m_exposed = newExposure;
++        DEBUG_MSG(m_exposed);
++        Q_EMIT exposedChanged(m_exposed);
          updateInputBoundsAfterResize();
+     }
+ }
@@ -273,6 +301,10 @@
      m_activeFocus = value;
      Q_EMIT activeFocusChanged(value);
++
++    if (m_activeFocus && !m_focused) {
++        requestFocus();
++    }
+ }
  int MirSurface::width() const
@@ -332,6 +364,7 @@
+     }
      if (changed) {
++        XDEBUG_MSG("sizeChanged(width="<<width<<", height="<<height<<")");
          Q_EMIT sizeChanged(QSize(width, height));
+     }
@@ -409,11 +442,6 @@
+     }
+ }
--void MirSurface::raise()
--{
--    Q_EMIT raiseRequested();
--}
--
  void MirSurface::close()
+ {
      DEBUG_MSG("");
@@ -423,6 +451,12 @@
+     }
+ }
++void MirSurface::activate()
++{
++    DEBUG_MSG("");
++    SurfaceManager::instance()->activate(this);
++}
++
  void MirSurface::requestFocus()
+ {
      DEBUG_MSG("");
@@ -431,27 +465,18 @@
  void MirSurface::setFocused(bool value)
+ {
--    DEBUG_MSG(value);
--
--    auto controller = MirFocusController::instance();
--    // controller instance might have been already destroyed by QQmlEngine destructor
--    if (!controller) {
++    if (m_focused == value)
          return;
--    }
--
--    if (value) {
--        controller->setFocusedSurface(this);
--    } else if (controller->focusedSurface() == this) {
--        controller->setFocusedSurface(nullptr);
--    }
++
++    DEBUG_MSG("(" << value << ")");
++
++    m_focused = value;
++    Q_EMIT focusedChanged(value);
+ }
  bool MirSurface::focused() const
+ {
--    auto controller = MirFocusController::instance();
--
--    // controller instance might have been already destroyed by QQmlEngine destructor
--    return controller ? controller->focusedSurface() == this : false;
++    return m_focused;
+ }
  QRect MirSurface::inputBounds() const
@@ -463,58 +488,20 @@
+ {
      if (boundsRect != m_inputBounds) {
          m_inputBounds = boundsRect;
++        DEBUG_MSG("(" << m_inputBounds << ")");
          Q_EMIT inputBoundsChanged(m_inputBounds);
+     }
+ }
--#if MIRSURFACE_DEBUG
--#undef DEBUG_MSG
--#define DEBUG_MSG(params) qDebug().nospace() << "MirFocusController::" << __func__  << " " << params
--#endif
--
--void MirFocusController::setFocusedSurface(MirSurfaceInterface *surface)
--{
--    if (m_focusedSurface == surface) {
--        return;
--    }
--    DEBUG_MSG("MirSurface[" << (void*)surface << "," << (surface?surface->name():"") << "]");
--
--    m_previouslyFocusedSurface = m_focusedSurface;
--    m_focusedSurface = surface;
--
--    if (m_previouslyFocusedSurface != m_focusedSurface) {
--        Q_EMIT focusedSurfaceChanged();
--    }
--
--    if (m_previouslyFocusedSurface) {
--        Q_EMIT m_previouslyFocusedSurface->focusedChanged(false);
--    }
--
--    if (m_focusedSurface) {
--        Q_EMIT m_focusedSurface->focusedChanged(true);
--        m_focusedSurface->raise();
--    }
--}
--
--MirFocusController* MirFocusController::instance()
--{
--    return m_instance;
--}
--
--MirFocusController::MirFocusController()
--{
--    DEBUG_MSG("");
--    Q_ASSERT(m_instance == nullptr);
--    m_instance = this;
--}
--
--MirFocusController::~MirFocusController()
--{
--    Q_ASSERT(m_instance == this);
--    m_instance = nullptr;
--}
--
--void MirFocusController::clear()
--{
--    m_focusedSurface = m_previouslyFocusedSurface = nullptr;
--    Q_EMIT focusedSurfaceChanged();
++
++void MirSurface::setRequestedPosition(const QPoint &value)
++{
++    if (value != m_requestedPosition) {
++        m_requestedPosition = value;
++        Q_EMIT requestedPositionChanged(value);
++
++        // fake-miral: always comply
++        m_position = m_requestedPosition;
++        XDEBUG_MSG("positionChanged("<<m_position<<")");
++        Q_EMIT positionChanged(m_position);
++    }
+ }
 === modified file 'tests/mocks/Unity/Application/MirSurface.h'
 --- tests/mocks/Unity/Application/MirSurface.h	2016-09-07 08:50:19 +0000
 +++ tests/mocks/Unity/Application/MirSurface.h	2016-11-30 19:24:53 +0000
@@ -23,31 +23,12 @@
  #include <QHash>
  // unity-api
--#include <unity/shell/application/MirFocusControllerInterface.h>
  #include <unity/shell/application/MirSurfaceInterface.h>
  #include "MirSurfaceListModel.h"
  class MirSurface;
--class MirFocusController : public unity::shell::application::MirFocusControllerInterface
--{
--    Q_OBJECT
--public:
--    MirFocusController();
--    virtual ~MirFocusController();
--    static MirFocusController* instance();
--
--    void setFocusedSurface(unity::shell::application::MirSurfaceInterface *surface) override;
--    unity::shell::application::MirSurfaceInterface* focusedSurface() const override { return m_focusedSurface; }
--    unity::shell::application::MirSurfaceInterface* previouslyFocusedSurface() { return m_previouslyFocusedSurface; }
--    void clear();
--private:
--    static MirFocusController *m_instance;
--    unity::shell::application::MirSurfaceInterface* m_previouslyFocusedSurface{nullptr};
--    unity::shell::application::MirSurfaceInterface* m_focusedSurface{nullptr};
--};
--
  class MirSurface : public unity::shell::application::MirSurfaceInterface
+ {
      Q_OBJECT
@@ -58,6 +39,7 @@
      Q_PROPERTY(int height READ height NOTIFY heightChanged)
      Q_PROPERTY(bool activeFocus READ activeFocus NOTIFY activeFocusChanged)
      Q_PROPERTY(bool slowToResize READ isSlowToResize WRITE setSlowToResize NOTIFY slowToResizeChanged)
++    Q_PROPERTY(bool exposed READ exposed NOTIFY exposedChanged)
  public:
      MirSurface(const QString& name,
@@ -76,13 +58,14 @@
      QString persistentId() const override;
++    QPoint position() const override { return m_position; }
++
      QSize size() const override { return QSize(width(),height()); }
      void resize(int width, int height) override;
      void resize(const QSize &size) override { resize(size.width(), size.height()); }
      Mir::State state() const override;
--    Q_INVOKABLE void setState(Mir::State) override;
      bool live() const override;
@@ -108,15 +91,16 @@
      bool confinesMousePointer() const override { return false; }
--    Q_INVOKABLE void requestFocus() override;
++    QPoint requestedPosition() const override { return m_requestedPosition; }
++    void setRequestedPosition(const QPoint &) override;
      Q_INVOKABLE void close() override;
--
--    Q_INVOKABLE void raise() override;
++    Q_INVOKABLE void activate() override;
      ////
      // API for tests
++    Q_INVOKABLE void requestFocus();
      Q_INVOKABLE void setLive(bool live);
      Q_INVOKABLE void setShellChrome(Mir::ShellChrome shellChrome);
@@ -126,6 +110,8 @@
      bool isSlowToResize() const;
      void setSlowToResize(bool value);
++    bool exposed() const { return m_exposed; }
++
      Q_INVOKABLE void setMinimumWidth(int);
      Q_INVOKABLE void setMaximumWidth(int);
      Q_INVOKABLE void setMinimumHeight(int);
@@ -148,24 +134,32 @@
      void registerView(qintptr viewId);
      void unregisterView(qintptr viewId);
--    void setViewVisibility(qintptr viewId, bool visible);
++    void setViewExposure(qintptr viewId, bool visible);
      int viewCount() const { return m_views.count(); }
      void setFocused(bool value);
++    void setState(Mir::State state);
++
++public Q_SLOTS:
++    ////
++    // unity.shell.application.MirSurface
++    void requestState(Mir::State) override;
++
  Q_SIGNALS:
      ////
      // API for tests
      void widthChanged();
      void heightChanged();
      void slowToResizeChanged();
++    void exposedChanged(bool exposed);
      ////
      // internal mock stuff
      void screenshotUrlChanged(QUrl);
      void activeFocusChanged(bool);
--    void raiseRequested();
      void closeRequested();
++    void stateRequested(Mir::State);
  protected:
      virtual void updateInputBoundsAfterResize();
@@ -175,7 +169,7 @@
  private:
      void doResize(int width, int height);
--    void updateVisibility();
++    void updateExposure();
      const QString m_name;
      const Mir::Type m_type;
@@ -185,7 +179,7 @@
      QUrl m_screenshotUrl;
      QUrl m_qmlFilePath;
      bool m_live;
--    bool m_visible;
++    bool m_focused;
      bool m_activeFocus;
      int m_width;
      int m_height;
@@ -210,10 +204,14 @@
          bool visible;
      };
      QHash<qintptr, View> m_views;
++    bool m_exposed{false};
      QTimer m_zombieTimer;
      QRect m_inputBounds;
++
++    QPoint m_position;
++    QPoint m_requestedPosition;
  };
  #endif // MOCK_MIR_SURFACE_H
 === modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
 --- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2016-08-23 11:11:32 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2016-11-30 19:24:53 +0000
@@ -59,7 +59,7 @@
          Qt::ExtraButton12 | Qt::ExtraButton13);
      connect(this, &QQuickItem::activeFocusChanged, this, &MirSurfaceItem::updateMirSurfaceActiveFocus);
--    connect(this, &QQuickItem::visibleChanged, this, &MirSurfaceItem::updateMirSurfaceVisibility);
++    connect(this, &QQuickItem::visibleChanged, this, &MirSurfaceItem::updateMirSurfaceExposure);
      connect(this, &MirSurfaceItem::consumesInputChanged, this, [this]() {
          updateMirSurfaceActiveFocus(hasActiveFocus());
@@ -278,7 +278,7 @@
          m_qmlSurface->registerView((qintptr)this);
          updateSurfaceSize();
--        updateMirSurfaceVisibility();
++        updateMirSurfaceExposure();
          if (m_orientationAngle) {
              m_qmlSurface->setOrientationAngle(*m_orientationAngle);
@@ -335,11 +335,11 @@
+     }
+ }
--void MirSurfaceItem::updateMirSurfaceVisibility()
++void MirSurfaceItem::updateMirSurfaceExposure()
+ {
      if (!m_qmlSurface) return;
--    m_qmlSurface->setViewVisibility((qintptr)this, isVisible());
++    m_qmlSurface->setViewExposure((qintptr)this, isVisible());
+ }
  void MirSurfaceItem::setConsumesInput(bool value)
 === modified file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
 --- tests/mocks/Unity/Application/MirSurfaceItem.h	2016-06-22 13:53:00 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceItem.h	2016-11-30 19:24:53 +0000
@@ -50,7 +50,6 @@
      Mir::ShellChrome shellChrome() const override;
      Mir::State surfaceState() const override;
--    void setSurfaceState(Mir::State) override {}
      Mir::OrientationAngle orientationAngle() const override;
      void setOrientationAngle(Mir::OrientationAngle angle) override;
@@ -102,7 +101,7 @@
  private Q_SLOTS:
      void onComponentStatusChanged(QQmlComponent::Status status);
      void updateScreenshot(QUrl screenshot);
--    void updateMirSurfaceVisibility();
++    void updateMirSurfaceExposure();
      void updateMirSurfaceActiveFocus(bool focused);
  private:
 === modified file 'tests/mocks/Unity/Application/MirSurfaceListModel.cpp'
 --- tests/mocks/Unity/Application/MirSurfaceListModel.cpp	2016-09-23 13:38:46 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceListModel.cpp	2016-11-30 19:24:53 +0000
@@ -21,8 +21,9 @@
  #define MIRSURFACELISTMODEL_DEBUG 0
--#ifdef MIRSURFACELISTMODEL_DEBUG
--#define DEBUG_MSG(params) qDebug().nospace() << "MirSurfaceListModel::" << __func__  << " " << params
++#if MIRSURFACELISTMODEL_DEBUG
++#include <QDebug>
++#define DEBUG_MSG(params) qDebug().nospace() << "MirSurfaceListModel::" << __func__  <<  params
  #else
  #define DEBUG_MSG(params) ((void)0)
  #endif
@@ -54,26 +55,16 @@
  void MirSurfaceListModel::raise(MirSurface *surface)
+ {
++    DEBUG_MSG("(" << surface << ")");
      int i = m_surfaceList.indexOf(surface);
      if (i != -1) {
          moveSurface(i, 0);
+     }
+ }
--void MirSurfaceListModel::appendSurface(MirSurface *surface)
--{
--    beginInsertRows(QModelIndex(), m_surfaceList.size(), m_surfaceList.size());
--    m_surfaceList.append(surface);
--    connectSurface(surface);
--    endInsertRows();
--    Q_EMIT countChanged(m_surfaceList.count());
--    if (m_surfaceList.count() == 1) {
--        Q_EMIT firstChanged();
--    }
--}
--
--void MirSurfaceListModel::prependSurface(MirSurface *surface)
--{
++void MirSurfaceListModel::addSurface(MirSurface *surface)
++{
++    DEBUG_MSG("(" << surface << ")");
      beginInsertRows(QModelIndex(), 0, 0);
      m_surfaceList.prepend(surface);
      connectSurface(surface);
@@ -85,6 +76,11 @@
  void MirSurfaceListModel::connectSurface(MirSurface *surface)
+ {
      connect(surface, &QObject::destroyed, this, [this, surface](){ this->removeSurface(surface); });
++    connect(surface, &MirSurfaceInterface::focusedChanged, this, [this, surface](bool surfaceFocused){
++        if (surfaceFocused) {
++            raise(surface);
++        }
++    });
+ }
  void MirSurfaceListModel::removeSurface(MirSurface *surface)
@@ -138,21 +134,3 @@
          return nullptr;
+     }
+ }
--
--MirSurfaceInterface *MirSurfaceListModel::createSurface()
--{
--    QStringList screenshotIds = {"gallery", "map", "facebook", "camera", "browser", "music", "twitter"};
--    int i = rand() % screenshotIds.count();
--
--    QUrl screenshotUrl = QString("qrc:///Unity/Application/screenshots/%1@12.png")
--            .arg(screenshotIds[i]);
--
--    auto surface = new MirSurface(QString("prompt foo"),
--            Mir::NormalType,
--            Mir::RestoredState,
--            screenshotUrl);
--
--    prependSurface(surface);
--
--    return surface;
--}
 === modified file 'tests/mocks/Unity/Application/MirSurfaceListModel.h'
 --- tests/mocks/Unity/Application/MirSurfaceListModel.h	2016-06-02 12:02:35 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceListModel.h	2016-11-30 19:24:53 +0000
@@ -38,18 +38,13 @@
      int rowCount(const QModelIndex &parent = QModelIndex()) const override;
      QVariant data(const QModelIndex& index, int role) const override;
--    void appendSurface(MirSurface *surface);
++    void addSurface(MirSurface *surface);
      void removeSurface(MirSurface *surface);
      bool contains(MirSurface *surface) const { return m_surfaceList.contains(surface); }
--    ////
--    // API for tests
--
--    Q_INVOKABLE unity::shell::application::MirSurfaceInterface *createSurface();
--
  private:
--    void prependSurface(MirSurface *surface);
++    void appendSurface(MirSurface *surface);
      void raise(MirSurface *surface);
      void moveSurface(int from, int to);
      void connectSurface(MirSurface *surface);
 === modified file 'tests/mocks/Unity/Application/SurfaceManager.cpp'
 --- tests/mocks/Unity/Application/SurfaceManager.cpp	2016-04-27 15:01:10 +0000
 +++ tests/mocks/Unity/Application/SurfaceManager.cpp	2016-11-30 19:24:53 +0000
@@ -21,33 +21,41 @@
  #include <paths.h>
--SurfaceManager *SurfaceManager::the_surface_manager = nullptr;
++#define SURFACEMANAGER_DEBUG 0
++
++#if SURFACEMANAGER_DEBUG
++#define DEBUG_MSG(params) qDebug().nospace() << "SurfaceManager[" << (void*)this << "]::" << __func__  << params
++#else
++#define DEBUG_MSG(params) ((void)0)
++#endif
++
++namespace unityapi = unity::shell::application;
++
++SurfaceManager *SurfaceManager::m_instance = nullptr;
  SurfaceManager *SurfaceManager::instance()
+ {
--    return the_surface_manager;
++    return m_instance;
+ }
--SurfaceManager::SurfaceManager(QObject *parent) :
--    QObject(parent)
--    , m_virtualKeyboard(nullptr)
++SurfaceManager::SurfaceManager(QObject *)
+ {
--    Q_ASSERT(the_surface_manager == nullptr);
--    the_surface_manager = this;
++    DEBUG_MSG("");
--    m_virtualKeyboard = new VirtualKeyboard;
--    connect(m_virtualKeyboard, &QObject::destroyed, this, [this](QObject *obj) {
--        MirSurface* surface = qobject_cast<MirSurface*>(obj);
--        m_virtualKeyboard = nullptr;
--        Q_EMIT inputMethodSurfaceChanged();
--        Q_EMIT surfaceDestroyed(surface);
--    });
++    Q_ASSERT(m_instance == nullptr);
++    m_instance = this;
+ }
  SurfaceManager::~SurfaceManager()
+ {
--    Q_ASSERT(the_surface_manager == this);
--    the_surface_manager = nullptr;
++    DEBUG_MSG("");
++
++    if (m_virtualKeyboard) {
++        m_virtualKeyboard->setLive(false);
++    }
++
++    Q_ASSERT(m_instance == this);
++    m_instance = nullptr;
+ }
  MirSurface *SurfaceManager::createSurface(const QString& name,
@@ -56,10 +64,13 @@
                                            const QUrl& screenshot)
+ {
      MirSurface* surface = new MirSurface(name, type, state, screenshot);
--    connect(surface, &QObject::destroyed, this, [this](QObject *obj) {
--        MirSurface* surface = qobject_cast<MirSurface*>(obj);
--        Q_EMIT surfaceDestroyed(surface);
--    });
++    registerSurface(surface);
++    return surface;
++}
++
++void SurfaceManager::registerSurface(MirSurface *surface)
++{
++    m_surfaces.prepend(surface);
      surface->setMinimumWidth(m_newSurfaceMinimumWidth);
      surface->setMaximumWidth(m_newSurfaceMaximumWidth);
@@ -68,13 +79,18 @@
      surface->setWidthIncrement(m_newSurfaceWidthIncrement);
      surface->setHeightIncrement(m_newSurfaceHeightIncrement);
++    connect(surface, &MirSurface::stateRequested, this, [=](Mir::State state) {
++        this->onStateRequested(surface, state);
++    });
++
++    connect(surface, &QObject::destroyed, this, [=]() {
++        this->onSurfaceDestroyed(surface);
++    });
++}
++
++void SurfaceManager::notifySurfaceCreated(unityapi::MirSurfaceInterface *surface)
++{
      Q_EMIT surfaceCreated(surface);
--    return surface;
--}
--
--MirSurface *SurfaceManager::inputMethodSurface() const
--{
--    return m_virtualKeyboard;
+ }
  void SurfaceManager::setNewSurfaceMinimumWidth(int value)
@@ -124,3 +140,130 @@
          Q_EMIT newSurfaceHeightIncrementChanged(m_newSurfaceHeightIncrement);
+     }
+ }
++
++void SurfaceManager::raise(unityapi::MirSurfaceInterface *surface)
++{
++    if (m_underModification)
++        return;
++
++    DEBUG_MSG("("<<surface<<") started");
++    Q_EMIT modificationsStarted();
++    m_underModification = true;
++
++    doRaise(surface);
++
++    m_underModification = false;
++    Q_EMIT modificationsEnded();
++    DEBUG_MSG("("<<surface<<") ended");
++}
++
++void SurfaceManager::doRaise(unityapi::MirSurfaceInterface *apiSurface)
++{
++    auto surface = static_cast<MirSurface*>(apiSurface);
++    int index = m_surfaces.indexOf(surface);
++    Q_ASSERT(index != -1);
++    m_surfaces.move(index, 0);
++
++    QVector<MirSurfaceInterface*> surfaces;
++    surfaces.append(surface);
++    Q_EMIT surfacesRaised(surfaces);
++}
++
++void SurfaceManager::activate(unityapi::MirSurfaceInterface *apiSurface)
++{
++    auto surface = static_cast<MirSurface*>(apiSurface);
++
++    if (surface == m_focusedSurface) {
++        return;
++    }
++
++    Q_ASSERT(!m_underModification);
++
++    DEBUG_MSG("("<<surface<<") started");
++    Q_EMIT modificationsStarted();
++    m_underModification = true;
++    if (m_focusedSurface) {
++        m_focusedSurface->setFocused(false);
++    }
++    if (surface) {
++        if (surface->state() == Mir::HiddenState || surface->state() == Mir::MinimizedState) {
++            surface->setState(Mir::RestoredState);
++        }
++        surface->setFocused(true);
++        doRaise(surface);
++    }
++    m_focusedSurface = surface;
++    m_underModification = false;
++    Q_EMIT modificationsEnded();
++    DEBUG_MSG("("<<surface<<") ended");
++}
++
++void SurfaceManager::onStateRequested(MirSurface *surface, Mir::State state)
++{
++    Q_ASSERT(!m_underModification);
++
++    DEBUG_MSG("("<<surface<<","<<state<<") started");
++    Q_EMIT modificationsStarted();
++    m_underModification = true;
++
++    surface->setState(state);
++
++    if ((state == Mir::MinimizedState || state == Mir::HiddenState) && surface->focused()) {
++        Q_ASSERT(m_focusedSurface == surface);
++        surface->setFocused(false);
++        m_focusedSurface = nullptr;
++        focusFirstAvailableSurface();
++    }
++
++    m_underModification = false;
++    Q_EMIT modificationsEnded();
++    DEBUG_MSG("("<<surface<<","<<state<<") ended");
++}
++
++void SurfaceManager::onSurfaceDestroyed(MirSurface *surface)
++{
++    m_surfaces.removeAll(surface);
++    if (m_focusedSurface == surface) {
++        m_focusedSurface = nullptr;
++
++        Q_EMIT modificationsStarted();
++        m_underModification = true;
++
++        focusFirstAvailableSurface();
++
++        m_underModification = false;
++        Q_EMIT modificationsEnded();
++    }
++}
++
++void SurfaceManager::focusFirstAvailableSurface()
++{
++    MirSurface *chosenSurface = nullptr;
++    for (int i = 0; i < m_surfaces.count() && !chosenSurface; ++i) {
++        auto *surface = m_surfaces[i];
++        if (surface->state() != Mir::HiddenState && surface->state() != Mir::MinimizedState) {
++            chosenSurface = surface;
++        }
++    }
++
++    if (!chosenSurface) {
++        return;
++    }
++
++    if (m_focusedSurface) {
++        m_focusedSurface->setFocused(false);
++    }
++    if (chosenSurface) {
++        chosenSurface->setFocused(true);
++    }
++    m_focusedSurface = chosenSurface;
++}
++
++void SurfaceManager::createInputMethodSurface()
++{
++    if (!m_virtualKeyboard) {
++        m_virtualKeyboard = new VirtualKeyboard;
++        registerSurface(m_virtualKeyboard);
++        Q_EMIT surfaceCreated(m_virtualKeyboard);
++    }
++}
 === modified file 'tests/mocks/Unity/Application/SurfaceManager.h'
 --- tests/mocks/Unity/Application/SurfaceManager.h	2016-04-13 18:33:15 +0000
 +++ tests/mocks/Unity/Application/SurfaceManager.h	2016-11-30 19:24:53 +0000
@@ -19,15 +19,16 @@
  #include <QObject>
++#include <unity/shell/application/SurfaceManagerInterface.h>
++
  #include "MirSurface.h"
  #include "VirtualKeyboard.h"
  class ApplicationInfo;
--class SurfaceManager : public QObject
++class SurfaceManager : public unity::shell::application::SurfaceManagerInterface
+ {
      Q_OBJECT
--    Q_PROPERTY(MirSurface* inputMethodSurface READ inputMethodSurface NOTIFY inputMethodSurfaceChanged)
      Q_PROPERTY(int newSurfaceMinimumWidth READ newSurfaceMinimumWidth WRITE setNewSurfaceMinimumWidth NOTIFY newSurfaceMinimumWidthChanged)
      Q_PROPERTY(int newSurfaceMaximumWidth READ newSurfaceMaximumWidth WRITE setNewSurfaceMaximumWidth NOTIFY newSurfaceMaximumWidthChanged)
      Q_PROPERTY(int newSurfaceMinimumHeight READ newSurfaceMinimumHeight WRITE setNewSurfaceMinimumHeight NOTIFY newSurfaceMinimumHeightChanged)
@@ -41,12 +42,17 @@
      static SurfaceManager *instance();
++    // SurfaceManagerInterface
++    void raise(unity::shell::application::MirSurfaceInterface *surface) override;
++    void activate(unity::shell::application::MirSurfaceInterface *surface) override;
++
      Q_INVOKABLE MirSurface* createSurface(const QString& name,
                                    Mir::Type type,
                                    Mir::State state,
                                    const QUrl& screenshot);
--    MirSurface* inputMethodSurface() const;
++
++    void notifySurfaceCreated(unity::shell::application::MirSurfaceInterface *);
      int newSurfaceMinimumWidth() const { return m_newSurfaceMinimumWidth; }
      void setNewSurfaceMinimumWidth(int value);
@@ -66,12 +72,10 @@
      int newSurfaceHeightIncrement() const { return m_newSurfaceHeightIncrement; }
      void setNewSurfaceHeightIncrement(int);
++public Q_SLOTS:
++    void createInputMethodSurface();
++
  Q_SIGNALS:
--    void inputMethodSurfaceChanged();
--    void countChanged();
--    void surfaceCreated(MirSurface *surface);
--    void surfaceDestroyed(MirSurface*surface);
--
      void newSurfaceMinimumWidthChanged(int value);
      void newSurfaceMaximumWidthChanged(int value);
      void newSurfaceMinimumHeightChanged(int value);
@@ -79,9 +83,16 @@
      void newSurfaceWidthIncrementChanged(int value);
      void newSurfaceHeightIncrementChanged(int value);
++private Q_SLOTS:
++    void onStateRequested(MirSurface *surface, Mir::State state);
++    void onSurfaceDestroyed(MirSurface *surface);
++
  private:
--    static SurfaceManager *the_surface_manager;
--    VirtualKeyboard *m_virtualKeyboard;
++    void doRaise(unity::shell::application::MirSurfaceInterface *surface);
++    void focusFirstAvailableSurface();
++    void registerSurface(MirSurface *surface);
++
++    static SurfaceManager *m_instance;
      int m_newSurfaceMinimumWidth{0};
      int m_newSurfaceMaximumWidth{0};
@@ -89,6 +100,13 @@
      int m_newSurfaceMaximumHeight{0};
      int m_newSurfaceWidthIncrement{1};
      int m_newSurfaceHeightIncrement{1};
++
++    MirSurface *m_focusedSurface{nullptr};
++    bool m_underModification{false};
++
++    QList<MirSurface*> m_surfaces;
++
++    VirtualKeyboard *m_virtualKeyboard{nullptr};
  };
  #endif // SURFACEMANAGER_H
 === modified file 'tests/mocks/Unity/Application/plugin.cpp'
 --- tests/mocks/Unity/Application/plugin.cpp	2016-10-21 08:25:18 +0000
 +++ tests/mocks/Unity/Application/plugin.cpp	2016-11-30 19:24:53 +0000
@@ -29,24 +29,8 @@
  namespace {
--// Creates the singletons that are called throughout C++ code
--void createUnityApplicationSharedSingletons()
--{
--    // they have to be created in a specific order
--    if (!MirFocusController::instance()) {
--        new MirFocusController;
--    }
--    if (!SurfaceManager::instance()) {
--        new SurfaceManager;
--    }
--    if (!MirMock::instance()) {
--        new MirMock;
--    }
--}
--
  QObject* applicationManagerSingleton(QQmlEngine*, QJSEngine*)
+ {
--    createUnityApplicationSharedSingletons();
      return new ApplicationManager;
+ }
@@ -55,19 +39,6 @@
      createUnityApplicationSharedSingletons();
      return MirMock::instance();
+ }
--
--QObject* surfaceManagerSingleton(QQmlEngine*, QJSEngine*)
--{
--    createUnityApplicationSharedSingletons();
--    return SurfaceManager::instance();
--}
--
--QObject* mirFocusControllerSingleton(QQmlEngine*, QJSEngine*)
--{
--    createUnityApplicationSharedSingletons();
--    return MirFocusController::instance();
--}
--
  } // anonymous namespace
  void FakeUnityApplicationQmlPlugin::registerTypes(const char *uri)
@@ -75,6 +46,7 @@
      qRegisterMetaType<ApplicationInfo*>("ApplicationInfo*");
      qRegisterMetaType<unity::shell::application::MirSurfaceInterface*>("unity::shell::application::MirSurfaceInterface*");
      qRegisterMetaType<unity::shell::application::MirSurfaceListInterface*>("unity::shell::application::MirSurfaceListInterface*");
++    qRegisterMetaType<unity::shell::application::SurfaceManagerInterface*>("unity::shell::application::SurfaceManagerInterface*");
      qRegisterMetaType<Mir::Type>("Mir::Type");
      qRegisterMetaType<Mir::State>("Mir::State");
@@ -83,13 +55,12 @@
      qmlRegisterUncreatableType<MirSurface>(uri, 0, 1, "MirSurface", "MirSurface can't be instantiated from QML");
      qmlRegisterUncreatableType<unity::shell::application::MirSurfaceInterface>(
                      uri, 0, 1, "MirSurface", "MirSurface can't be instantiated from QML");
--    qmlRegisterSingletonType<MirFocusController>(uri, 0, 1, "MirFocusController", mirFocusControllerSingleton);
      qmlRegisterType<MirSurfaceItem>(uri, 0, 1, "MirSurfaceItem");
      qmlRegisterType<ApplicationInfo>(uri, 0, 1, "ApplicationInfo");
      qmlRegisterSingletonType<ApplicationManager>(uri, 0, 1, "ApplicationManager", applicationManagerSingleton);
      qmlRegisterSingletonType<MirMock>(uri, 0, 1, "Mir", mirSingleton);
--    qmlRegisterSingletonType<SurfaceManager>(uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
++    qmlRegisterType<SurfaceManager>(uri, 0, 1, "SurfaceManager");
+ }
  void FakeUnityApplicationQmlPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 === modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
 --- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-09-22 20:43:05 +0000
 +++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-11-30 19:24:53 +0000
@@ -65,6 +65,7 @@
      MirSurfaceListInterface* promptSurfaceList() const override { return nullptr; }
      int surfaceCount() const override { return m_surfaceCount; }
      void setSurfaceCount(int count) { m_surfaceCount = count; Q_EMIT surfaceCountChanged(count); }
++    void close() override {}
      // Methods used for mocking (not in the interface)
      void setFocused(bool focused) { m_focused = focused; Q_EMIT focusedChanged(focused); }
@@ -98,6 +99,9 @@
+         }
          return nullptr;
+     }
++    unity::shell::application::ApplicationInfoInterface *findApplicationWithSurface(unity::shell::application::MirSurfaceInterface* surface) override {
++        return nullptr;
++    }
      unity::shell::application::ApplicationInfoInterface *startApplication(const QString &, const QStringList &) override { return nullptr; }
      bool stopApplication(const QString &appId) override {
          Q_FOREACH(MockApp* app, m_list) {
 === modified file 'tests/qmltests/Stage/ApplicationCheckBox.qml'
 --- tests/qmltests/Stage/ApplicationCheckBox.qml	2016-06-02 12:02:35 +0000
 +++ tests/qmltests/Stage/ApplicationCheckBox.qml	2016-11-30 19:24:53 +0000
@@ -149,7 +149,7 @@
              width: height
              height: promptsLabel.height * 0.7
              anchors.verticalCenter: parent.verticalCenter
--            onClicked: d.application.promptSurfaceList.createSurface()
++            onClicked: d.application.createPromptSurface()
              Label { text: "➕"; anchors.centerIn: parent }
+         }
          MouseArea {
 === modified file 'tests/qmltests/Stage/tst_ApplicationWindow.qml'
 --- tests/qmltests/Stage/tst_ApplicationWindow.qml	2016-09-14 09:14:46 +0000
 +++ tests/qmltests/Stage/tst_ApplicationWindow.qml	2016-11-30 19:24:53 +0000
@@ -37,6 +37,8 @@
+     }
      property QtObject fakeApplication: null
++    SurfaceManager{}
++
      Loader {
          id: applicationWindowLoader
          focus: true
@@ -53,6 +55,8 @@
                  surfaceOrientationAngle: 0
                  interactive: true
                  focus: true
++                requestedWidth: width
++                requestedHeight: height
                  Component.onDestruction: {
                      applicationWindowLoader.itemDestroyed = true;
+                 }
@@ -103,17 +107,17 @@
              RowLayout {
                  property var promptSurfaceList: root.fakeApplication ? root.fakeApplication.promptSurfaceList : null
                  Button {
--                    enabled: parent.promptSurfaceList !== null && parent.promptSurfaceList.count > 0
++                    enabled: root.fakeApplication && root.fakeApplication.promptSurfaceList.count > 0
                      activeFocusOnPress: false
                      text: "Remove"
--                    onClicked: { parent.promptSurfaceList.get(0).close(); }
++                    onClicked: { root.fakeApplication.promptSurfaceList.get(0).close(); }
+                 }
                  Button {
--                    enabled: parent.promptSurfaceList !== null
++                    enabled: root.fakeApplication
                      activeFocusOnPress: false
                      text: "Add Prompt Surface"
--                    onClicked: { parent.promptSurfaceList.createSurface(); }
++                    onClicked: { root.fakeApplication.createPromptSurface(); }
+                 }
+             }
@@ -150,26 +154,6 @@
+                     }
+                 }
+             }
--
--            Button {
--                anchors { left: parent.left; right: parent.right }
--                activeFocusOnPress: false
--                text: "Rotate device \u27F3"
--                onClicked: {
--                    var orientation = applicationWindowLoader.item.orientation
--                    if (orientation == Qt.PortraitOrientation) {
--                        orientation = Qt.LandscapeOrientation;
--                    } else if (orientation == Qt.LandscapeOrientation) {
--                        orientation = Qt.InvertedPortraitOrientation;
--                    } else if (orientation == Qt.InvertedPortraitOrientation) {
--                        orientation = Qt.InvertedLandscapeOrientation;
--                    } else {
--                        orientation = Qt.PortraitOrientation;
--                    }
--                    applicationWindowLoader.item.orientation = orientation;
--                }
--            }
--
+         }
+     }
@@ -445,7 +429,7 @@
              var i;
              // 3 surfaces should cover all edge cases
              for (i = 0; i < 3; i++) {
--                promptSurfaceList.createSurface();
++                root.fakeApplication.createPromptSurface();
                  compare(promptSurfaces.count, i+1);
                  waitUntilSurfaceContainerStopsAnimating(promptSurfaces.itemAt(0));
+             }
@@ -470,9 +454,7 @@
+         }
          function test_promptSurfaceAdjustsForParentSize() {
--            var promptSurfaceList = root.fakeApplication.promptSurfaceList;
--
--            promptSurfaceList.createSurface();
++            root.fakeApplication.createPromptSurface();
              var promptSurfaces = testCase.findChild(applicationWindow, "promptSurfacesRepeater");
@@ -505,10 +487,10 @@
              var promptSurfaceList = root.fakeApplication.promptSurfaceList;
              var promptSurfaces = testCase.findChild(applicationWindow, "promptSurfacesRepeater");
--            promptSurfaceList.createSurface();
++            root.fakeApplication.createPromptSurface();
              for (var i = 2; i <= 3; i++) {
--                promptSurfaceList.createSurface();
++                root.fakeApplication.createPromptSurface();
                  tryCompare(promptSurfaces, "count", i);
                  waitUntilSurfaceContainerStopsAnimating(promptSurfaces.itemAt(0));
 === modified file 'tests/qmltests/Stage/tst_DesktopStage.qml'
 --- tests/qmltests/Stage/tst_DesktopStage.qml	2016-11-29 09:38:13 +0000
 +++ tests/qmltests/Stage/tst_DesktopStage.qml	2016-11-30 19:24:53 +0000
@@ -20,8 +20,8 @@
  import Ubuntu.Components.ListItems 1.3
  import Unity.Application 0.1
  import Unity.Test 0.1
--import WindowManager 0.1
  import Utils 0.1
++import WindowManager 1.0
  import ".." // For EdgeBarrierControls
  import "../../../qml/Stage"
@@ -57,9 +57,11 @@
+         }
+     }
--    TopLevelSurfaceList {
++    SurfaceManager { id: sMgr }
++    TopLevelWindowModel {
          id: topSurfaceList
--        applicationsModel: ApplicationManager
++        applicationManager: ApplicationManager
++        surfaceManager: sMgr
+     }
      Loader {
@@ -80,6 +82,7 @@
                  Component.onCompleted: {
                      edgeBarrierControls.target = testCase.findChild(this, "edgeBarrierController");
++                    ApplicationManager.startApplication("unity8-dash");
+                 }
                  Component.onDestruction: {
                      stageLoader.itemDestroyed = true;
@@ -170,8 +173,9 @@
              tryCompare(dashApp, "state", ApplicationInfoInterface.Running);
              tryCompare(topSurfaceList, "count", 1);
--            tryCompareFunction(function(){return topSurfaceList.surfaceAt(0) != null;}, true);
--            compare(MirFocusController.focusedSurface, topSurfaceList.surfaceAt(0));
++            tryCompareFunction(function(){return topSurfaceList.windowAt(0) != null;}, true);
++            topSurfaceList.windowAt(0).activate();
++            tryCompare(topSurfaceList, "focusedWindow", topSurfaceList.windowAt(0));
+         }
          function cleanup() {
@@ -284,13 +288,13 @@
              verify(fromAppWindow);
              tap(fromAppWindow);
              compare(fromDelegate.surface.activeFocus, true);
--            compare(MirFocusController.focusedSurface, fromDelegate.surface);
++            compare(topSurfaceList.focusedWindow, fromDelegate.window);
              var toAppWindow = findChild(toDelegate, "appWindow");
              verify(toAppWindow);
              tap(toAppWindow);
              compare(toDelegate.surface.activeFocus, true);
--            compare(MirFocusController.focusedSurface, toDelegate.surface);
++            compare(topSurfaceList.focusedWindow, toDelegate.window);
+         }
          function test_clickingOnWindowChangesFocusedApp_data() {
@@ -309,13 +313,13 @@
              verify(fromAppWindow);
              mouseClick(fromAppWindow);
              compare(fromDelegate.surface.activeFocus, true);
--            compare(MirFocusController.focusedSurface, fromDelegate.surface);
++            compare(topSurfaceList.focusedWindow, fromDelegate.window);
              var toAppWindow = findChild(toDelegate, "appWindow");
              verify(toAppWindow);
              mouseClick(toAppWindow);
              compare(toDelegate.surface.activeFocus, true);
--            compare(MirFocusController.focusedSurface, toDelegate.surface);
++            compare(topSurfaceList.focusedWindow, toDelegate.window);
+         }
          function test_tappingOnDecorationFocusesApplication_data() {
@@ -343,6 +347,13 @@
              return findChild(appDelegate, "appWindowDecoration");
+         }
++        function maximizeDelegate(appDelegate) {
++            var maximizeButton = findChild(appDelegate, "maximizeWindowButton");
++            verify(maximizeButton);
++            mouseClick(maximizeButton);
++            tryCompare(appDelegate, "visuallyMaximized", true);
++        }
++
          function test_tappingOnDecorationFocusesApplication(data) {
              var appDelegates = [];
              for (var i = 0; i < data.apps.length; i++) {
@@ -398,7 +409,7 @@
              startApplication("camera-app");
              tryCompareFunction(function(){ return dialerDelegate.surface !== null; }, true);
--            dialerDelegate.surface.requestFocus();
++            dialerDelegate.surface.activate();
              tryCompare(dialerDelegate, "focus", true);
              keyClick(Qt.Key_Up, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+Up shortcut to maximize
@@ -411,7 +422,7 @@
              startApplication("camera-app");
              tryCompareFunction(function(){ return dialerDelegate.surface !== null; }, true);
--            dialerDelegate.surface.requestFocus();
++            dialerDelegate.surface.activate();
              tryCompare(dialerDelegate, "focus", true);
              keyClick(Qt.Key_Left, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+Left shortcut to maximizeLeft
@@ -426,7 +437,7 @@
              startApplication("camera-app");
              tryCompareFunction(function(){ return dialerDelegate.surface !== null; }, true);
--            dialerDelegate.surface.requestFocus();
++            dialerDelegate.surface.activate();
              tryCompare(dialerDelegate, "focus", true);
              keyClick(Qt.Key_Right, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+Right shortcut to maximizeRight
@@ -441,7 +452,7 @@
              startApplication("camera-app");
              tryCompareFunction(function(){ return dialerDelegate.surface !== null; }, true);
--            dialerDelegate.surface.requestFocus();
++            dialerDelegate.surface.activate();
              tryCompare(dialerDelegate, "focus", true);
              keyClick(Qt.Key_Down, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+Down shortcut to minimize
@@ -512,11 +523,11 @@
              apps.forEach(startApplication);
              verify(topSurfaceList.count == 3);
              keyClick(Qt.Key_D, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+D shortcut to minimize all
--            tryCompare(MirFocusController, "focusedSurface", null); // verify no surface is focused
++            tryCompare(topSurfaceList, "focusedWindow", null); // verify no window is focused
              // now try pressing all 4 arrow keys + ctrl + meta
              keyClick(Qt.Key_Up | Qt.Key_Down | Qt.Key_Left | Qt.Key_Right, Qt.MetaModifier|Qt.ControlModifier); // smash it!!!
--            tryCompare(MirFocusController, "focusedSurface", null); // verify still no surface is focused
++            tryCompare(topSurfaceList, "focusedWindow", null); // verify still no window is focused
+         }
          function test_minimizeApplicationHidesSurface() {
@@ -527,9 +538,12 @@
              var decoratedWindow = findDecoratedWindow(dashSurfaceId);
              verify(decoratedWindow);
--            tryCompare(dashSurface, "visible", true);
--            decoratedWindow.minimizeClicked();
--            tryCompare(dashSurface, "visible", false);
++            var minimizeButton = findChild(decoratedWindow, "minimizeWindowButton");
++            verify(minimizeButton);
++
++            tryCompare(dashSurface, "exposed", true);
++            mouseClick(minimizeButton);
++            tryCompare(dashSurface, "exposed", false);
+         }
          function test_maximizeApplicationHidesSurfacesBehindIt() {
@@ -538,16 +552,16 @@
              var gmailDelegate = startApplication("gmail-webapp");
              // maximize without raising
--            dialerDelegate.maximize();
++            dialerDelegate.requestMaximize();
              tryCompare(dialerDelegate, "visuallyMaximized", true);
--            tryCompare(dashDelegate.surface, "visible", false);
--            compare(gmailDelegate.surface.visible, true);
++            tryCompare(dashDelegate.surface, "exposed", false);
++            compare(gmailDelegate.surface.exposed, true);
              // restore without raising
--            dialerDelegate.restoreFromMaximized();
--            compare(dashDelegate.surface.visible, true);
--            compare(gmailDelegate.surface.visible, true);
++            dialerDelegate.requestRestore();
++            compare(dashDelegate.surface.exposed, true);
++            compare(gmailDelegate.surface.exposed, true);
+         }
          function test_applicationsBecomeVisibleWhenOccludingAppRemoved() {
@@ -580,26 +594,22 @@
              tryCompare(dialerDelegate, "visuallyMaximized", true);
              tryCompare(gmailDelegate, "visuallyMaximized", true);
--            tryCompare(dashApp.surfaceList.get(0), "visible", false);
--            tryCompare(dialerApp.surfaceList.get(0), "visible", false);
--            tryCompare(mapApp.surfaceList.get(0), "visible", false);
++            tryCompare(dashApp.surfaceList.get(0), "exposed", false);
++            tryCompare(dialerApp.surfaceList.get(0), "exposed", false);
++            tryCompare(mapApp.surfaceList.get(0), "exposed", false);
              ApplicationManager.stopApplication("gmail-webapp");
              wait(2000)
--            tryCompare(mapApp.surfaceList.get(0), "visible", true);
--            tryCompare(dialerApp.surfaceList.get(0), "visible", true);
--            tryCompare(dashApp.surfaceList.get(0), "visible", false); // still occluded by maximised dialer
++            tryCompare(mapApp.surfaceList.get(0), "exposed", true);
++            tryCompare(dialerApp.surfaceList.get(0), "exposed", true);
++            tryCompare(dashApp.surfaceList.get(0), "exposed", false); // still occluded by maximised dialer
+         }
          function test_maximisedAppStaysVisibleWhenAppStarts() {
              var dashDelegate = startApplication("unity8-dash");
--            // maximize
--            var dashMaximizeButton = findChild(dashDelegate, "maximizeWindowButton");
--            verify(dashMaximizeButton);
--            mouseClick(dashMaximizeButton);
--            tryCompare(dashDelegate, "visuallyMaximized", true);
++            maximizeDelegate(dashDelegate);
              var dialerDelegate = startApplication("dialer-app");
              verify(dialerDelegate);
@@ -621,25 +631,25 @@
              tryCompare(facebookAppDelegate, "visible", true);
              // Maximize the topmost and make sure the other two are hidden
--            facebookAppDelegate.maximize();
++            maximizeDelegate(facebookAppDelegate);
              tryCompare(dashAppDelegate, "visible", false);
              tryCompare(dialerAppDelegate, "visible", false);
              tryCompare(facebookAppDelegate, "visible", true);
              // Bring dash to front. make sure dash and the maximized facebook are visible, the restored one behind is hidden
--            dashAppDelegate.focus = true;
++            dashAppDelegate.activate();
              tryCompare(dashAppDelegate, "visible", true);
              tryCompare(dialerAppDelegate, "visible", false);
              tryCompare(facebookAppDelegate, "visible", true);
              // Now focus the dialer app. all 3 should be visible again
--            dialerAppDelegate.focus = true;
++            dialerAppDelegate.activate();
              tryCompare(dashAppDelegate, "visible", true);
              tryCompare(dialerAppDelegate, "visible", true);
              tryCompare(facebookAppDelegate, "visible", true);
              // Maximize the dialer app. The other 2 should hide
--            dialerAppDelegate.maximize();
++            maximizeDelegate(dialerAppDelegate);
              tryCompare(dashAppDelegate, "visible", false);
              tryCompare(dialerAppDelegate, "visible", true);
              tryCompare(facebookAppDelegate, "visible", false);
@@ -648,7 +658,7 @@
          function test_dropShadow() {
              // start an app, maximize it
              var facebookAppDelegate = startApplication("facebook-webapp");
--            facebookAppDelegate.maximize();
++            maximizeDelegate(facebookAppDelegate);
              // verify the drop shadow is still not visible
              verify(PanelState.dropShadow == false);
 === modified file 'tests/qmltests/Stage/tst_PhoneStage.qml'
 --- tests/qmltests/Stage/tst_PhoneStage.qml	2016-10-08 16:45:37 +0000
 +++ tests/qmltests/Stage/tst_PhoneStage.qml	2016-11-30 19:24:53 +0000
@@ -22,7 +22,7 @@
  import "../../../qml/Stage"
  import Ubuntu.Components 1.3
  import Unity.Application 0.1
--import WindowManager 0.1
++import WindowManager 1.0
  Item {
      id: root
@@ -31,6 +31,7 @@
      property var greeter: { fullyShown: true }
++    SurfaceManager { id: sMgr }
      Stage {
          id: stage
          anchors { fill: parent; rightMargin: units.gu(30) }
@@ -41,9 +42,13 @@
          orientations: Orientations {}
          applicationManager: ApplicationManager
          mode: "staged"
--        topLevelSurfaceList: TopLevelSurfaceList {
++        topLevelSurfaceList: TopLevelWindowModel {
              id: topLevelSurfaceList
--            applicationsModel: ApplicationManager
++            applicationManager: ApplicationManager
++            surfaceManager: sMgr
++        }
++        Component.onCompleted: {
++            ApplicationManager.startApplication("unity8-dash");
+         }
+     }
@@ -86,11 +91,16 @@
          function init() {
              // wait until unity8-dash is up and running.
--            // it's started automatically by ApplicationManager mock implementation
++            ApplicationManager.startApplication("unity8-dash");
              tryCompare(ApplicationManager, "count", 1);
              var dashApp = ApplicationManager.findApplication("unity8-dash");
              verify(dashApp);
              tryCompare(dashApp, "state", ApplicationInfoInterface.Running);
++
++            // wait for Stage to stabilize back into its initial state
++            var appRepeater = findChild(stage, "appRepeater");
++            tryCompare(appRepeater, "count", 1);
++            tryCompare(appRepeater.itemAt(0), "x", 0);
+         }
          function cleanup() {
@@ -100,10 +110,6 @@
              waitForRendering(stage);
              killApps();
--            // wait for Stage to stabilize back into its initial state
--            var appRepeater = findChild(stage, "appRepeater");
--            tryCompare(appRepeater, "count", 1);
--            tryCompare(appRepeater.itemAt(0), "x", 0);
              stage.shellOrientationAngle = 0;
@@ -505,7 +511,7 @@
          function test_selectSuspendedAppWithoutSurface() {
              compare(topLevelSurfaceList.applicationAt(0).appId, "unity8-dash");
              var dashSurfaceId = topLevelSurfaceList.idAt(0);
--            var dashSurface = topLevelSurfaceList.surfaceAt(0);
++            var dashWindow = topLevelSurfaceList.windowAt(0);
              var webbrowserSurfaceId = topLevelSurfaceList.nextId;
              var webbrowserApp  = ApplicationManager.startApplication("webbrowser-app");
@@ -513,7 +519,7 @@
              switchToSurface(dashSurfaceId);
--            tryCompare(MirFocusController, "focusedSurface", dashSurface);
++            tryCompare(topLevelSurfaceList, "focusedWindow", dashWindow);
              tryCompare(webbrowserApp, "state", ApplicationInfoInterface.Suspended);
              compare(webbrowserApp.surfaceList.count, 1);
@@ -549,7 +555,7 @@
+         {
              compare(topLevelSurfaceList.applicationAt(0).appId, "unity8-dash");
              var dashSurfaceId = topLevelSurfaceList.idAt(0);
--            var dashSurface = topLevelSurfaceList.surfaceAt(0);
++            var dashWindow = topLevelSurfaceList.windowAt(0);
              var webbrowserSurfaceId = topLevelSurfaceList.nextId;
              var webbrowserApp  = ApplicationManager.startApplication("webbrowser-app");
@@ -557,7 +563,7 @@
              switchToSurface(dashSurfaceId);
--            tryCompare(MirFocusController, "focusedSurface", dashSurface);
++            tryCompare(topLevelSurfaceList, "focusedWindow", dashWindow);
              tryCompare(webbrowserApp, "state", ApplicationInfoInterface.Suspended);
              compare(webbrowserApp.surfaceList.count, 1);
 === modified file 'tests/qmltests/Stage/tst_TabletStage.qml'
 --- tests/qmltests/Stage/tst_TabletStage.qml	2016-10-08 16:45:37 +0000
 +++ tests/qmltests/Stage/tst_TabletStage.qml	2016-11-30 19:24:53 +0000
@@ -21,7 +21,7 @@
  import Unity.Application 0.1
  import Unity.Test 0.1
  import Utils 0.1
--import WindowManager 0.1
++import WindowManager 1.0
  import ".."
  import "../../../qml/Stage"
@@ -35,6 +35,7 @@
      property var greeter: { fullyShown: true }
++    SurfaceManager { id: sMgr }
      Stage {
          id: stage
          anchors { fill: parent; rightMargin: units.gu(30) }
@@ -50,9 +51,13 @@
          focus: true
          mode: "stagedWithSideStage"
          applicationManager: ApplicationManager
--        topLevelSurfaceList: TopLevelSurfaceList {
++        topLevelSurfaceList: TopLevelWindowModel {
              id: topLevelSurfaceList
--            applicationsModel: ApplicationManager
++            applicationManager: ApplicationManager
++            surfaceManager: sMgr
++        }
++        Component.onCompleted: {
++            ApplicationManager.startApplication("unity8-dash");
+         }
+     }
@@ -129,6 +134,7 @@
          function init() {
              stageSaver.clear();
++            ApplicationManager.startApplication("unity8-dash");
              tryCompare(topSurfaceList, "count", 1);
              compare(topSurfaceList.applicationAt(0).appId, "unity8-dash");
@@ -143,6 +149,11 @@
+                 }
+             }
++            // wait for Stage to stabilize back into its initial state
++            var appRepeater = findChild(stage, "appRepeater");
++            tryCompare(appRepeater, "count", 1);
++            tryCompare(appRepeater.itemAt(0), "x", 0);
++
              waitUntilAppSurfaceShowsUp(topSurfaceList.idAt(0));
              sideStage.hideNow()
              tryCompare(sideStage, "x", stage.width)
@@ -156,11 +167,6 @@
              killApps();
--            // wait for Stage to stabilize back into its initial state
--            var appRepeater = findChild(stage, "appRepeater");
--            tryCompare(appRepeater, "count", 1);
--            tryCompare(appRepeater.itemAt(0), "x", 0);
--
              sideStage.hideNow();
              tryCompare(sideStage, "x", stage.width)
              waitForRendering(stage)
@@ -628,7 +634,7 @@
          function test_selectSuspendedAppWithoutSurface() {
              compare(topSurfaceList.applicationAt(0).appId, "unity8-dash");
              var dashSurfaceId = topSurfaceList.idAt(0);
--            var dashSurface = topSurfaceList.surfaceAt(0);
++            var dashWindow = topSurfaceList.windowAt(0);
              var webbrowserSurfaceId = topSurfaceList.nextId;
              webbrowserCheckBox.checked = true;
@@ -637,7 +643,7 @@
              switchToSurface(dashSurfaceId);
--            tryCompare(MirFocusController, "focusedSurface", dashSurface);
++            tryCompare(topLevelSurfaceList, "focusedWindow", dashWindow);
              tryCompare(webbrowserApp, "state", ApplicationInfoInterface.Suspended);
              compare(webbrowserApp.surfaceList.count, 1);
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2016-11-22 17:00:33 +0000
 +++ tests/qmltests/tst_Shell.qml	2016-11-30 19:24:53 +0000
@@ -52,6 +52,15 @@
+     }
      property var shell: shellLoader.item ? shellLoader.item : null