Merge lp:~alan-griffiths/mir/remove-DefaultWindowManager into lp:mir

[Alan Griffiths]

playground: get rid of the legacy DefaultWindowManager (and the --window-manager option) in mir_proving_server

playground: get rid of the legacy DefaultWindowManager (and the --window-manager option) in mir_proving_server

We have too many window managers around the system, and this one is pointless

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3476
https://mir-jenkins.ubuntu.com/job/mir-ci/895/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/931
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/970
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/961
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/961
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/941
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/941/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/941
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/941/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/941
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/941/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/941
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/941/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/941
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/941/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/895/rebuild

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

Yep.. Too many.

review: Approve

[Kevin DuBois (kdub)]

alright

review: Approve

[Daniel van Vugt (vanvugt)]

I was wondering why that was there... In theory: Approved.

In practice: Manual testing of this branch reveals that it breaks mir_proving_server's nice reliable resizing and moving. So I would prefer that we fix bug 1447886 before introducing it into mir_proving_server that is presently immune to bug 1447886.

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> I was wondering why that was there... In theory: Approved.
>
> In practice: Manual testing of this branch reveals that it breaks
> mir_proving_server's nice reliable resizing and moving. So I would prefer that
> we fix bug 1447886 before introducing it into mir_proving_server that is
> presently immune to bug 1447886.

AFAICS the principle difference is that the "canonical" window manager expects you to click on a window to resize or move it. (And, if you chose to size to 1x1 that can be tricky - but not impossible.)

In contrast mir_proving_server the window management currently resizes or moves the active window regardless of where you click. This happens even when you click on another window on another screen.

I'm not sure that the latter behaviour is worth preserving.

[Daniel van Vugt (vanvugt)]

It's not a show-stopper. And I really like the gist of this proposal. But I personally request that we don't break mir_proving_server till more bugs in the canonical window manager are fixed.

If this MP landed it would only motivate me to take a tangent and spend time fixing the canonical window manager, which I don't want to do. More details are in bug 1447886.

Also relevant is: https://trello.com/c/Ru4bK7J4

[Alan Griffiths (alan-griffiths)]

> It's not a show-stopper. And I really like the gist of this proposal. But I
> personally request that we don't break mir_proving_server till more bugs in
> the canonical window manager are fixed.
>
> If this MP landed it would only motivate me to take a tangent and spend time
> fixing the canonical window manager, which I don't want to do. More details
> are in bug 1447886.

I've tried addressing your concerns in lp:~alan-griffiths/miral/revised-resize/+merge/293125

If that addresses your concerns we can proceed with this MP and I'll backport to Mir's CanonicalWindowManager.

[Daniel van Vugt (vanvugt)]

