Merge lp:~alan-griffiths/mir/move-miral-to-mir-cleanup-playground into lp:mir

[Alan Griffiths]

Incorporate miral project into mir source tree

This is a third pass at removing code obsoleted by MirAL

=== modified file 'examples/miral-shell/CMakeLists.txt'
--- examples/miral-shell/CMakeLists.txt	2017-08-30 15:50:37 +0000
+++ examples/miral-shell/CMakeLists.txt	2017-08-30 15:50:38 +0000
@@ -1,70 +1,3 @@
-<<<<<<< TREE
-include_directories(
-        ${PROJECT_SOURCE_DIR}/include/miral
-        ${PROJECT_SOURCE_DIR}/include/client
-)
-
-add_subdirectory(spinner)
-add_subdirectory(desktop)
-
-add_custom_target(miral-run ALL
-    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-run.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-run
-)
-
-install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-run
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-)
-
-add_custom_target(miral-xrun ALL
-    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-xrun.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-xrun
-)
-
-install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-xrun
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-)
-
-add_custom_target(miral-screencast ALL
-    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-screencast.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-screencast
-)
-
-install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-screencast
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-)
-
-add_custom_target(miral-desktop ALL
-    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-desktop.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-desktop
-)
-
-install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-desktop
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-)
-
-add_custom_target(miral-app ALL
-    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-app.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-app
-)
-
-install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-app
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-)
-
-mir_add_wrapped_executable(miral-shell
-    shell_main.cpp
-    tiling_window_manager.cpp   tiling_window_manager.h
-        floating_window_manager.cpp floating_window_manager.h
-    decoration_provider.cpp     decoration_provider.h
-    titlebar_config.cpp         titlebar_config.h
-)
-
-pkg_check_modules(FREETYPE freetype2 REQUIRED)
-target_include_directories(miral-shell PRIVATE ${FREETYPE_INCLUDE_DIRS})
-target_compile_definitions(miral-shell PRIVATE -DTYPO_SUPPORTS_FREETYPE)
-target_link_libraries(miral-shell
-    miral-spinner
-    miral
-    ${FREETYPE_LIBRARIES}
-)
-
-=======
 include_directories(
         ${PROJECT_SOURCE_DIR}/include/miral
         ${PROJECT_SOURCE_DIR}/include/client
@@ -134,4 +67,3 @@
     miral
 )
 
->>>>>>> MERGE-SOURCE
 
=== modified file 'include/miral/miral/command_line_option.h'
--- include/miral/miral/command_line_option.h	2017-08-30 15:50:37 +0000
+++ include/miral/miral/command_line_option.h	2017-08-30 15:50:38 +0000
@@ -1,114 +1,3 @@
-<<<<<<< TREE
-/*
- * Copyright © 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 version 2 or 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 MIRAL_COMMAND_LINE_OPTION_H
-#define MIRAL_COMMAND_LINE_OPTION_H
-
-#include <mir/optional_value.h>
-
-#include <functional>
-#include <memory>
-#include <string>
-
-namespace mir { class Server; }
-
-namespace miral
-{
-/// Add a user configuration option to Mir's option handling.
-/// By default the callback will be invoked following Mir initialisation but
-/// prior to the server starting. The value supplied to the callback will come
-/// from the command line, environment variable, config file or the default.
-///
-/// \note Except for re-ordering implied by "pre_init()" the callbacks will be
-/// invoked in the order supplied.
-class CommandLineOption
-{
-public:
-    CommandLineOption(
-        std::function<void(int value)> callback,
-        std::string const& option,
-        std::string const& description,
-        int default_value);
-
-    CommandLineOption(
-        std::function<void(double value)> callback,
-        std::string const& option,
-        std::string const& description,
-        double default_value);
-
-    CommandLineOption(
-        std::function<void(std::string const& value)> callback,
-        std::string const& option,
-        std::string const& description,
-        std::string const& default_value);
-
-    CommandLineOption(
-        std::function<void(std::string const& value)> callback,
-        std::string const& option,
-        std::string const& description,
-        char const* default_value);
-
-    CommandLineOption(
-        std::function<void(bool value)> callback,
-        std::string const& option,
-        std::string const& description,
-        bool default_value);
-
-    CommandLineOption(
-        std::function<void(mir::optional_value<int> const& value)> callback,
-        std::string const& option,
-        std::string const& description);
-
-    CommandLineOption(
-        std::function<void(mir::optional_value<std::string> const& value)> callback,
-        std::string const& option,
-        std::string const& description);
-
-    CommandLineOption(
-        std::function<void(mir::optional_value<bool> const& value)> callback,
-        std::string const& option,
-        std::string const& description);
-
-    CommandLineOption(
-        std::function<void(bool is_set)> callback,
-        std::string const& option,
-        std::string const& description);
-
-    void operator()(mir::Server& server) const;
-
-    // Call the callback *before* Mir initialization starts
-    friend auto pre_init(CommandLineOption const& clo) -> CommandLineOption;
-
-    ~CommandLineOption();
-    CommandLineOption(CommandLineOption const&);
-    auto operator=(CommandLineOption const&) -> CommandLineOption&;
-
-private:
-    struct Self;
-    std::shared_ptr<Self> self;
-};
-
-auto pre_init(CommandLineOption const& clo) -> CommandLineOption;
-}
-
-#endif //MIRAL_COMMAND_LINE_OPTION_H
-=======
 /*
  * Copyright © 2016 Canonical Ltd.
  *
@@ -223,4 +112,3 @@
 }
 
 #endif //MIRAL_COMMAND_LINE_OPTION_H
->>>>>>> MERGE-SOURCE
 
=== modified file 'include/miral/miral/window_management_policy_addendum3.h'
--- include/miral/miral/window_management_policy_addendum3.h	2017-08-30 15:50:37 +0000
+++ include/miral/miral/window_management_policy_addendum3.h	2017-08-30 15:50:38 +0000
@@ -1,73 +1,3 @@
-<<<<<<< TREE
-/*
- * Copyright © 2017 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 or 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 MIRAL_WINDOW_MANAGEMENT_POLICY_ADDENDUM3_H
-#define MIRAL_WINDOW_MANAGEMENT_POLICY_ADDENDUM3_H
-
-#include <mir_toolkit/client_types.h>
-
-#include <mir/geometry/rectangles.h>
-#include <mir_toolkit/mir_version_number.h>
-
-namespace miral
-{
-using namespace mir::geometry;
-struct WindowInfo;
-
-/**
- *  Handle additional client requests.
- *
- *  \note This interface is intended to be implemented by a WindowManagementPolicy
- *  implementation, we can't add these functions directly to that interface without
- *  breaking ABI (the vtab could be incompatible).
- *  When initializing the window manager this interface will be detected by
- *  dynamic_cast and registered accordingly.
- */
-class WindowManagementPolicyAddendum3
-{
-public:
-    /** Confirm (and optionally adjust) the placement of a window on the display.
-     * Called when (re)placing fullscreen, maximized, horizontally maximised and
-     * vertically maximized windows to allow adjustment for decorations.
-     *
-     * @param window_info   the window
-     * @param new_placement the suggested placement
-     *
-     * @return the confirmed placement of the window
-     */
-    virtual auto confirm_placement_on_display(
-        WindowInfo const& window_info,
-        MirWindowState new_state,
-        Rectangle const& new_placement) -> Rectangle = 0;
-
-    virtual ~WindowManagementPolicyAddendum3() = default;
-    WindowManagementPolicyAddendum3() = default;
-    WindowManagementPolicyAddendum3(WindowManagementPolicyAddendum3 const&) = delete;
-    WindowManagementPolicyAddendum3& operator=(WindowManagementPolicyAddendum3 const&) = delete;
-};
-#if MIRAL_VERSION >= MIR_VERSION_NUMBER(2, 0, 0)
-#error "We've presumably broken ABI - please roll this interface into WindowManagementPolicy"
-#endif
-}
-
-#endif //MIRAL_WINDOW_MANAGEMENT_POLICY_ADDENDUM3_H
-=======
 /*
  * Copyright © 2017 Canonical Ltd.
  *
@@ -137,4 +67,3 @@
 }
 
 #endif //MIRAL_WINDOW_MANAGEMENT_POLICY_ADDENDUM3_H
->>>>>>> MERGE-SOURCE
 
=== modified file 'include/server/mir/compositor/scene_element.h'
--- include/server/mir/compositor/scene_element.h	2017-07-28 17:00:43 +0000
+++ include/server/mir/compositor/scene_element.h	2017-08-30 15:50:38 +0000
@@ -39,10 +39,6 @@
     virtual void rendered() = 0;
     virtual void occluded() = 0;
 
-    //TODO: Decoration is opaque on purpose. It is only used by an internal example,
-    //      and this function should be removed from the public API.
-    virtual std::unique_ptr<Decoration> decoration() const = 0; 
-
 protected:
     SceneElement() = default;
     SceneElement(SceneElement const&) = delete;
 
=== modified file 'include/server/mir/scene/surface.h'
--- include/server/mir/scene/surface.h	2017-07-28 17:00:43 +0000
+++ include/server/mir/scene/surface.h	2017-08-30 15:50:38 +0000
@@ -66,7 +66,6 @@
     virtual graphics::RenderableList generate_renderables(compositor::CompositorID id) const = 0; 
     virtual int buffers_ready_for_compositor(void const* compositor_id) const = 0;
 
-    virtual float alpha() const = 0; //only used in examples/
     virtual MirWindowType type() const = 0;
     virtual MirWindowState state() const = 0;
     virtual void hide() = 0;
 
=== modified file 'include/test/mir/test/doubles/stub_surface.h'
--- include/test/mir/test/doubles/stub_surface.h	2017-07-28 17:00:43 +0000
+++ include/test/mir/test/doubles/stub_surface.h	2017-08-30 15:50:38 +0000
@@ -32,7 +32,6 @@
 {
     std::string name() const override;
     void move_to(geometry::Point const& top_left) override;
-    float alpha() const override;
     geometry::Size size() const override;
     geometry::Size client_size() const override;
     std::shared_ptr<frontend::BufferStream> primary_buffer_stream() const override;
 
=== modified file 'playground/CMakeLists.txt'
--- playground/CMakeLists.txt	2017-08-30 15:50:37 +0000
+++ playground/CMakeLists.txt	2017-08-30 15:50:38 +0000
@@ -1,27 +1,6 @@
-
 include_directories(
-  ${PROJECT_SOURCE_DIR}/src/include/server
-  ${PROJECT_SOURCE_DIR}/src/include/platform
-  ${PROJECT_SOURCE_DIR}/src/include/common
-  ${PROJECT_SOURCE_DIR}/src/include/gl
-  ${PROJECT_SOURCE_DIR}/src/include/client
-  ${PROJECT_SOURCE_DIR}/src/renderers
   ${PROJECT_SOURCE_DIR}/include/client
-  ${PROJECT_SOURCE_DIR}/include/server
-  ${PROJECT_SOURCE_DIR}/include/platform
-  ${PROJECT_SOURCE_DIR}/include/renderer
-  ${PROJECT_SOURCE_DIR}/include/renderers/gl
-  ${PROJECT_SOURCE_DIR}/examples/
-)
-
-add_library(playgroundserverconfig STATIC
-    server_configuration.cpp
-    server_example_display_configuration_policy.cpp
-)
-
-add_subdirectory(demo-shell/)
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+)
 
 mir_add_wrapped_executable(mir_demo_client_egldiamond_render_surface
     egldiamond_render_surface.c
 
=== removed directory 'playground/demo-shell'
=== removed file 'playground/demo-shell/CMakeLists.txt'
--- playground/demo-shell/CMakeLists.txt	2017-05-08 03:04:26 +0000
+++ playground/demo-shell/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-add_library(demo-shell STATIC
-  demo_compositor.cpp
-  demo_renderer.cpp
-  window_manager.cpp
-)
-
-add_subdirectory(typo)
-target_link_libraries(demo-shell typo)
-
-mir_add_wrapped_executable(mir_proving_server
-  demo_shell.cpp
-)
-
-target_link_libraries(mir_proving_server
-  demo-shell
-  mirserver
-  playgroundserverconfig
-  exampleserverconfig
-)
 
=== removed file 'playground/demo-shell/demo_compositor.cpp'
--- playground/demo-shell/demo_compositor.cpp	2017-07-28 17:00:43 +0000
+++ playground/demo-shell/demo_compositor.cpp	1970-01-01 00:00:00 +0000
@@ -1,204 +0,0 @@
-/*
- * Copyright © 2014 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 2 or 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: Kevin DuBois <[e-mail]>
- */
-
-#include "mir/graphics/display_buffer.h"
-#include "mir/compositor/compositor_report.h"
-#include "mir/compositor/scene_element.h"
-#include "demo_compositor.h"
-
-namespace me = mir::examples;
-namespace mg = mir::graphics;
-namespace mc = mir::compositor;
-namespace geom = mir::geometry;
-
-std::mutex                              me::DemoCompositor::instances_mutex;
-std::unordered_set<me::DemoCompositor*> me::DemoCompositor::instances;
-
-me::DemoCompositor::DemoCompositor(
-    mg::DisplayBuffer& display_buffer,
-    std::shared_ptr<mc::CompositorReport> const& report) :
-    display_buffer(display_buffer),
-    report(report),
-    viewport(display_buffer.view_area()),
-    zoom_mag{1.0f},
-    renderer(
-        display_buffer,
-        30.0f, //titlebar_height
-        80.0f) //shadow_radius
-{
-    std::lock_guard<std::mutex> lock(instances_mutex);
-    instances.insert(this);
-}
-
-me::DemoCompositor::~DemoCompositor()
-{
-    std::lock_guard<std::mutex> lock(instances_mutex);
-    instances.erase(this);
-}
-
-void me::DemoCompositor::for_each(std::function<void(DemoCompositor&)> f)
-{
-    std::lock_guard<std::mutex> lock(instances_mutex);
-    for (auto& i : instances)
-        f(*i);
-}
-
-void me::DemoCompositor::composite(mc::SceneElementSequence&& elements)
-{
-    report->began_frame(this);
-    //a simple filtering out of renderables that shouldn't be drawn
-    //the elements should be notified if they are rendered or not
-    bool nonrenderlist_elements{false};
-    mg::RenderableList renderable_list;
-    DecorMap decorated;
-
-    for(auto const& it : elements)
-    {
-        auto const& renderable = it->renderable();
-        
-        bool embellished = false;
-        if (auto decor = it->decoration())
-        {
-            embellished = decor->type != mc::Decoration::Type::none;
-            decorated[renderable->id()] = std::move(decor);
-        }
-
-        if (embellished || viewport.overlaps(renderable->screen_position()))
-        {
-            renderable_list.push_back(renderable);
-
-            /*
-             * TODO: This logic could be replaced more cleanly in future by
-             *       the surface stack logic setting decoration status more
-             *       accurately for fullscreen surfaces.
-             */
-            // Fullscreen and opaque? Definitely no embellishment
-            if (renderable->screen_position() == viewport &&
-                renderable->alpha() == 1.0f &&
-                !renderable->shaped() &&
-                renderable->transformation() == glm::mat4())
-            {
-                embellished = false;
-                nonrenderlist_elements = false; // Don't care what's underneath
-            }
-
-            it->rendered();
-        }
-        else
-        {
-            it->occluded();
-        }
-        nonrenderlist_elements |= embellished;
-    }
-
-    /*
-     * Note: Buffer lifetimes are ensured by the two objects holding
-     *       references to them; elements and renderable_list.
-     *       So no buffer is going to be released back to the client till
-     *       both of those containers get destroyed (end of the function).
-     *       Actually, there's a third reference held by the texture cache
-     *       in GLRenderer, but that gets released earlier in render().
-     */
-    elements.clear();  // Release those that didn't make it to renderable_list
-
-    if (!nonrenderlist_elements &&
-        viewport == display_buffer.view_area() &&  // no bypass while zoomed
-        display_buffer.overlay(renderable_list))
-    {
-        report->renderables_in_frame(this, renderable_list);
-        renderer.suspend();
-    }
-    else
-    {
-        renderer.set_output_transform(display_buffer.transformation());
-        update_viewport();
-        renderer.set_viewport(viewport);
-        renderer.begin(std::move(decorated));
-        renderer.render(renderable_list);
-
-        report->renderables_in_frame(this, renderable_list);
-        report->rendered_frame(this);
-
-        // Release buffers back to the clients now that the swap has returned.
-        // It's important to do this before starting on the potentially slow
-        // flip() ...
-        // FIXME: This clear() call is blocking a little (LP: #1395421)
-        renderable_list.clear();
-    }
-
-    report->finished_frame(this);
-}
-
-void me::DemoCompositor::on_cursor_movement(
-    geometry::Point const& p)
-{
-    cursor_pos = p;
-    if (zoom_mag != 1.0f)
-        update_viewport();
-}
-
-void me::DemoCompositor::zoom(float mag)
-{
-    zoom_mag = mag;
-    update_viewport();
-}
-
-void me::DemoCompositor::set_colour_effect(me::ColourEffect e)
-{
-    renderer.set_colour_effect(e);
-}
-
-void me::DemoCompositor::update_viewport()
-{
-    auto const& view_area = display_buffer.view_area();
-
-    if (zoom_mag == 1.0f)
-    {
-        // The below calculations should yield the same result as this, but
-        // just in case there are any floating point precision errors,
-        // set it precisely:
-        viewport = view_area;
-    }
-    else
-    {
-        int db_width = view_area.size.width.as_int();
-        int db_height = view_area.size.height.as_int();
-        int db_x = view_area.top_left.x.as_int();
-        int db_y = view_area.top_left.y.as_int();
-    
-        float zoom_width = db_width / zoom_mag;
-        float zoom_height = db_height / zoom_mag;
-    
-        // Note the 0.5f. This is because cursors (and all input in general)
-        // measures coordinates at the centre of a pixel. But GL measures to
-        // the top-left corner of a pixel.
-        float screen_x = cursor_pos.x.as_int() + 0.5f - db_x;
-        float screen_y = cursor_pos.y.as_int() + 0.5f - db_y;
-
-        float normal_x = screen_x / db_width;
-        float normal_y = screen_y / db_height;
-    
-        // Position the viewport so the cursor location matches up.
-        // This assumes the hardware cursor still traverses the physical
-        // screen and isn't being warped.
-        int zoom_x = db_x + (db_width - zoom_width) * normal_x;
-        int zoom_y = db_y + (db_height - zoom_height) * normal_y;
-
-        viewport = {{zoom_x, zoom_y}, {zoom_width, zoom_height}};
-    }
-}
 
