Merge lp:~alan-griffiths/qtmir/spike-using-WindowManager into lp:qtmir/devel-mir-next

[Alan Griffiths]

Switch from subclassing mir::shell::AbstractShell to implementing mir::shell::WindowManager

Switch from subclassing mir::shell::AbstractShell to implementing mir::shell::WindowManager

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:340
http://jenkins.qa.ubuntu.com/job/qtmir-ci/244/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/95/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/244/rebuild

review: Needs Fixing (continuous-integration)

[lp:~alan-griffiths/qtmir/spike-using-WindowManager]

278. By Daniel van Vugt on 2015-04-02

Merge lp:~mir-team/qtmir/devel-mir-next-update

279. By Alan Griffiths on 2015-05-01

Mir 0.13.0 fixes

280. By Alan Griffiths on 2015-05-01

Workaround API that uses references to opaque types

281. By Alan Griffiths on 2015-05-01

libmircommon-dev dependency should be versioned

282. By Alan Griffiths on 2015-05-06

merge lp:~alan-griffiths/qtmir/spike-using-WindowManager

283. By Alan Griffiths on 2015-05-06

Very basic version of MirWindowManager::modify_surface()

[Alan Griffiths (alan-griffiths)]

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

Works on manta with Mir 0.13.0 stack

 * Did CI run pass?

Not until 0.13.0 is in archive

Unmerged revisions

283. By Alan Griffiths on 2015-05-06

Very basic version of MirWindowManager::modify_surface()

282. By Alan Griffiths on 2015-05-06

merge lp:~alan-griffiths/qtmir/spike-using-WindowManager

281. By Alan Griffiths on 2015-05-01

libmircommon-dev dependency should be versioned

280. By Alan Griffiths on 2015-05-01

Workaround API that uses references to opaque types

279. By Alan Griffiths on 2015-05-01

Mir 0.13.0 fixes

278. By Daniel van Vugt on 2015-04-02

Merge lp:~mir-team/qtmir/devel-mir-next-update

277. By Daniel van Vugt on 2015-03-27

Update mock headers so they can build again, following racarr's
cursor BufferStream changes.

276. By Daniel van Vugt on 2015-03-27

Migrate to MirEvent 2.1 API, coming in Mir 0.13

275. By Daniel van Vugt on 2015-03-25

Link to libmirclient too. That's where all mir_* client (and input
functions) now correctly reside.

274. By Daniel van Vugt on 2015-03-25

Merge branch lp:~mir-team/qtmir/compatibility-with-mir-API-changes

=== modified file 'src/modules/Unity/Application/application_manager.h'
--- src/modules/Unity/Application/application_manager.h	2015-01-09 11:23:34 +0000
+++ src/modules/Unity/Application/application_manager.h	2015-05-06 15:47:57 +0000
@@ -151,7 +151,7 @@
 
     Application* findApplicationWithPromptSession(const mir::scene::PromptSession* promptSession);
 
-    QSharedPointer<MirServer> m_mirServer;
+    const QSharedPointer<MirServer> m_mirServer;
 
     QList<Application*> m_applications;
     Application* m_focusedApplication;

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
--- src/modules/Unity/Application/mirsurfaceitem.cpp	2015-03-27 07:29:14 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.cpp	2015-05-06 15:47:57 +0000
@@ -23,7 +23,6 @@
 #include "mirbuffersgtexture.h"
 #include "session.h"
 #include "mirsurfaceitem.h"
-#include "mirshell.h"
 #include "logging.h"
 #include "ubuntukeyboardinfo.h"
 
@@ -46,6 +45,7 @@
 // Mir
 #include <mir/geometry/rectangle.h>
 #include <mir/events/event_builders.h>
+#include <mir/shell/shell.h>
 #include <mir_toolkit/event.h>
 
 namespace mg = mir::graphics;
@@ -187,7 +187,7 @@
 
 MirSurfaceItem::MirSurfaceItem(std::shared_ptr<mir::scene::Surface> surface,
                                SessionInterface* session,
-                               MirShell *shell,
+                               mir::shell::Shell *shell,
                                std::shared_ptr<SurfaceObserver> observer,
                                QQuickItem *parent)
     : QQuickItem(parent)

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.h'
--- src/modules/Unity/Application/mirsurfaceitem.h	2015-02-20 15:52:17 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.h	2015-05-06 15:47:57 +0000
@@ -33,8 +33,9 @@
 
 #include "session_interface.h"
 
