Mir

Merge lp:~alan-griffiths/mir/server-support-for-client-initiates-move into lp:mir

server-support-for-client-initiates-move
Merge into development-branch

Proposed by Alan Griffiths on 2017-03-30

Status:

Merged

Approved by:

Alan Griffiths on 2017-04-06

Approved revision:

no longer in the source branch.

Merged at revision:

4143

Proposed branch:

lp:~alan-griffiths/mir/server-support-for-client-initiates-move

Merge into:

lp:mir

Diff against target:

1792 lines (+444/-630)

34 files modified

examples/CMakeLists.txt (+0/-2)
examples/server_example_basic_window_manager.cpp (+8/-0)
examples/server_example_basic_window_manager.h (+8/-1)
examples/server_example_window_management_info.cpp (+0/-373)
examples/server_example_window_management_info.h (+0/-105)
include/server/mir/shell/abstract_shell.h (+5/-0)
include/server/mir/shell/basic_window_manager.h (+14/-2)
include/server/mir/shell/canonical_window_manager.h (+5/-1)
include/server/mir/shell/shell.h (+5/-0)
include/server/mir/shell/shell_wrapper.h (+5/-0)
include/server/mir/shell/system_compositor_window_manager.h (+5/-0)
include/server/mir/shell/window_management_info.h (+3/-3)
include/server/mir/shell/window_manager.h (+5/-0)
include/test/mir/test/doubles/mock_window_manager.h (+1/-0)
src/include/server/mir/frontend/shell.h (+9/-7)
src/server/CMakeLists.txt (+1/-0)
src/server/frontend/CMakeLists.txt (+1/-0)
src/server/frontend/session_mediator.cpp (+15/-2)
src/server/frontend/shell_wrapper.cpp (+4/-14)
src/server/frontend/shell_wrapper.h (+5/-9)
src/server/shell/CMakeLists.txt (+3/-3)
src/server/shell/abstract_shell.cpp (+8/-0)
src/server/shell/basic_window_manager.cpp (+32/-6)
src/server/shell/frontend_shell.cpp (+30/-18)
src/server/shell/frontend_shell.h (+5/-9)
src/server/shell/shell_wrapper.cpp (+8/-0)
src/server/shell/system_compositor_window_manager.cpp (+7/-0)
src/server/shell/window_management_info.cpp (+72/-0)
src/server/symbols.map (+144/-63)
tests/acceptance-tests/CMakeLists.txt (+0/-8)
tests/acceptance-tests/client_mediated_user_gestures.cpp (+28/-2)
tests/acceptance-tests/test_client_cursor_api.cpp (+3/-0)
tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp (+3/-0)
tests/include/mir/test/doubles/mock_shell.h (+2/-2)

To merge this branch:

bzr merge lp:~alan-griffiths/mir/server-support-for-client-initiates-move

High

Invalid

Link a bug report

Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-04-04
Kevin DuBois (community)		2017-03-30	Approve on 2017-04-04
Review via email: mp+321470@code.launchpad.net

Commit message

Server support for mir_window_request_user_move()

Description of the change

Server support for mir_window_request_user_move()

To test this I had to make some classes public (msh::BasicWindowManager et alias) these are largely duplicated in examples and are simply replaced in libmiral.

So these classes are both published and deprecated. Cleanup to follow, hopefully soon.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-30:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-31:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-03-31:

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