=== removed file 'playground/demo-shell/demo_compositor.h'
--- playground/demo-shell/demo_compositor.h	2017-07-28 17:00:43 +0000
+++ playground/demo-shell/demo_compositor.h	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright © 2014 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 2 or 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: Kevin DuBois <[e-mail]>
- */
-
-#ifndef MIR_EXAMPLES_DEMO_COMPOSITOR_H_
-#define MIR_EXAMPLES_DEMO_COMPOSITOR_H_
-
-#include "mir/compositor/display_buffer_compositor.h"
-#include "mir/compositor/scene.h"
-#include "mir/geometry/rectangle.h"
-#include "mir/graphics/renderable.h"
-#include "demo_renderer.h"
-
-#include <mutex>
-#include <set>
-
-namespace mir
-{
-namespace compositor
-{
-class Scene;
-class CompositorReport;
-}
-namespace graphics
-{
-class DisplayBuffer;
-}
-namespace examples
-{
-
-class DemoCompositor : public compositor::DisplayBufferCompositor
-{
-public:
-    DemoCompositor(
-        graphics::DisplayBuffer& display_buffer,
-        std::shared_ptr<compositor::CompositorReport> const& report);
-    ~DemoCompositor();
-
-    void composite(compositor::SceneElementSequence&& elements) override;
-
-    void zoom(float mag);
-    void on_cursor_movement(geometry::Point const& p);
-
-    void set_colour_effect(ColourEffect);
-
-    static void for_each(std::function<void(DemoCompositor&)> f);
-
-private:
-    void update_viewport();
-
-    graphics::DisplayBuffer& display_buffer;
-    std::shared_ptr<compositor::CompositorReport> const report;
-    geometry::Rectangle viewport;
-    geometry::Point cursor_pos;
-    float zoom_mag;
-    DemoRenderer renderer;
-
-    static std::mutex instances_mutex;
-    static std::unordered_set<DemoCompositor*> instances;
-};
-
-} // namespace examples
-} // namespace mir
-
-#endif // MIR_EXAMPLES_DEMO_COMPOSITOR_H_
 
