Merge lp:~alan-griffiths/unity-system-compositor/use-WindowMangager-NOT-ShellWrapper into lp:unity-system-compositor

[Alan Griffiths]

Use the new mir::shell::WindowManager interface instead of wrapping the default shell

Use the new mir::shell::WindowManager interface instead of wrapping the default shell

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:210
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/189/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-amd64-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-armhf-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/189/rebuild

review: Needs Fixing (continuous-integration)

[lp:~alan-griffiths/unity-system-compositor/use-WindowMangager-NOT-ShellWrapper]

201. By Alexandros Frantzis on 2015-03-16

Add unit tests for components managing screen state.

Approved by PS Jenkins bot, Alberto Aguirre, Andreas Pokorny, Alan Griffiths.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:211
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/194/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/194/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

426 + focus_controller->set_focus_to(session, {});

437 + auto const next_session = session_coordinator->successor_of({});
438 + if (next_session)
439 + focus_controller->set_focus_to(next_session, next_session->default_surface());
440 + else
441 + focus_controller->set_focus_to(next_session, {});

I think that the focus setting code is not needed, since the session_switcher will set the focus as needed. I need to try this manually to check (unfortunately we don't have tests covering these interactions yet).

review: Needs Information

[Alan Griffiths (alan-griffiths)]

> 426 + focus_controller->set_focus_to(session, {});
>
> 437 + auto const next_session = session_coordinator->successor_of({});
> 438 + if (next_session)
> 439 + focus_controller->set_focus_to(next_session,
> next_session->default_surface());
> 440 + else
> 441 + focus_controller->set_focus_to(next_session, {});
>
> I think that the focus setting code is not needed, since the session_switcher

You're likely right - I took the conservative approach of simply moving the calls from one site to another. I didn't try to figure out which were redundant.

> will set the focus as needed. I need to try this manually to check
> (unfortunately we don't have tests covering these interactions yet).

Are you volunteering to test?

[Alexandros Frantzis (afrantzis)]

> > will set the focus as needed. I need to try this manually to check
> > (unfortunately we don't have tests covering these interactions yet).
>
> Are you volunteering to test?

Yes, hopefully I will manage to do so today.

[Alexandros Frantzis (afrantzis)]

> > Are you volunteering to test?
>
> Yes, hopefully I will manage to do so today.

I am having trouble getting input to work properly when I install packages based on lp:mir (which are needed to test this branch) on the phone (which has 0.12 packages). So testing this branch will need to be postponed until the situation is investigated and resolved.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:213
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/199/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-amd64-ci/36/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-armhf-ci/36/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/199/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:214
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/200/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-amd64-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-armhf-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/200/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:215
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/201/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-amd64-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-armhf-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-i386-ci/13/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/201/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:216
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/202/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-armhf-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-vivid-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/202/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

Some of the code looks moved from an old location (via CP), and the new code looks okay to me

review: Approve

[Alexandros Frantzis (afrantzis)]

I would like to test this manually before it lands, but since testing is blocked [1], let's merge this and test later (it's a priority for me as soon as it is possible to do so). In any case, this branch won't hit production any time soon, so we have plenty of time to test.

[1] I am trying to work around problems with parallel mir installs by rebuilding qtmir (devel-mir-next) against latest mir too, but it seems it needs further updates to build properly.

review: Approve

[lp:~alan-griffiths/unity-system-compositor/use-WindowMangager-NOT-ShellWrapper]

202. By Alan Griffiths on 2015-04-01

Use the new mir::shell::WindowManager interface instead of wrapping the default shell.

Approved by Alexandros Frantzis, Kevin DuBois, PS Jenkins bot.

=== modified file 'debian/control'
--- debian/control	2015-03-16 14:54:17 +0000
+++ debian/control	2015-03-31 13:42:52 +0000
@@ -18,7 +18,7 @@
                libcairo2-dev,
                libglib2.0-dev,
                libgles2-mesa-dev,
-               libmirclient-dev (>= 0.6.0),
+               libmirclient-dev (>= 0.13.0~),
                libmirserver-dev (>= 0.13.0~),
                libprotobuf-dev,
                pkg-config,

=== modified file 'spinner/eglapp.c'
--- spinner/eglapp.c	2014-03-28 13:02:02 +0000
+++ spinner/eglapp.c	2015-03-31 13:42:52 +0000
@@ -144,11 +144,6 @@
         mir_buffer_usage_hardware,
         mir_display_output_id_invalid
     };
-    MirEventDelegate delegate = 
-    {
-        mir_eglapp_handle_event,
-        NULL
-    };
     EGLConfig eglconfig;
     EGLint neglconfigs;
     EGLContext eglctx;
@@ -323,7 +318,7 @@
     surface = mir_connection_create_surface_sync(connection, &surfaceparm);
     CHECK(mir_surface_is_valid(surface), "Can't create a surface");
 
-    mir_surface_set_event_handler(surface, &delegate);
+    mir_surface_set_event_handler(surface, mir_eglapp_handle_event, NULL);
 
     egldisplay = eglGetDisplay(
                     (EGLNativeDisplayType) mir_connection_get_egl_native_display(connection));

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-02-18 14:40:29 +0000
+++ src/CMakeLists.txt	2015-03-31 13:42:52 +0000
@@ -22,9 +22,9 @@
   screen_event_handler.cpp
   mir_screen.cpp
   server.cpp
-  shell.cpp
   session_switcher.cpp
   system_compositor.cpp
+  window_manager.cpp
   worker_thread.cpp
 )
 