review: Approve (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-04-03:

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

review: Approve (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2017-04-03:

'StreamPainter' isn't a useful interface anymore, can probably be removed.

should this be comment out?
963 +// policy->handle_request_move(session, surface);

review: Needs Information

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2017-04-04:

> 'StreamPainter' isn't a useful interface anymore, can probably be removed.

Reworking the code to remove it is beyond the scope of *this* MP.

In fact, I think it pointless as this code is superseded by miral, we just haven't quite reached the point where we can integrate that work.

> should this be comment out?
> 963 +// policy->handle_request_move(session, surface);

Replaced with an English version.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-04-04:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2017-04-04:

^ Seems like a CI glitch...

10:48:46 error: device offline
10:48:46 error: device offline
10:48:46 error: device offline

Revision history for this message

Kevin DuBois (kdub) wrote on 2017-04-04:

alright then, lgtm

review: Approve

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-04-04:

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

review: Approve (continuous-integration)

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes:

Alan Griffiths

Emanuele Antonio Faraone

Gerry Boland

Mir development team

 === modified file 'examples/CMakeLists.txt'
 --- examples/CMakeLists.txt	2017-02-15 07:38:33 +0000
 +++ examples/CMakeLists.txt	2017-04-04 10:15:32 +0000
@@ -28,8 +28,6 @@
    server_example_input_filter.cpp
    server_example_host_lifecycle_event.cpp
    server_example_window_management.cpp
--  server_example_window_management_info.cpp
--  server_example_window_management_info.h
    server_example_custom_compositor.cpp
    server_example_adorning_compositor.cpp
    server_example_cursor_images.cpp
 === modified file 'examples/server_example_basic_window_manager.cpp'
 --- examples/server_example_basic_window_manager.cpp	2017-03-08 16:16:44 +0000
 +++ examples/server_example_basic_window_manager.cpp	2017-04-04 10:15:32 +0000
@@ -144,6 +144,14 @@
      // Not supported in example servers
+ }
++void me::BasicWindowManager::handle_request_move(
++    std::shared_ptr<scene::Session> const& /*session*/,
++    std::shared_ptr<scene::Surface> const& /*surface*/,
++    uint64_t /*timestamp*/)
++{
++    // Not supported in example servers
++}
++
  int me::BasicWindowManager::set_surface_attribute(
      std::shared_ptr<scene::Session> const& /*session*/,
      std::shared_ptr<scene::Surface> const& surface,
 === modified file 'examples/server_example_basic_window_manager.h'
 --- examples/server_example_basic_window_manager.h	2017-03-08 12:59:36 +0000
 +++ examples/server_example_basic_window_manager.h	2017-04-04 10:15:32 +0000
@@ -19,7 +19,7 @@
  #ifndef MIR_EXAMPLE_BASIC_WINDOW_MANAGER_H_
  #define MIR_EXAMPLE_BASIC_WINDOW_MANAGER_H_
--#include "server_example_window_management_info.h"
++#include "mir/shell/window_management_info.h"
  #include "mir/geometry/rectangles.h"
  #include "mir/shell/abstract_shell.h"
@@ -36,6 +36,8 @@
  namespace examples
+ {
  using shell::SurfaceSet;
++using shell::SurfaceInfo;
++using shell::SessionInfo;
  /// The interface through which the policy instructs the controller.
  /// These functions assume that the BasicWindowManager data structures can be accessed freely.
@@ -179,6 +181,11 @@
          std::shared_ptr<scene::Surface> const& surface,
          uint64_t timestamp) override;
++    void handle_request_move(
++        std::shared_ptr<scene::Session> const& session,
++        std::shared_ptr<scene::Surface> const& surface,
++        uint64_t timestamp) override;
++
      int set_surface_attribute(
          std::shared_ptr<scene::Session> const& /*session*/,
          std::shared_ptr<scene::Surface> const& surface,
 === removed file 'examples/server_example_window_management_info.cpp'
 --- examples/server_example_window_management_info.cpp	2017-01-30 08:13:20 +0000
 +++ examples/server_example_window_management_info.cpp	1970-01-01 00:00:00 +0000
@@ -1,373 +0,0 @@
--/*
-- * Copyright © 2015 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3,
-- * as published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authored by: Alan Griffiths <alan@octopull.co.uk>
-- */
--
--#include "server_example_window_management_info.h"
--
--#include "mir/scene/surface.h"
--#include "mir/scene/surface_creation_parameters.h"
--#include "mir/scene/session.h"
--
--#include "mir/graphics/buffer.h"
--#include "mir/renderer/sw/pixel_source.h"
--
--#include <atomic>
--
--namespace me = mir::examples;
--namespace ms = mir::scene;
--namespace mg = mir::graphics;
--namespace mrs = mir::renderer::software;
--using namespace mir::geometry;
--
--me::SurfaceInfo::SurfaceInfo(
--    std::shared_ptr<scene::Session> const& session,
--    std::shared_ptr<scene::Surface> const& surface,
--    scene::SurfaceCreationParameters const& params) :
--    type{surface->type()},
--    state{surface->state()},
--    restore_rect{surface->top_left(), surface->size()},
--    session{session},
--    parent{params.parent},
--    min_width{params.min_width.is_set() ? params.min_width.value()  : Width{}},
--    min_height{params.min_height.is_set() ? params.min_height.value() : Height{}},
--    max_width{params.max_width.is_set() ? params.max_width.value() : Width{std::numeric_limits<int>::max()}},
--    max_height{params.max_height.is_set() ? params.max_height.value() : Height{std::numeric_limits<int>::max()}},
--    width_inc{params.width_inc},
--    height_inc{params.height_inc},
--    min_aspect{params.min_aspect},
--    max_aspect{params.max_aspect}
--{
--    if (params.output_id != mir::graphics::DisplayConfigurationOutputId{0})
--        output_id = params.output_id;
--}
--
--bool me::SurfaceInfo::can_be_active() const
--{
--    switch (type)
--    {
--    case mir_window_type_normal:       /**< AKA "regular"                       */
--    case mir_window_type_utility:      /**< AKA "floating"                      */
--    case mir_window_type_dialog:
--    case mir_window_type_satellite:    /**< AKA "toolbox"/"toolbar"             */
--    case mir_window_type_freestyle:
--    case mir_window_type_menu:
--    case mir_window_type_inputmethod:  /**< AKA "OSK" or handwriting etc.       */
--        return true;
--
--    case mir_window_type_gloss:
--    case mir_window_type_tip:          /**< AKA "tooltip"                       */
--    default:
--        // Cannot have input focus
--        return false;
--    }
--}
--
--bool me::SurfaceInfo::must_have_parent() const
--{
--    switch (type)
--    {
--    case mir_window_type_gloss:;
--    case mir_window_type_inputmethod:
--    case mir_window_type_satellite:
--    case mir_window_type_tip:
--        return true;
--
--    default:
--        return false;
--    }
--}
--
--bool me::SurfaceInfo::can_morph_to(MirWindowType new_type) const
--{
--    switch (new_type)
--    {
--    case mir_window_type_normal:
--    case mir_window_type_utility:
--    case mir_window_type_satellite:
--        switch (type)
--        {
--        case mir_window_type_normal:
--        case mir_window_type_utility:
--        case mir_window_type_dialog:
--        case mir_window_type_satellite:
--            return true;
--
--        default:
--            break;
--        }
--        break;
--
--    case mir_window_type_dialog:
--        switch (type)
--        {
--        case mir_window_type_normal:
--        case mir_window_type_utility:
--        case mir_window_type_dialog:
--        case mir_window_type_menu:
--        case mir_window_type_satellite:
--            return true;
--
--        default:
--            break;
--        }
--        break;
--
--    default:
--        break;
--    }
--
--    return false;
--}
--
--bool me::SurfaceInfo::must_not_have_parent() const
--{
--    switch (type)
--    {
--    case mir_window_type_normal:
--    case mir_window_type_utility:
--        return true;
--
--    default:
--        return false;
--    }
--}
--
--bool me::SurfaceInfo::is_visible() const
--{
--    switch (state)
--    {
--    case mir_window_state_hidden:
--    case mir_window_state_minimized:
--        return false;
--    default:
--        break;
--    }
--    return true;
--}
--
--struct mir::examples::SurfaceInfo::StreamPainter
--{
--    virtual void paint(int) = 0;
--    virtual ~StreamPainter() = default;
--    StreamPainter() = default;
--    StreamPainter(StreamPainter const&) = delete;
--    StreamPainter& operator=(StreamPainter const&) = delete;
--};
--
--struct mir::examples::SurfaceInfo::AllocatingPainter
--    : mir::examples::SurfaceInfo::StreamPainter
--{
--    AllocatingPainter(
--        std::shared_ptr<frontend::BufferStream> const& buffer_stream,
--        std::shared_ptr<scene::Session> const& session,
--        Size size) :
--        buffer_stream(buffer_stream),
--        session(session),
--        properties({
--            size,
--            buffer_stream->pixel_format(),
--            mg::BufferUsage::software
--        }),
--        front_buffer(session->create_buffer(properties)),
--        back_buffer(session->create_buffer(properties))
--    {
--    }
--
--    void paint(int intensity) override
--    {
--        auto buffer = session->get_buffer(back_buffer);
--
--        auto const format = buffer->pixel_format();
--        auto const sz = buffer->size().height.as_int() *
--                        buffer->size().width.as_int() * MIR_BYTES_PER_PIXEL(format);
--        std::vector<unsigned char> pixels(sz, intensity);
--        if (auto pixel_source = dynamic_cast<mrs::PixelSource*>(buffer->native_buffer_base()))
--            pixel_source->write(pixels.data(), sz);
--        buffer_stream->submit_buffer(buffer);
--
--        std::swap(front_buffer, back_buffer);
--    }
--
--    ~AllocatingPainter()
--    {
--        session->destroy_buffer(front_buffer);
--        session->destroy_buffer(back_buffer);
--    }
--
--    std::shared_ptr<frontend::BufferStream> const buffer_stream;
--    std::shared_ptr<scene::Session> const session;
--    mg::BufferProperties properties;
--    mg::BufferID front_buffer;
--    mg::BufferID back_buffer;
--};
--
--void mir::examples::SurfaceInfo::init_titlebar(
--    std::shared_ptr<scene::Session> const& session,
--    std::shared_ptr<scene::Surface> const& surface)
--{
--    auto stream = surface->primary_buffer_stream();
--    stream_painter = std::make_shared<AllocatingPainter>(stream, session, surface->size());
--}
--
--void mir::examples::SurfaceInfo::paint_titlebar(int intensity)
--{
--    stream_painter->paint(intensity);
--}
--
--void me::SurfaceInfo::constrain_resize(
--    std::shared_ptr<ms::Surface> const& surface,
--    Point& requested_pos,
--    Size& requested_size,
--    bool const left_resize,
--    bool const top_resize,
--    Rectangle const& /*bounds*/) const
--{
--    Point new_pos = requested_pos;
--    Size new_size = requested_size;
--
--    if (min_aspect.is_set())
--    {
--        auto const ar = min_aspect.value();
--
--        auto const error = new_size.height.as_int()*long(ar.width) - new_size.width.as_int()*long(ar.height);
--
--        if (error > 0)
--        {
--            // Add (denominator-1) to numerator to ensure rounding up
--            auto const width_correction  = (error+(ar.height-1))/ar.height;
--            auto const height_correction = (error+(ar.width-1))/ar.width;
--
--            if (width_correction < height_correction)
--            {
--                new_size.width = new_size.width + DeltaX(width_correction);
--            }
--            else
--            {
--                new_size.height = new_size.height - DeltaY(height_correction);
--            }
--        }
--    }
--
--    if (max_aspect.is_set())
--    {
--        auto const ar = max_aspect.value();
--
--        auto const error = new_size.width.as_int()*long(ar.height) - new_size.height.as_int()*long(ar.width);
--
--        if (error > 0)
--        {
--            // Add (denominator-1) to numerator to ensure rounding up
--            auto const height_correction = (error+(ar.width-1))/ar.width;
--            auto const width_correction  = (error+(ar.height-1))/ar.height;
--
--            if (width_correction < height_correction)
--            {
--                new_size.width = new_size.width - DeltaX(width_correction);
--            }
--            else
--            {
--                new_size.height = new_size.height + DeltaY(height_correction);
--            }
--        }
--    }
--
--    if (min_width > new_size.width)
--        new_size.width = min_width;
--
--    if (min_height > new_size.height)
--        new_size.height = min_height;
--
--    if (max_width < new_size.width)
--        new_size.width = max_width;
--
--    if (max_height < new_size.height)
--        new_size.height = max_height;
--
--    if (width_inc.is_set())
--    {
--        auto const width = new_size.width.as_int() - min_width.as_int();
--        auto inc = width_inc.value().as_int();
--        if (width % inc)
--            new_size.width = min_width + DeltaX{inc*(((2L*width + inc)/2)/inc)};
--    }
--
--    if (height_inc.is_set())
--    {
--        auto const height = new_size.height.as_int() - min_height.as_int();
--        auto inc = height_inc.value().as_int();
--        if (height % inc)
--            new_size.height = min_height + DeltaY{inc*(((2L*height + inc)/2)/inc)};
--    }
--
--    if (left_resize)
--        new_pos.x += new_size.width - requested_size.width;
--
--    if (top_resize)
--        new_pos.y += new_size.height - requested_size.height;
--
--    // placeholder - constrain onscreen
--
--    switch (state)
--    {
--    case mir_window_state_restored:
--        break;
--
--        // "A vertically maximised surface is anchored to the top and bottom of
--        // the available workspace and can have any width."
--    case mir_window_state_vertmaximized:
--        new_pos.y = surface->top_left().y;
--        new_size.height = surface->size().height;
--        break;
--
--        // "A horizontally maximised surface is anchored to the left and right of
--        // the available workspace and can have any height"
--    case mir_window_state_horizmaximized:
--        new_pos.x = surface->top_left().x;
--        new_size.width = surface->size().width;
--        break;
--
--        // "A maximised surface is anchored to the top, bottom, left and right of the
--        // available workspace. For example, if the launcher is always-visible then
--        // the left-edge of the surface is anchored to the right-edge of the launcher."
--    case mir_window_state_maximized:
--    default:
--        new_pos.x = surface->top_left().x;
--        new_pos.y = surface->top_left().y;
--        new_size.width = surface->size().width;
--        new_size.height = surface->size().height;
--        break;
--    }
--
--    requested_pos = new_pos;
--    requested_size = new_size;
--}
--
--bool me::SurfaceInfo::needs_titlebar(MirWindowType type)
--{
--    switch (type)
--    {
--    case mir_window_type_freestyle:
--    case mir_window_type_menu:
--    case mir_window_type_inputmethod:
--    case mir_window_type_gloss:
--    case mir_window_type_tip:
--        // No decorations for these surface types
--        return false;
--    default:
--        return true;
--    }
--}
 === removed file 'examples/server_example_window_management_info.h'
 --- examples/server_example_window_management_info.h	2017-01-18 02:29:37 +0000
 +++ examples/server_example_window_management_info.h	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
--/*
-- * Copyright © 2015 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3,
-- * as published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authored by: Alan Griffiths <alan@octopull.co.uk>
-- */
--
--#ifndef MIR_SERVER_EXAMPLE_WINDOW_MANAGEMENT_INFO_H
--#define MIR_SERVER_EXAMPLE_WINDOW_MANAGEMENT_INFO_H
--
--#include "mir/geometry/rectangles.h"
--#include "mir/optional_value.h"
--#include "mir/shell/surface_specification.h"
--
--#include <vector>
--
--namespace mir
--{
--namespace scene { class Session; class Surface; class SurfaceCreationParameters; }
--namespace examples
--{
--struct SurfaceInfo
--{
--    SurfaceInfo(
--        std::shared_ptr <scene::Session> const& session,
--        std::shared_ptr <scene::Surface> const& surface,
--        scene::SurfaceCreationParameters const& params);
--
--    bool can_be_active() const;
--
--    bool can_morph_to(MirWindowType new_type) const;
--
--    bool must_have_parent() const;
--
--    bool must_not_have_parent() const;
--
--    bool is_visible() const;
--
--    static bool needs_titlebar(MirWindowType type);
--
--    void constrain_resize(
--        std::shared_ptr <scene::Surface> const& surface,
--        geometry::Point& requested_pos,
--        geometry::Size& requested_size,
--        const bool left_resize,
--        const bool top_resize,
--        geometry::Rectangle const& bounds) const;
--
--    MirWindowType type;
--    MirWindowState state;
--    geometry::Rectangle restore_rect;
--    std::weak_ptr <scene::Session> session;
--    std::weak_ptr <scene::Surface> parent;
--    std::vector <std::weak_ptr<scene::Surface>> children;
--    std::shared_ptr <scene::Surface> titlebar;
--    frontend::SurfaceId titlebar_id;
--    frontend::BufferStreamId titlebar_stream_id;
--    bool is_titlebar = false;
--    geometry::Width min_width;
--    geometry::Height min_height;
--    geometry::Width max_width;
--    geometry::Height max_height;
--    mir::optional_value<geometry::DeltaX> width_inc;
--    mir::optional_value<geometry::DeltaY> height_inc;
--    mir::optional_value<shell::SurfaceAspectRatio> min_aspect;
--    mir::optional_value<shell::SurfaceAspectRatio> max_aspect;
--    mir::optional_value<graphics::DisplayConfigurationOutputId> output_id;
--
--    void init_titlebar(
--        std::shared_ptr<scene::Session> const& session,
--        std::shared_ptr<scene::Surface> const& surface);
--
--    void paint_titlebar(int intensity);
--
--private:
--
--    struct StreamPainter;
--    struct AllocatingPainter;
--
--    std::shared_ptr <StreamPainter> stream_painter;
--};
--
--struct SessionInfo
--{
--    std::vector<std::weak_ptr<scene::Surface>> surfaces;
--
--    // This is only used by the TilingWindowManagerPolicy,
--    // perhaps we need a more extensible mechanism. (std::experimental::any?)
--    geometry::Rectangle tile;
--};
--}
--}
--
--#endif //MIR_SERVER_EXAMPLE_WINDOW_MANAGEMENT_INFO_H
 === modified file 'include/server/mir/shell/abstract_shell.h'
 --- include/server/mir/shell/abstract_shell.h	2017-03-09 17:42:58 +0000
 +++ include/server/mir/shell/abstract_shell.h	2017-04-04 10:15:32 +0000
@@ -87,6 +87,11 @@
          std::shared_ptr<scene::Surface> const& surface,
          uint64_t timestamp) override;
++    void request_move(
++        std::shared_ptr<scene::Session> const& session,
++        std::shared_ptr<scene::Surface> const& surface,
++        uint64_t timestamp) override;
++
      std::shared_ptr<scene::PromptSession> start_prompt_session_for(
          std::shared_ptr<scene::Session> const& session,
          scene::PromptSessionCreationParameters const& params) override;
 === renamed file 'src/include/server/mir/shell/basic_window_manager.h' => 'include/server/mir/shell/basic_window_manager.h'
 --- src/include/server/mir/shell/basic_window_manager.h	2017-03-09 17:49:01 +0000
 +++ include/server/mir/shell/basic_window_manager.h	2017-04-04 10:15:32 +0000
@@ -130,6 +130,8 @@
          shell::FocusController* focus_controller,
          std::unique_ptr<WindowManagementPolicy> policy);
++    ~BasicWindowManager();
++
  public:
      using typename WindowManagerTools::SurfaceInfoMap;
      using typename WindowManagerTools::SessionInfoMap;
@@ -175,6 +177,11 @@
          std::shared_ptr<scene::Surface> const& surface,
          uint64_t timestamp) override;