=== removed file 'playground/demo-shell/demo_renderer.cpp'
--- playground/demo-shell/demo_renderer.cpp	2017-07-28 17:00:43 +0000
+++ playground/demo-shell/demo_renderer.cpp	1970-01-01 00:00:00 +0000
@@ -1,402 +0,0 @@
-/*
- * Copyright © 2014 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 2 or 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: Daniel van Vugt <[e-mail]>
- */
-
-#define MIR_LOG_COMPONENT "DemoRenderer"
-
-#include "typo_stub_renderer.h"
-#ifdef TYPO_SUPPORTS_FREETYPE
-#include "typo_freetype_renderer.h"
-#endif
-#include "demo_renderer.h"
-#include <mir/graphics/renderable.h>
-#include <mir/log.h>
-#include <cmath>
-
-using namespace mir;
-using namespace mir::examples;
-using namespace mir::geometry;
-using namespace mir::compositor;
-using namespace mir::renderer;
-
-namespace
-{
-
-struct Color
-{
-     GLubyte r, g, b, a;
-};
-
-float penumbra_curve(float x)
-{
-    return 1.0f - std::sin(x * M_PI / 2.0f);
-}
-
-GLuint generate_shadow_corner_texture(float opacity)
-{
-    struct Texel
-    {
-        GLubyte luminance;
-        GLubyte alpha;
-    };
-
-    int const width = 256;
-    Texel image[width][width];
-
-    int const max = width - 1;
-    for (int y = 0; y < width; ++y)
-    {
-        float curve_y = opacity * 255.0f *
-                        penumbra_curve(static_cast<float>(y) / max);
-        for (int x = 0; x < width; ++x)
-        {
-            Texel *t = &image[y][x];
-            t->luminance = 0;
-            t->alpha = curve_y * penumbra_curve(static_cast<float>(x) / max);
-        }
-    }
-
-    GLuint corner;
-    glGenTextures(1, &corner);
-    glBindTexture(GL_TEXTURE_2D, corner);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA,
-                 width, width, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE,
-                 image);
-
-    return corner;
-}
-
-GLuint generate_frame_corner_texture(float corner_radius,
-                                     Color const& color,
-                                     GLubyte highlight)
-{
-    int const height = 256;
-/*
- * GCC 4.9 with optimizations enabled will generate armhf NEON/VFP instructions
- * here that are not understood/implemented by Valgrind (but are by hardware),
- * causing Valgrind to crash:
- *   eebe 0acc       vcvt.s32.f32    s0, s0, #8
- * So this clumsy expression below tricks the compiler into not using those
- * optimized ARM instructions that Valgrind doesn't support yet:
- */
-    int const width = height / (1.0f / corner_radius);
-    Color image[height * height]; // Worst case still much faster than the heap
-
-    int const cx = width;
-    int const cy = cx;
-    int const radius_sqr = cx * cy;
-
-    for (int y = 0; y < height; ++y)
-    {
-        for (int x = 0; x < width; ++x)
-        {
-            Color col = color;
-
-            // Set gradient
-            if (y < cy)
-            {
-                float brighten = (1.0f - (static_cast<float>(y) / cy)) *
-                                 std::sin(x * M_PI / (2 * (width - 1)));
-
-                col.r += (highlight - col.r) * brighten;
-                col.g += (highlight - col.g) * brighten;
-                col.b += (highlight - col.b) * brighten;
-            }
-
-            // Cut out the corner in a circular shape.
-            if (x < cx && y < cy)
-            {
-                int dx = cx - x;
-                int dy = cy - y;
-                if (dx * dx + dy * dy >= radius_sqr)
-                    col = {0, 0, 0, 0};
-            }
-
-            image[y * width + x] = col;
-        }
-    }
-
-    GLuint corner;
-    glGenTextures(1, &corner);
-    glBindTexture(GL_TEXTURE_2D, corner);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-                                   GL_LINEAR_MIPMAP_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
-                 width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-                 image);
-    glGenerateMipmap(GL_TEXTURE_2D); // Antialiasing please
-
-    return corner;
-}
-
-static const GLchar inverse_fshader[] =
-{
-    "#ifdef GL_ES\n"
-    "precision mediump float;\n"
-    "#endif\n"
-    "uniform sampler2D tex;\n"
-    "uniform float alpha;\n"
-    "varying vec2 v_texcoord;\n"
-    "void main() {\n"
-    "    vec4 f = texture2D(tex, v_texcoord);\n"
-    "    vec3 inverted = (vec3(1.0) - (f.rgb / f.a)) * f.a;\n"
-    "    gl_FragColor = alpha*vec4(inverted, f.a);\n"
-    "}\n"
-};
-static const GLchar contrast_fshader[] =
-{
-    "#ifdef GL_ES\n"
-    "precision mediump float;\n"
-    "#endif\n"
-    "uniform sampler2D tex;\n"
-    "uniform float alpha;\n"
-    "varying vec2 v_texcoord;\n"
-    "void main() {\n"
-    "    vec4 raw = texture2D(tex, v_texcoord);\n"
-    "    vec3 bent = (1.0 - cos(raw.rgb * 3.141592654)) / 2.0;\n"
-    "    gl_FragColor = alpha * vec4(bent, raw.a);\n"
-    "}\n"
-};
-
-} // namespace
-
-DemoRenderer::DemoRenderer(
-    graphics::DisplayBuffer& display_buffer,
-    float const titlebar_height,
-    float const shadow_radius) :
-    renderer::gl::Renderer(display_buffer),
-    titlebar_height{titlebar_height},
-    shadow_radius{shadow_radius},
-    corner_radius{0.5f},
-    colour_effect{none},
-    inverse_program(family.add_program(vshader, inverse_fshader)),
-    contrast_program(family.add_program(vshader, contrast_fshader)),
-    title_cache(std::make_shared<typo::StubRenderer>())
-{
-    shadow_corner_tex = generate_shadow_corner_texture(0.4f);
-    titlebar_corner_tex = generate_frame_corner_texture(corner_radius,
-                                                        {128,128,128,255},
-                                                        255);
-
-    clear_color[0] = clear_color[1] = clear_color[2] = 0.2f;
-    clear_color[3] = 1.0f;
-
-#ifdef TYPO_SUPPORTS_FREETYPE
-    const char title_font_path[] = "/usr/share/fonts/truetype/liberation/LiberationSans-Bold.ttf";
-    auto ftrenderer = std::make_shared<typo::FreetypeRenderer>();
-    if (ftrenderer->load(title_font_path, 128))
-        title_cache.change_renderer(ftrenderer);
-    else
-        mir::log_error("Failed to load titlebar font: %s", title_font_path);
-#endif
-}
-
-DemoRenderer::~DemoRenderer()
-{
-    glDeleteTextures(1, &shadow_corner_tex);
-    glDeleteTextures(1, &titlebar_corner_tex);
-}
-
-void DemoRenderer::begin(DecorMap&& d) const
-{
-    decor_map = std::move(d);
-    title_cache.drop_unused();
-    title_cache.mark_all_unused();
-}
-
-void DemoRenderer::tessellate(std::vector<gl::Primitive>& primitives,
-                              graphics::Renderable const& renderable) const
-{
-    renderer::gl::Renderer::tessellate(primitives, renderable);
-    auto d = decor_map.find(renderable.id());
-    if (d != decor_map.end())
-    {
-        auto& decor = d->second;
-        if (decor->type != Decoration::Type::none)
-        {
-            tessellate_shadow(primitives, renderable, shadow_radius);
-            tessellate_frame(primitives, renderable, titlebar_height,
-                             decor->name.c_str());
-        }
-    }
-}
-
-void DemoRenderer::tessellate_shadow(std::vector<gl::Primitive>& primitives,
-                                     graphics::Renderable const& renderable,
-                                     float radius) const
-{
-    auto const& rect = renderable.screen_position();
-    GLfloat left = rect.top_left.x.as_int();
-    GLfloat right = left + rect.size.width.as_int();
-    GLfloat top = rect.top_left.y.as_int();
-    GLfloat bottom = top + rect.size.height.as_int();
-
-    auto n = primitives.size();
-    primitives.resize(n + 8);
-
-    GLfloat rightr = right + radius;
-    GLfloat leftr = left - radius;
-    GLfloat topr = top - radius;
-    GLfloat bottomr = bottom + radius;
-
-    auto& right_shadow = primitives[n++];
-    right_shadow.tex_id = shadow_corner_tex;
-    right_shadow.vertices[0] = {{right,  top,    0.0f}, {0.0f, 0.0f}};
-    right_shadow.vertices[1] = {{rightr, top,    0.0f}, {1.0f, 0.0f}};
-    right_shadow.vertices[2] = {{rightr, bottom, 0.0f}, {1.0f, 0.0f}};
-    right_shadow.vertices[3] = {{right,  bottom, 0.0f}, {0.0f, 0.0f}};
-
-    auto& left_shadow = primitives[n++];
-    left_shadow.tex_id = shadow_corner_tex;
-    left_shadow.vertices[0] = {{leftr, top,    0.0f}, {1.0f, 0.0f}};
-    left_shadow.vertices[1] = {{left,  top,    0.0f}, {0.0f, 0.0f}};
-    left_shadow.vertices[2] = {{left,  bottom, 0.0f}, {0.0f, 0.0f}};
-    left_shadow.vertices[3] = {{leftr, bottom, 0.0f}, {1.0f, 0.0f}};
-
-    auto& top_shadow = primitives[n++];
-    top_shadow.tex_id = shadow_corner_tex;
-    top_shadow.vertices[0] = {{left,  topr, 0.0f}, {1.0f, 0.0f}};
-    top_shadow.vertices[1] = {{right, topr, 0.0f}, {1.0f, 0.0f}};
-    top_shadow.vertices[2] = {{right, top,  0.0f}, {0.0f, 0.0f}};
-    top_shadow.vertices[3] = {{left,  top,  0.0f}, {0.0f, 0.0f}};
-
-    auto& bottom_shadow = primitives[n++];
-    bottom_shadow.tex_id = shadow_corner_tex;
-    bottom_shadow.vertices[0] = {{left,  bottom,  0.0f}, {0.0f, 0.0f}};
-    bottom_shadow.vertices[1] = {{right, bottom,  0.0f}, {0.0f, 0.0f}};
-    bottom_shadow.vertices[2] = {{right, bottomr, 0.0f}, {1.0f, 0.0f}};
-    bottom_shadow.vertices[3] = {{left,  bottomr, 0.0f}, {1.0f, 0.0f}};
-
-    auto& tr_shadow = primitives[n++];
-    tr_shadow.tex_id = shadow_corner_tex;
-    tr_shadow.vertices[0] = {{right,  top,  0.0f}, {0.0f, 0.0f}};
-    tr_shadow.vertices[1] = {{right,  topr, 0.0f}, {1.0f, 0.0f}};
-    tr_shadow.vertices[2] = {{rightr, topr, 0.0f}, {1.0f, 1.0f}};
-    tr_shadow.vertices[3] = {{rightr, top,  0.0f}, {0.0f, 1.0f}};
-
-    auto& br_shadow = primitives[n++];
-    br_shadow.tex_id = shadow_corner_tex;
-    br_shadow.vertices[0] = {{right,  bottom,  0.0f}, {0.0f, 0.0f}};
-    br_shadow.vertices[1] = {{rightr, bottom,  0.0f}, {1.0f, 0.0f}};
-    br_shadow.vertices[2] = {{rightr, bottomr, 0.0f}, {1.0f, 1.0f}};
-    br_shadow.vertices[3] = {{right,  bottomr, 0.0f}, {0.0f, 1.0f}};
-
-    auto& bl_shadow = primitives[n++];
-    bl_shadow.tex_id = shadow_corner_tex;
-    bl_shadow.vertices[0] = {{left,  bottom,  0.0f}, {0.0f, 0.0f}};
-    bl_shadow.vertices[1] = {{left,  bottomr, 0.0f}, {1.0f, 0.0f}};
-    bl_shadow.vertices[2] = {{leftr, bottomr, 0.0f}, {1.0f, 1.0f}};
-    bl_shadow.vertices[3] = {{leftr, bottom,  0.0f}, {0.0f, 1.0f}};
-
-    auto& tl_shadow = primitives[n++];
-    tl_shadow.tex_id = shadow_corner_tex;
-    tl_shadow.vertices[0] = {{left,  top,  0.0f}, {0.0f, 0.0f}};
-    tl_shadow.vertices[1] = {{leftr, top,  0.0f}, {1.0f, 0.0f}};
-    tl_shadow.vertices[2] = {{leftr, topr, 0.0f}, {1.0f, 1.0f}};
-    tl_shadow.vertices[3] = {{left,  topr, 0.0f}, {0.0f, 1.0f}};
-}
-
-void DemoRenderer::tessellate_frame(std::vector<gl::Primitive>& primitives,
-                                    graphics::Renderable const& renderable,
-                                    float titlebar_height,
-                                    char const* name) const
-{
-    auto const& rect = renderable.screen_position();
-    GLfloat left = rect.top_left.x.as_int();
-    GLfloat right = left + rect.size.width.as_int();
-    GLfloat top = rect.top_left.y.as_int();
-
-    auto n = primitives.size();
-    primitives.resize(n + 4);
-
-    GLfloat htop = top - titlebar_height;
-    GLfloat in = titlebar_height * corner_radius;
-    GLfloat inleft = left + in;
-    GLfloat inright = right - in;
-
-    GLfloat mid = (left + right) / 2.0f;
-    if (inleft > mid) inleft = mid;
-    if (inright < mid) inright = mid;
-
-    auto& top_left_corner = primitives[n++];
-    top_left_corner.tex_id = titlebar_corner_tex;
-    top_left_corner.vertices[0] = {{left,   htop, 0.0f}, {0.0f, 0.0f}};
-    top_left_corner.vertices[1] = {{inleft, htop, 0.0f}, {1.0f, 0.0f}};
-    top_left_corner.vertices[2] = {{inleft, top,  0.0f}, {1.0f, 1.0f}};
-    top_left_corner.vertices[3] = {{left,   top,  0.0f}, {0.0f, 1.0f}};
-
-    auto& top_right_corner = primitives[n++];
-    top_right_corner.tex_id = titlebar_corner_tex;
-    top_right_corner.vertices[0] = {{inright, htop, 0.0f}, {1.0f, 0.0f}};
-    top_right_corner.vertices[1] = {{right,   htop, 0.0f}, {0.0f, 0.0f}};
-    top_right_corner.vertices[2] = {{right,   top,  0.0f}, {0.0f, 1.0f}};
-    top_right_corner.vertices[3] = {{inright, top,  0.0f}, {1.0f, 1.0f}};
-
-    auto& titlebar = primitives[n++];
-    titlebar.tex_id = titlebar_corner_tex;
-    titlebar.vertices[0] = {{inleft,  htop, 0.0f}, {1.0f, 0.0f}};
-    titlebar.vertices[1] = {{inright, htop, 0.0f}, {1.0f, 0.0f}};
-    titlebar.vertices[2] = {{inright, top,  0.0f}, {1.0f, 1.0f}};
-    titlebar.vertices[3] = {{inleft,  top,  0.0f}, {1.0f, 1.0f}};
-
-    auto str = title_cache.get(name);
-    GLfloat text_vin = titlebar_height / 5;
-    GLfloat text_top = htop + text_vin;
-    GLfloat text_bot = top - text_vin;
-    GLfloat text_height = text_bot - text_top;
-    GLfloat text_scale = text_height / str.height;
-    GLfloat text_left = inleft;
-    GLfloat text_right = text_left + text_scale * str.width;
-    GLfloat text_u = 1.0f;
-    if (text_right > inright)  // Title too long for window
-    {
-        text_u = (inright - text_left) / (text_right - text_left);
-        text_right = inright;
-    }
-
-    auto& text_prim = primitives[n++];
-    text_prim.tex_id = str.tex;
-    text_prim.vertices[0] = {{text_left,  text_top, 0.0f}, {0.0f, 0.0f}};
-    text_prim.vertices[1] = {{text_right, text_top, 0.0f}, {text_u, 0.0f}};
-    text_prim.vertices[2] = {{text_right, text_bot, 0.0f}, {text_u, 1.0f}};
-    text_prim.vertices[3] = {{text_left,  text_bot, 0.0f}, {0.0f, 1.0f}};
-}
-
-void DemoRenderer::set_colour_effect(ColourEffect e)
-{
-    colour_effect = e;
-}
-
-void DemoRenderer::draw(graphics::Renderable const& renderable,
-                        renderer::gl::Renderer::Program const& current_program) const
-{
-    const renderer::gl::Renderer::Program* const programs[ColourEffect::neffects] =
-    {
-        &current_program,
-        &inverse_program,
-        &contrast_program
-    };
-
-    renderer::gl::Renderer::draw(renderable, *programs[colour_effect]);
-}
 
=== removed file 'playground/demo-shell/demo_renderer.h'
--- playground/demo-shell/demo_renderer.h	2017-07-28 17:00:43 +0000
+++ playground/demo-shell/demo_renderer.h	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-/*
- * Copyright © 2014 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 2 or 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: Daniel van Vugt <[e-mail]>
- */
-
-#ifndef MIR_EXAMPLES_DEMO_RENDERER_H_
-#define MIR_EXAMPLES_DEMO_RENDERER_H_
-
-#include "gl/renderer.h"
-#include "mir/compositor/decoration.h"
-#include "typo_glcache.h"
-
-#include <unordered_map>
-
-namespace mir
-{
-namespace examples
-{
-
-enum ColourEffect
-{
-    none,
-    inverse,
-    contrast,
-    neffects
-};
-
-typedef std::unordered_map<graphics::Renderable::ID,
-                           std::unique_ptr<compositor::Decoration>> DecorMap;
-
-class DemoRenderer : public renderer::gl::Renderer
-{
-public:
-    DemoRenderer(
-        graphics::DisplayBuffer& display_buffer,
-        float const titlebar_height,
-        float const shadow_radius);
-    ~DemoRenderer();
-
-    void begin(DecorMap&&) const;
-    void set_colour_effect(ColourEffect);
-
-protected:
-    void tessellate(std::vector<gl::Primitive>& primitives,
-                    graphics::Renderable const& renderable) const override;
-
-    void draw(graphics::Renderable const& renderable,
-              Renderer::Program const& prog) const override;
-
-private:
-    void tessellate_shadow(
-        std::vector<gl::Primitive>& primitives,
-        graphics::Renderable const& renderable,
-        float radius) const;
-    void tessellate_frame(
-        std::vector<gl::Primitive>& primitives,
-        graphics::Renderable const& renderable,
-        float titlebar_height,
-        char const* name) const;
-
-    float const titlebar_height;
-    float const shadow_radius;
-    float const corner_radius;
-    GLuint shadow_corner_tex;
-    GLuint titlebar_corner_tex;
-
-    ColourEffect colour_effect;
-    Program inverse_program, contrast_program;
-    
-    mutable DecorMap decor_map;
-    mutable typo::GLCache title_cache;
-};
-
-} // namespace examples
-} // namespace mir
-
-#endif // MIR_EXAMPLES_DEMO_RENDERER_H_
 