It sounds good in theory (I haven't tested it). Land that one, and then let's see how this goes.

[Alan Griffiths (alan-griffiths)]

> It sounds good in theory (I haven't tested it). Land that one, and then let's
> see how this goes.

You can see the effect by trying lp:~alan-griffiths/mir/fix-1447886 with:

  $ bin/mir_proving_server --window-manager canonical

[Alan Griffiths (alan-griffiths)]

I have a better theory - just let playground's WindowManager filter events first. That way the behaviour of proving_server doesn't change.

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3478
https://mir-jenkins.ubuntu.com/job/mir-ci/921/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/974/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1020
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1011
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1011
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/984
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/984/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/984
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/984/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/984
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/984/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/984
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/984/artifact/output/*zip*/output.zip
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/984/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/921/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

13:17:36 Build timed out (after 180 minutes). Marking the build as aborted.
13:17:36 Build was aborted
13:17:36 Archiving artifacts
13:17:36 [WS-CLEANUP] Deleting project workspace...[WS-CLEANUP] done
13:17:36 Finished: ABORTED

Rebuild triggered

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3478
https://mir-jenkins.ubuntu.com/job/mir-ci/925/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/978/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1024
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1015
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1015
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/988
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/988/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/988
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/988/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/988
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/988/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/988
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/988/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/988/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/925/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

lp:1570327 and lp:1576760

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3478
https://mir-jenkins.ubuntu.com/job/mir-ci/926/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/979/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1025
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1016
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1016
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/989
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/989/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/989
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/989/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/989
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/989/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/989
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/989/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/989/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/926/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Sure, looks like a good (smaller) step.

review: Approve

[Mir CI Bot (mir-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'playground/demo-shell/CMakeLists.txt'
--- playground/demo-shell/CMakeLists.txt	2015-06-24 03:00:56 +0000
+++ playground/demo-shell/CMakeLists.txt	2016-04-29 10:12:03 +0000
@@ -2,7 +2,6 @@
   demo_compositor.cpp
   demo_renderer.cpp
   window_manager.cpp
-  default_window_manager.cpp
 )
 
 add_subdirectory(typo)

=== removed file 'playground/demo-shell/default_window_manager.cpp'
--- playground/demo-shell/default_window_manager.cpp	2016-01-29 08:18:22 +0000
+++ playground/demo-shell/default_window_manager.cpp	1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
-/*
- * 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 "default_window_manager.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/shell/surface_ready_observer.h"
-#include "mir/shell/surface_specification.h"
-
-#include "mir_toolkit/client_types.h"
-
-namespace mf = mir::frontend;
-namespace ms = mir::scene;
-namespace msh = mir::shell;
-namespace me = mir::examples;
-namespace geom = mir::geometry;
-
-me::DefaultWindowManager::DefaultWindowManager(
-    msh::FocusController* focus_controller,
-    std::shared_ptr<shell::DisplayLayout> const& display_layout,
-    std::shared_ptr<scene::SessionCoordinator> const& session_coordinator) :
-    focus_controller{focus_controller},
-    display_layout{display_layout},
-    session_coordinator{session_coordinator}
-{
-}
-
-void me::DefaultWindowManager::add_session(std::shared_ptr<scene::Session> const& session)
-{
-    focus_controller->set_focus_to(session, {});
-}
-
-void me::DefaultWindowManager::remove_session(std::shared_ptr<scene::Session> const& /*session*/)
-{
-    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, {});
-}
-
-auto me::DefaultWindowManager::add_surface(
-    std::shared_ptr<scene::Session> const& session,
-    scene::SurfaceCreationParameters const& request_parameters,
-    std::function<frontend::SurfaceId(std::shared_ptr<scene::Session> const& session, scene::SurfaceCreationParameters const& params)> const& build)
--> frontend::SurfaceId
-{
-    mir::graphics::DisplayConfigurationOutputId const output_id_invalid{
-        mir_display_output_id_invalid};
-    auto placed_parameters = request_parameters;
-
-    geom::Rectangle rect{request_parameters.top_left, request_parameters.size};
-
-    if (request_parameters.output_id != output_id_invalid)
-    {
-        display_layout->place_in_output(request_parameters.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);
-
-    surface->add_observer(std::make_shared<msh::SurfaceReadyObserver>(
-        [this](std::shared_ptr<scene::Session> const& session,
-               std::shared_ptr<scene::Surface> const& surface)
-            {
-                focus_controller->set_focus_to(session, surface);
-            },
-        session,
-        surface));
-
-    return result;
-}
-
-void me::DefaultWindowManager::modify_surface(
-    std::shared_ptr<scene::Session> const& /*session*/,
-    std::shared_ptr<scene::Surface> const& surface,
-    msh::SurfaceSpecification const& modifications)
-{
-    if (modifications.name.is_set())
-        surface->rename(modifications.name.value());
-}
-
-void me::DefaultWindowManager::remove_surface(
-    std::shared_ptr<scene::Session> const& session,
-    std::weak_ptr<scene::Surface> const& surface)
-{
-    session->destroy_surface(surface);
-}
-
-void me::DefaultWindowManager::add_display(geometry::Rectangle const& /*area*/)
-{
-}
-
-void me::DefaultWindowManager::remove_display(geometry::Rectangle const& /*area*/)
-{
-}
-
-void me::DefaultWindowManager::handle_raise_surface(
-    std::shared_ptr<scene::Session> const& /*session*/,
-    std::shared_ptr<scene::Surface> const& /*surface*/,
-    uint64_t /*timestamp*/)
-{
-}
-
-bool me::DefaultWindowManager::handle_keyboard_event(MirKeyboardEvent const* /*event*/)
-{
-    return false;
-}
-
-bool me::DefaultWindowManager::handle_touch_event(MirTouchEvent const* /*event*/)
-{
-    return false;
-}
-
-bool me::DefaultWindowManager::handle_pointer_event(MirPointerEvent const* /*event*/)
-{
-    return false;
-}
-
-int me::DefaultWindowManager::set_surface_attribute(
-    std::shared_ptr<scene::Session> const& /*session*/,
-    std::shared_ptr<scene::Surface> const& surface,
-    MirSurfaceAttrib attrib,
-    int value)
-{
-    return surface->configure(attrib, value);
-}

=== removed file 'playground/demo-shell/default_window_manager.h'
--- playground/demo-shell/default_window_manager.h	2016-01-29 08:18:22 +0000
+++ playground/demo-shell/default_window_manager.h	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-/*
- * 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 MIR_EXAMPLES_DEFAULT_WINDOW_MANAGER_H_
-#define MIR_EXAMPLES_DEFAULT_WINDOW_MANAGER_H_
-
-#include "mir/shell/window_manager.h"
-
-namespace mir
-{
-namespace scene { class SessionCoordinator; }
-
-namespace shell { class FocusController; class DisplayLayout; }
-
-namespace examples
-{
-class DefaultWindowManager : public shell::WindowManager
-{
-public:
-    explicit DefaultWindowManager(shell::FocusController* focus_controller,
-        std::shared_ptr<shell::DisplayLayout> const& display_layout,
-        std::shared_ptr<scene::SessionCoordinator> const& session_coordinator);
-
-    void add_session(std::shared_ptr<scene::Session> const& session) override;
-
-    void remove_session(std::shared_ptr<scene::Session> const& session) override;
-
-    frontend::SurfaceId add_surface(
-        std::shared_ptr<scene::Session> const& session,
-        scene::SurfaceCreationParameters const& params,
-        std::function<frontend::SurfaceId(std::shared_ptr<scene::Session> const& session, scene::SurfaceCreationParameters const& params)> const& build) override;
-
-    void modify_surface(
-        std::shared_ptr<scene::Session> const& session,
-        std::shared_ptr<scene::Surface> const& surface,
-        shell::SurfaceSpecification const& modifications) override;
-
-    void remove_surface(
-        std::shared_ptr<scene::Session> const& session,
-        std::weak_ptr<scene::Surface> const& surface) override;
-
-    void add_display(geometry::Rectangle const& area) override;
-
-    void remove_display(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;
-
-    void handle_raise_surface(
-        std::shared_ptr<scene::Session> const& session,
-        std::shared_ptr<scene::Surface> const& surface,
-        uint64_t timestamp) override;
-
-    int set_surface_attribute(
-        std::shared_ptr<scene::Session> const& session,
-        std::shared_ptr<scene::Surface> const& surface,
-        MirSurfaceAttrib attrib,
-        int value) override;
-
-private:
-    shell::FocusController* const focus_controller;
-    std::shared_ptr<shell::DisplayLayout> const display_layout;
-    std::shared_ptr<scene::SessionCoordinator> const session_coordinator;
-};
-}
-}
-
-#endif /* MIR_SHELL_DEFAULT_WINDOW_MANAGER_H_ */

=== modified file 'playground/demo-shell/demo_shell.cpp'
--- playground/demo-shell/demo_shell.cpp	2016-01-29 08:18:22 +0000
+++ playground/demo-shell/demo_shell.cpp	2016-04-29 10:12:03 +0000
@@ -29,9 +29,6 @@
 #include "mir/compositor/display_buffer_compositor_factory.h"
 #include "mir/compositor/renderer_factory.h"
 #include "mir/options/option.h"
-#include "default_window_manager.h"
-#include "server_example_tiling_window_manager.h"
-#include "mir/shell/canonical_window_manager.h"
 #include "server_example_host_lifecycle_event_listener.h"
 
 #include <iostream>
@@ -71,13 +68,7 @@
 class DemoServerConfiguration : public mir::examples::ServerConfiguration
 {
 public:
-    DemoServerConfiguration(int argc, char const* argv[],
-                            std::initializer_list<std::shared_ptr<mi::EventFilter>> const& filter_list)
-      : ServerConfiguration(argc, argv),
-        filter_list(filter_list)
-    {
-    }
-
+    using mir::examples::ServerConfiguration::ServerConfiguration;
 
     std::shared_ptr<compositor::DisplayBufferCompositorFactory> the_display_buffer_compositor_factory() override
     {
@@ -89,45 +80,6 @@
             });
     }
 
-    std::shared_ptr<mi::CompositeEventFilter> the_composite_event_filter() override
-    {
-        return composite_event_filter(
-            [this]() -> std::shared_ptr<mi::CompositeEventFilter>
-            {
-                auto composite_filter = ServerConfiguration::the_composite_event_filter();
-                for (auto const& filter : filter_list)
-                    composite_filter->append(filter);
-
-                return composite_filter;
-            });
-    }
-
-    auto the_window_manager_builder() -> shell::WindowManagerBuilder override
-    {
-        return [this](shell::FocusController* focus_controller)
-            -> std::shared_ptr<msh::WindowManager>
-            {
-                auto const options = the_options();
-                auto const selection = options->get<std::string>(wm_option);
-
-                if (selection == wm_tiling)
-                {
-                    return std::make_shared<TilingWindowManager>(focus_controller);
-                }
-                else if (selection == wm_canonical)
-                {
-                    return std::make_shared<msh::CanonicalWindowManager>(
-                        focus_controller,
-                        the_shell_display_layout());
-                }
-
-                return std::make_shared<DefaultWindowManager>(
-                    focus_controller,
-                    the_shell_display_layout(),
-                    the_session_coordinator());
-            };
-    }
-
     std::shared_ptr<msh::HostLifecycleEventListener> the_host_lifecycle_event_listener() override
     {
        return host_lifecycle_event_listener(
@@ -136,9 +88,6 @@
                return std::make_shared<HostLifecycleEventListener>(the_logger());
            });
     }