++    void handle_request_move(
++        std::shared_ptr<scene::Session> const& session,
++        std::shared_ptr<scene::Surface> const& surface,
++        uint64_t timestamp) override;
++
      int set_surface_attribute(
          std::shared_ptr<scene::Session> const& /*session*/,
          std::shared_ptr<scene::Surface> const& surface,
@@ -217,12 +224,16 @@
      geometry::Rectangles displays;
      geometry::Point cursor;
      uint64_t last_input_event_timestamp{0};
++    MirEvent const* last_input_event{nullptr};
      void update_event_timestamp(MirKeyboardEvent const* kev);
      void update_event_timestamp(MirPointerEvent const* pev);
      void update_event_timestamp(MirTouchEvent const* tev);
--};
++    void update_event_timestamp(MirInputEvent const* iev);
++} __attribute__((deprecated("Use libmiral instead")));
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
  /// A policy based window manager. This exists to initialize BasicWindowManager and
  /// the WMPolicy (in an awkward manner).
  /// TODO revisit this initialization sequence.
@@ -249,7 +260,8 @@
          return std::unique_ptr<WMPolicy>(
              new WMPolicy(this, std::forward<PolicyArgs>(policy_args)...));
+     }
--};
++} __attribute__((deprecated("Use libmiral instead")));
++#pragma GCC diagnostic pop
+ }
+ }
 === renamed file 'src/include/server/mir/shell/canonical_window_manager.h' => 'include/server/mir/shell/canonical_window_manager.h'
 --- src/include/server/mir/shell/canonical_window_manager.h	2017-03-08 16:16:44 +0000
 +++ include/server/mir/shell/canonical_window_manager.h	2017-04-04 10:15:32 +0000
@@ -19,7 +19,7 @@
  #ifndef MIR_SHELL_CANONICAL_WINDOW_MANAGER_H_
  #define MIR_SHELL_CANONICAL_WINDOW_MANAGER_H_
--#include "basic_window_manager.h"
++#include "mir/shell/basic_window_manager.h"
  #include "mir/geometry/displacement.h"
@@ -122,7 +122,11 @@
      std::weak_ptr<scene::Surface> active_surface_;
  };
++
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
  using CanonicalWindowManager = WindowManagerConstructor<CanonicalWindowManagerPolicy>;
++#pragma GCC diagnostic pop
+ }
+ }
 === modified file 'include/server/mir/shell/shell.h'
 --- include/server/mir/shell/shell.h	2017-03-08 12:34:11 +0000
 +++ include/server/mir/shell/shell.h	2017-04-04 10:15:32 +0000
@@ -104,6 +104,11 @@
          std::shared_ptr<scene::Session> const& session,
          std::shared_ptr<scene::Surface> const& surface,
          uint64_t timestamp) = 0;
++
++    virtual void request_move(
++        std::shared_ptr<scene::Session> const& session,
++        std::shared_ptr<scene::Surface> const& surface,
++        uint64_t timestamp) = 0;
  /** @} */
  };
+ }
 === modified file 'include/server/mir/shell/shell_wrapper.h'
 --- include/server/mir/shell/shell_wrapper.h	2017-03-09 17:42:58 +0000
 +++ include/server/mir/shell/shell_wrapper.h	2017-04-04 10:15:32 +0000
@@ -90,6 +90,11 @@
          std::shared_ptr<scene::Surface> const& surface,
          uint64_t timestamp) override;
++    void request_move(
++        std::shared_ptr<scene::Session> const& session,
++        std::shared_ptr<scene::Surface> const& surface,
++        uint64_t timestamp) override;
++
      void add_display(geometry::Rectangle const& area) override;
      void remove_display(geometry::Rectangle const& area) override;
 === modified file 'include/server/mir/shell/system_compositor_window_manager.h'
 --- include/server/mir/shell/system_compositor_window_manager.h	2017-03-08 12:59:36 +0000
 +++ include/server/mir/shell/system_compositor_window_manager.h	2017-04-04 10:15:32 +0000
@@ -100,6 +100,11 @@
          std::shared_ptr<scene::Surface> const& surface,
          uint64_t timestamp) override;