=== removed file 'playground/demo-shell/demo_shell.cpp'
--- playground/demo-shell/demo_shell.cpp	2017-07-28 17:00:43 +0000
+++ playground/demo-shell/demo_shell.cpp	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-/*
- * Copyright © 2013-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 2 or 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: Robert Carr <[e-mail]>
- */
-
-/// \example demo_shell.cpp A simple mir shell
-
-#include "demo_compositor.h"
-#include "window_manager.h"
-#include "../server_configuration.h"
-
-#include "mir/run_mir.h"
-#include "mir/report_exception.h"
-#include "mir/graphics/display.h"
-#include "mir/input/composite_event_filter.h"
-#include "mir/compositor/display_buffer_compositor_factory.h"
-#include "mir/renderer/renderer_factory.h"
-#include "mir/options/option.h"
-#include "server_example_host_lifecycle_event_listener.h"
-
-#include <iostream>
-
-namespace me = mir::examples;
-namespace ms = mir::scene;
-namespace mg = mir::graphics;
-namespace mf = mir::frontend;
-namespace mi = mir::input;
-namespace mc = mir::compositor;
-namespace msh = mir::shell;
-
-namespace mir
-{
-namespace examples
-{
-class DisplayBufferCompositorFactory : public mc::DisplayBufferCompositorFactory
-{
-public:
-    DisplayBufferCompositorFactory(
-        std::shared_ptr<mc::CompositorReport> const& report) :
-        report(report)
-    {
-    }
-
-    std::unique_ptr<mc::DisplayBufferCompositor> create_compositor_for(
-        mg::DisplayBuffer& display_buffer) override
-    {
-        return std::unique_ptr<mc::DisplayBufferCompositor>(
-            new me::DemoCompositor{display_buffer, report});
-    }
-
-private:
-    std::shared_ptr<mc::CompositorReport> const report;
-};
-
-class DemoServerConfiguration : public mir::examples::ServerConfiguration
-{
-public:
-    using mir::examples::ServerConfiguration::ServerConfiguration;
-
-    std::shared_ptr<compositor::DisplayBufferCompositorFactory> the_display_buffer_compositor_factory() override
-    {
-        return display_buffer_compositor_factory(
-            [this]()
-            {
-                return std::make_shared<me::DisplayBufferCompositorFactory>(
-                    the_compositor_report());
-            });
-    }
-
-    std::shared_ptr<msh::HostLifecycleEventListener> the_host_lifecycle_event_listener() override
-    {
-       return host_lifecycle_event_listener(
-           [this]()
-           {
-               return std::make_shared<HostLifecycleEventListener>(the_logger());
-           });
-    }
-};
-
-}
-}
-
-int main(int argc, char const* argv[])
-try
-{
-    me::DemoServerConfiguration config(argc, argv);
-
-    auto wm = std::make_shared<me::WindowManager>();
-
-    mir::run_mir(config, [&config, &wm](mir::DisplayServer&)
-        {
-            // We use this strange two stage initialization to avoid a circular dependency between the EventFilters
-            // and the SessionStore
-            wm->set_focus_controller(config.the_focus_controller());
-            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;
-}
-catch (...)
-{
-    mir::report_exception(std::cerr);
-    return 1;
-}
 
=== removed directory 'playground/demo-shell/typo'
=== removed file 'playground/demo-shell/typo/CMakeLists.txt'
--- playground/demo-shell/typo/CMakeLists.txt	2017-05-08 03:04:26 +0000
+++ playground/demo-shell/typo/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-find_package(PkgConfig)
-
-pkg_search_module(FREETYPE freetype2)
-if (FREETYPE_FOUND)
-  set(OPTIONAL_SRCS typo_freetype_renderer.cpp)
-endif ()
-
-add_library(typo STATIC
-  typo_renderer.cpp
-  typo_stub_renderer.cpp
-  typo_glcache.cpp
-  ${OPTIONAL_SRCS}
-)
-
-target_link_libraries(typo ${GL_LIBRARIES})
-target_include_directories(typo PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-if (FREETYPE_FOUND)
-  target_compile_definitions(typo PUBLIC -DTYPO_SUPPORTS_FREETYPE)
-  target_link_libraries(typo ${FREETYPE_LIBRARIES})
-  target_include_directories(typo PUBLIC ${FREETYPE_INCLUDE_DIRS})
-endif ()
-
 
=== removed file 'playground/demo-shell/typo/typo_freetype_renderer.cpp'
--- playground/demo-shell/typo/typo_freetype_renderer.cpp	2017-07-28 17:00:43 +0000
+++ playground/demo-shell/typo/typo_freetype_renderer.cpp	1970-01-01 00:00:00 +0000
@@ -1,125 +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 2 or 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: Daniel van Vugt <[e-mail]>
- */
-
-#include "typo_freetype_renderer.h"
-#include <stdexcept>
-#include <cstring>
-
-using namespace mir::typo;
-
-FreetypeRenderer::FreetypeRenderer()
-    : lib(nullptr), face(nullptr), preferred_height(16)
-{
-    if (FT_Init_FreeType(&lib))
-        throw std::runtime_error("FreeType init failed");
-}
-
-FreetypeRenderer::~FreetypeRenderer()
-{
-    if (face) FT_Done_Face(face);
-    if (lib) FT_Done_FreeType(lib);
-}
-
-bool FreetypeRenderer::load(char const* font_path, int pref_height)
-{
-    preferred_height = pref_height;
-
-    if (face)
-    {
-        FT_Done_Face(face);
-        face = nullptr;
-    }
-    if (FT_New_Face(lib, font_path, 0, &face))
-        return false;
-
-    FT_Set_Pixel_Sizes(face, 0, preferred_height);
-
-    return true;
-}
-
-void FreetypeRenderer::render(char const* str, Image& img)
-{
-    int minx = 0, maxx = 0, miny = 0, maxy = 0;
-    int penx = 0, peny = 0;
-    FT_GlyphSlot slot = face->glyph;
-
-    char const* s = str;
-    while (unsigned long u = unicode_from_utf8(&s))
-    {
-        auto glyph = FT_Get_Char_Index(face, u);
-        FT_Load_Glyph(face, glyph, FT_LOAD_DEFAULT);
-        FT_Render_Glyph(slot, FT_RENDER_MODE_NORMAL);
-
-        int left = penx + slot->bitmap_left;
-        if (left < minx) minx = left;
-
-        int right = left + slot->bitmap.width;
-        if (right > maxx) maxx = right;
-
-        int top = peny - slot->bitmap_top;
-        if (top < miny) miny = top;
-
-        int bottom = top + slot->bitmap.rows;
-        if (bottom > maxy) maxy = bottom;
-
-        penx += slot->advance.x >> 6;
-        peny += slot->advance.y >> 6;
-    }
-
-    int const padding = preferred_height / 8;  // Allow mipmapping to smear
-    int width = maxx - minx + 1 + 2*padding;
-    int height = maxy - miny + 1;
-    if (height < preferred_height)  // e.g. str has no descenders, but make
-        height = preferred_height;  //      room so we get a consistent height
-    height += 2*padding;
-    penx = -minx + padding;
-    peny = -miny + padding;
-
-    img.reserve(width, height, Image::alpha8);
-
-    s = str;
-    while (unsigned long u = unicode_from_utf8(&s))
-    {
-        auto glyph = FT_Get_Char_Index(face, u);
-        FT_Load_Glyph(face, glyph, FT_LOAD_DEFAULT);
-        FT_Render_Glyph(slot, FT_RENDER_MODE_NORMAL);
-
-        auto& bitmap = slot->bitmap;
-        int x = penx + slot->bitmap_left;
-        int y = peny - slot->bitmap_top;
-        int right = x + bitmap.width;
-        int bottom = y + bitmap.rows;
-
-        if (x >= 0 && right <= width && y >= 0 && bottom <= height)
-        {
-            unsigned char* src = bitmap.buffer;
-            unsigned char* dest = img.data() + y*img.stride() + x;
-
-            int ylimit = y + bitmap.rows;
-            for (; y < ylimit; ++y)
-            {
-                memcpy(dest, src, bitmap.width);
-                src += bitmap.pitch;
-                dest += img.stride();
-            }
-        }
-
-        penx += slot->advance.x >> 6;
-        peny += slot->advance.y >> 6;
-    }
-}
 
=== removed file 'playground/demo-shell/typo/typo_freetype_renderer.h'
--- playground/demo-shell/typo/typo_freetype_renderer.h	2017-07-28 17:00:43 +0000
+++ playground/demo-shell/typo/typo_freetype_renderer.h	1970-01-01 00:00:00 +0000
@@ -1,44 +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 2 or 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: Daniel van Vugt <[e-mail]>
- */
-
-#ifndef MIR_TYPO_FREETYPE_RENDERER_H_
-#define MIR_TYPO_FREETYPE_RENDERER_H_
-
-#include "typo_renderer.h"
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-namespace mir { namespace typo {
-
-class FreetypeRenderer : public Renderer
-{
-public:
-    FreetypeRenderer();
-    ~FreetypeRenderer();
-    bool load(char const* font_path, int pref_height);
-    void render(char const* str, Image& img) override;
-
-private:
-    FT_Library lib;
-    FT_Face face;
-    int preferred_height;
-};
-
-} } // namespace mir::typo
-
-#endif // MIR_TYPO_FREETYPE_RENDERER_H_
 
=== removed file 'playground/demo-shell/typo/typo_glcache.cpp'
--- playground/demo-shell/typo/typo_glcache.cpp	2017-07-28 17:00:43 +0000
+++ playground/demo-shell/typo/typo_glcache.cpp	1970-01-01 00:00:00 +0000
@@ -1,99 +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 2 or 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: Daniel van Vugt <[e-mail]>
- */
-
-#include "typo_glcache.h"
-#include MIR_SERVER_GL_H
-
-using namespace mir::typo;
-
-GLCache::GLCache(std::shared_ptr<Renderer> const& r)
-    : renderer(r)
-{
-}
-
-GLCache::~GLCache()
-{
-    clear();
-}
-
-void GLCache::change_renderer(std::shared_ptr<Renderer> const& r)
-{
-    clear();
-    renderer = r;
-}
-
-void GLCache::clear()
-{
-    for (auto& e : map)
-        glDeleteTextures(1, &e.second.tex);
-    map.clear();
-}
-
-void GLCache::mark_all_unused()
-{
-    for (auto& e : map)
-        e.second.used = false;
-}
-
-void GLCache::drop_unused()
-{
-    for (auto e = map.begin(); e != map.end();)
-    {
-        if (!e->second.used)
-        {
-            glDeleteTextures(1, &e->second.tex);
-            e = map.erase(e);
-        }
-        else
-            e++;
-    }
-}
-
-bool GLCache::Entry::valid() const
-{
-    return width > 0 && height > 0;
-}
-
-GLCache::Entry const& GLCache::get(char const* str)
-{
-    Entry& entry = map[str];
-    if (!entry.valid())
-    {
-        Renderer::Image img;
-        renderer->render(str, img);
-        if (img.data())
-        {
-            entry.width = img.width();
-            entry.height = img.height();
-            glGenTextures(1, &entry.tex);
-            glBindTexture(GL_TEXTURE_2D, entry.tex);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-                                           GL_LINEAR_MIPMAP_NEAREST);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-            glPixelStorei(GL_UNPACK_ALIGNMENT, img.alignment());
-            glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA,
-                         img.width(), img.height(), 0, GL_ALPHA,
-                         GL_UNSIGNED_BYTE, img.data());
-            glGenerateMipmap(GL_TEXTURE_2D); // Antialiasing shrinkage please
-        }
-    }
-    entry.used = true;
-    return entry;
-}
 
=== removed file 'playground/demo-shell/typo/typo_glcache.h'
--- playground/demo-shell/typo/typo_glcache.h	2017-07-28 17:00:43 +0000
+++ playground/demo-shell/typo/typo_glcache.h	1970-01-01 00:00:00 +0000
@@ -1,56 +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 2 or 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: Daniel van Vugt <[e-mail]>
- */
-
-#ifndef MIR_TYPO_GLCACHE_H_
-#define MIR_TYPO_GLCACHE_H_
-
-#include "typo_renderer.h"
-#include <string>
-#include <unordered_map>
-#include <memory>
-
-namespace mir { namespace typo {
-
-class GLCache
-{
-public:
-    struct Entry
-    {
-        bool valid() const;
-        unsigned int tex = 0;
-        int width = 0, height = 0;
-        bool used = false;
-    };
-
-    explicit GLCache(std::shared_ptr<Renderer> const&);
-    ~GLCache();
-    void change_renderer(std::shared_ptr<Renderer> const&);
-    Entry const& get(char const* str);
-    void clear();
-    void mark_all_unused();
-    void drop_unused();
-
-private:
-    typedef std::unordered_map<std::string, Entry> Map;
-    Map map;
-    std::shared_ptr<Renderer> renderer;
-};
-
-} } // namespace mir::typo
-
-#endif // MIR_TYPO_GLCACHE_H_
 
=== removed file 'playground/demo-shell/typo/typo_renderer.cpp'
--- playground/demo-shell/typo/typo_renderer.cpp	2017-07-28 17:00:43 +0000
+++ playground/demo-shell/typo/typo_renderer.cpp	1970-01-01 00:00:00 +0000
@@ -1,59 +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 2 or 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: Daniel van Vugt <[e-mail]>
- */
-
-#include "typo_renderer.h"
-#include <cstring>
-
-using namespace mir::typo;
-
-Renderer::Image::Image()
-    : buf(nullptr), width_(0), stride_(0), height_(0), align_(4),
-      format_(alpha8)
-{
-}
-
-Renderer::Image::~Image()
-{
-    delete[] buf;
-}
-
-void Renderer::Image::reserve(int w, int h, Format f)
-{
-    width_ = w;
-    height_ = h;
-    format_ = f;
-    int const bpp = 1;  // format is always alpha8
-    stride_ = (((width_ * bpp) + align_ - 1) / align_) * align_;
-    delete[] buf;
-    auto size = stride_ * height_;
-    buf = new unsigned char[size];
-    memset(buf, 0, size);
-}
-
-Renderer::~Renderer()
-{
-}
-
-unsigned long Renderer::unicode_from_utf8(char const** utf8)
-{
-    int char_len = 1; // TODO: Add support for non-ASCII UTF-8
-    unsigned long unicode = **utf8;
-    if (unicode)
-        *utf8 += char_len;
-    return unicode;
-}
 
=== removed file 'playground/demo-shell/typo/typo_renderer.h'
--- playground/demo-shell/typo/typo_renderer.h	2017-07-28 17:00:43 +0000
+++ playground/demo-shell/typo/typo_renderer.h	1970-01-01 00:00:00 +0000
@@ -1,61 +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 2 or 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: Daniel van Vugt <[e-mail]>
- */
-
-#ifndef MIR_TYPO_RENDERER_H_
-#define MIR_TYPO_RENDERER_H_
-
-namespace mir { namespace typo {
-
-class Renderer
-{
-public:
-    class Image
-    {
-    public:
-        Image();
-        Image(Image const&) = delete;
-        Image(Image const&&) = delete;
-        Image& operator=(Image const&) = delete;
-        ~Image();
-
-        typedef enum {alpha8} Format;
-
-        void reserve(int w, int h, Format f);
-        unsigned char* data() const { return buf; };
-        int width() const { return width_; }
-        int height() const { return height_; }
-        int stride() const { return stride_; }
-        int alignment() const { return align_; }
-        Format format() const { return format_; }
-
-    private:
-        unsigned char* buf;
-        int width_, stride_, height_, align_;
-        Format format_;
-    };
-
-    virtual ~Renderer();
-    virtual void render(char const* str, Image& img) = 0;
-
-protected:
-    static unsigned long unicode_from_utf8(char const** utf8);
-};
-
-} } // namespace mir::typo
-
-#endif // MIR_TYPO_RENDERER_H_
 
=== removed file 'playground/demo-shell/typo/typo_stub_renderer.cpp'
--- playground/demo-shell/typo/typo_stub_renderer.cpp	2017-07-28 17:00:43 +0000
+++ playground/demo-shell/typo/typo_stub_renderer.cpp	1970-01-01 00:00:00 +0000
@@ -1,47 +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 2 or 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: Daniel van Vugt <[e-mail]>
- */
-
-#include "typo_stub_renderer.h"
-#include <cstring>
-
-using namespace mir::typo;
-
-void StubRenderer::render(char const* str, Image& img)
-{
-    int const char_width = 8;
-    int const char_height = 16;
-    int const char_space = 2;
-    int const tex_height = 20;
-    int const len = strlen(str);
-    int const top = (tex_height - char_height) / 2;
-
-    img.reserve(len*(char_width+char_space) - char_space, tex_height,
-                Image::alpha8);
-
-    char const* s = str;
-    for (int n = 0; unicode_from_utf8(&s); ++n)
-    {
-        unsigned char* row = img.data() + top*img.stride() +
-                             n*(char_width+char_space);
-        for (int y = 0; y < char_height; ++y)
-        {
-            memset(row, 255, char_width);
-            row += img.stride();
-        }
-    }
-}
 
=== removed file 'playground/demo-shell/typo/typo_stub_renderer.h'
--- playground/demo-shell/typo/typo_stub_renderer.h	2017-07-28 17:00:43 +0000
+++ playground/demo-shell/typo/typo_stub_renderer.h	1970-01-01 00:00:00 +0000
@@ -1,34 +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 2 or 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: Daniel van Vugt <[e-mail]>
- */
-
-#ifndef MIR_TYPO_STUB_RENDERER_H_
-#define MIR_TYPO_STUB_RENDERER_H_
-
-#include "typo_renderer.h"
-
-namespace mir { namespace typo {
-
-class StubRenderer : public Renderer
-{
-public:
-    void render(char const* str, Image& img) override;
-};
-
-} } // namespace mir::typo
-
-#endif // MIR_TYPO_STUB_RENDERER_H_
 
=== removed file 'playground/demo-shell/window_manager.cpp'
--- playground/demo-shell/window_manager.cpp	2017-07-28 17:00:43 +0000
+++ playground/demo-shell/window_manager.cpp	1970-01-01 00:00:00 +0000
@@ -1,611 +0,0 @@
-/*
- * Copyright © 2013 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 2 or 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: Robert Carr <[e-mail]>
- *              Daniel van Vugt <[e-mail]>
- */
-
-#include "window_manager.h"
-#include "demo_compositor.h"
-
-#include "mir/shell/focus_controller.h"
-#include "mir/scene/session.h"
-#include "mir/scene/surface.h"
-#include "mir/graphics/display.h"
-#include "mir/graphics/display_configuration.h"
-#include "mir/compositor/compositor.h"
-
-#include <linux/input.h>
-
-#include <cassert>
-#include <cstdlib>
-#include <cmath>
-
-namespace me = mir::examples;
-namespace msh = mir::shell;
-namespace mg = mir::graphics;
-namespace mc = mir::compositor;
-namespace mi = mir::input;
-
-namespace
-{
-const int min_swipe_distance = 100;  // How long must a swipe be to act on?
-}
-
-me::WindowManager::WindowManager()
-    : old_pinch_diam(0.0f), max_fingers(0)
-{
-}
-
-void me::WindowManager::set_focus_controller(std::shared_ptr<msh::FocusController> const& controller)
-{
-    focus_controller = controller;
-}
-
-void me::WindowManager::set_display(std::shared_ptr<mg::Display> const& dpy)
-{
-    display = dpy;
-}
-
-void me::WindowManager::set_compositor(std::shared_ptr<mc::Compositor> const& cptor)
-{
-    compositor = cptor;
-}
-
-void me::WindowManager::set_input_scene(std::shared_ptr<mi::Scene> const& s)
-{
-    input_scene = s;
-}
-
-void me::WindowManager::force_redraw()
-{
-    // This is clumsy, but the only option our architecture allows us for now
-    // Same hack as used in TouchspotController...
-    input_scene->emit_scene_changed();
-}
-
-namespace
-{
-
-mir::geometry::Point average_pointer(MirTouchEvent const* tev)
-{
-    using namespace mir;
-    using namespace geometry;
-
-    int x = 0, y = 0;
-    int count = mir_touch_event_point_count(tev);
-
-    for (int i = 0; i < count; i++)
-    {
-        x += mir_touch_event_axis_value(tev, i, mir_touch_axis_x);
-        y += mir_touch_event_axis_value(tev, i, mir_touch_axis_y);
-    }
-
-    x /= count;
-    y /= count;
-
-    return Point{x, y};
-}
-
-float measure_pinch(MirTouchEvent const* tev,
-                    mir::geometry::Displacement& dir)
-{
-    int count = mir_touch_event_point_count(tev);
-    int max = 0;
-
-    for (int i = 0; i < count; i++)
-    {
-        for (int j = 0; j < i; j++)
-        {
-            int dx = mir_touch_event_axis_value(tev, i, mir_touch_axis_x) -
-                mir_touch_event_axis_value(tev, j, mir_touch_axis_x);
-            int dy = mir_touch_event_axis_value(tev, i, mir_touch_axis_y) -
-                mir_touch_event_axis_value(tev, j, mir_touch_axis_y);
-
-            int sqr = dx*dx + dy*dy;
-
-            if (sqr > max)
-            {
-                max = sqr;
-                dir = mir::geometry::Displacement{dx, dy};
-            }
-        }
-    }
-
-    return sqrtf(max);  // return pinch diameter
-}
-
-} // namespace
-
-
-void me::WindowManager::toggle(ColourEffect which)
-{
-    colour_effect = (colour_effect == which) ? none : which;
-    me::DemoCompositor::for_each([this](me::DemoCompositor& c)
-    {
-        c.set_colour_effect(colour_effect);
-    });
-    force_redraw();
-}
-
-void me::WindowManager::save_edges(scene::Surface& surf,
-                                   geometry::Point const& p)
-{
-    int width = surf.size().width.as_int();
-    int height = surf.size().height.as_int();
-
-    int left = surf.top_left().x.as_int();
-    int right = left + width;
-    int top = surf.top_left().y.as_int();
-    int bottom = top + height;
-
-    int leftish = left + width/3;
-    int rightish = right - width/3;
-    int topish = top + height/3;
-    int bottomish = bottom - height/3;
-
-    int click_x = p.x.as_int();
-    xedge = (click_x <= leftish) ? left_edge :
-            (click_x >= rightish) ? right_edge :
-            hmiddle;
-
-    int click_y = p.y.as_int();
-    yedge = (click_y <= topish) ? top_edge :
-            (click_y >= bottomish) ? bottom_edge :
-            vmiddle;
-}
-
-void me::WindowManager::resize(scene::Surface& surf,
-                               geometry::Point const& cursor) const
-{
-    int width = surf.size().width.as_int();
-    int height = surf.size().height.as_int();
-
-    int left = surf.top_left().x.as_int();
-    int right = left + width;
-    int top = surf.top_left().y.as_int();
-    int bottom = top + height;
-
-    geometry::Displacement drag = cursor - old_cursor;
-    int dx = drag.dx.as_int();
-    int dy = drag.dy.as_int();
-
-    if (xedge == left_edge && dx < width)
-        left = old_pos.x.as_int() + dx;
-    else if (xedge == right_edge)
-        right = old_pos.x.as_int() + old_size.width.as_int() + dx;
-    
-    if (yedge == top_edge && dy < height)
-        top = old_pos.y.as_int() + dy;
-    else if (yedge == bottom_edge)
-        bottom = old_pos.y.as_int() + old_size.height.as_int() + dy;
-
-    surf.move_to({left, top});
-    surf.resize({right-left, bottom-top});
-}
-
-bool me::WindowManager::handle_key_event(MirKeyboardEvent const* kev)
-{
-    static bool display_off = false;
-
-    if (mir_keyboard_event_action(kev) != mir_keyboard_action_down)
-        return false;
-
-    auto modifiers = mir_keyboard_event_modifiers(kev);
-    auto scan_code = mir_keyboard_event_scan_code(kev);
-    
-    if (modifiers & mir_input_event_modifier_alt &&
-        scan_code == KEY_TAB)  // TODO: Use keycode once we support keymapping on the server side
-    {
-        focus_controller->focus_next_session();
-        if (auto const surface = focus_controller->focused_surface())
-            focus_controller->raise({surface});
-        return true;
-    }
-    else if (modifiers & mir_input_event_modifier_alt &&
-             scan_code == KEY_GRAVE)
-    {
-        if (auto const prev = focus_controller->focused_surface())
-        {
-            auto const app = focus_controller->focused_session();
-            auto const next = app->surface_after(prev);
-            focus_controller->set_focus_to(app, next);
-            focus_controller->raise({next});
-        }
-        return true;
-    }
-    else if (modifiers & mir_input_event_modifier_alt &&
-             scan_code == KEY_F4)
-    {
-        auto const surf = focus_controller->focused_surface();
-        if (surf)
-            surf->request_client_surface_close();
-        return true;
-    }
-    else if ((modifiers & mir_input_event_modifier_alt &&
-              scan_code == KEY_P) ||
-             (scan_code == KEY_POWER))
-    {
-        compositor->stop();
-        auto conf = display->configuration();
-        MirPowerMode new_power_mode = display_off ?
-            mir_power_mode_on : mir_power_mode_off;
-        conf->for_each_output(
-            [&](mg::UserDisplayConfigurationOutput& output) -> void
-            {
-                output.power_mode = new_power_mode;
-            });
-        display_off = !display_off;
-
-        display->configure(*conf.get());
-        if (!display_off)
-            compositor->start();
-        return true;
-    }
-    else if ((modifiers & mir_input_event_modifier_alt) &&
-             (modifiers & mir_input_event_modifier_ctrl) &&
-             (scan_code == KEY_ESC))
-    {
-        std::abort();
-        return true;
-    }
-    else if ((modifiers & mir_input_event_modifier_alt) &&
-             (modifiers & mir_input_event_modifier_ctrl) &&
-             (scan_code == KEY_L) &&
-             focus_controller)
-    {
-        auto const app = focus_controller->focused_session();
-        if (app)
-        {
-            app->set_lifecycle_state(mir_lifecycle_state_will_suspend);
-        }
-    }
-    else if ((modifiers & mir_input_event_modifier_alt) &&
-             (modifiers & mir_input_event_modifier_ctrl))
-    {
-        MirOrientation orientation = mir_orientation_normal;
-        bool rotating = true;
-        int mode_change = 0;
-        bool preferred_mode = false;
-        switch (scan_code)
-        {
-        case KEY_UP:    orientation = mir_orientation_normal; break;
-        case KEY_DOWN:  orientation = mir_orientation_inverted; break;
-        case KEY_LEFT:  orientation = mir_orientation_left; break;
-        case KEY_RIGHT: orientation = mir_orientation_right; break;
-        default:        rotating = false; break;
-        }
-        switch (scan_code)
-        {
-        case KEY_MINUS: mode_change = -1;      break;
-        case KEY_EQUAL: mode_change = +1;      break;
-        case KEY_0:     preferred_mode = true; break;
-        default:                               break;
-        }
-        
-        if (rotating || mode_change || preferred_mode)
-        {
-            auto conf = display->configuration();
-            conf->for_each_output(
-                [&](mg::UserDisplayConfigurationOutput& output) -> void
-                {
-                    // Only apply changes to the monitor the cursor is on
-                    if (!output.extents().contains(old_cursor))
-                        return;
-                    if (rotating)
-                        output.orientation = orientation;
-                    if (preferred_mode)
-                    {
-                        output.current_mode_index =
-                            output.preferred_mode_index;
-                    }
-                    else if (mode_change)
-                    {
-                        size_t nmodes = output.modes.size();
-                        if (nmodes)
-                            output.current_mode_index =
-                                (output.current_mode_index + nmodes +
-                                 mode_change) % nmodes;
-                    }
-                });
-
-            if (!rotating) compositor->stop();
-            display->configure(*conf);
-            if (!rotating) compositor->start();
-            force_redraw();
-            return true;
-        }
-    }
-    else if ((scan_code == KEY_VOLUMEDOWN ||
-              scan_code == KEY_VOLUMEUP) &&
-             max_fingers == 1)
-    {
-        int delta = (scan_code == KEY_VOLUMEDOWN) ? -1 : +1;
-        static const MirOrientation order[4] =
-        {
-            mir_orientation_normal,
-            mir_orientation_right,
-            mir_orientation_inverted,
-            mir_orientation_left
-        };
-        compositor->stop();
-        auto conf = display->configuration();
-        conf->for_each_output(
-            [&](mg::UserDisplayConfigurationOutput& output)
-            {
-                int i = 0;
-                for (; i < 4; ++i)
-                {
-                    if (output.orientation == order[i])
-                        break;
-                }
-                output.orientation = order[(i+4+delta) % 4];
-            });
-        display->configure(*conf.get());
-        compositor->start();
-        return true;
-    }
-    else if (modifiers & mir_input_event_modifier_meta &&
-             scan_code == KEY_N)
-    {
-        toggle(inverse);
-        return true;
-    }
-    else if (modifiers & mir_input_event_modifier_meta &&
-             scan_code == KEY_C)
-    {
-        toggle(contrast);
-        return true;
-    }
-    return false;
-}
-
-
-bool me::WindowManager::handle_pointer_event(MirPointerEvent const* pev)
-{
-    bool handled = false;
-
-    geometry::Point cursor{mir_pointer_event_axis_value(pev, mir_pointer_axis_x),
-                           mir_pointer_event_axis_value(pev, mir_pointer_axis_y)};
-    auto action = mir_pointer_event_action(pev);
-    auto modifiers = mir_pointer_event_modifiers(pev);
-    auto vscroll = mir_pointer_event_axis_value(pev, mir_pointer_axis_vscroll);
-    auto primary_button_pressed = mir_pointer_event_button_state(pev, mir_pointer_button_primary);
-    auto tertiary_button_pressed = mir_pointer_event_button_state(pev, mir_pointer_button_tertiary);
-
-    float new_zoom_mag = 0.0f;  // zero means unchanged
-
-    if (modifiers & mir_input_event_modifier_meta &&
-        action == mir_pointer_action_motion &&
-        vscroll != 0.0f)
-    {
-        zoom_exponent += vscroll;
-
-        // Negative exponents do work too, but disable them until
-        // there's a clear edge to the desktop.
-        if (zoom_exponent < 0)
-            zoom_exponent = 0;
-    
-        new_zoom_mag = powf(1.2f, zoom_exponent);
-        handled = true;
-    }
-
-    me::DemoCompositor::for_each(
-        [new_zoom_mag,&cursor](me::DemoCompositor& c)
-        {
-            if (new_zoom_mag > 0.0f)
-                c.zoom(new_zoom_mag);
-            c.on_cursor_movement(cursor);
-        });
-
-    if (zoom_exponent || new_zoom_mag)
-        force_redraw();
-
-    auto const surf = focus_controller->focused_surface();
-    if (surf &&
-        (modifiers & mir_input_event_modifier_alt) && (primary_button_pressed || tertiary_button_pressed))
-    {
-        // Start of a gesture: When the latest finger/button goes down
-        if (action == mir_pointer_action_button_down)
-        {
-            click = cursor;
-            save_edges(*surf, click);
-            handled = true;
-        }
-        else if (action == mir_pointer_action_motion)
-        {
-            geometry::Displacement drag = cursor - old_cursor;
-
-            if (tertiary_button_pressed)
-            {  // Resize by mouse middle button
-                resize(*surf, cursor);
-            }
-            else
-            {
-                surf->move_to(old_pos + drag);
-            }
-
-            handled = true;
-        }
-
-        old_pos = surf->top_left();
-        old_size = surf->size();
-    }
-
-    if (surf && 
-        (modifiers & mir_input_event_modifier_alt) &&
-        action == mir_pointer_action_motion &&
-        vscroll)
-    {
-        float alpha = surf->alpha();
-        alpha += vscroll > 0.0f ? 0.1f : -0.1f;
-        if (alpha < 0.0f)
-            alpha = 0.0f;
-        else if (alpha > 1.0f)
-            alpha = 1.0f;
-        surf->set_alpha(alpha);
-        handled = true;
-    }
-
-    old_cursor = cursor;
-    return handled;
-}
-
-namespace
-{
-bool any_touches_went_down(MirTouchEvent const* tev)
-{
-    auto count = mir_touch_event_point_count(tev);
-    for (unsigned i = 0; i < count; i++)
-    {
-        if (mir_touch_event_action(tev, i) == mir_touch_action_down)
-            return true;
-    }
-    return false;
-}
-bool last_touch_released(MirTouchEvent const* tev)
-{
-    auto count = mir_touch_event_point_count(tev);
-    if (count > 1)
-        return false;
-    return mir_touch_event_action(tev, 0) == mir_touch_action_up;
-}
-}
-
-bool me::WindowManager::handle_touch_event(MirTouchEvent const* tev)
-{
-    bool handled = false;
-    geometry::Point cursor = average_pointer(tev);
-
-    auto const& modifiers = mir_touch_event_modifiers(tev);
-
-    int fingers = mir_touch_event_point_count(tev);
-
-    if (fingers > max_fingers)
-        max_fingers = fingers;
-
-    auto const surf = focus_controller->focused_surface();
-    if (surf &&
-        (modifiers & mir_input_event_modifier_alt ||
-         fingers >= 3))
-    {
-        geometry::Displacement pinch_dir;
-        auto pinch_diam =
-            measure_pinch(tev, pinch_dir);
-
-        // Start of a gesture: When the latest finger/button goes down
-        if (any_touches_went_down(tev))
-        {
-            click = cursor;
-            save_edges(*surf, click);
-            handled = true;
-        }
-        else if(max_fingers <= 3)  // Avoid accidental movement
-        {
-            geometry::Displacement drag = cursor - old_cursor;
-
-            surf->move_to(old_pos + drag);
-
-            if (fingers == 3)
-            {  // Resize by pinch/zoom
-                float diam_delta = pinch_diam - old_pinch_diam;
-                /*
-                 * Resize vector (dx,dy) has length=diam_delta and
-                 * direction=pinch_dir, so solve for (dx,dy)...
-                 */
-                float lenlen = diam_delta * diam_delta;
-                int x = pinch_dir.dx.as_int();
-                int y = pinch_dir.dy.as_int();
-                int xx = x * x;
-                int yy = y * y;
-                int xxyy = xx + yy;
-                int dx = sqrtf(lenlen * xx / xxyy);
-                int dy = sqrtf(lenlen * yy / xxyy);
-                if (diam_delta < 0.0f)
-                {
-                    dx = -dx;
-                    dy = -dy;
-                }
-
-                int width = old_size.width.as_int() + dx;
-                int height = old_size.height.as_int() + dy;
-                surf->resize({width, height});
-            }
-
-            handled = true;
-        }
-
-        old_pos = surf->top_left();
-        old_size = surf->size();
-        old_pinch_diam = pinch_diam;
-    }
-
-    auto gesture_ended = last_touch_released(tev);
-
-    if (max_fingers == 4 && gesture_ended)
-    { // Four fingers released
-        geometry::Displacement dir = cursor - click;
-        if (abs(dir.dx.as_int()) >= min_swipe_distance)
-        {
-            focus_controller->focus_next_session();
-            if (auto const surface = focus_controller->focused_surface())
-                focus_controller->raise({surface});
-            handled = true;
-        }
-    }
-
-    if (fingers == 1 && gesture_ended)
-        max_fingers = 0;
-
-    old_cursor = cursor;
-
-    /*
-     * For now we reserve all 3 or 4 finger gestures for window manipulation.
-     * Make sure clients don't receive spurious events in the process...
-     */
-    handled |= (max_fingers == 3 || max_fingers == 4);
-
-    return handled;
-}
-
-bool me::WindowManager::handle(MirEvent const& event)
-{
-    assert(focus_controller);
-    assert(display);
-    assert(compositor);
-
-    if (mir_event_get_type(&event) != mir_event_type_input)
-        return false;
-    auto iev = mir_event_get_input_event(&event);
-    auto input_type = mir_input_event_get_type(iev);
-    
-    if (input_type == mir_input_event_type_key)
-    {
-        return handle_key_event(mir_input_event_get_keyboard_event(iev));
-    }
-    else if (input_type == mir_input_event_type_pointer &&
-             focus_controller)
-    {
-        return handle_pointer_event(mir_input_event_get_pointer_event(iev));
-    }
-    else if (input_type == mir_input_event_type_touch &&
-             focus_controller)
-    {
-        return handle_touch_event(mir_input_event_get_touch_event(iev));
-    }
-
-
-    return false;
-}
 
=== removed file 'playground/demo-shell/window_manager.h'
--- playground/demo-shell/window_manager.h	2017-07-28 17:00:43 +0000
+++ playground/demo-shell/window_manager.h	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright © 2013 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 2 or 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: Robert Carr <[e-mail]>
- */
-
-#ifndef MIR_EXAMPLES_WINDOW_MANAGER_H_
-#define MIR_EXAMPLES_WINDOW_MANAGER_H_
-
-#include "mir/input/event_filter.h"
-#include "mir/input/scene.h"
-#include "mir/geometry/displacement.h"
-#include "mir/geometry/size.h"
-#include "demo_renderer.h"
-
-#include <memory>
-
-namespace mir
-{
-namespace shell
-{
-class FocusController;
-}
-namespace graphics
-{
-class Display;
-}
-namespace compositor
-{
-class Compositor;
-}
-
-namespace scene { class Surface; }
-
-namespace examples
-{
-
-class WindowManager : public input::EventFilter
-{
-public: 
-    WindowManager();
-    ~WindowManager() = default;
-
-    void set_focus_controller(std::shared_ptr<shell::FocusController> const& focus_controller);
-    void set_display(std::shared_ptr<graphics::Display> const& display);
-    void set_compositor(std::shared_ptr<compositor::Compositor> const& compositor);
-    void set_input_scene(std::shared_ptr<input::Scene> const& scene);
-    void force_redraw();
-    
-    bool handle(MirEvent const& event) override;
-
-protected:
-    WindowManager(const WindowManager&) = delete;
-    WindowManager& operator=(const WindowManager&) = delete;
-
-private:
-    std::shared_ptr<shell::FocusController> focus_controller;
-    std::shared_ptr<graphics::Display> display;
-    std::shared_ptr<compositor::Compositor> compositor;
-    std::shared_ptr<input::Scene> input_scene;
-
-    geometry::Point click;
-    geometry::Point old_pos;
-    geometry::Point old_cursor;
-    geometry::Size old_size;
-    float old_pinch_diam;
-    int max_fingers;  // Maximum number of fingers touched during gesture
-    float zoom_exponent = 0.0f;
-    ColourEffect colour_effect = none;
-
-    void toggle(ColourEffect);
-
-    enum {left_edge, hmiddle, right_edge} xedge = hmiddle;
-    enum {top_edge, vmiddle, bottom_edge} yedge = vmiddle;
-    void save_edges(scene::Surface& surf, geometry::Point const& p);
-    void resize(scene::Surface& surf, geometry::Point const& cursor) const;
-    bool handle_key_event(MirKeyboardEvent const* event);
-    bool handle_touch_event(MirTouchEvent const* event);
-    bool handle_pointer_event(MirPointerEvent const* event);
-};
-
-}
-} // namespace mir
-
-#endif // MIR_EXAMPLES_WINDOW_MANAGER_H_
 
=== removed file 'playground/server_configuration.cpp'
--- playground/server_configuration.cpp	2017-07-28 17:00:43 +0000
+++ playground/server_configuration.cpp	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-/*
- * Copyright © 2013-2014 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 2 or 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 "server_configuration.h"
-#include "mir/options/default_configuration.h"
-#include "mir/input/composite_event_filter.h"
-#include "mir/graphics/default_display_configuration_policy.h"
-#include "mir/main_loop.h"
-
-#include "server_example_display_configuration_policy.h"
-#include "server_example_input_event_filter.h"
-
-namespace me = mir::examples;
-namespace mg = mir::graphics;
-
-namespace
-{
-std::shared_ptr<mir::options::DefaultConfiguration> const& customize(
-    std::shared_ptr<mir::options::DefaultConfiguration> const& opt)
-{
-    opt->add_options()(me::display_config_opt,
-                       boost::program_options::value<std::string>()->
-                           default_value(me::clone_opt_val),
-                       me::display_config_descr);
-    
-    return opt;
-}
-}
-
-me::ServerConfiguration::ServerConfiguration(std::shared_ptr<options::DefaultConfiguration> const& configuration_options) :
-    DefaultServerConfiguration(customize(configuration_options))
-{
-}
-
-me::ServerConfiguration::ServerConfiguration(int argc, char const** argv) :
-    ServerConfiguration(std::make_shared<options::DefaultConfiguration>(argc, argv))
-{
-}
-
-std::shared_ptr<mg::DisplayConfigurationPolicy>
-me::ServerConfiguration::the_display_configuration_policy()
-{
-    return display_configuration_policy(
-        [this]() -> std::shared_ptr<mg::DisplayConfigurationPolicy>
-        {
-            auto display_config = the_options()->get<std::string>(me::display_config_opt);
-
-            if (display_config == me::sidebyside_opt_val)
-                return std::make_shared<mg::SideBySideDisplayConfigurationPolicy>();
-            else if (display_config == me::single_opt_val)
-                return std::make_shared<mg::SingleDisplayConfigurationPolicy>();
-            else
-                return DefaultServerConfiguration::the_display_configuration_policy();
-        });
-}
-
-std::shared_ptr<mir::input::CompositeEventFilter>
-me::ServerConfiguration::the_composite_event_filter()
-{
-    return composite_event_filter(
-        [this]() -> std::shared_ptr<mir::input::CompositeEventFilter>
-        {
-            if (!quit_filter)
-                quit_filter = std::make_shared<me::QuitFilter>([this] { the_main_loop()->stop(); });
-
-            auto composite_filter = DefaultServerConfiguration::the_composite_event_filter();
-            composite_filter->append(quit_filter);
-
-            return composite_filter;
-        });
-}
 
=== removed file 'playground/server_configuration.h'
--- playground/server_configuration.h	2017-07-28 17:00:43 +0000
+++ playground/server_configuration.h	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2013-2014 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 2 or 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 MIR_EXAMPLES_SERVER_CONFIGURATION_H_
-#define MIR_EXAMPLES_SERVER_CONFIGURATION_H_
-
-#include "mir/default_server_configuration.h"
-
-namespace mir
-{
-namespace options
-{
-class DefaultConfiguration;
-}
-
-namespace examples
-{
-
-class ServerConfiguration : public DefaultServerConfiguration
-{
-public:
-    ServerConfiguration(int argc, char const** argv);
-    explicit ServerConfiguration(std::shared_ptr<options::DefaultConfiguration> const& configuration_options);
-
-    std::shared_ptr<graphics::DisplayConfigurationPolicy> the_display_configuration_policy() override;
-    std::shared_ptr<input::CompositeEventFilter> the_composite_event_filter() override;
-
-private:
-    std::shared_ptr<input::EventFilter> quit_filter;
-};
-}
-}
-
-#endif /* MIR_EXAMPLES_SERVER_CONFIGURATION_H_ */
 
=== removed file 'playground/server_example_display_configuration_policy.cpp'
--- playground/server_example_display_configuration_policy.cpp	2017-07-28 17:00:43 +0000
+++ playground/server_example_display_configuration_policy.cpp	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-/*
- * Copyright © 2014 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 2 or 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 "server_example_display_configuration_policy.h"
-#include "mir/graphics/default_display_configuration_policy.h"
-
-#include "mir/graphics/display_configuration.h"
-#include "mir/server.h"
-#include "mir/options/option.h"
-
-#include <algorithm>
-#include <unordered_map>
-#include <stdexcept>
-
-namespace geom = mir::geometry;
-namespace me = mir::examples;
-namespace mg = mir::graphics;
-
-///\example server_example_display_configuration_policy.cpp
-/// Demonstrate custom display configuration policies for "sidebyside" and "single"
-
-char const* const me::display_config_opt = "display-config";
-char const* const me::display_config_descr = "Display configuration [{clone,sidebyside,single}]";
-
-char const* const me::clone_opt_val = "clone";
-char const* const me::sidebyside_opt_val = "sidebyside";
-char const* const me::single_opt_val = "single";
-
-char const* const me::display_alpha_opt = "translucent";
-char const* const me::display_alpha_descr = "Select a display mode with alpha[{on,off}]";
-
-char const* const me::display_alpha_off = "off";
-char const* const me::display_alpha_on = "on";
-
-namespace
-{
-bool contains_alpha(MirPixelFormat format)
-{
-    return (format == mir_pixel_format_abgr_8888 ||
-            format == mir_pixel_format_argb_8888);
-}
-}
-
-me::PixelFormatSelector::PixelFormatSelector(std::shared_ptr<DisplayConfigurationPolicy> const& base_policy,
-                                         bool with_alpha)
-    : base_policy{base_policy},
-    with_alpha{with_alpha}
-{}
-
-void me::PixelFormatSelector::apply_to(graphics::DisplayConfiguration & conf)
-{
-    base_policy->apply_to(conf);
-    conf.for_each_output(
-        [&](graphics::UserDisplayConfigurationOutput& conf_output)
-        {
-            if (!conf_output.connected || !conf_output.used) return;
-
-            auto const& pos = find_if(conf_output.pixel_formats.begin(),
-                                      conf_output.pixel_formats.end(),
-                                      [&](MirPixelFormat format) -> bool
-                                          {
-                                              return contains_alpha(format) == with_alpha;
-                                          }
-                                     );
-
-            // keep the default settings if nothing was found
-            if (pos == conf_output.pixel_formats.end())
-                return;
-
-            conf_output.current_format = *pos;
-        });
-}
-
-void me::add_display_configuration_options_to(mir::Server& server)
-{
-    // Add choice of monitor configuration
-    server.add_configuration_option(
-        me::display_config_opt, me::display_config_descr,   me::clone_opt_val);
-    server.add_configuration_option(
-        me::display_alpha_opt,  me::display_alpha_descr,    me::display_alpha_off);
-
-    server.wrap_display_configuration_policy(
-        [&](std::shared_ptr<mg::DisplayConfigurationPolicy> const& wrapped)
-        -> std::shared_ptr<mg::DisplayConfigurationPolicy>
-        {
-            auto const options = server.get_options();
-            auto display_layout = options->get<std::string>(me::display_config_opt);
-            auto with_alpha = options->get<std::string>(me::display_alpha_opt) == me::display_alpha_on;
-
-            auto layout_selector = wrapped;
-
-            if (display_layout == me::sidebyside_opt_val)
-                layout_selector = std::make_shared<mg::SideBySideDisplayConfigurationPolicy>();
-            else if (display_layout == me::single_opt_val)
-                layout_selector = std::make_shared<mg::SingleDisplayConfigurationPolicy>();
-
-            // Whatever the layout select a pixel format with requested alpha
-            return std::make_shared<me::PixelFormatSelector>(layout_selector, with_alpha);
-        });
-}
 
=== removed file 'playground/server_example_display_configuration_policy.h'
--- playground/server_example_display_configuration_policy.h	2017-07-28 17:00:43 +0000
+++ playground/server_example_display_configuration_policy.h	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright © 2014 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 2 or 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_EXAMPLE_DISPLAY_CONFIGURATION_POLICY_H_
-#define MIR_EXAMPLE_DISPLAY_CONFIGURATION_POLICY_H_
-
-#include "mir/graphics/display_configuration_policy.h"
-
-#include <memory>
-
-namespace mir
-{
-class Server;
-
-namespace examples
-{
-extern char const* const display_config_opt;
-extern char const* const display_config_descr;
-extern char const* const clone_opt_val;
-extern char const* const sidebyside_opt_val;
-extern char const* const single_opt_val;
-extern char const* const display_alpha_opt;
-extern char const* const display_alpha_descr;
-extern char const* const display_alpha_off;
-extern char const* const display_alpha_on;
-
-/**
- * \brief Example of a DisplayConfigurationPolicy that tries to find
- * an opaque or transparent pixel format, or falls back to the default
- * if not found.
- */
-class PixelFormatSelector : public graphics::DisplayConfigurationPolicy
-{
-public:
-    PixelFormatSelector(std::shared_ptr<graphics::DisplayConfigurationPolicy> const& base_policy,
-                        bool with_alpha);
-    virtual void apply_to(graphics::DisplayConfiguration& conf);
-private:
-    std::shared_ptr<graphics::DisplayConfigurationPolicy> const base_policy;
-    bool const with_alpha;
-};
-
-void add_display_configuration_options_to(Server& server);
-}
-}
-
-#endif /* MIR_EXAMPLE_DISPLAY_CONFIGURATION_POLICY_H_ */
 