=== modified file 'src/screen_event_handler.cpp'
--- src/screen_event_handler.cpp	2015-03-16 10:24:45 +0000
+++ src/screen_event_handler.cpp	2015-03-31 13:42:52 +0000
@@ -19,6 +19,7 @@
 #include "power_state_change_reason.h"
 
 #include <mir/time/alarm_factory.h>
+#include <mir_toolkit/events/input/input_event.h>
 
 #include <cstdio>
 
@@ -52,14 +53,14 @@
 
     if (input_event_type == mir_input_event_type_key)
     {
-        auto const kev = mir_input_event_get_key_input_event(input_event);
-        if (mir_key_input_event_get_key_code(kev) != POWER_KEY_CODE)
+        auto const kev = mir_input_event_get_keyboard_event(input_event);
+        if (mir_keyboard_event_key_code(kev) != POWER_KEY_CODE)
             return false;
 
-        auto const action = mir_key_input_event_get_action(kev);
-        if (action == mir_key_input_event_action_down)
+        auto const action = mir_keyboard_event_action(kev);
+        if (action == mir_keyboard_action_down)
             power_key_down();
-        else if (action == mir_key_input_event_action_up)
+        else if (action == mir_keyboard_action_up)
             power_key_up();
     }
     else if (input_event_type == mir_input_event_type_touch ||

=== modified file 'src/server.cpp'
--- src/server.cpp	2015-03-16 10:24:45 +0000
+++ src/server.cpp	2015-03-31 13:42:52 +0000
@@ -18,9 +18,9 @@
 
 #include "server.h"
 #include "external_spinner.h"
-#include "shell.h"
 #include "asio_dm_connection.h"
 #include "session_switcher.h"
+#include "window_manager.h"
 #include "powerd_mediator.h"
 
 #include <mir/input/cursor_listener.h>
@@ -127,11 +127,14 @@
             return std::make_shared<ServerStatusListener>(the_focus_controller());
         });
 
-    wrap_shell([this](std::shared_ptr<msh::Shell> const& wrapped)
-        -> std::shared_ptr<msh::Shell>
-        {
-            return std::make_shared<Shell>(wrapped, the_session_switcher());
-        });
+    override_the_window_manager_builder([this](msh::FocusController* focus_controller)
+       {
+         return std::make_shared<WindowManager>(
+             focus_controller,
+             the_shell_display_layout(),
+             the_session_coordinator(),
+             the_session_switcher());
+       });
 
     set_config_filename("unity-system-compositor.conf");
 