++    void handle_request_move(
++        std::shared_ptr<scene::Session> const& session,
++        std::shared_ptr<scene::Surface> const& surface,
++        uint64_t timestamp) override;
++
      int set_surface_attribute(
          std::shared_ptr<scene::Session> const& session,
          std::shared_ptr<scene::Surface> const& surface,
 === renamed file 'src/include/server/mir/shell/window_management_info.h' => 'include/server/mir/shell/window_management_info.h'
 --- src/include/server/mir/shell/window_management_info.h	2017-01-18 02:29:37 +0000
 +++ include/server/mir/shell/window_management_info.h	2017-04-04 10:15:32 +0000
@@ -27,7 +27,7 @@
  namespace mir
+ {
--namespace scene { class Session; class Surface; class SurfaceCreationParameters; }
++namespace scene { class Session; class Surface; struct SurfaceCreationParameters; }
  namespace shell
+ {
  struct SurfaceInfo
@@ -65,6 +65,7 @@
      std::vector <std::weak_ptr<scene::Surface>> children;
      std::shared_ptr <scene::Surface> titlebar;
      frontend::SurfaceId titlebar_id;
++    frontend::BufferStreamId titlebar_stream_id;
      bool is_titlebar = false;
      geometry::Width min_width;
      geometry::Height min_height;
@@ -77,8 +78,7 @@
      mir::optional_value<graphics::DisplayConfigurationOutputId> output_id;
      mir::optional_value<MirPointerConfinementState> confine_pointer;
--    void init_titlebar(std::shared_ptr <scene::Surface> const& surface);
--
++    void init_titlebar(std::shared_ptr<scene::Session> const& session, std::shared_ptr<scene::Surface> const& surface);
      void paint_titlebar(int intensity);
  private:
 === modified file 'include/server/mir/shell/window_manager.h'
 --- include/server/mir/shell/window_manager.h	2017-03-08 12:59:36 +0000
 +++ include/server/mir/shell/window_manager.h	2017-04-04 10:15:32 +0000
@@ -81,6 +81,11 @@
          std::shared_ptr<scene::Surface> const& surface,
          uint64_t timestamp) = 0;
++    virtual void handle_request_move(
++        std::shared_ptr<scene::Session> const& session,
++        std::shared_ptr<scene::Surface> const& surface,
++        uint64_t timestamp) = 0;
++
      virtual ~WindowManager() = default;
      WindowManager() = default;
      WindowManager(WindowManager const&) = delete;
 === modified file 'include/test/mir/test/doubles/mock_window_manager.h'
 --- include/test/mir/test/doubles/mock_window_manager.h	2017-03-08 12:59:36 +0000
 +++ include/test/mir/test/doubles/mock_window_manager.h	2017-04-04 10:15:32 +0000
@@ -59,6 +59,7 @@
      MOCK_METHOD3(handle_raise_surface, void(std::shared_ptr<scene::Session> const&, std::shared_ptr<scene::Surface> const&, uint64_t));
      MOCK_METHOD3(handle_request_drag_and_drop, void(std::shared_ptr<scene::Session> const&, std::shared_ptr<scene::Surface> const&, uint64_t));
++    MOCK_METHOD3(handle_request_move, void(std::shared_ptr<scene::Session> const&, std::shared_ptr<scene::Surface> const&, uint64_t));
      MOCK_METHOD4(set_surface_attribute,
          int(std::shared_ptr<scene::Session> const& session,
 === modified file 'src/include/server/mir/frontend/shell.h'
 --- src/include/server/mir/frontend/shell.h	2017-03-08 12:34:11 +0000
 +++ src/include/server/mir/frontend/shell.h	2017-04-04 10:15:32 +0000
@@ -82,15 +82,17 @@
          SurfaceId surface_id,
          MirWindowAttrib attrib) = 0;
--    virtual void raise_surface(
--        std::shared_ptr<Session> const& session,
--        SurfaceId surface_id,
--        uint64_t timestamp) = 0;
++    enum class UserRequest
++    {
++        drag_and_drop,
++        move,
++        activate,
++    };
--    virtual void request_drag_and_drop(
++    virtual void request_operation(
          std::shared_ptr<Session> const& session,
--        SurfaceId surface_id,
--        uint64_t timestamp) = 0;
++        SurfaceId surface_id, uint64_t timestamp,
++        UserRequest request) = 0;
  protected:
      Shell() = default;
 === modified file 'src/server/CMakeLists.txt'
 --- src/server/CMakeLists.txt	2017-03-14 05:30:56 +0000
 +++ src/server/CMakeLists.txt	2017-04-04 10:15:32 +0000
@@ -11,6 +11,7 @@
    ${PROJECT_SOURCE_DIR}/include/server
    ${PROJECT_SOURCE_DIR}/include/renderer
    ${PROJECT_SOURCE_DIR}/include/renderers/gl
++  ${PROJECT_SOURCE_DIR}/include/renderers/sw
    ${PROJECT_SOURCE_DIR}/src/include/platform
    ${PROJECT_SOURCE_DIR}/src/include/client
    ${PROJECT_SOURCE_DIR}/src/include/server
 === modified file 'src/server/frontend/CMakeLists.txt'
 --- src/server/frontend/CMakeLists.txt	2017-02-15 07:38:33 +0000
 +++ src/server/frontend/CMakeLists.txt	2017-04-04 10:15:32 +0000
@@ -33,6 +33,7 @@
    screencast_buffer_tracker.cpp
    session_mediator_observer_multiplexer.cpp
    session_mediator_observer_multiplexer.h
++  ${PROJECT_SOURCE_DIR}/src/include/server/mir/frontend/shell.h
+ )
  add_library(
 === modified file 'src/server/frontend/session_mediator.cpp'
 --- src/server/frontend/session_mediator.cpp	2017-04-04 07:04:57 +0000
 +++ src/server/frontend/session_mediator.cpp	2017-04-04 10:15:32 +0000
@@ -1180,11 +1180,24 @@
      switch (request->operation())
+     {
      case mir::protobuf::RequestOperation::START_DRAG_AND_DROP:
--        shell->request_drag_and_drop(session, mf::SurfaceId{surface_id.value()}, cookie_ptr->timestamp());
++        shell->request_operation(
++            session, mf::SurfaceId{surface_id.value()},
++            cookie_ptr->timestamp(),
++            Shell::UserRequest::drag_and_drop);
          break;
      case mir::protobuf::RequestOperation::MAKE_ACTIVE:
--        shell->raise_surface(session, mf::SurfaceId{surface_id.value()}, cookie_ptr->timestamp());
++        shell->request_operation(
++            session, mf::SurfaceId{surface_id.value()},
++            cookie_ptr->timestamp(),
++            Shell::UserRequest::activate);
++        break;
++
++    case mir::protobuf::RequestOperation::USER_MOVE:
++        shell->request_operation(
++            session, mf::SurfaceId{surface_id.value()},
++            cookie_ptr->timestamp(),
++            Shell::UserRequest::move);
          break;
      default:
 === modified file 'src/server/frontend/shell_wrapper.cpp'
 --- src/server/frontend/shell_wrapper.cpp	2017-03-08 12:34:11 +0000
 +++ src/server/frontend/shell_wrapper.cpp	2017-04-04 10:15:32 +0000
@@ -99,18 +99,8 @@
      return wrapped->get_surface_attribute(session, surface_id, attrib);
+ }
--void mf::ShellWrapper::raise_surface(
--    std::shared_ptr<Session> const& session,
--    SurfaceId surface_id,
--    uint64_t timestamp)
--{
--    wrapped->raise_surface(session, surface_id, timestamp);
--}
--
--void mf::ShellWrapper::request_drag_and_drop(
--    std::shared_ptr<Session> const& session,
--    SurfaceId surface_id,
--    uint64_t timestamp)
--{
--    wrapped->request_drag_and_drop(session, surface_id, timestamp);
++void mf::ShellWrapper::request_operation(
++    std::shared_ptr<Session> const& session, SurfaceId surface_id, uint64_t timestamp, UserRequest request)
++{
++    wrapped->request_operation(session, surface_id, timestamp, request);
+ }
 === modified file 'src/server/frontend/shell_wrapper.h'
 --- src/server/frontend/shell_wrapper.h	2017-03-08 12:34:11 +0000
 +++ src/server/frontend/shell_wrapper.h	2017-04-04 10:15:32 +0000
@@ -75,15 +75,11 @@
          SurfaceId surface_id,
          MirWindowAttrib attrib) override;
--    void raise_surface(
--        std::shared_ptr<Session> const& session,
--        SurfaceId surface_id,
--        uint64_t timestamp) override;
--
--    void request_drag_and_drop(
--        std::shared_ptr<Session> const& session,
--        SurfaceId surface_id,
--        uint64_t timestamp) override;
++    void request_operation(
++        std::shared_ptr<Session> const& session,
++        SurfaceId surface_id,
++        uint64_t timestamp,
++        UserRequest request) override;
  protected:
      std::shared_ptr<Shell> const wrapped;
 === modified file 'src/server/shell/CMakeLists.txt'
 --- src/server/shell/CMakeLists.txt	2017-01-18 02:29:37 +0000
 +++ src/server/shell/CMakeLists.txt	2017-04-04 10:15:32 +0000
@@ -2,8 +2,8 @@
    SHELL_SOURCES
    abstract_shell.cpp
--  basic_window_manager.cpp  ${CMAKE_SOURCE_DIR}/src/include/server/mir/shell/basic_window_manager.h
--  canonical_window_manager.cpp  ${CMAKE_SOURCE_DIR}/src/include/server/mir/shell/canonical_window_manager.h
++  basic_window_manager.cpp  ${CMAKE_SOURCE_DIR}/include/server/mir/shell/basic_window_manager.h
++  canonical_window_manager.cpp  ${CMAKE_SOURCE_DIR}/include/server/mir/shell/canonical_window_manager.h
    frontend_shell.cpp
    graphics_display_layout.cpp
    graphics_display_layout.h
@@ -17,7 +17,7 @@
    ${CMAKE_SOURCE_DIR}/include/server/mir/shell/display_configuration_controller.h
    surface_specification.cpp
    surface_stack_wrapper.cpp ${CMAKE_SOURCE_DIR}/include/server/mir/shell/surface_stack_wrapper.h
--  window_management_info.cpp   ${CMAKE_SOURCE_DIR}/src/include/server/mir/shell/window_management_info.h
++  window_management_info.cpp   ${CMAKE_SOURCE_DIR}/include/server/mir/shell/window_management_info.h
+ )
  add_library(
 === modified file 'src/server/shell/abstract_shell.cpp'
 --- src/server/shell/abstract_shell.cpp	2017-03-28 18:02:49 +0000
 +++ src/server/shell/abstract_shell.cpp	2017-04-04 10:15:32 +0000
@@ -266,6 +266,14 @@
      window_manager->handle_request_drag_and_drop(session, surface, timestamp);
+ }
++void msh::AbstractShell::request_move(
++    std::shared_ptr<scene::Session> const& session,
++    std::shared_ptr<scene::Surface> const& surface,
++    uint64_t timestamp)
++{
++    window_manager->handle_request_move(session, surface, timestamp);
++}
++
  void msh::AbstractShell::focus_next_session()
+ {
      std::unique_lock<std::mutex> lock(focus_mutex);
 === modified file 'src/server/shell/basic_window_manager.cpp'
 --- src/server/shell/basic_window_manager.cpp	2017-03-09 17:49:01 +0000
 +++ src/server/shell/basic_window_manager.cpp	2017-04-04 10:15:32 +0000
@@ -32,6 +32,12 @@
+ {
+ }
++msh::BasicWindowManager::~BasicWindowManager()
++{
++    if (last_input_event)
++        mir_event_unref(last_input_event);
++}
++
  void msh::BasicWindowManager::add_session(std::shared_ptr<scene::Session> const& session)
+ {
      std::lock_guard<decltype(mutex)> lock(mutex);
@@ -145,6 +151,21 @@
          policy->handle_request_drag_and_drop(session, surface);
+ }
++void msh::BasicWindowManager::handle_request_move(
++    std::shared_ptr<scene::Session> const& session,
++    std::shared_ptr<scene::Surface> const& surface,
++    uint64_t timestamp)
++{
++    std::lock_guard<decltype(mutex)> lock(mutex);
++    if (timestamp >= last_input_event_timestamp)
++    {
++        // When we reintegrate with miral::BasicWindowManager this is where we
++        // will ask the policy to to handle the move.
++        (void)session;
++        (void)surface;
++    }
++}
++
  int msh::BasicWindowManager::set_surface_attribute(
      std::shared_ptr<scene::Session> const& /*session*/,
      std::shared_ptr<scene::Surface> const& surface,
@@ -288,25 +309,22 @@
  void msh::BasicWindowManager::update_event_timestamp(MirKeyboardEvent const* kev)
+ {
--    auto iev = mir_keyboard_event_input_event(kev);
--    last_input_event_timestamp = mir_input_event_get_event_time(iev);
++    update_event_timestamp(mir_keyboard_event_input_event(kev));
+ }
  void msh::BasicWindowManager::update_event_timestamp(MirPointerEvent const* pev)
+ {
--    auto iev = mir_pointer_event_input_event(pev);
      auto pointer_action = mir_pointer_event_action(pev);
      if (pointer_action == mir_pointer_action_button_up ||
          pointer_action == mir_pointer_action_button_down)
+     {
--        last_input_event_timestamp = mir_input_event_get_event_time(iev);
++        update_event_timestamp(mir_pointer_event_input_event(pev));
+     }
+ }
  void msh::BasicWindowManager::update_event_timestamp(MirTouchEvent const* tev)
+ {
--    auto iev = mir_touch_event_input_event(tev);
      auto touch_count = mir_touch_event_point_count(tev);
      for (unsigned i = 0; i < touch_count; i++)
+     {
@@ -314,12 +332,20 @@
          if (touch_action == mir_touch_action_up ||
              touch_action == mir_touch_action_down)
+         {
--            last_input_event_timestamp = mir_input_event_get_event_time(iev);
++            update_event_timestamp(mir_touch_event_input_event(tev));
              break;
+         }
+     }
+ }
++void msh::BasicWindowManager::update_event_timestamp(MirInputEvent const* iev)
++{
++    last_input_event_timestamp = mir_input_event_get_event_time(iev);
++    if (last_input_event)
++        mir_event_unref(last_input_event);
++    last_input_event = mir_event_ref(mir_input_event_get_event(iev));
++}
++
  void mir::shell::BasicWindowManager::set_drag_and_drop_handle(std::vector<uint8_t> const& handle)
+ {
      focus_controller->set_drag_and_drop_handle(handle);
 === modified file 'src/server/shell/frontend_shell.cpp'
 --- src/server/shell/frontend_shell.cpp	2017-03-08 12:34:11 +0000
 +++ src/server/shell/frontend_shell.cpp	2017-04-04 10:15:32 +0000
@@ -148,22 +148,34 @@
      return wrapped->get_surface_attribute(surface, attrib);
+ }
--void msh::FrontendShell::raise_surface(
--    std::shared_ptr<mf::Session> const& session,
--    mf::SurfaceId surface_id,
--    uint64_t timestamp)
--{
--    auto const scene_session = std::dynamic_pointer_cast<ms::Session>(session);
--    auto const surface = scene_session->surface(surface_id);
--    wrapped->raise_surface(scene_session, surface, timestamp);
--}
--
--void msh::FrontendShell::request_drag_and_drop(
--    std::shared_ptr<mf::Session> const& session,
--    mf::SurfaceId surface_id,
--    uint64_t timestamp)
--{
--    auto const scene_session = std::dynamic_pointer_cast<ms::Session>(session);
--    auto const surface = scene_session->surface(surface_id);
--    wrapped->request_drag_and_drop(scene_session, surface, timestamp);
++void msh::FrontendShell::request_operation(
++    std::shared_ptr<mf::Session> const& session,
++    mf::SurfaceId surface_id,
++    uint64_t timestamp,
++    UserRequest request)
++{
++    auto const scene_session = std::dynamic_pointer_cast<ms::Session>(session);
++    auto const surface = scene_session->surface(surface_id);
++
++    switch (request)
++    {
++    case UserRequest::activate:
++    {
++        auto const scene_session = std::dynamic_pointer_cast<ms::Session>(session);
++        auto const surface = scene_session->surface(surface_id);
++        wrapped->raise_surface(scene_session, surface, timestamp);
++        break;
++    }
++
++    case UserRequest::drag_and_drop:
++        wrapped->request_drag_and_drop(scene_session, surface, timestamp);
++        break;
++
++    case UserRequest::move:
++        wrapped->request_move(scene_session, surface, timestamp);
++        break;
++
++    default:
++        break;
++    }
+ }
 === modified file 'src/server/shell/frontend_shell.h'
 --- src/server/shell/frontend_shell.h	2017-03-08 12:34:11 +0000
 +++ src/server/shell/frontend_shell.h	2017-04-04 10:15:32 +0000
@@ -87,15 +87,11 @@
          mf::SurfaceId surface_id,
          MirWindowAttrib attrib) override;
--    void raise_surface(
--        std::shared_ptr<mf::Session> const& session,
--        mf::SurfaceId surface_id,
--        uint64_t timestamp) override;
--
--    void request_drag_and_drop(
--        std::shared_ptr<mf::Session> const& session,
--        mf::SurfaceId surface_id,
--        uint64_t timestamp) override;
++    void request_operation(
++        std::shared_ptr<mf::Session> const& session,
++        mf::SurfaceId surface_id,
++        uint64_t timestamp,
++        UserRequest request) override;
  };
+ }
+ }
 === modified file 'src/server/shell/shell_wrapper.cpp'
 --- src/server/shell/shell_wrapper.cpp	2017-03-10 14:27:50 +0000
 +++ src/server/shell/shell_wrapper.cpp	2017-04-04 10:15:32 +0000
@@ -128,6 +128,14 @@
      wrapped->request_drag_and_drop(session, surface, timestamp);
+ }
++void msh::ShellWrapper::request_move(
++    std::shared_ptr<ms::Session> const& session,
++    std::shared_ptr<ms::Surface> const& surface,
++    uint64_t timestamp)
++{
++    wrapped->request_move(session, surface, timestamp);
++}
++
  void msh::ShellWrapper::add_display(geometry::Rectangle const& area)