=== removed file 'src/include/server/mir/compositor/decoration.h'
--- src/include/server/mir/compositor/decoration.h	2017-07-28 17:00:43 +0000
+++ src/include/server/mir/compositor/decoration.h	1970-01-01 00:00:00 +0000
@@ -1,38 +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 2 or 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: Daniel van Vugt <[e-mail]>
- */
-
-#ifndef MIR_COMPOSITOR_DECORATION_H_
-#define MIR_COMPOSITOR_DECORATION_H_
-
-#include <string>
-
-namespace mir { namespace compositor {
-
-struct Decoration
-{
-    enum class Type {none, surface} type;
-    std::string name;
-
-    Decoration() : type{Type::none} {}
-    Decoration(Type t, std::string const& n) : type{t}, name{n} {}
-    operator bool() const { return type != Type::none; }
-};
-
-} } // namespace mir::compositor
-
-#endif // MIR_COMPOSITOR_DECORATION_H_
 
=== modified file 'src/miral/CMakeLists.txt'
--- src/miral/CMakeLists.txt	2017-08-30 15:50:37 +0000
+++ src/miral/CMakeLists.txt	2017-08-30 15:50:38 +0000
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 set(MIRAL_VERSION_MAJOR 1)
 set(MIRAL_VERSION_MINOR 5)
 set(MIRAL_VERSION_PATCH 0)