+namespace mir { namespace shell { class Shell; } }
+
 class SurfaceObserver;
-class MirShell;
 
 namespace qtmir {
 
@@ -58,7 +59,7 @@
 public:
     explicit MirSurfaceItem(std::shared_ptr<mir::scene::Surface> surface,
                             SessionInterface* session,
-                            MirShell *shell,
+                            mir::shell::Shell *shell,
                             std::shared_ptr<SurfaceObserver> observer,
                             QQuickItem *parent = 0);
     ~MirSurfaceItem();
@@ -179,7 +180,7 @@
 
     std::shared_ptr<mir::scene::Surface> m_surface;
     QPointer<SessionInterface> m_session;
-    MirShell *const m_shell;
+    mir::shell::Shell *const m_shell;
     bool m_firstFrameDrawn;
     bool m_live;
     Qt::ScreenOrientation m_orientation; //FIXME -  have to save the state as Mir has no getter for it (bug:1357429)

=== modified file 'src/modules/Unity/Application/mirsurfacemanager.cpp'
--- src/modules/Unity/Application/mirsurfacemanager.cpp	2015-02-06 09:47:21 +0000
+++ src/modules/Unity/Application/mirsurfacemanager.cpp	2015-05-06 15:47:57 +0000
@@ -31,7 +31,7 @@
 #include "nativeinterface.h"
 #include "mirserver.h"
 #include "sessionlistener.h"
-#include "mirshell.h"
+#include "mirwindowmanager.h"
 #include "logging.h"
 
 Q_LOGGING_CATEGORY(QTMIR_SURFACES, "qtmir.surfaces")
@@ -51,9 +51,9 @@
                      manager, &MirSurfaceManager::onSessionDestroyingSurface);
 }
 
-void connectToShell(MirSurfaceManager *manager, MirShell *shell)
+void connectToWindowManager(MirSurfaceManager *manager, MirWindowManager *windowManager)
 {
-    QObject::connect(shell, &MirShell::surfaceAttributeChanged,
+    QObject::connect(windowManager, &MirWindowManager::surfaceAttributeChanged,
                      manager, &MirSurfaceManager::onSurfaceAttributeChanged);
 }
 
@@ -70,23 +70,22 @@
         }
 
         SessionListener *sessionListener = static_cast<SessionListener*>(nativeInterface->nativeResourceForIntegration("SessionListener"));
-        MirShell *shell = static_cast<MirShell*>(nativeInterface->nativeResourceForIntegration("Shell"));
+        MirWindowManager *window_manager = static_cast<MirWindowManager*>(nativeInterface->nativeResourceForIntegration("WindowManager"));
+        mir::shell::Shell *const shell = static_cast<mir::shell::Shell*>(nativeInterface->nativeResourceForIntegration("mir::shell::Shell"));
 
-        the_surface_manager = new MirSurfaceManager(nativeInterface->m_mirServer, shell, SessionManager::singleton());
+        the_surface_manager = new MirSurfaceManager(shell, SessionManager::singleton());
 
         connectToSessionListener(the_surface_manager, sessionListener);
-        connectToShell(the_surface_manager, shell);
+        connectToWindowManager(the_surface_manager, window_manager);
     }
     return the_surface_manager;
 }
 
 MirSurfaceManager::MirSurfaceManager(
-        const QSharedPointer<MirServer>& mirServer,
-        MirShell *shell,
+        mir::shell::Shell *shell,
         SessionManager* sessionManager,
         QObject *parent)
     : MirSurfaceItemModel(parent)
-    , m_mirServer(mirServer)
     , m_shell(shell)
     , m_sessionManager(sessionManager)
 {

=== modified file 'src/modules/Unity/Application/mirsurfacemanager.h'
--- src/modules/Unity/Application/mirsurfacemanager.h	2015-02-06 09:47:21 +0000
+++ src/modules/Unity/Application/mirsurfacemanager.h	2015-05-06 15:47:57 +0000
@@ -37,10 +37,12 @@
         class Session;
         class PromptSession;
     }