=== removed file 'src/shell.cpp'
--- src/shell.cpp	2015-03-16 10:24:45 +0000
+++ src/shell.cpp	1970-01-01 00:00:00 +0000
@@ -1,159 +0,0 @@
-/*
- * Copyright © 2014-2015 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License 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 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/>.
- *
- * Authored by: Alexandros Frantzis <[e-mail]>
- */
-
-#include "shell.h"
-#include "session_switcher.h"
-
-#include <mir/scene/null_surface_observer.h>
-#include <mir/scene/session.h>
-#include <mir/scene/surface.h>
-#include <mir/frontend/session.h>
-
-#include <iostream>
-
-namespace msh = mir::shell;
-namespace ms = mir::scene;
-namespace mf = mir::frontend;
-
-namespace
-{
-
-class UscSession : public usc::Session
-{
-public:
-    UscSession(
-        std::shared_ptr<ms::Session> const& scene_session,
-        msh::FocusController& focus_controller)
-        : scene_session{scene_session},
-          focus_controller(focus_controller)
-    {
-    }
-
-    std::string name()
-    {
-        return scene_session->name();
-    }
-
-    void show() override
-    {
-        scene_session->show();
-    }
-
-    void hide() override
-    {
-        scene_session->hide();
-    }
-
-    void raise_and_focus() override
-    {
-        auto const surface = scene_session->default_surface();
-        focus_controller.raise({surface});
-        focus_controller.set_focus_to(scene_session, surface);
-    }
-
-    bool corresponds_to(mir::frontend::Session const* s) override
-    {
-        return scene_session.get() == s;
-    }
-
-    std::shared_ptr<ms::Session> const scene_session;
-    msh::FocusController& focus_controller;
-};
-
-
-struct SessionReadyObserver : ms::NullSurfaceObserver,
-                              std::enable_shared_from_this<SessionReadyObserver>
-{
-    SessionReadyObserver(
-        std::shared_ptr<usc::SessionSwitcher> const& switcher,
-        std::shared_ptr<ms::Surface> const& surface,
-        ms::Session const* session)
-        : switcher{switcher},
-          surface{surface},
-          session{session}
-    {
-    }
-
-    void frame_posted(int) override
-    {
-        ++num_frames_posted;
-        if (num_frames_posted == num_frames_for_session_ready)
-        {
-            switcher->mark_ready(session);
-            surface->remove_observer(shared_from_this());
-        }
-    }
-
-    std::shared_ptr<usc::SessionSwitcher> const switcher;
-    std::shared_ptr<ms::Surface> const surface;
-    ms::Session const* const session;
-    // We need to wait for the second frame before marking the session
-    // as ready. The first frame posted from sessions is a blank frame.
-    // TODO: Solve this issue at its root and remove this workaround
-    int const num_frames_for_session_ready{2};
-    int num_frames_posted{0};
-};
-
-}
-
-usc::Shell::Shell(
-    std::shared_ptr<msh::Shell> const& wrapped,
-    std::shared_ptr<SessionSwitcher> const& session_switcher)
-    : msh::ShellWrapper{wrapped},
-      session_switcher{session_switcher}
-{
-}
-
-std::shared_ptr<ms::Session>
-usc::Shell::open_session(
-    pid_t client_pid,
-    std::string const& name,
-    std::shared_ptr<mf::EventSink> const& sink)
-{
-    std::cerr << "Opening session " << name << std::endl;
-
-    auto orig = msh::ShellWrapper::open_session(client_pid, name, sink);
-
-    auto const usc_session = std::make_shared<UscSession>(orig, *this);
-
-    session_switcher->add(usc_session, client_pid);
-
-    return orig;
-}
-
-void usc::Shell::close_session(std::shared_ptr<ms::Session> const& session)
-{
-    std::cerr << "Closing session " << session->name() << std::endl;
-
-    msh::ShellWrapper::close_session(session);
-
-    session_switcher->remove(session);
-}
-
-mf::SurfaceId usc::Shell::create_surface(std::shared_ptr<ms::Session> const& session, ms::SurfaceCreationParameters const& params)
-{
-    auto const id = msh::ShellWrapper::create_surface(session, params);
-
-    auto const surface = session->surface(id);
-    auto const session_ready_observer = std::make_shared<SessionReadyObserver>(
-        session_switcher, surface, session.get());
-
-    surface->add_observer(session_ready_observer);
-
-    return id;
-}