@@ -135,146 +134,6 @@
     ${miral_include}/miral/version.h
 )
 
-install(TARGETS     miral                           LIBRARY         DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
-install(DIRECTORY   ${CMAKE_SOURCE_DIR}/include/miral               DESTINATION "${INCLUDEDIR}")
-install(FILES       ${CMAKE_CURRENT_BINARY_DIR}/miral.pc
-                    ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc    DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
-=======
-set(MIRAL_VERSION_MAJOR 1)
-set(MIRAL_VERSION_MINOR 5)
-set(MIRAL_VERSION_PATCH 0)
-
-if(${CMAKE_COMPILER_IS_GNUCXX})
-    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -flto")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto")
-    set(CMAKE_AR "gcc-ar")
-    set(CMAKE_NM "gcc-nm")
-    set(CMAKE_RANLIB "gcc-ranlib")
-endif()
-
-include_directories(
-  ${PROJECT_SOURCE_DIR}/include/platform
-  ${PROJECT_SOURCE_DIR}/include/client
-  ${PROJECT_SOURCE_DIR}/include/server
-)
-
-set(MIRAL_ABI 2)
-set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
-set(miral_include ${PROJECT_SOURCE_DIR}/include/miral)
-
-add_library(mirclientcpp INTERFACE)
-
-add_library(miral-internal STATIC
-    basic_window_manager.cpp            basic_window_manager.h window_manager_tools_implementation.h
-    coordinate_translator.cpp           coordinate_translator.h
-    display_configuration_listeners.cpp display_configuration_listeners.h
-    mru_window_list.cpp                 mru_window_list.h
-    window_management_trace.cpp         window_management_trace.h
-    xcursor_loader.cpp                  xcursor_loader.h
-    xcursor.c                           xcursor.h
-                                        both_versions.h
-                                        join_client_threads.h
-)
-
-set_source_files_properties(xcursor.c PROPERTIES COMPILE_DEFINITIONS _GNU_SOURCE)
-
-add_library(miral SHARED
-    active_outputs.cpp                  ${miral_include}/miral/active_outputs.h
-    add_init_callback.cpp               ${miral_include}/miral/add_init_callback.h
-    application.cpp                     ${miral_include}/miral/application.h
-    application_authorizer.cpp          ${miral_include}/miral/application_authorizer.h
-    application_info.cpp                ${miral_include}/miral/application_info.h
-    canonical_window_manager.cpp        ${miral_include}/miral/canonical_window_manager.h
-    command_line_option.cpp             ${miral_include}/miral/command_line_option.h
-    cursor_theme.cpp                    ${miral_include}/miral/cursor_theme.h
-    debug_extension.cpp                 ${miral_include}/miral/debug_extension.h
-    keymap.cpp                          ${miral_include}/miral/keymap.h
-    runner.cpp                          ${miral_include}/miral/runner.h
-    display_configuration_option.cpp    ${miral_include}/miral/display_configuration_option.h
-    output.cpp                          ${miral_include}/miral/output.h
-    append_event_filter.cpp             ${miral_include}/miral/append_event_filter.h
-    window.cpp                          ${miral_include}/miral/window.h
-    window_info.cpp                     ${miral_include}/miral/window_info.h
-    window_management_options.cpp       ${miral_include}/miral/window_management_options.h
-    window_specification.cpp            ${miral_include}/miral/window_specification.h
-    internal_client.cpp                 ${miral_include}/miral/internal_client.h
-    set_command_line_handler.cpp        ${miral_include}/miral/set_command_line_handler.h
-    set_terminator.cpp                  ${miral_include}/miral/set_terminator.h
-    set_window_management_policy.cpp    ${miral_include}/miral/set_window_management_policy.h
-    workspace_policy.cpp                ${miral_include}/miral/workspace_policy.h
-    window_management_policy.cpp        ${miral_include}/miral/window_management_policy.h
-    window_manager_tools.cpp            ${miral_include}/miral/window_manager_tools.h
-                                        ${miral_include}/miral/window_management_policy_addendum2.h
-                                        ${miral_include}/miral/window_management_policy_addendum3.h
-                                        ${miral_include}/mir/client/blob.h
-                                        ${miral_include}/mir/client/cookie.h
-                                        ${miral_include}/mir/client/window_spec.h
-                                        ${miral_include}/mir/client/window_id.h
-                                        ${miral_include}/mir/client/connection.h
-                                        ${miral_include}/mir/client/display_config.h
-                                        ${miral_include}/mir/client/window.h
-)
-
-target_include_directories(mirclientcpp
-    INTERFACE "${miral_include}" ${MIRCLIENT_INCLUDE_DIRS}
-)
-
-target_include_directories(miral-internal
-    PRIVATE "${miral_include}" ${MIRCLIENT_INCLUDE_DIRS}
-    PRIVATE ${MIRSERVER_INCLUDE_DIRS}
-)
-
-target_include_directories(miral
-    PUBLIC  "${miral_include}" ${MIRCLIENT_INCLUDE_DIRS}
-    PRIVATE ${MIRSERVER_INCLUDE_DIRS}
-)
-
-target_link_libraries(miral
-    PUBLIC
-        mirclient
-        mircommon
-    PRIVATE
-        miral-internal
-        mirserver
-)
-
-set_target_properties(miral
-        PROPERTIES
-        SOVERSION ${MIRAL_ABI}
-        LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
-        LINK_DEPENDS ${symbol_map}
-)
-
-# clang generates slightly different symbols (but we don't care)
-if (CMAKE_COMPILER_IS_GNUCXX)
-    add_custom_target(check-miral-symbols ALL
-            DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols
-            COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
-            COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
-            WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
-            VERBATIM
-    )
-endif()
-
-set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
-set(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include")
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/miral.pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/miral.pc
-    @ONLY
-)
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mirclientcpp.pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
-    @ONLY
-)
-
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
-    ${miral_include}/miral/version.h
-)
-
 if(TARGET doc)
     add_custom_target(regenerate-miral-symbols-map
             ${CMAKE_CURRENT_SOURCE_DIR}/process_doxygen_xml.py ${CMAKE_BINARY_DIR}/doc/xml/*.xml > ${symbol_map}
@@ -285,4 +144,3 @@
 install(DIRECTORY   ${CMAKE_SOURCE_DIR}/include/miral               DESTINATION "${INCLUDEDIR}")
 install(FILES       ${CMAKE_CURRENT_BINARY_DIR}/miral.pc
                     ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc    DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
->>>>>>> MERGE-SOURCE
 
=== modified file 'src/miral/miral.pc.in'
--- src/miral/miral.pc.in	2017-08-30 15:50:37 +0000
+++ src/miral/miral.pc.in	2017-08-29 09:17:03 +0000
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 libdir=@LIBDIR@
 includedir=@INCLUDEDIR@/miral
 
@@ -8,14 +7,3 @@
 Requires: mirclientcpp
 Libs: -L${libdir} -lmiral
 Cflags: -I${includedir}
-=======
-libdir=@LIBDIR@
-includedir=@INCLUDEDIR@
-
-Name: miral
-Description: Mir Abstraction Layer library
-Version: @MIRAL_VERSION@
-Requires: mirclientcpp
-Libs: -L${libdir} -lmiral
-Cflags: -I${includedir}
->>>>>>> MERGE-SOURCE
 
=== modified file 'src/miral/mirclientcpp.pc.in'
--- src/miral/mirclientcpp.pc.in	2017-08-30 15:50:37 +0000
+++ src/miral/mirclientcpp.pc.in	2017-08-29 09:17:03 +0000
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 includedir=@INCLUDEDIR@/miral
 
 Name: mirclientcpp
@@ -6,12 +5,3 @@
 Version: @MIRAL_VERSION@
 Requires: mirclient
 Cflags: -I${includedir}
-=======
-includedir=@INCLUDEDIR@
-
-Name: mirclientcpp
-Description: Mir Abstraction Layer C++ wrapper for mirclient
-Version: @MIRAL_VERSION@
-Requires: mirclient
-Cflags: -I${includedir}
->>>>>>> MERGE-SOURCE
 
=== modified file 'src/server/scene/basic_surface.cpp'
--- src/server/scene/basic_surface.cpp	2017-07-28 17:00:43 +0000
+++ src/server/scene/basic_surface.cpp	2017-08-30 15:50:38 +0000
@@ -289,12 +289,6 @@
     observers.moved_to(top_left);
 }
 
-float ms::BasicSurface::alpha() const
-{
-    std::unique_lock<std::mutex> lk(guard);
-    return surface_alpha;
-}
-
 void ms::BasicSurface::set_hidden(bool hide)
 {
     {
 
=== modified file 'src/server/scene/basic_surface.h'
--- src/server/scene/basic_surface.h	2017-07-28 17:00:43 +0000
+++ src/server/scene/basic_surface.h	2017-08-30 15:50:38 +0000
@@ -79,7 +79,7 @@
 
     std::string name() const override;
     void move_to(geometry::Point const& top_left) override;
-    float alpha() const override;
+
     void set_hidden(bool is_hidden);
 
     geometry::Size size() const override;
 
=== modified file 'src/server/scene/surface_stack.cpp'
--- src/server/scene/surface_stack.cpp	2017-07-28 17:00:43 +0000
+++ src/server/scene/surface_stack.cpp	2017-08-30 15:50:38 +0000
@@ -23,7 +23,6 @@
 #include "mir/scene/surface.h"
 #include "mir/scene/scene_report.h"
 #include "mir/compositor/scene_element.h"
-#include "mir/compositor/decoration.h"
 #include "mir/graphics/renderable.h"
 
 #include <boost/throw_exception.hpp>
@@ -73,11 +72,6 @@
         tracker->occluded_in(cid);
     }
 
-    std::unique_ptr<mc::Decoration> decoration() const override
-    {
-        return std::make_unique<mc::Decoration>(mc::Decoration::Type::surface, surface_name);
-    }
-
 private:
     std::shared_ptr<mg::Renderable> const renderable_;
     std::shared_ptr<ms::RenderingTracker> const tracker;
@@ -108,11 +102,6 @@
     {
     }
 
-    std::unique_ptr<mc::Decoration> decoration() const override
-    {
-        return std::make_unique<mc::Decoration>();
-    }
-
 private:
     std::shared_ptr<mg::Renderable> const renderable_;
 };
 
=== modified file 'tests/include/mir/test/doubles/stub_scene_element.h'
--- tests/include/mir/test/doubles/stub_scene_element.h	2017-07-28 17:00:43 +0000
+++ tests/include/mir/test/doubles/stub_scene_element.h	2017-08-30 15:50:38 +0000
@@ -20,7 +20,6 @@
 #define MIR_TEST_DOUBLES_STUB_SCENE_ELEMENT_H_
 
 #include "mir/compositor/scene_element.h"
-#include "mir/compositor/decoration.h"
 #include "stub_renderable.h"
 
 namespace mir
@@ -56,11 +55,6 @@
     {
     }
 
-    std::unique_ptr<compositor::Decoration> decoration() const override
-    {
-        return nullptr;
-    }
-
 private:
     std::shared_ptr<graphics::Renderable> const renderable_;
 };
 
=== modified file 'tests/include/mir/test/doubles/stub_scene_surface.h'
--- tests/include/mir/test/doubles/stub_scene_surface.h	2017-07-28 17:00:43 +0000
+++ tests/include/mir/test/doubles/stub_scene_surface.h	2017-08-30 15:50:38 +0000
@@ -53,7 +53,6 @@
     graphics::RenderableList generate_renderables(compositor::CompositorID) const override { return {}; }
     int buffers_ready_for_compositor(void const*) const override { return 0; }
 
-    float alpha() const override { return 0.0f;}
     MirWindowType type() const override { return mir_window_type_normal; }
     MirWindowState state() const override { return mir_window_state_unknown; }
 
 
=== modified file 'tests/mir_test_framework/stub_surface.cpp'
--- tests/mir_test_framework/stub_surface.cpp	2017-07-28 17:00:43 +0000
+++ tests/mir_test_framework/stub_surface.cpp	2017-08-30 15:50:38 +0000
@@ -29,11 +29,6 @@
 {
 }
 
-float mtd::StubSurface::alpha() const
-{
-    return 0;
-}
-
 mir::geometry::Size mtd::StubSurface::size() const
 {
     return {};
 
=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2017-05-08 03:04:26 +0000
+++ tests/unit-tests/CMakeLists.txt	2017-08-30 15:50:38 +0000
@@ -122,7 +122,6 @@
 
   exampleserverconfig
   mirdraw
-  demo-shell
   mircommon
   client_platform_common
   server_platform_common
@@ -166,7 +165,6 @@
 
   exampleserverconfig
   mirdraw
-  demo-shell
   mircommon
   client_platform_common
 
 
=== modified file 'tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp'
--- tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp	2017-07-28 17:00:43 +0000
+++ tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp	2017-08-30 15:50:38 +0000
@@ -18,7 +18,6 @@
 
 #include "src/server/compositor/default_display_buffer_compositor.h"
 #include "mir/compositor/display_buffer_compositor.h"
-#include "mir/compositor/decoration.h"
 #include "src/server/report/null_report_factory.h"
 #include "mir/compositor/scene.h"
 #include "mir/renderer/renderer.h"
@@ -74,11 +73,6 @@
     {
     }
 
-    std::unique_ptr<mc::Decoration> decoration() const override
-    {
-        return nullptr;
-    }
-
 private:
     std::shared_ptr<mg::Renderable> const renderable_;
 };
@@ -346,7 +340,6 @@
     }
 
     MOCK_CONST_METHOD0(renderable, std::shared_ptr<mir::graphics::Renderable>());
-    MOCK_CONST_METHOD0(decoration, std::unique_ptr<mc::Decoration>());
     MOCK_METHOD0(rendered, void());
     MOCK_METHOD0(occluded, void());
 };
 
=== modified file 'tests/unit-tests/scene/test_basic_surface.cpp'
--- tests/unit-tests/scene/test_basic_surface.cpp	2017-07-28 17:00:43 +0000
+++ tests/unit-tests/scene/test_basic_surface.cpp	2017-08-30 15:50:38 +0000
@@ -229,24 +229,10 @@
     EXPECT_EQ(trans, got);
 }
 
-TEST_F(BasicSurfaceTest, test_surface_set_alpha_notifies_changes)
-{
-    using namespace testing;
-    EXPECT_CALL(mock_callback, call())
-        .Times(1);
-
-    surface.add_observer(observer);
-
-    float alpha = 0.5f;
-    surface.set_alpha(0.5f);
-    EXPECT_THAT(alpha, FloatEq(surface.alpha()));
-}
-
 TEST_F(BasicSurfaceTest, test_surface_is_opaque_by_default)
 {
     using namespace testing;
 
-    EXPECT_THAT(1.0f, FloatEq(surface.alpha()));
     auto renderables = surface.generate_renderables(compositor_id);
     ASSERT_THAT(renderables.size(), testing::Eq(1));
     EXPECT_FALSE(renderables[0]->shaped());
 
=== modified file 'tests/unit-tests/scene/test_surface.cpp'
--- tests/unit-tests/scene/test_surface.cpp	2017-07-28 17:00:43 +0000
+++ tests/unit-tests/scene/test_surface.cpp	2017-08-30 15:50:38 +0000
@@ -331,27 +331,6 @@
     }
 }
 
-TEST_F(SurfaceCreation, test_surface_set_alpha)
-{
-    using namespace testing;
-
-    float alpha = 0.5f;
-
-    surface.set_alpha(alpha);
-    EXPECT_FLOAT_EQ(alpha, surface.alpha());
-    auto renderables = surface.generate_renderables(nullptr);
-    ASSERT_THAT(renderables.size(), Ge(1));
-    EXPECT_FLOAT_EQ(alpha, renderables[0]->alpha());
-    
-    alpha = 0.1;
-
-    surface.set_alpha(alpha);
-    EXPECT_FLOAT_EQ(alpha, surface.alpha());
-    renderables = surface.generate_renderables(nullptr);
-    ASSERT_THAT(renderables.size(), Ge(1));
-    EXPECT_FLOAT_EQ(alpha, renderables[0]->alpha());
-}
-
 TEST_F(SurfaceCreation, consume_calls_send_event)
 {
     using namespace testing;
 
=== modified file 'tests/unit-tests/scene/test_surface_stack.cpp'
--- tests/unit-tests/scene/test_surface_stack.cpp	2017-07-28 17:00:43 +0000
+++ tests/unit-tests/scene/test_surface_stack.cpp	2017-08-30 15:50:38 +0000
@@ -22,7 +22,6 @@
 #include "mir/scene/observer.h"
 #include "mir/scene/surface_creation_parameters.h"
 #include "mir/compositor/scene_element.h"
-#include "mir/compositor/decoration.h"
 #include "src/server/report/null_report_factory.h"
 #include "src/server/scene/basic_surface.h"
 #include "src/server/compositor/stream.h"
@@ -226,63 +225,6 @@
             SceneElementForStream(stub_buffer_stream2)));
 }
 
-TEST_F(SurfaceStack, decor_name_is_surface_name)
-{
-    using namespace testing;
-
-    ms::SurfaceStack stack{report};
-    auto surface = std::make_shared<ms::BasicSurface>(
-        std::string("Mary had a little lamb"),
-        geom::Rectangle{{},{}},
-        mir_pointer_unconfined,
-        std::list<ms::StreamInfo> { { std::make_shared<mtd::StubBufferStream>(), {}, {} } },
-        std::shared_ptr<mg::CursorImage>(),
-        report);
-    stack.add_surface(surface, default_params.input_mode);
-    surface->configure(mir_window_attrib_visibility,
-                       mir_window_visibility_exposed);
-    
-    auto elements = stack.scene_elements_for(compositor_id);
-    ASSERT_EQ(1, elements.size());
-
-    auto& element = elements.front();
-
-    auto decor = element->decoration();
-    ASSERT_THAT(decor, Ne(nullptr));
-    EXPECT_EQ(mc::Decoration::Type::surface, decor->type);
-    EXPECT_EQ("Mary had a little lamb", decor->name);
-}
-
-TEST_F(SurfaceStack, gets_surface_renames)
-{
-    using namespace testing;
-
-    ms::SurfaceStack stack{report};
-    auto surface = std::make_shared<ms::BasicSurface>(
-        std::string("username@hostname: /"),
-        geom::Rectangle{{},{}},
-        mir_pointer_unconfined,
-        std::list<ms::StreamInfo> { { std::make_shared<mtd::StubBufferStream>(), {}, {} } },
-        std::shared_ptr<mg::CursorImage>(),
-        report);
-    stack.add_surface(surface, default_params.input_mode);
-    surface->configure(mir_window_attrib_visibility,
-                       mir_window_visibility_exposed);
-    
-    // (change directory in shell app)
-    surface->rename("username@hostname: ~/Documents");
-
-    auto elements = stack.scene_elements_for(compositor_id);
-    ASSERT_EQ(1, elements.size());
-
-    auto& element = elements.front();
-
-    auto decor = element->decoration();
-    ASSERT_THAT(decor, Ne(nullptr));
-    EXPECT_EQ(mc::Decoration::Type::surface, decor->type);
-    EXPECT_EQ("username@hostname: ~/Documents", decor->name);
-}
-
 TEST_F(SurfaceStack, scene_counts_pending_accurately)
 {
     using namespace testing;