+    namespace shell {
+        class Shell;
+    }
 }
 
 class MirServer;
-class MirShell;
 
 namespace qtmir {
 
@@ -54,8 +56,7 @@
 
 public:
     explicit MirSurfaceManager(
-        const QSharedPointer<MirServer>& mirServer,
-        MirShell *shell,
+        mir::shell::Shell *shell,
         SessionManager* sessionManager,
         QObject *parent = 0
     );
@@ -81,8 +82,7 @@
     QMutex m_mutex;
 
 private:
-    QSharedPointer<MirServer> m_mirServer;
-    MirShell *const m_shell;
+    mir::shell::Shell *const m_shell;
     SessionManager* m_sessionManager;
     static MirSurfaceManager *the_surface_manager;
 };

=== modified file 'src/modules/Unity/Application/sessionmanager.cpp'
--- src/modules/Unity/Application/sessionmanager.cpp	2015-01-28 14:25:36 +0000
+++ src/modules/Unity/Application/sessionmanager.cpp	2015-05-06 15:47:57 +0000
@@ -26,7 +26,6 @@
 #include "nativeinterface.h"
 #include "mirserver.h"
 #include "sessionlistener.h"
-#include "mirshell.h"
 #include "logging.h"
 #include "promptsessionlistener.h"
 