=== removed file 'src/shell.h'
--- src/shell.h	2015-01-27 17:43:17 +0000
+++ src/shell.h	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2014-2015 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License 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 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/>.
- *
- * Authored by: Alexandros Frantzis <[e-mail]>
- */
-
-#ifndef USC_SHELL_H_
-#define USC_SHELL_H_
-
-#include <mir/shell/shell_wrapper.h>
-
-#include <memory>
-
-
-namespace usc
-{
-class SessionSwitcher;
-
-class Shell : public mir::shell::ShellWrapper
-{
-public:
-    Shell(
-        std::shared_ptr<mir::shell::Shell> const& wrapped,
-        std::shared_ptr<SessionSwitcher> const& session_switcher);
-
-private:
-    std::shared_ptr<mir::scene::Session> open_session(
-        pid_t client_pid,
-        std::string const& name,
-        std::shared_ptr<mir::frontend::EventSink> const& sink) override;
-    void close_session(std::shared_ptr<mir::scene::Session> const& session) override;
-
-    mir::frontend::SurfaceId create_surface(
-        std::shared_ptr<mir::scene::Session> const& session,
-        mir::scene::SurfaceCreationParameters const& params) override;
-
-    std::shared_ptr<SessionSwitcher> const session_switcher;
-};
-
-}
-
-#endif