+ {
      wrapped->add_display(area);
 === modified file 'src/server/shell/system_compositor_window_manager.cpp'
 --- src/server/shell/system_compositor_window_manager.cpp	2017-03-08 12:59:36 +0000
 +++ src/server/shell/system_compositor_window_manager.cpp	2017-04-04 10:15:32 +0000
@@ -208,3 +208,10 @@
      uint64_t /*timestamp*/)
+ {
+ }
++
++void msh::SystemCompositorWindowManager::handle_request_move(
++    std::shared_ptr<ms::Session> const& /*session*/,
++    std::shared_ptr<ms::Surface> const& /*surface*/,
++    uint64_t /*timestamp*/)
++{
++}
 === modified file 'src/server/shell/window_management_info.cpp'
 --- src/server/shell/window_management_info.cpp	2017-01-18 02:29:37 +0000
 +++ src/server/shell/window_management_info.cpp	2017-04-04 10:15:32 +0000
@@ -18,13 +18,16 @@
  #include "mir/shell/window_management_info.h"
++#include "mir/scene/session.h"
  #include "mir/scene/surface.h"
  #include "mir/scene/surface_creation_parameters.h"
  #include "mir/graphics/buffer.h"
++#include "mir/renderer/sw/pixel_source.h"
  #include <atomic>
++namespace mrs = mir::renderer::software;
  namespace msh = mir::shell;
  namespace ms = mir::scene;
  namespace mg = mir::graphics;
@@ -156,6 +159,75 @@
      return true;