-
-private:
-    std::vector<std::shared_ptr<mi::EventFilter>> const filter_list;
 };
 
 }
@@ -147,8 +96,9 @@
 int main(int argc, char const* argv[])
 try
 {
+    me::DemoServerConfiguration config(argc, argv);
+
     auto wm = std::make_shared<me::WindowManager>();
-    me::DemoServerConfiguration config(argc, argv, {wm});
 
     mir::run_mir(config, [&config, &wm](mir::DisplayServer&)
         {
@@ -158,6 +108,8 @@
             wm->set_display(config.the_display());
             wm->set_compositor(config.the_compositor());
             wm->set_input_scene(config.the_input_scene());
+
+            config.the_composite_event_filter()->prepend(wm);
         });
     return 0;
 }

=== modified file 'playground/server_configuration.cpp'
--- playground/server_configuration.cpp	2015-06-25 13:43:43 +0000
+++ playground/server_configuration.cpp	2016-04-29 10:12:03 +0000
@@ -28,12 +28,6 @@
 namespace me = mir::examples;
 namespace mg = mir::graphics;
 
-char const* const me::wm_option = "window-manager";
-char const* const me::wm_description = "window management strategy [{legacy|canonical|tiling}]";
-char const* const me::wm_tiling = "tiling";
-char const* const me::wm_legacy = "legacy";
-char const* const me::wm_canonical = "canonical";
-
 me::ServerConfiguration::ServerConfiguration(std::shared_ptr<options::DefaultConfiguration> const& configuration_options) :
     DefaultServerConfiguration(configuration_options)
 {
@@ -42,8 +36,6 @@
     configuration_options->add_options()
         (me::display_config_opt, po::value<std::string>()->default_value(me::clone_opt_val),
             me::display_config_descr);
-    configuration_options->add_options()
-        (wm_option, po::value<std::string>()->default_value(wm_legacy), wm_description);
 }
 
 me::ServerConfiguration::ServerConfiguration(int argc, char const** argv) :

=== modified file 'playground/server_configuration.h'
--- playground/server_configuration.h	2015-06-17 05:20:42 +0000
+++ playground/server_configuration.h	2016-04-29 10:12:03 +0000
@@ -43,12 +43,6 @@
 private:
     std::shared_ptr<input::EventFilter> quit_filter;
 };
-
-extern char const* const wm_option;
-extern char const* const wm_description;
-extern char const* const wm_tiling;
-extern char const* const wm_legacy;
-extern char const* const wm_canonical;
 }
 }