=== added file 'src/window_manager.cpp'
--- src/window_manager.cpp	1970-01-01 00:00:00 +0000
+++ src/window_manager.cpp	2015-03-31 13:42:52 +0000
@@ -0,0 +1,224 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License 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 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/>.
+ *
+ * Authored By: Alan Griffiths <[e-mail]>
+ */
+
+#include "window_manager.h"
+
+#include "session_switcher.h"
+
+#include "mir/geometry/rectangle.h"
+#include "mir/scene/null_surface_observer.h"
+#include "mir/scene/session.h"
+#include "mir/scene/session_coordinator.h"
+#include "mir/scene/surface.h"
+#include "mir/scene/surface_creation_parameters.h"
+#include "mir/shell/display_layout.h"
+#include "mir/shell/focus_controller.h"
+
+#include "mir_toolkit/client_types.h"
+
+#include <iostream>
+
+namespace mf = mir::frontend;
+namespace ms = mir::scene;
+namespace msh = mir::shell;
+
+namespace
+{
+
+class UscSession : public usc::Session
+{
+public:
+    UscSession(
+        std::shared_ptr<ms::Session> const& scene_session,
+        msh::FocusController& focus_controller)
+        : scene_session{scene_session},
+          focus_controller(focus_controller)
+    {
+    }
+
+    std::string name()
+    {
+        return scene_session->name();
+    }
+
+    void show() override
+    {
+        scene_session->show();
+    }
+
+    void hide() override
+    {
+        scene_session->hide();
+    }
+
+    void raise_and_focus() override
+    {
+        auto const surface = scene_session->default_surface();
+        focus_controller.raise({surface});
+        focus_controller.set_focus_to(scene_session, surface);
+    }
+
+    bool corresponds_to(mir::frontend::Session const* s) override
+    {
+        return scene_session.get() == s;
+    }
+
+    std::shared_ptr<ms::Session> const scene_session;
+    msh::FocusController& focus_controller;
+};
+
+
+struct SessionReadyObserver : ms::NullSurfaceObserver,
+                              std::enable_shared_from_this<SessionReadyObserver>
+{
+    SessionReadyObserver(
+        std::shared_ptr<usc::SessionSwitcher> const& switcher,
+        std::shared_ptr<ms::Surface> const& surface,
+        ms::Session const* session)
+        : switcher{switcher},
+          surface{surface},
+          session{session}
+    {
+    }
+
+    void frame_posted(int) override
+    {
+        ++num_frames_posted;
+        if (num_frames_posted == num_frames_for_session_ready)
+        {
+            switcher->mark_ready(session);
+            surface->remove_observer(shared_from_this());
+        }
+    }
+
+    std::shared_ptr<usc::SessionSwitcher> const switcher;
+    std::shared_ptr<ms::Surface> const surface;
+    ms::Session const* const session;
+    // We need to wait for the second frame before marking the session
+    // as ready. The first frame posted from sessions is a blank frame.
+    // TODO: Solve this issue at its root and remove this workaround
+    int const num_frames_for_session_ready{2};
+    int num_frames_posted{0};
+};
+
+}
+
+usc::WindowManager::WindowManager(
+    mir::shell::FocusController* focus_controller,
+    std::shared_ptr<mir::shell::DisplayLayout> const& display_layout,
+    std::shared_ptr<ms::SessionCoordinator> const& session_coordinator,
+    std::shared_ptr<SessionSwitcher> const& session_switcher) :
+    focus_controller{focus_controller},
+    display_layout{display_layout},
+    session_coordinator{session_coordinator},
+    session_switcher{session_switcher}
+{
+}
+
+void usc::WindowManager::add_session(std::shared_ptr<ms::Session> const& session)
+{
+    std::cerr << "Opening session " << session->name() << std::endl;
+
+    focus_controller->set_focus_to(session, {});
+
+    auto const usc_session = std::make_shared<UscSession>(session, *focus_controller);
+
+    session_switcher->add(usc_session, session->process_id());
+}
+
+void usc::WindowManager::remove_session(std::shared_ptr<ms::Session> const& session)
+{
+    std::cerr << "Closing session " << session->name() << std::endl;
+
+    auto const next_session = session_coordinator->successor_of({});
+    if (next_session)
+        focus_controller->set_focus_to(next_session, next_session->default_surface());
+    else
+        focus_controller->set_focus_to(next_session, {});
+
+    session_switcher->remove(session);
+}
+
+auto usc::WindowManager::add_surface(
+    std::shared_ptr<ms::Session> const& session,
+    ms::SurfaceCreationParameters const& params,
+    std::function<mf::SurfaceId(std::shared_ptr<ms::Session> const& session, ms::SurfaceCreationParameters const& params)> const& build)
+-> mf::SurfaceId
+{
+    mir::graphics::DisplayConfigurationOutputId const output_id_invalid{
+        mir_display_output_id_invalid};
+    auto placed_parameters = params;
+
+    mir::geometry::Rectangle rect{params.top_left, params.size};
+
+    if (params.output_id != output_id_invalid)
+    {
+        display_layout->place_in_output(params.output_id, rect);
+    }
+
+    placed_parameters.top_left = rect.top_left;
+    placed_parameters.size = rect.size;
+
+    auto const result = build(session, placed_parameters);
+    auto const surface = session->surface(result);
+
+    auto const session_ready_observer = std::make_shared<SessionReadyObserver>(
+        session_switcher, surface, session.get());
+
+    surface->add_observer(session_ready_observer);
+
+    return result;
+}
+
+void usc::WindowManager::remove_surface(
+    std::shared_ptr<ms::Session> const& /*session*/,
+    std::weak_ptr<ms::Surface> const& /*surface*/)
+{
+}
+
+void usc::WindowManager::add_display(mir::geometry::Rectangle const& /*area*/)
+{
+}
+
+void usc::WindowManager::remove_display(mir::geometry::Rectangle const& /*area*/)
+{
+}
+
+bool usc::WindowManager::handle_key_event(MirKeyboardEvent const* /*event*/)
+{
+    return false;
+}
+
+bool usc::WindowManager::handle_touch_event(MirTouchEvent const* /*event*/)
+{
+    return false;
+}
+
+bool usc::WindowManager::handle_pointer_event(MirPointerEvent const* /*event*/)
+{
+    return false;
+}
+
+int usc::WindowManager::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);
+}