+ }
++struct msh::SurfaceInfo::StreamPainter
++{
++    virtual void paint(int) = 0;
++    virtual ~StreamPainter() = default;
++    StreamPainter() = default;
++    StreamPainter(StreamPainter const&) = delete;
++    StreamPainter& operator=(StreamPainter const&) = delete;
++};
++
++struct msh::SurfaceInfo::AllocatingPainter
++    : msh::SurfaceInfo::StreamPainter
++{
++    AllocatingPainter(
++        std::shared_ptr<frontend::BufferStream> const& buffer_stream,
++        std::shared_ptr<scene::Session> const& session,
++        Size size) :
++        buffer_stream(buffer_stream),
++        session(session),
++        properties({
++            size,
++            buffer_stream->pixel_format(),
++            mg::BufferUsage::software
++        }),
++        front_buffer(session->create_buffer(properties)),
++        back_buffer(session->create_buffer(properties))
++    {
++    }
++
++    void paint(int intensity) override
++    {
++        auto buffer = session->get_buffer(back_buffer);
++
++        auto const format = buffer->pixel_format();
++        auto const sz = buffer->size().height.as_int() *
++                        buffer->size().width.as_int() * MIR_BYTES_PER_PIXEL(format);
++        std::vector<unsigned char> pixels(sz, intensity);
++        if (auto pixel_source = dynamic_cast<mrs::PixelSource*>(buffer->native_buffer_base()))
++            pixel_source->write(pixels.data(), sz);
++        buffer_stream->submit_buffer(buffer);
++
++        std::swap(front_buffer, back_buffer);
++    }
++
++    ~AllocatingPainter()
++    {
++        session->destroy_buffer(front_buffer);
++        session->destroy_buffer(back_buffer);
++    }
++
++    std::shared_ptr<frontend::BufferStream> const buffer_stream;
++    std::shared_ptr<scene::Session> const session;
++    mg::BufferProperties properties;
++    mg::BufferID front_buffer;
++    mg::BufferID back_buffer;
++};
++
++void msh::SurfaceInfo::init_titlebar(
++    std::shared_ptr<scene::Session> const& session,
++    std::shared_ptr<scene::Surface> const& surface)
++{
++    auto stream = surface->primary_buffer_stream();
++    stream_painter = std::make_shared<AllocatingPainter>(stream, session, surface->size());
++}
++
++void msh::SurfaceInfo::paint_titlebar(int intensity)
++{
++    stream_painter->paint(intensity);
++}
++
  void msh::SurfaceInfo::constrain_resize(
      std::shared_ptr<ms::Surface> const& surface,
      Point& requested_pos,
 === modified file 'src/server/symbols.map'
 --- src/server/symbols.map	2017-03-21 07:57:17 +0000
 +++ src/server/symbols.map	2017-04-04 10:15:32 +0000
@@ -37,6 +37,7 @@
      mir::frontend::BufferStream::operator*;
      mir::frontend::ClientBuffers::?ClientBuffers*;
      mir::frontend::ClientBuffers::ClientBuffers*;
++    mir::frontend::ClientBuffers::operator*;
      mir::frontend::PromptSession::operator*;
      mir::frontend::PromptSession::?PromptSession*;
      mir::frontend::PromptSession::PromptSession*;
@@ -251,6 +252,7 @@
      mir::shell::AbstractShell::AbstractShell*;
      mir::shell::AbstractShell::add_display*;
      mir::shell::AbstractShell::add_prompt_provider_for*;
++    mir::shell::AbstractShell::clear_drag_and_drop_handle*;
      mir::shell::AbstractShell::close_session*;
      mir::shell::AbstractShell::create_surface*;
      mir::shell::AbstractShell::destroy_surface*;
@@ -264,12 +266,56 @@
      mir::shell::AbstractShell::raise*;
      mir::shell::AbstractShell::raise_surface*;
      mir::shell::AbstractShell::remove_display*;
++    mir::shell::AbstractShell::request_drag_and_drop*;
++    mir::shell::AbstractShell::request_move*;
++    mir::shell::AbstractShell::set_drag_and_drop_handle*;
      mir::shell::AbstractShell::set_focus_to*;
      mir::shell::AbstractShell::set_surface_attribute*;
      mir::shell::AbstractShell::start_prompt_session_for*;
      mir::shell::AbstractShell::stop_prompt_session*;
      mir::shell::AbstractShell::surface_at*;
      mir::shell::AbstractShell::update_focused_surface_confined_region*;
++    mir::shell::BasicWindowManager::active_display*;
++    mir::shell::BasicWindowManager::add_display*;
++    mir::shell::BasicWindowManager::add_session*;
++    mir::shell::BasicWindowManager::add_surface*;
++    mir::shell::BasicWindowManager::?BasicWindowManager*;
++    mir::shell::BasicWindowManager::BasicWindowManager*;
++    mir::shell::BasicWindowManager::clear_drag_and_drop_handle*;
++    mir::shell::BasicWindowManager::find_session*;
++    mir::shell::BasicWindowManager::focused_session*;
++    mir::shell::BasicWindowManager::focused_surface*;
++    mir::shell::BasicWindowManager::focus_next_session*;
++    mir::shell::BasicWindowManager::forget*;
++    mir::shell::BasicWindowManager::handle_keyboard_event*;
++    mir::shell::BasicWindowManager::handle_pointer_event*;
++    mir::shell::BasicWindowManager::handle_raise_surface*;
++    mir::shell::BasicWindowManager::handle_request_drag_and_drop*;
++    mir::shell::BasicWindowManager::handle_request_move*;
++    mir::shell::BasicWindowManager::handle_touch_event*;
++    mir::shell::BasicWindowManager::info_for*;
++    mir::shell::BasicWindowManager::modify_surface*;
++    mir::shell::BasicWindowManager::raise_tree*;
++    mir::shell::BasicWindowManager::remove_display*;
++    mir::shell::BasicWindowManager::remove_session*;
++    mir::shell::BasicWindowManager::remove_surface*;
++    mir::shell::BasicWindowManager::set_drag_and_drop_handle*;
++    mir::shell::BasicWindowManager::set_focus_to*;
++    mir::shell::BasicWindowManager::set_surface_attribute*;
++    mir::shell::BasicWindowManager::surface_at*;
++    mir::shell::CanonicalWindowManagerPolicy::CanonicalWindowManagerPolicy*;
++    mir::shell::CanonicalWindowManagerPolicy::handle_delete_surface*;
++    mir::shell::CanonicalWindowManagerPolicy::handle_displays_updated*;
++    mir::shell::CanonicalWindowManagerPolicy::handle_keyboard_event*;
++    mir::shell::CanonicalWindowManagerPolicy::handle_modify_surface*;
++    mir::shell::CanonicalWindowManagerPolicy::handle_new_surface*;
++    mir::shell::CanonicalWindowManagerPolicy::handle_place_new_surface*;
++    mir::shell::CanonicalWindowManagerPolicy::handle_pointer_event*;
++    mir::shell::CanonicalWindowManagerPolicy::handle_raise_surface*;
++    mir::shell::CanonicalWindowManagerPolicy::handle_request_drag_and_drop*;
++    mir::shell::CanonicalWindowManagerPolicy::handle_session_info_updated*;
++    mir::shell::CanonicalWindowManagerPolicy::handle_set_state*;
++    mir::shell::CanonicalWindowManagerPolicy::handle_touch_event*;
      mir::shell::DisplayConfigurationController::?DisplayConfigurationController*;
      mir::shell::DisplayConfigurationController::DisplayConfigurationController*;
      mir::shell::DisplayConfigurationController::operator*;
@@ -309,13 +355,24 @@
      mir::shell::ShellWrapper::raise_surface*;
      mir::shell::ShellWrapper::remove_display*;
      mir::shell::ShellWrapper::request_drag_and_drop*;
++    mir::shell::ShellWrapper::request_move*;
++    mir::shell::ShellWrapper::set_drag_and_drop_handle*;
      mir::shell::ShellWrapper::set_focus_to*;
      mir::shell::ShellWrapper::set_surface_attribute*;
      mir::shell::ShellWrapper::ShellWrapper*;
--    mir::shell::ShellWrapper::set_drag_and_drop_handle*;
      mir::shell::ShellWrapper::start_prompt_session_for*;
      mir::shell::ShellWrapper::stop_prompt_session*;
      mir::shell::ShellWrapper::surface_at*;
++    mir::shell::SurfaceInfo::can_be_active*;
++    mir::shell::SurfaceInfo::can_morph_to*;
++    mir::shell::SurfaceInfo::constrain_resize*;
++    mir::shell::SurfaceInfo::init_titlebar*;
++    mir::shell::SurfaceInfo::is_visible*;
++    mir::shell::SurfaceInfo::must_have_parent*;
++    mir::shell::SurfaceInfo::must_not_have_parent*;
++    mir::shell::SurfaceInfo::needs_titlebar*;
++    mir::shell::SurfaceInfo::paint_titlebar*;
++    mir::shell::SurfaceInfo::SurfaceInfo*;
      mir::shell::SurfaceReadyObserver::frame_posted*;
      mir::shell::SurfaceReadyObserver::?SurfaceReadyObserver*;
      mir::shell::SurfaceReadyObserver::SurfaceReadyObserver*;
@@ -334,6 +391,8 @@
      mir::shell::SystemCompositorWindowManager::handle_keyboard_event*;
      mir::shell::SystemCompositorWindowManager::handle_pointer_event*;
      mir::shell::SystemCompositorWindowManager::handle_raise_surface*;
++    mir::shell::SystemCompositorWindowManager::handle_request_drag_and_drop*;
++    mir::shell::SystemCompositorWindowManager::handle_request_move*;
      mir::shell::SystemCompositorWindowManager::handle_touch_event*;
      mir::shell::SystemCompositorWindowManager::modify_surface*;
      mir::shell::SystemCompositorWindowManager::on_session_added*;
@@ -342,10 +401,15 @@
      mir::shell::SystemCompositorWindowManager::remove_display*;
      mir::shell::SystemCompositorWindowManager::remove_session*;
      mir::shell::SystemCompositorWindowManager::remove_surface*;
--    mir::shell::SystemCompositorWindowManager::handle_request_drag_and_drop*;
      mir::shell::SystemCompositorWindowManager::set_surface_attribute*;
      mir::shell::SystemCompositorWindowManager::SystemCompositorWindowManager*;
++    mir::shell::WindowManagementPolicy::operator*;
++    mir::shell::WindowManagementPolicy::?WindowManagementPolicy*;
++    mir::shell::WindowManagementPolicy::WindowManagementPolicy*;
      mir::shell::WindowManager::operator*;
++    mir::shell::WindowManagerTools::operator*;
++    mir::shell::WindowManagerTools::?WindowManagerTools*;
++    mir::shell::WindowManagerTools::WindowManagerTools*;
      mir::shell::WindowManager::?WindowManager*;
      mir::shell::WindowManager::WindowManager*;
      mir::terminate_with_current_exception*;
@@ -410,6 +474,7 @@
      non-virtual?thunk?to?mir::scene::NullSurfaceObserver::reception_mode_set_to*;
      non-virtual?thunk?to?mir::scene::NullSurfaceObserver::renamed*;
      non-virtual?thunk?to?mir::scene::NullSurfaceObserver::resized_to*;
++    non-virtual?thunk?to?mir::scene::NullSurfaceObserver::start_drag_and_drop*;
      non-virtual?thunk?to?mir::scene::NullSurfaceObserver::transformation_set_to*;
      non-virtual?thunk?to?mir::scene::Observer::?Observer*;
      non-virtual?thunk?to?mir::scene::PromptSessionListener::?PromptSessionListener*;
@@ -422,6 +487,7 @@
      non-virtual?thunk?to?mir::ServerStatusListener::?ServerStatusListener*;
      non-virtual?thunk?to?mir::shell::AbstractShell::add_display*;
      non-virtual?thunk?to?mir::shell::AbstractShell::add_prompt_provider_for*;
++    non-virtual?thunk?to?mir::shell::AbstractShell::clear_drag_and_drop_handle*;
      non-virtual?thunk?to?mir::shell::AbstractShell::close_session*;
      non-virtual?thunk?to?mir::shell::AbstractShell::create_surface*;
      non-virtual?thunk?to?mir::shell::AbstractShell::destroy_surface*;
@@ -435,11 +501,52 @@
      non-virtual?thunk?to?mir::shell::AbstractShell::raise*;
      non-virtual?thunk?to?mir::shell::AbstractShell::raise_surface*;
      non-virtual?thunk?to?mir::shell::AbstractShell::remove_display*;
++    non-virtual?thunk?to?mir::shell::AbstractShell::request_drag_and_drop*;
++    non-virtual?thunk?to?mir::shell::AbstractShell::request_move*;
++    non-virtual?thunk?to?mir::shell::AbstractShell::set_drag_and_drop_handle*;
      non-virtual?thunk?to?mir::shell::AbstractShell::set_focus_to*;
      non-virtual?thunk?to?mir::shell::AbstractShell::set_surface_attribute*;
      non-virtual?thunk?to?mir::shell::AbstractShell::start_prompt_session_for*;
      non-virtual?thunk?to?mir::shell::AbstractShell::stop_prompt_session*;
      non-virtual?thunk?to?mir::shell::AbstractShell::surface_at*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::active_display*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::add_display*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::add_session*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::add_surface*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::clear_drag_and_drop_handle*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::find_session*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::focused_session*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::focused_surface*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::focus_next_session*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::forget*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::handle_keyboard_event*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::handle_pointer_event*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::handle_raise_surface*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::handle_request_drag_and_drop*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::handle_request_move*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::handle_touch_event*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::info_for*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::modify_surface*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::raise_tree*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::remove_display*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::remove_session*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::remove_surface*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::set_drag_and_drop_handle*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::set_focus_to*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::set_surface_attribute*;
++    non-virtual?thunk?to?mir::shell::BasicWindowManager::surface_at*;
++    non-virtual?thunk?to?mir::shell::CanonicalWindowManagerPolicy::handle_delete_surface*;
++    non-virtual?thunk?to?mir::shell::CanonicalWindowManagerPolicy::handle_displays_updated*;
++    non-virtual?thunk?to?mir::shell::CanonicalWindowManagerPolicy::handle_keyboard_event*;
++    non-virtual?thunk?to?mir::shell::CanonicalWindowManagerPolicy::handle_modify_surface*;
++    non-virtual?thunk?to?mir::shell::CanonicalWindowManagerPolicy::handle_new_surface*;
++    non-virtual?thunk?to?mir::shell::CanonicalWindowManagerPolicy::handle_place_new_surface*;
++    non-virtual?thunk?to?mir::shell::CanonicalWindowManagerPolicy::handle_pointer_event*;
++    non-virtual?thunk?to?mir::shell::CanonicalWindowManagerPolicy::handle_raise_surface*;
++    non-virtual?thunk?to?mir::shell::CanonicalWindowManagerPolicy::handle_request_drag_and_drop*;
++    non-virtual?thunk?to?mir::shell::CanonicalWindowManagerPolicy::handle_session_info_updated*;
++    non-virtual?thunk?to?mir::shell::CanonicalWindowManagerPolicy::handle_set_state*;
++    non-virtual?thunk?to?mir::shell::CanonicalWindowManagerPolicy::handle_touch_event*;
      non-virtual?thunk?to?mir::shell::DisplayConfigurationController::?DisplayConfigurationController*;
      non-virtual?thunk?to?mir::shell::DisplayLayout::?DisplayLayout*;
      non-virtual?thunk?to?mir::shell::FocusController::?FocusController*;
@@ -449,6 +556,7 @@
      non-virtual?thunk?to?mir::shell::ShellReport::?ShellReport*;
      non-virtual?thunk?to?mir::shell::ShellWrapper::add_display*;
      non-virtual?thunk?to?mir::shell::ShellWrapper::add_prompt_provider_for*;
++    non-virtual?thunk?to?mir::shell::ShellWrapper::clear_drag_and_drop_handle*;
      non-virtual?thunk?to?mir::shell::ShellWrapper::close_session*;
      non-virtual?thunk?to?mir::shell::ShellWrapper::create_surface*;
      non-virtual?thunk?to?mir::shell::ShellWrapper::destroy_surface*;
@@ -462,6 +570,9 @@
      non-virtual?thunk?to?mir::shell::ShellWrapper::raise*;
      non-virtual?thunk?to?mir::shell::ShellWrapper::raise_surface*;
      non-virtual?thunk?to?mir::shell::ShellWrapper::remove_display*;
++    non-virtual?thunk?to?mir::shell::ShellWrapper::request_drag_and_drop*;
++    non-virtual?thunk?to?mir::shell::ShellWrapper::request_move*;
++    non-virtual?thunk?to?mir::shell::ShellWrapper::set_drag_and_drop_handle*;
      non-virtual?thunk?to?mir::shell::ShellWrapper::set_focus_to*;
      non-virtual?thunk?to?mir::shell::ShellWrapper::set_surface_attribute*;
      non-virtual?thunk?to?mir::shell::ShellWrapper::start_prompt_session_for*;
@@ -479,6 +590,8 @@
      non-virtual?thunk?to?mir::shell::SystemCompositorWindowManager::handle_keyboard_event*;
      non-virtual?thunk?to?mir::shell::SystemCompositorWindowManager::handle_pointer_event*;
      non-virtual?thunk?to?mir::shell::SystemCompositorWindowManager::handle_raise_surface*;
++    non-virtual?thunk?to?mir::shell::SystemCompositorWindowManager::handle_request_drag_and_drop*;
++    non-virtual?thunk?to?mir::shell::SystemCompositorWindowManager::handle_request_move*;
      non-virtual?thunk?to?mir::shell::SystemCompositorWindowManager::handle_touch_event*;
      non-virtual?thunk?to?mir::shell::SystemCompositorWindowManager::modify_surface*;
      non-virtual?thunk?to?mir::shell::SystemCompositorWindowManager::on_session_added*;
@@ -488,6 +601,8 @@
      non-virtual?thunk?to?mir::shell::SystemCompositorWindowManager::remove_session*;
      non-virtual?thunk?to?mir::shell::SystemCompositorWindowManager::remove_surface*;
      non-virtual?thunk?to?mir::shell::SystemCompositorWindowManager::set_surface_attribute*;
++    non-virtual?thunk?to?mir::shell::WindowManagementPolicy::?WindowManagementPolicy*;
++    non-virtual?thunk?to?mir::shell::WindowManagerTools::?WindowManagerTools*;
      non-virtual?thunk?to?mir::shell::WindowManager::?WindowManager*;
      non-virtual?thunk?to?mir::time::Alarm::?Alarm*;
      non-virtual?thunk?to?mir::time::AlarmFactory::?AlarmFactory*;
@@ -552,6 +667,8 @@
      typeinfo?for?mir::ServerActionQueue;
      typeinfo?for?mir::ServerStatusListener;
      typeinfo?for?mir::shell::AbstractShell;
++    typeinfo?for?mir::shell::BasicWindowManager;
++    typeinfo?for?mir::shell::CanonicalWindowManagerPolicy;
      typeinfo?for?mir::shell::DisplayConfigurationController;
      typeinfo?for?mir::shell::DisplayLayout;
      typeinfo?for?mir::shell::FocusController;
@@ -559,18 +676,22 @@
      typeinfo?for?mir::shell::InputTargeter;
      typeinfo?for?mir::shell::PersistentSurfaceStore;
      typeinfo?for?mir::shell::PersistentSurfaceStore::Id;
++    typeinfo?for?mir::shell::SessionInfo;
      typeinfo?for?mir::shell::Shell;
      typeinfo?for?mir::shell::ShellReport;
      typeinfo?for?mir::shell::ShellWrapper;
      typeinfo?for?mir::shell::StreamCursor;
      typeinfo?for?mir::shell::StreamSpecification;
      typeinfo?for?mir::shell::SurfaceAspectRatio;
++    typeinfo?for?mir::shell::SurfaceInfo;
      typeinfo?for?mir::shell::SurfaceReadyObserver;
      typeinfo?for?mir::shell::SurfaceSpecification;
      typeinfo?for?mir::shell::SurfaceStack;
      typeinfo?for?mir::shell::SurfaceStackWrapper;
      typeinfo?for?mir::shell::SystemCompositorWindowManager;
++    typeinfo?for?mir::shell::WindowManagementPolicy;
      typeinfo?for?mir::shell::WindowManager;
++    typeinfo?for?mir::shell::WindowManagerTools;
      typeinfo?for?mir::time::Alarm;
      typeinfo?for?mir::time::AlarmFactory;
      vtable?for?mir::compositor::Compositor;
@@ -634,6 +755,8 @@
      vtable?for?mir::ServerActionQueue;
      vtable?for?mir::ServerStatusListener;
      vtable?for?mir::shell::AbstractShell;
++    vtable?for?mir::shell::BasicWindowManager;
++    vtable?for?mir::shell::CanonicalWindowManagerPolicy;
      vtable?for?mir::shell::DisplayConfigurationController;
      vtable?for?mir::shell::DisplayLayout;
      vtable?for?mir::shell::FocusController;
@@ -641,18 +764,22 @@
      vtable?for?mir::shell::InputTargeter;
      vtable?for?mir::shell::PersistentSurfaceStore;
      vtable?for?mir::shell::PersistentSurfaceStore::Id;
++    vtable?for?mir::shell::SessionInfo;
      vtable?for?mir::shell::Shell;
      vtable?for?mir::shell::ShellReport;
      vtable?for?mir::shell::ShellWrapper;
      vtable?for?mir::shell::StreamCursor;
      vtable?for?mir::shell::StreamSpecification;
      vtable?for?mir::shell::SurfaceAspectRatio;
++    vtable?for?mir::shell::SurfaceInfo;
      vtable?for?mir::shell::SurfaceReadyObserver;
      vtable?for?mir::shell::SurfaceSpecification;
      vtable?for?mir::shell::SurfaceStack;
      vtable?for?mir::shell::SurfaceStackWrapper;
      vtable?for?mir::shell::SystemCompositorWindowManager;
++    vtable?for?mir::shell::WindowManagementPolicy;
      vtable?for?mir::shell::WindowManager;
++    vtable?for?mir::shell::WindowManagerTools;
      vtable?for?mir::time::Alarm;
      vtable?for?mir::time::AlarmFactory;
@@ -675,6 +802,21 @@
      virtual?thunk?to?mir::shell::AbstractShell::setting_focus_to*;
      virtual?thunk?to?mir::shell::AbstractShell::start_prompt_session_for*;
      virtual?thunk?to?mir::shell::AbstractShell::stop_prompt_session*;
++    virtual?thunk?to?mir::shell::BasicWindowManager::?BasicWindowManager*;
++    virtual?thunk?to?mir::shell::BasicWindowManager::add_display*;
++    virtual?thunk?to?mir::shell::BasicWindowManager::add_session*;
++    virtual?thunk?to?mir::shell::BasicWindowManager::add_surface*;
++    virtual?thunk?to?mir::shell::BasicWindowManager::handle_keyboard_event*;
++    virtual?thunk?to?mir::shell::BasicWindowManager::handle_pointer_event*;
++    virtual?thunk?to?mir::shell::BasicWindowManager::handle_raise_surface*;
++    virtual?thunk?to?mir::shell::BasicWindowManager::handle_request_drag_and_drop*;
++    virtual?thunk?to?mir::shell::BasicWindowManager::handle_request_move*;
++    virtual?thunk?to?mir::shell::BasicWindowManager::handle_touch_event*;
++    virtual?thunk?to?mir::shell::BasicWindowManager::modify_surface*;
++    virtual?thunk?to?mir::shell::BasicWindowManager::remove_display*;
++    virtual?thunk?to?mir::shell::BasicWindowManager::remove_session*;
++    virtual?thunk?to?mir::shell::BasicWindowManager::remove_surface*;
++    virtual?thunk?to?mir::shell::BasicWindowManager::set_surface_attribute*;
      virtual?thunk?to?mir::shell::ShellWrapper::add_display*;
      virtual?thunk?to?mir::shell::ShellWrapper::handle*;
      virtual?thunk?to?mir::shell::ShellWrapper::remove_display*;
@@ -686,25 +828,6 @@
  MIR_SERVER_DETAIL_FOR_TESTING_0.27 {
   global:
    extern "C++" {
--    mir::shell::CanonicalWindowManagerPolicy::handle_set_state*;
--    mir::shell::CanonicalWindowManagerPolicy::CanonicalWindowManagerPolicy*;
--    mir::shell::CanonicalWindowManagerPolicy::handle_session_info_updated*;
--    mir::shell::CanonicalWindowManagerPolicy::handle_session_info_updated*;
--    mir::shell::CanonicalWindowManagerPolicy::handle_place_new_surface*;
--    mir::shell::CanonicalWindowManagerPolicy::handle_modify_surface*;
--    mir::shell::CanonicalWindowManagerPolicy::handle_new_surface*;
--    mir::shell::CanonicalWindowManagerPolicy::handle_delete_surface*;
--    mir::shell::CanonicalWindowManagerPolicy::handle_displays_updated*;
--    mir::shell::CanonicalWindowManagerPolicy::handle_displays_updated*;
--    mir::shell::CanonicalWindowManagerPolicy::handle_keyboard_event*;
--    mir::shell::CanonicalWindowManagerPolicy::handle_touch_event*;
--    mir::shell::CanonicalWindowManagerPolicy::handle_pointer_event*;
--    mir::shell::CanonicalWindowManagerPolicy::handle_raise_surface*;
--    mir::shell::CanonicalWindowManagerPolicy::handle_request_drag_and_drop*;
--    typeinfo?for?mir::shell::CanonicalWindowManagerPolicy;
--    vtable?for?mir::shell::CanonicalWindowManagerPolicy;
--    VTT?for?mir::shell::CanonicalWindowManagerPolicy;
--
      mir::DefaultServerConfiguration::clock*;
      mir::DefaultServerConfiguration::DefaultServerConfiguration*;
      mir::DefaultServerConfiguration::new_ipc_factory*;
@@ -831,47 +954,5 @@
      mir::renderer::gl::Renderer::vshader;
      typeinfo?for?mir::renderer::gl::Renderer;
      vtable?for?mir::renderer::gl::Renderer;
--
--    mir::shell::BasicWindowManager::active_display*;
--    mir::shell::BasicWindowManager::add_display*;
--    mir::shell::BasicWindowManager::add_session*;
--    mir::shell::BasicWindowManager::add_surface*;
--    mir::shell::BasicWindowManager::BasicWindowManager*;
--    mir::shell::BasicWindowManager::clear_drag_and_drop_handle*;
--    mir::shell::BasicWindowManager::find_session*;
--    mir::shell::BasicWindowManager::focused_session*;
--    mir::shell::BasicWindowManager::focused_surface*;
--    mir::shell::BasicWindowManager::focus_next_session*;
--    mir::shell::BasicWindowManager::forget*;
--    mir::shell::BasicWindowManager::handle_keyboard_event*;
--    mir::shell::BasicWindowManager::handle_pointer_event*;
--    mir::shell::BasicWindowManager::handle_raise_surface*;
--    mir::shell::BasicWindowManager::handle_request_drag_and_drop*;
--    mir::shell::BasicWindowManager::handle_touch_event*;
--    mir::shell::BasicWindowManager::info_for*;
--    mir::shell::BasicWindowManager::modify_surface*;
--    mir::shell::BasicWindowManager::raise_tree*;
--    mir::shell::BasicWindowManager::remove_display*;
--    mir::shell::BasicWindowManager::remove_session*;
--    mir::shell::BasicWindowManager::remove_surface*;
--    mir::shell::BasicWindowManager::set_drag_and_drop_handle*;
--    mir::shell::BasicWindowManager::set_focus_to*;
--    mir::shell::BasicWindowManager::set_surface_attribute*;
--    mir::shell::BasicWindowManager::surface_at*;
--    typeinfo?for?mir::shell::BasicWindowManager;
--    virtual?thunk?to?mir::shell::BasicWindowManager::add_display*;
--    virtual?thunk?to?mir::shell::BasicWindowManager::add_session*;
--    virtual?thunk?to?mir::shell::BasicWindowManager::add_surface*;
--    virtual?thunk?to?mir::shell::BasicWindowManager::handle_keyboard_event*;
--    virtual?thunk?to?mir::shell::BasicWindowManager::handle_pointer_event*;
--    virtual?thunk?to?mir::shell::BasicWindowManager::handle_raise_surface*;
--    virtual?thunk?to?mir::shell::BasicWindowManager::handle_request_drag_and_drop*;
--    virtual?thunk?to?mir::shell::BasicWindowManager::handle_touch_event*;
--    virtual?thunk?to?mir::shell::BasicWindowManager::modify_surface*;
--    virtual?thunk?to?mir::shell::BasicWindowManager::remove_display*;
--    virtual?thunk?to?mir::shell::BasicWindowManager::remove_session*;
--    virtual?thunk?to?mir::shell::BasicWindowManager::remove_surface*;
--    virtual?thunk?to?mir::shell::BasicWindowManager::set_surface_attribute*;
--    VTT?for?mir::shell::BasicWindowManager;
    };
  } MIR_SERVER_DETAIL_FOR_TESTING_0.27;
 === modified file 'tests/acceptance-tests/CMakeLists.txt'
 --- tests/acceptance-tests/CMakeLists.txt	2017-03-24 10:16:59 +0000
 +++ tests/acceptance-tests/CMakeLists.txt	2017-04-04 10:15:32 +0000
@@ -77,18 +77,10 @@
  # The following tests use still files we have chosen not to support in the public API
  # TODO update these "throwback" tests to rely only on the public APIs
--  # uses BasicWindowManager<>
--  set_source_files_properties(test_client_cursor_api.cpp PROPERTIES COMPILE_FLAGS
--          "${CMAKE_CXXFLAGS} -I ${PROJECT_SOURCE_DIR}/src/include/server")
--
    # uses UsingClientPlatform
    set_source_files_properties(test_client_library_errors.cpp PROPERTIES COMPILE_FLAGS
            "${CMAKE_CXXFLAGS} -I ${CMAKE_SOURCE_DIR}")
--  # uses CanonicalWindowManager
--  set_source_files_properties(test_shell_control_of_surface_configuration.cpp PROPERTIES COMPILE_FLAGS
--          "${CMAKE_CXXFLAGS} -I ${PROJECT_SOURCE_DIR}/src/include/server")
--
    # uses src/include/common/mir/protobuf/protocol_version.h
    set_source_files_properties(test_client_library.cpp PROPERTIES COMPILE_FLAGS
            "${CMAKE_CXXFLAGS} -I ${CMAKE_SOURCE_DIR}")
 === modified file 'tests/acceptance-tests/client_mediated_user_gestures.cpp'
 --- tests/acceptance-tests/client_mediated_user_gestures.cpp	2017-03-27 16:13:56 +0000
 +++ tests/acceptance-tests/client_mediated_user_gestures.cpp	2017-04-04 10:15:32 +0000
@@ -22,12 +22,14 @@
  #include <mir/geometry/displacement.h>
  #include <mir/input/input_device_info.h>
  #include <mir/input/device_capability.h>
++#include <mir/shell/canonical_window_manager.h>
  #include <mir/shell/shell.h>
  #include <mir_test_framework/connected_client_with_a_window.h>
  #include <mir_test_framework/fake_input_device.h>
  #include <mir_test_framework/stub_server_platform_factory.h>
  #include <mir/test/event_factory.h>
++#include <mir/test/fake_shared.h>
  #include <mir/test/signal.h>
  #include <gmock/gmock.h>
@@ -40,6 +42,7 @@
  using namespace std::chrono_literals;
  using namespace mir::geometry;
  using namespace testing;
++using mir::test::fake_shared;
  using mir::test::Signal;
  namespace
@@ -67,6 +70,17 @@
  void mir_cookie_release(Cookie const&) = delete;
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++struct MockWindowManager : mir::shell::CanonicalWindowManager
++{
++    using mir::shell::CanonicalWindowManager::CanonicalWindowManager;
++
++    MOCK_METHOD3(handle_request_move,
++        void(std::shared_ptr<mir::scene::Session> const&, std::shared_ptr<mir::scene::Surface> const&, uint64_t));
++};
++#pragma GCC diagnostic pop
++
  struct MouseMoverAndFaker
+ {
      void start_dragging_mouse()
@@ -103,6 +117,12 @@
      void SetUp() override
+     {
          initial_display_layout({screen_geometry});
++        server.override_the_window_manager_builder([this](mir::shell::FocusController* focus_controller)
++            {
++                return window_manager =
++                    std::make_shared<MockWindowManager>(focus_controller, server.the_shell_display_layout());
++            });
++
          mir_test_framework::ConnectedClientWithAWindow::SetUp();
          mir_window_set_event_handler(window, &window_event_handler, this);
@@ -114,11 +134,14 @@
      void TearDown() override
+     {
          reset_window_event_handler();
++        window_manager.reset();
          mir_test_framework::ConnectedClientWithAWindow::TearDown();
+     }
      auto user_initiates_gesture() -> Cookie;
++    std::shared_ptr<MockWindowManager> window_manager;
++
  private:
      void center_mouse();
      void paint_window();
@@ -250,10 +273,13 @@
      EXPECT_THAT(cookie.get(), NotNull());
+ }
--// TODO extend this test when server side implemented
--TEST_F(ClientMediatedUserGestures, when_client_initiates_move_nothing_bad_happens)
++TEST_F(ClientMediatedUserGestures, when_client_initiates_move_window_manager_handles_request)
+ {
      auto const cookie = user_initiates_gesture();
++    Signal have_request;
++    EXPECT_CALL(*window_manager, handle_request_move(_, _, _)).WillOnce(InvokeWithoutArgs([&]{ have_request.raise(); }));
      mir_window_request_user_move(window, cookie);
++
++    EXPECT_THAT(have_request.wait_for(receive_event_timeout), Eq(true));
+ }
 === modified file 'tests/acceptance-tests/test_client_cursor_api.cpp'
 --- tests/acceptance-tests/test_client_cursor_api.cpp	2017-03-15 09:30:18 +0000
 +++ tests/acceptance-tests/test_client_cursor_api.cpp	2017-04-04 10:15:32 +0000
@@ -275,7 +275,10 @@
          server.override_the_window_manager_builder([this](msh::FocusController* focus_controller)
+             {
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
                  using PlacementWindowManager = msh::WindowManagerConstructor<mtf::DeclarativePlacementWindowManagerPolicy>;
++#pragma GCC diagnostic pop
                  return std::make_shared<PlacementWindowManager>(
                      focus_controller,
                      client_geometries,
 === modified file 'tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp'
 --- tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp	2017-03-14 02:26:28 +0000
 +++ tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp	2017-04-04 10:15:32 +0000
@@ -39,6 +39,8 @@
  namespace
+ {
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
  struct MockWindowManager : msh::CanonicalWindowManager
+ {
      using msh::CanonicalWindowManager::CanonicalWindowManager;
@@ -57,6 +59,7 @@
          return msh::CanonicalWindowManager::set_surface_attribute(session, surface, attrib, value);
+     }
  };
++#pragma GCC diagnostic pop
  void signal_state_change(MirWindow*, MirEvent const* event, void* context)
+ {
 === modified file 'tests/include/mir/test/doubles/mock_shell.h'
 --- tests/include/mir/test/doubles/mock_shell.h	2017-03-08 12:34:11 +0000
 +++ tests/include/mir/test/doubles/mock_shell.h	2017-04-04 10:15:32 +0000
@@ -73,8 +73,8 @@
      MOCK_METHOD3(raise_surface, void(std::shared_ptr<frontend::Session> const& session,
          frontend::SurfaceId surface_id, uint64_t timestamp));
--    MOCK_METHOD3(request_drag_and_drop, void(std::shared_ptr<frontend::Session> const& session,
--        frontend::SurfaceId surface_id, uint64_t timestamp));
++    MOCK_METHOD4(request_operation, void(std::shared_ptr<frontend::Session> const &session,
++        frontend::SurfaceId surface_id, uint64_t timestamp, UserRequest request));
  };
+ }