=== modified file 'src/platforms/mirserver/CMakeLists.txt'
--- src/platforms/mirserver/CMakeLists.txt	2015-04-01 11:59:05 +0000
+++ src/platforms/mirserver/CMakeLists.txt	2015-05-06 15:47:57 +0000
@@ -37,7 +37,7 @@
 
 set(MIRSERVER_QPA_PLUGIN_SRC
     ../../common/debughelpers.cpp
-    mirshell.cpp
+    mirwindowmanager.cpp
     qteventfeeder.cpp
     plugin.cpp
     qmirserver.cpp

=== modified file 'src/platforms/mirserver/mirserver.cpp'
--- src/platforms/mirserver/mirserver.cpp	2015-02-09 16:28:40 +0000
+++ src/platforms/mirserver/mirserver.cpp	2015-05-06 15:47:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 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
@@ -19,7 +19,7 @@
 #include "mirserver.h"
 
 // local
-#include "mirshell.h"
+#include "mirwindowmanager.h"
 #include "mirglconfig.h"
 #include "mirserverstatuslistener.h"
 #include "promptsessionlistener.h"
@@ -51,19 +51,25 @@
     set_command_line_handler(&ignore_unparsed_arguments);
     set_command_line(argc, argv);
 
-    override_the_session_listener([]
-        {
-            return std::make_shared<SessionListener>();
-        });
-
-    override_the_prompt_session_listener([]
-        {
-            return std::make_shared<PromptSessionListener>();
-        });
-
-    override_the_session_authorizer([]
-        {
-            return std::make_shared<SessionAuthorizer>();
+    override_the_session_listener([this]
+        {
+            const auto result = std::make_shared<SessionListener>();
+            m_sessionListener = result;
+            return result;
+        });
+
+    override_the_prompt_session_listener([this]
+        {
+            const auto result = std::make_shared<PromptSessionListener>();
+            m_promptSessionListener = result;
+            return result;
+        });
+
+    override_the_session_authorizer([this]
+        {
+            const auto result = std::make_shared<SessionAuthorizer>();
+            m_sessionAuthorizer = result;
+            return result;
         });
 
     override_the_compositor([]
@@ -86,17 +92,11 @@
             return std::make_shared<MirServerStatusListener>();
         });
 
-    override_the_shell([this]
+    override_the_window_manager_builder([this](mir::shell::FocusController*)
         {
-            auto const shell = std::make_shared<MirShell>(
-                the_input_targeter(),
-                the_surface_coordinator(),
-                the_session_coordinator(),
-                the_prompt_session_manager(),
-                the_shell_display_layout());
-
-            m_shell = shell;
-            return shell;
+            const auto result = std::make_shared<MirWindowManager>(the_shell_display_layout());
+            m_windowManager = result;
+            return result;
         });
 
     set_terminator([&](int)
@@ -113,43 +113,25 @@
 
 /************************************ Shell side ************************************/
 
-//
-// Note about the
-//     if (sharedPtr.unique()) return 0;
-// constructs used in the functions below.
-// The rationale is that if when you do
-//     the_session_authorizer()
-// get a pointer that is unique means that Mir is not
-// holding the pointer and thus when we return from the
-//     sessionAuthorizer()
-// scope the unique pointer will be destroyed so we return 0
-//
+// Note about the"weak_ptr<X>.lock().get();" constructs used in the functions below.
+// An empty weak_ptr<> means that Mir is not holding the pointer so we return nullptr.
 
 SessionAuthorizer *MirServer::sessionAuthorizer()
 {
-    auto sharedPtr = the_session_authorizer();
-    if (sharedPtr.unique()) return 0;
-
-    return static_cast<SessionAuthorizer*>(sharedPtr.get());
+    return m_sessionAuthorizer.lock().get();
 }
 
 SessionListener *MirServer::sessionListener()
 {
-    auto sharedPtr = the_session_listener();
-    if (sharedPtr.unique()) return 0;
-
-    return static_cast<SessionListener*>(sharedPtr.get());
+    return m_sessionListener.lock().get();
 }
 
 PromptSessionListener *MirServer::promptSessionListener()
 {
-    auto sharedPtr = the_prompt_session_listener();
-    if (sharedPtr.unique()) return 0;
-
-    return static_cast<PromptSessionListener*>(sharedPtr.get());
+    return m_promptSessionListener.lock().get();
 }
 
-MirShell *MirServer::shell()
+MirWindowManager *MirServer::windowManager()
 {
-    return m_shell.lock().get();
+    return m_windowManager.lock().get();
 }

=== modified file 'src/platforms/mirserver/mirserver.h'
--- src/platforms/mirserver/mirserver.h	2015-03-25 14:49:58 +0000
+++ src/platforms/mirserver/mirserver.h	2015-05-06 15:47:57 +0000
@@ -23,7 +23,7 @@
 class QtEventFeeder;
 class SessionListener;
 class SessionAuthorizer;
-class MirShell;
+class MirWindowManager;
 class PromptSessionListener;
 
 // We use virtual inheritance of mir::Server to facilitate derived classes (e.g. testing)
@@ -34,7 +34,7 @@
 
     Q_PROPERTY(SessionAuthorizer* sessionAuthorizer READ sessionAuthorizer CONSTANT)
     Q_PROPERTY(SessionListener* sessionListener READ sessionListener CONSTANT)
-    Q_PROPERTY(MirShell* shell READ shell CONSTANT)
+    Q_PROPERTY(MirWindowManager* windowManager READ windowManager CONSTANT)
     Q_PROPERTY(PromptSessionListener* promptSessionListener READ promptSessionListener CONSTANT)
 
 public:
@@ -47,21 +47,22 @@
     using mir::Server::the_display;
     using mir::Server::the_gl_config;
     using mir::Server::the_main_loop;
-    using mir::Server::the_prompt_session_listener;
     using mir::Server::the_prompt_session_manager;
-    using mir::Server::the_session_authorizer;
-    using mir::Server::the_session_listener;
+    using mir::Server::the_shell;
 
     /* qt specific */
     // getters
     SessionAuthorizer *sessionAuthorizer();
     SessionListener *sessionListener();
     PromptSessionListener *promptSessionListener();
-    MirShell *shell();
+    MirWindowManager *windowManager();
 
 private:
     std::shared_ptr<QtEventFeeder> m_qtEventFeeder;
-    std::weak_ptr<MirShell> m_shell;
+    std::weak_ptr<SessionAuthorizer> m_sessionAuthorizer;
+    std::weak_ptr<SessionListener> m_sessionListener;
+    std::weak_ptr<PromptSessionListener> m_promptSessionListener;
+    std::weak_ptr<MirWindowManager> m_windowManager;
 };
 
 #endif // MIRSERVER_H

=== renamed file 'src/platforms/mirserver/mirshell.cpp' => 'src/platforms/mirserver/mirwindowmanager.cpp'
--- src/platforms/mirserver/mirshell.cpp	2015-05-01 13:21:00 +0000
+++ src/platforms/mirserver/mirwindowmanager.cpp	2015-05-06 15:47:57 +0000
@@ -14,163 +14,121 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mirshell.h"
+#include "mirwindowmanager.h"
 #include "logging.h"
 #include "tracepoints.h" // generated from tracepoints.tp
 
 #include <mir/geometry/rectangle.h>
 #include <mir/scene/session.h>
+#include <mir/scene/surface.h>
 #include <mir/scene/surface_creation_parameters.h>
-#include <mir/scene/surface.h>
 #include <mir/shell/display_layout.h>
-#include <mir/shell/window_manager.h>
 
 namespace ms = mir::scene;
-using mir::shell::AbstractShell;
-
-namespace
-{
-class NullWindowManager : public mir::shell::WindowManager
-{
-public:
-    void add_session(std::shared_ptr<ms::Session> const& session) override;
-
-    void remove_session(std::shared_ptr<ms::Session> const& session) override;
-
-    mir::frontend::SurfaceId add_surface(
-        std::shared_ptr<ms::Session> const& session,
-        ms::SurfaceCreationParameters const& params,
-        std::function<mir::frontend::SurfaceId(std::shared_ptr<ms::Session> const& session, ms::SurfaceCreationParameters const& params)> const& build) override;
-
-    void remove_surface(
-        std::shared_ptr<ms::Session> const& session,
-        std::weak_ptr<ms::Surface> const& surface) override;
-
-    void add_display(mir::geometry::Rectangle const& area) override;
-
-    void remove_display(mir::geometry::Rectangle const& area) override;
-
-    bool handle_keyboard_event(MirKeyboardEvent const* event) override;
-
-    bool handle_touch_event(MirTouchEvent const* event) override;
-
-    bool handle_pointer_event(MirPointerEvent const* event) override;
-
-    int set_surface_attribute(
-        std::shared_ptr<ms::Session> const& session,
-        std::shared_ptr<ms::Surface> const& surface,
-        MirSurfaceAttrib attrib,
-        int value) override;
-
-    void modify_surface(const std::shared_ptr<mir::scene::Session>&, const std::shared_ptr<mir::scene::Surface>&, const mir::shell::SurfaceSpecification&);
-};
-}
-
-
-MirShell::MirShell(
-    const std::shared_ptr<mir::shell::InputTargeter> &inputTargeter,
-    const std::shared_ptr<mir::scene::SurfaceCoordinator> &surfaceCoordinator,
-    const std::shared_ptr<mir::scene::SessionCoordinator> &sessionCoordinator,
-    const std::shared_ptr<mir::scene::PromptSessionManager> &promptSessionManager,
-    const std::shared_ptr<mir::shell::DisplayLayout> &displayLayout) :
-    AbstractShell(inputTargeter, surfaceCoordinator, sessionCoordinator, promptSessionManager,
-        [](mir::shell::FocusController*) { return std::make_shared<NullWindowManager>(); }),
-    m_displayLayout{displayLayout}
-{
-    qCDebug(QTMIR_MIR_MESSAGES) << "MirShell::MirShell";
-}
-
-mir::frontend::SurfaceId MirShell::create_surface(const std::shared_ptr<ms::Session> &session, const ms::SurfaceCreationParameters &requestParameters)
+
+MirWindowManager::MirWindowManager(const std::shared_ptr<mir::shell::DisplayLayout> &displayLayout) :
+        m_displayLayout{displayLayout}
+{
+    qCDebug(QTMIR_MIR_MESSAGES) << "MirWindowManager::MirWindowManager";
+}
+
+auto MirWindowManager::add_surface(
+    std::shared_ptr<mir::scene::Session> const& session,
+    mir::scene::SurfaceCreationParameters const& requestParameters,
+    std::function<mir::frontend::SurfaceId(std::shared_ptr<mir::scene::Session> const& session, mir::scene::SurfaceCreationParameters const& params)> const& build)
+-> mir::frontend::SurfaceId
 {
     tracepoint(qtmirserver, surfacePlacementStart);
 
-     // TODO: Callback unity8 so that it can make a decision on that.
-     //       unity8 must bear in mind that the called function will be on a Mir thread though.
-     //       The QPA shouldn't be deciding for itself on such things.
-
-     ms::SurfaceCreationParameters placedParameters = requestParameters;
-
-     // Just make it fullscreen for now
-     mir::geometry::Rectangle rect{requestParameters.top_left, requestParameters.size};
-     m_displayLayout->size_to_output(rect);
-     placedParameters.size = rect.size;
-
-     qCDebug(QTMIR_MIR_MESSAGES) << "MirShell::create_surface(): size requested ("
-         << requestParameters.size.width.as_int() << "," << requestParameters.size.height.as_int() << ") and placed ("
-         << placedParameters.size.width.as_int() << "," << placedParameters.size.height.as_int() << ")";
-
-     tracepoint(qtmirserver, surfacePlacementEnd);
-
-     return AbstractShell::create_surface(session, placedParameters);
-}
-
-int MirShell::set_surface_attribute(
-    const std::shared_ptr<mir::scene::Session> &session,
-    const std::shared_ptr<mir::scene::Surface> &surface,
+    // TODO: Callback unity8 so that it can make a decision on that.
+    //       unity8 must bear in mind that the called function will be on a Mir thread though.
+    //       The QPA shouldn't be deciding for itself on such things.
+
+    ms::SurfaceCreationParameters placedParameters = requestParameters;
+
+    // Just make it fullscreen for now
+    mir::geometry::Rectangle rect{requestParameters.top_left, requestParameters.size};
+    m_displayLayout->size_to_output(rect);
+    placedParameters.size = rect.size;
+
+    qCDebug(QTMIR_MIR_MESSAGES) << "MirWindowManager::add_surface(): size requested ("
+        << requestParameters.size.width.as_int() << "," << requestParameters.size.height.as_int() << ") and placed ("
+        << placedParameters.size.width.as_int() << "," << placedParameters.size.height.as_int() << ")";
+
+    tracepoint(qtmirserver, surfacePlacementEnd);
+
+    return build(session, placedParameters);
+}
+
+void MirWindowManager::modify_surface(
+    std::shared_ptr<mir::scene::Session> const& /*session*/,
+    std::shared_ptr<mir::scene::Surface> const& surface,
+    mir::shell::SurfaceSpecification const& modifications)
+{
+    // TODO ought to wire up some window management logic around here
+    // Here's a very basic implementation
+
+    if (modifications.name.is_set())
+        surface->rename(modifications.name.value());
+
+    if (modifications.width.is_set() || modifications.height.is_set())
+    {
+        auto new_size = surface->size();
+
+        if (modifications.width.is_set())
+            new_size.width = modifications.width.value();
+
+        if (modifications.height.is_set())
+            new_size.height = modifications.height.value();
+
+        surface->resize(new_size);
+    }
+}
+
+int MirWindowManager::set_surface_attribute(
+    std::shared_ptr<mir::scene::Session> const& /*session*/,
+    std::shared_ptr<mir::scene::Surface> const& surface,
     MirSurfaceAttrib attrib,
     int value)
 {
-    auto const result = AbstractShell::set_surface_attribute(session, surface, attrib, value);
+    const auto result = surface->configure(attrib, value);
     Q_EMIT surfaceAttributeChanged(surface.get(), attrib, result);
-
     return result;
 }
 
-void NullWindowManager::add_session(std::shared_ptr<ms::Session> const& /*session*/)
-{
-}
-
-void NullWindowManager::remove_session(std::shared_ptr<ms::Session> const& /*session*/)
-{
-}
-
-auto NullWindowManager::add_surface(
-    std::shared_ptr<ms::Session> const& session,
-    ms::SurfaceCreationParameters const& params,
-    std::function<mir::frontend::SurfaceId(std::shared_ptr<ms::Session> const& session, ms::SurfaceCreationParameters const& params)> const& build)
--> mir::frontend::SurfaceId
-{
-    return build(session, params);
-}
-
-void NullWindowManager::remove_surface(
-    std::shared_ptr<ms::Session> const& /*session*/,
-    std::weak_ptr<ms::Surface> const& /*surface*/)
-{
-}
-
-void NullWindowManager::add_display(mir::geometry::Rectangle const& /*area*/)
-{
-}
-
-void NullWindowManager::remove_display(mir::geometry::Rectangle const& /*area*/)
-{
-}
-
-bool NullWindowManager::handle_keyboard_event(MirKeyboardEvent const* /*event*/)
-{
-    return false;
-}
-
-bool NullWindowManager::handle_touch_event(MirTouchEvent const* /*event*/)
-{
-    return false;
-}
-
-bool NullWindowManager::handle_pointer_event(MirPointerEvent const* /*event*/)
-{
-    return false;
-}
-
-int NullWindowManager::set_surface_attribute(
-    std::shared_ptr<ms::Session> const& /*session*/,
-    std::shared_ptr<ms::Surface> const& surface,
-    MirSurfaceAttrib attrib,
-    int value)
-{
-    return surface->configure(attrib, value);
-}
-
-void NullWindowManager::modify_surface(const std::shared_ptr<mir::scene::Session>&, const std::shared_ptr<mir::scene::Surface>&, const mir::shell::SurfaceSpecification&)
-{
+void MirWindowManager::add_session(std::shared_ptr<mir::scene::Session> const& /*session*/)
+{
+}
+
+void MirWindowManager::remove_session(std::shared_ptr<mir::scene::Session> const& /*session*/)
+{
+}
+
+void MirWindowManager::remove_surface(
+    std::shared_ptr<mir::scene::Session> const& /*session*/,
+    std::weak_ptr<mir::scene::Surface> const& /*surface*/)
+{
+}
+
+void MirWindowManager::add_display(mir::geometry::Rectangle const& /*area*/)
+{
+}
+
+void MirWindowManager::remove_display(mir::geometry::Rectangle const& /*area*/)
+{
+}
+
+bool MirWindowManager::handle_keyboard_event(MirKeyboardEvent const* /*event*/)
+{
+    return false;
+}
+
+bool MirWindowManager::handle_touch_event(MirTouchEvent const* /*event*/)
+{
+    return false;
+}
+
+bool MirWindowManager::handle_pointer_event(MirPointerEvent const* /*event*/)
+{
+    return false;
 }

=== renamed file 'src/platforms/mirserver/mirshell.h' => 'src/platforms/mirserver/mirwindowmanager.h'
--- src/platforms/mirserver/mirshell.h	2015-02-04 17:17:53 +0000
+++ src/platforms/mirserver/mirwindowmanager.h	2015-05-06 15:47:57 +0000
@@ -14,10 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef QPAMIRSERVER_SHELL_H
-#define QPAMIRSERVER_SHELL_H
+#ifndef MIRWINDOWMANAGER_H
+#define MIRWINDOWMANAGER_H
 
-#include <mir/shell/abstract_shell.h>
+#include <mir/shell/window_manager.h>
 #include <QObject>
 
 namespace mir {
@@ -26,26 +26,45 @@
     }
 }
 
-class MirShell : public QObject, public mir::shell::AbstractShell
+class MirWindowManager : public QObject, public mir::shell::WindowManager
 {
     Q_OBJECT
 
 public:
-    MirShell(
-        const std::shared_ptr<mir::shell::InputTargeter> &inputTargeter,
-        const std::shared_ptr<mir::scene::SurfaceCoordinator> &surfaceCoordinator,
-        const std::shared_ptr<mir::scene::SessionCoordinator> &sessionCoordinator,
-        const std::shared_ptr<mir::scene::PromptSessionManager> &promptSessionManager,
-        const std::shared_ptr<mir::shell::DisplayLayout> &displayLayout);
+    explicit MirWindowManager(const std::shared_ptr<mir::shell::DisplayLayout> &displayLayout);
 
-    virtual mir::frontend::SurfaceId create_surface(const std::shared_ptr<mir::scene::Session>& session, const mir::scene::SurfaceCreationParameters &params);
+    auto add_surface(
+        std::shared_ptr<mir::scene::Session> const& session,
+        mir::scene::SurfaceCreationParameters const& params,
+        std::function<mir::frontend::SurfaceId(std::shared_ptr<mir::scene::Session> const& session, mir::scene::SurfaceCreationParameters const& params)> const& build)
+    -> mir::frontend::SurfaceId override;
 
     int set_surface_attribute(
-        const std::shared_ptr<mir::scene::Session> &session,
-        const std::shared_ptr<mir::scene::Surface> &surface,
+        std::shared_ptr<mir::scene::Session> const& session,
+        std::shared_ptr<mir::scene::Surface> const& surface,
         MirSurfaceAttrib attrib,
         int value) override;
 
+    void add_session(std::shared_ptr<mir::scene::Session> const& session) override;
+
+    void remove_session(std::shared_ptr<mir::scene::Session> const& session) override;
+
+    void remove_surface(
+        std::shared_ptr<mir::scene::Session> const& session,
+        std::weak_ptr<mir::scene::Surface> const& surface) override;
+
+    void modify_surface(std::shared_ptr<mir::scene::Session> const&, std::shared_ptr<mir::scene::Surface> const&, mir::shell::SurfaceSpecification const&);
+
+    void add_display(mir::geometry::Rectangle const& area) override;
+
+    void remove_display(mir::geometry::Rectangle const& area) override;
+
+    bool handle_keyboard_event(MirKeyboardEvent const* event) override;
+
+    bool handle_touch_event(MirTouchEvent const* event) override;
+
+    bool handle_pointer_event(MirPointerEvent const* event) override;
+
 Q_SIGNALS:
     void surfaceAttributeChanged(mir::scene::Surface const*, const MirSurfaceAttrib, const int);
 
@@ -53,4 +72,4 @@
     std::shared_ptr<mir::shell::DisplayLayout> const m_displayLayout;
 };
 
-#endif /* QPAMIRSERVER_SHELL_H */
+#endif /* MIRWINDOWMANAGER_H */

=== modified file 'src/platforms/mirserver/nativeinterface.cpp'
--- src/platforms/mirserver/nativeinterface.cpp	2015-01-28 14:25:36 +0000
+++ src/platforms/mirserver/nativeinterface.cpp	2015-05-06 15:47:57 +0000
@@ -29,12 +29,17 @@
 
     if (resource == "SessionAuthorizer")
         result = m_mirServer->sessionAuthorizer();
-    else if (resource == "Shell")
-        result = m_mirServer->shell();
+    else if (resource == "WindowManager")
+        result = m_mirServer->windowManager();
     else if (resource == "SessionListener")
         result = m_mirServer->sessionListener();
     else if (resource == "PromptSessionListener")
         result = m_mirServer->promptSessionListener();
+    else if (resource == "mir::shell::Shell")
+    {
+        const std::weak_ptr<mir::shell::Shell> shell{m_mirServer->the_shell()};
+        result = shell.lock().get();
+    }
 
     return result;
 }

=== modified file 'src/platforms/mirserver/nativeinterface.h'
--- src/platforms/mirserver/nativeinterface.h	2014-12-01 11:05:01 +0000
+++ src/platforms/mirserver/nativeinterface.h	2015-05-06 15:47:57 +0000
@@ -33,7 +33,7 @@
 
     virtual void *nativeResourceForIntegration(const QByteArray &resource);
 
-    QSharedPointer<MirServer> m_mirServer;
+    const QSharedPointer<MirServer> m_mirServer;
 };
 
 #endif // NATIVEINTEGRATION_H

=== modified file 'tests/modules/common/qtmir_test.h'
--- tests/modules/common/qtmir_test.h	2015-02-06 09:47:21 +0000
+++ tests/modules/common/qtmir_test.h	2015-05-06 15:47:57 +0000
@@ -109,7 +109,6 @@
             &applicationManager,
         }
         , surfaceManager{
-            mirServer,
             mirShell,
             &sessionManager
         }
@@ -150,7 +149,7 @@
     testing::NiceMock<testing::MockDesktopFileReaderFactory> desktopFileReaderFactory;
     testing::NiceMock<testing::MockSharedWakelock> sharedWakelock;
     QSharedPointer<FakeMirServer> mirServer;
-    MirShell *mirShell{nullptr};
+    mir::shell::Shell *mirShell{nullptr};
     QSharedPointer<TaskController> taskController;
     ApplicationManager applicationManager;
     SessionManager sessionManager;