=== added file 'src/window_manager.h'
--- src/window_manager.h	1970-01-01 00:00:00 +0000
+++ src/window_manager.h	2015-03-31 13:42:52 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License 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 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/>.
+ *
+ * Authored By: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef USC_WINDOW_MANAGER_H_
+#define USC_WINDOW_MANAGER_H_
+
+#include <mir/shell/window_manager.h>
+
+namespace mir
+{
+namespace scene { class PlacementStrategy; class SessionCoordinator; }
+namespace shell { class FocusController; class DisplayLayout; }
+}
+
+namespace usc
+{
+class SessionSwitcher;
+
+class WindowManager : public mir::shell::WindowManager
+{
+public:
+    explicit WindowManager(
+        mir::shell::FocusController* focus_controller,
+        std::shared_ptr<mir::shell::DisplayLayout> const& display_layout,
+        std::shared_ptr<mir::scene::SessionCoordinator> const& session_coordinator,
+        std::shared_ptr<SessionSwitcher> const& session_switcher);
+
+    void add_session(std::shared_ptr<mir::scene::Session> const& session) override;
+
+    void remove_session(std::shared_ptr<mir::scene::Session> const& session) override;
+
+    mir::frontend::SurfaceId 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) override;
+
+    void remove_surface(
+        std::shared_ptr<mir::scene::Session> const& session,
+        std::weak_ptr<mir::scene::Surface> const& surface) override;
+
+    void add_display(mir::geometry::Rectangle const& area) override;
+
+    void remove_display(mir::geometry::Rectangle const& area) override;
+
+    bool handle_key_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<mir::scene::Session> const& session,
+        std::shared_ptr<mir::scene::Surface> const& surface,
+        MirSurfaceAttrib attrib,
+        int value) override;
+
+private:
+    mir::shell::FocusController* const focus_controller;
+    std::shared_ptr<mir::shell::DisplayLayout> const display_layout;
+    std::shared_ptr<mir::scene::SessionCoordinator> const session_coordinator;
+    std::shared_ptr<SessionSwitcher> const session_switcher;
+};
+}
+
+#endif /* USC_WINDOW_MANAGER_H_ */

=== modified file 'tests/unit-tests/test_screen_event_handler.cpp'
--- tests/unit-tests/test_screen_event_handler.cpp	2015-02-18 14:40:29 +0000
+++ tests/unit-tests/test_screen_event_handler.cpp	2015-03-31 13:42:52 +0000
@@ -73,16 +73,16 @@
 
     static const int32_t POWER_KEY_CODE = 26;
     mir::EventUPtr power_key_down_event = mir::events::make_event(
-        MirInputDeviceId{1}, 0, mir_key_input_event_action_down,
+        MirInputDeviceId{1}, 0, mir_keyboard_action_down,
         POWER_KEY_CODE, 0, mir_input_event_modifier_none);
     mir::EventUPtr power_key_up_event = mir::events::make_event(
-        MirInputDeviceId{1}, 0, mir_key_input_event_action_up,
+        MirInputDeviceId{1}, 0, mir_keyboard_action_up,
         POWER_KEY_CODE, 0, mir_input_event_modifier_none);
     mir::EventUPtr touch_event = mir::events::make_event(
         MirInputDeviceId{1}, 0, mir_input_event_modifier_none);
     mir::EventUPtr pointer_event = mir::events::make_event(
         MirInputDeviceId{1}, 0, mir_input_event_modifier_none,
-        mir_pointer_input_event_action_motion,
+        mir_pointer_action_motion,
         {}, 0.0f, 0.0f, 0.0f, 0.0f);
 
     AdvanceableTimer timer;

=== modified file 'tests/unit-tests/test_session_switcher.cpp'
--- tests/unit-tests/test_session_switcher.cpp	2015-01-27 17:43:17 +0000
+++ tests/unit-tests/test_session_switcher.cpp	2015-03-31 13:42:52 +0000
@@ -98,6 +98,10 @@
 
     std::shared_ptr<mir::frontend::Surface> get_surface(mir::frontend::SurfaceId surface) const override { return nullptr; }
 
+    mir::frontend::BufferStreamId create_buffer_stream(mir::graphics::BufferProperties const& /*props*/) override { return {}; }
+    std::shared_ptr<mir::frontend::BufferStream> get_buffer_stream(mir::frontend::BufferStreamId /*stream*/) const override { return nullptr; }
+    void destroy_buffer_stream(mir::frontend::BufferStreamId /*stream*/) override {}
+
     std::string name() const override { return name_; }
 
 private: