Mir

Merge lp:~alan-griffiths/mir/MVC-refactor-msh-Shell-hierarchy into lp:mir

MVC-refactor-msh-Shell-hierarchy
Merge into development-branch

Proposed by Alan Griffiths on 2015-01-29

Status:	Merged
Approved by:	Robert Carr on 2015-02-03
Approved revision:	2296
Merged at revision:	2284
Proposed branch:	lp:~alan-griffiths/mir/MVC-refactor-msh-Shell-hierarchy
Merge into:	lp:mir
Diff against target:	2334 lines (+681/-608) 31 files modified examples/server_example_window_management.cpp (+1/-0) include/server/mir/server.h (+14/-1) include/server/mir/shell/abstract_shell.h (+116/-0) include/server/mir/shell/shell.h (+2/-22) include/server/mir/shell/shell_wrapper.h (+2/-3) server-ABI-sha1sums (+4/-3) src/server/scene/basic_surface.cpp (+2/-9) src/server/scene/basic_surface.h (+0/-4) src/server/scene/default_configuration.cpp (+0/-1) src/server/scene/surface_allocator.cpp (+0/-3) src/server/scene/surface_allocator.h (+0/-2) src/server/server.cpp (+2/-0) src/server/shell/CMakeLists.txt (+1/-0) src/server/shell/abstract_shell.cpp (+197/-0) src/server/shell/default_configuration.cpp (+2/-1) src/server/shell/default_shell.cpp (+21/-134) src/server/shell/default_shell.h (+9/-45) src/server/shell/frontend_shell.cpp (+4/-2) src/server/shell/shell_wrapper.cpp (+4/-5) src/server/symbols.map (+243/-263) tests/include/mir_test_doubles/mock_surface.h (+0/-1) tests/integration-tests/surface_composition.cpp (+0/-6) tests/integration-tests/test_default_shell.cpp (+51/-2) tests/integration-tests/test_surface_stack_with_compositor.cpp (+0/-2) tests/unit-tests/examples/test_demo_compositor.cpp (+0/-2) tests/unit-tests/scene/test_basic_surface.cpp (+2/-49) tests/unit-tests/scene/test_default_shell.cpp (+3/-1) tests/unit-tests/scene/test_session_manager.cpp (+0/-3) tests/unit-tests/scene/test_surface.cpp (+0/-4) tests/unit-tests/scene/test_surface_impl.cpp (+1/-30) tests/unit-tests/scene/test_surface_stack.cpp (+0/-10)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/MVC-refactor-msh-Shell-hierarchy
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Kevin DuBois (community)			Approve on 2015-02-02
Robert Carr (community)			Approve on 2015-02-02
Chris Halse Rogers		2015-01-29	Abstain on 2015-02-02
PS Jenkins bot	continuous-integration		Approve on 2015-01-30
Alexandros Frantzis (community)			Approve on 2015-01-30
Review via email: mp+248030@code.launchpad.net

Commit Message

shell: refactor Shell hierarchy

This gives the classes a clearer role:

AbstractShell - this is a policy-less implementation of the Shell interface

DefaultShell - this adds window management policies to the AbstractShell (mostly by overriding methods to add pre- or post-processing). This is still configurable by established strategy classes (placement_strategy and surface_configurator).

Description of the Change

shell: refactor Shell hierarchy

This gives the classes a clearer role:

AbstractShell - this is a policy-less implementation of the Shell interface

Note:
These changes are driven by:

1. a desire to put all the window management together
2. experience spiking "compatibility branches" to USC and qtmir

PS Jenkins bot (ps-jenkins) wrote on 2015-01-29:

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

review: Needs Fixing (continuous-integration)

Chris Halse Rogers (raof) wrote on 2015-01-30:

So, I'm confused as to why we want a policy-less implementation of the Shell interface at all?

If the idea is to share common implementation then wouldn't a separate helper class that shell implementations can use be a more appropriate mechanism?

review: Needs Information

Alan Griffiths (alan-griffiths) wrote on 2015-01-30:

> So, I'm confused as to why we want a policy-less implementation of the Shell
> interface at all?
>
> If the idea is to share common implementation then wouldn't a separate helper
> class that shell implementations can use be a more appropriate mechanism?

I think we agree that it is a good idea to remove remove everything that isn't "policy" from DefaultShell and put all the policy there? The question them becomes one of how to do that without spurious restrictions on the policies that can be implemented through the public interface.

Having a separate helper class would mean that a shell implementor would need to forward or re-implement functions for which they don't wish to apply policy - either way leading to significant "boiler plate".

Ignoring for a moment the deficiencies of the programming language I think the ideal mechanism would be something AOP - where we provide a policy-less shell and the the policy is implemented with decorations like "on_entering(create_surface, [] (/*args*/) { /* policy code */ })". We could, of course, implement something like that using std::function and lambdas - but there are some use cases that are a little awkward (like forcing an early return).

Traditionally, C++ code has used "override and call the base method" to provide this sort of decoration and I feel it is a suitable solution here.

PS Jenkins bot (ps-jenkins) wrote on 2015-01-30:

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

review: Approve (continuous-integration)

Alexandros Frantzis (afrantzis) wrote on 2015-01-30:

A slight concern:

133 + virtual void setting_focus_to(std::shared_ptr<scene::Surface> const& next_focus);
134 + virtual void setting_focus_to(std::shared_ptr<scene::Session> const& next_focus);

Unless one looks at the AbstractShell implementation, it's not apparent that these are called under lock. This may come as a surprise to shell writers and could lead to code with deadlocks. It would be good to document the caveats of overriding these functions.

Looks good otherwise.

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2015-01-30:

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-01-30:

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

review: Approve (continuous-integration)

Alexandros Frantzis (afrantzis) wrote on 2015-01-30:

Still OK.

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-01-30:

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

review: Approve (continuous-integration)

Chris Halse Rogers (raof) wrote on 2015-02-02:

> Having a separate helper class would mean that a shell implementor would need
> to forward or re-implement functions for which they don't wish to apply policy
> - either way leading to significant "boiler plate".

I feel that, in this case, override-and-call-base-method will have comparable boiler plate, but with the added downside that the compiler doesn't warn you when you've failed to correctly call the base method.

You've done more work on the downstreams, so you've got a better idea of this, so I won't block.

(It vaguely looks like there might be two different worthwhile interfaces merged into Shell, but that's somewhat of a different thingy)

review: Abstain

Alan Griffiths (alan-griffiths) wrote on 2015-02-02:

> I feel that, in this case, override-and-call-base-method will have comparable
> boiler plate, but with the added downside that the compiler doesn't warn you
> when you've failed to correctly call the base method.

This can also happen with a "helper object" as there is no guarantee that the helper method is invoked.

It is a legitimate concern (and one that would be addressed by AOP if we had it in C++).

Alan Griffiths (alan-griffiths) wrote on 2015-02-02:

> You've done more work on the downstreams, so you've got a better idea of this,
> so I won't block.

Here's an example of downstream use:

lp:~alan-griffiths/qtmir/port-to-msh-Shell/+merge/247844

Robert Carr (robertcarr) wrote on 2015-02-02:

w.r.t. Chris's concerns and the abstract shell...I guess I hope this could dissapear

afaics it arises from a combination of two rolls in msh::Shell (preexisting of course)
there is both the factory role and the policy role still.

It seems like AbstractShell provides implementations for the factory roles and allows decoration to implement the policy. If these roles were split AbstractShell impl could dissapear. (e.g. create/destroy_surface belong to another interface and surface_created/surface_destroyed live on msh::Shell)

>> + attribute_set(*focussed_surface, mir_surface_attrib_state, state);

This line is making me think that attribute_set is looking weirder and weirder on SurfaceConfigurator and should just be part of the observer system.

Robert Carr (robertcarr) wrote on 2015-02-02:

Anyway LGTM :)

review: Approve

Alan Griffiths (alan-griffiths) wrote on 2015-02-02:

> >> + attribute_set(*focussed_surface, mir_surface_attrib_state, state);
>
> This line is making me think that attribute_set is looking weirder and weirder
> on SurfaceConfigurator and should just be part of the observer system.

If you look at the dependent branch (which just updates the example) this weird line goes away.

Alan Griffiths (alan-griffiths) wrote on 2015-02-02:

> It seems like AbstractShell provides implementations for the factory roles and
> allows decoration to implement the policy. If these roles were split
> AbstractShell impl could dissapear. (e.g. create/destroy_surface belong to
> another interface and surface_created/surface_destroyed live on msh::Shell)

Actually, for generic policy, you need both before_surface_created() (to vet and/or update the create parameters) and after_surface_created() (to react to the surface creation). I took the proposed approach as I think it easier to do this by wrapping.

As I said before:

"I think the ideal mechanism would be something AOP - where we provide a policy-less shell and the the policy is implemented with decorations like "on_entering(create_surface, [] (/*args*/) { /* policy code */ })". We could, of course, implement something like that using std::function and lambdas - but there are some use cases that are a little awkward (like forcing an early return)."

Kevin DuBois (kdub) wrote on 2015-02-02:

approve:
I think its a step forward, and the interface looks okay to me. The focus setting code still looks like it has more requirements that the other stuff the shell might want to do, something to clean later.

needs info:
Some of the symbols in the map file seem updated that aren't related to the interface changes (the one that stood out to me was mc::SceneElement). Are all the symbols.map changes hand-picked or autogenerated?

review: Needs Information

Alan Griffiths (alan-griffiths) wrote on 2015-02-02:

> needs info:
> Some of the symbols in the map file seem updated that aren't related to the
> interface changes (the one that stood out to me was mc::SceneElement). Are all
> the symbols.map changes hand-picked or autogenerated?

Yes, there are some overdue updates in the sysmols.map changes. They come from rerunning the script (the hand-crafted stuff is commented at the end of the file).

Kevin DuBois (kdub) wrote on 2015-02-02:

Okay, lgtm then, I guess I just picked out a few pre-existing problems in the autogenerated symbols.map

review: Approve

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/server_example_window_management.cpp'
 --- examples/server_example_window_management.cpp	2015-01-26 18:57:21 +0000
 +++ examples/server_example_window_management.cpp	2015-01-30 14:41:53 +0000
@@ -281,6 +281,7 @@
+                 }
                  focussed_surface->configure(mir_surface_attrib_state, state);
++                attribute_set(*focussed_surface, mir_surface_attrib_state, state);
+             }
+         }
+     }
 === modified file 'include/server/mir/server.h'
 --- include/server/mir/server.h	2015-01-29 04:34:12 +0000
 +++ include/server/mir/server.h	2015-01-30 14:41:53 +0000
@@ -33,7 +33,14 @@
  namespace input { class CompositeEventFilter; class InputDispatcher; class CursorListener; class TouchVisualizer; }
  namespace logging { class Logger; }
  namespace options { class Option; }
--namespace shell { class Shell; class FocusController; class DisplayLayout; class HostLifecycleEventListener; }
++namespace shell
++{
++class DisplayLayout;
++class FocusController;
++class HostLifecycleEventListener;
++class InputTargeter;
++class Shell;
++}
  namespace scene
+ {
  class PlacementStrategy;
@@ -241,6 +248,9 @@
      /// Sets an override functor for creating the session mediator report.
      void override_the_session_mediator_report(Builder<frontend::SessionMediatorReport> const& session_mediator_builder);
++    /// Sets an override functor for creating the shell.
++    void override_the_shell(Builder<shell::Shell> const& wrapper);
++
      /// Sets an override functor for creating the surface configurator.
      void override_the_surface_configurator(Builder<scene::SurfaceConfigurator> const& surface_configurator_builder);
@@ -288,6 +298,9 @@
      /// \return the graphics platform.
      auto the_graphics_platform() const -> std::shared_ptr<graphics::Platform>;
++    /// \return the input targeter.
++    auto the_input_targeter() const -> std::shared_ptr<shell::InputTargeter>;
++
      /// \return the logger.
      auto the_logger() const -> std::shared_ptr<logging::Logger>;
 === added file 'include/server/mir/shell/abstract_shell.h'
 --- include/server/mir/shell/abstract_shell.h	1970-01-01 00:00:00 +0000
 +++ include/server/mir/shell/abstract_shell.h	2015-01-30 14:41:53 +0000
@@ -0,0 +1,116 @@
++/*
++ * 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_SHELL_ABSTRACT_SHELL_H_
++#define MIR_SHELL_ABSTRACT_SHELL_H_
++
++#include "mir/shell/shell.h"
++
++#include <mutex>
++
++namespace mir
++{
++namespace shell
++{
++/// Minimal Shell implementation with none of the necessary window management logic
++class AbstractShell : public virtual Shell
++{
++public:
++    AbstractShell(
++        std::shared_ptr<InputTargeter> const& input_targeter,
++        std::shared_ptr<scene::SurfaceCoordinator> const& surface_coordinator,
++        std::shared_ptr<scene::SessionCoordinator> const& session_coordinator,
++        std::shared_ptr<scene::PromptSessionManager> const& prompt_session_manager);
++
++    ~AbstractShell() noexcept;
++
++    std::shared_ptr<scene::Session> open_session(
++        pid_t client_pid,
++        std::string const& name,
++        std::shared_ptr<frontend::EventSink> const& sink) override;
++
++    void close_session(std::shared_ptr<scene::Session> const& session) override;
++
++    frontend::SurfaceId create_surface(std::shared_ptr<scene::Session> const& session, scene::SurfaceCreationParameters const& params) override;
++
++    void destroy_surface(std::shared_ptr<scene::Session> const& session, frontend::SurfaceId surface) override;
++
++    void handle_surface_created(std::shared_ptr<scene::Session> const& session) override;
++
++    int set_surface_attribute(
++        std::shared_ptr<scene::Session> const& session,
++        std::shared_ptr<scene::Surface> const& surface,
++        MirSurfaceAttrib attrib,
++        int value) override;
++
++    int get_surface_attribute(
++        std::shared_ptr<scene::Surface> const& surface,
++        MirSurfaceAttrib attrib) override;
++
++    std::shared_ptr<scene::PromptSession> start_prompt_session_for(
++        std::shared_ptr<scene::Session> const& session,
++        scene::PromptSessionCreationParameters const& params) override;
++
++    void add_prompt_provider_for(
++        std::shared_ptr<scene::PromptSession> const& prompt_session,
++        std::shared_ptr<scene::Session> const& session) override;
++
++    void stop_prompt_session(std::shared_ptr<scene::PromptSession> const& prompt_session) override;
++
++/** @name these come from FocusController
++ * Focus changes are notified to the derived class via the private setting_focus_to()
++ * functions.
++ * \note I think the FocusController interface is unnecessary as:
++ *   1. the functions are only meaningful in the context of implementing a Shell
++ *   2. the implementation of these functions is Shell behaviour
++ * Simply providing them as part of AbstractShell is probably adequate.
++ *  @{ */
++    void focus_next() override;
++
++    std::weak_ptr<scene::Session> focussed_application() const override;
++
++    void set_focus_to(std::shared_ptr<scene::Session> const& focus) override;
++/** @} */
++
++protected:
++    std::shared_ptr<InputTargeter> const input_targeter;
++    std::shared_ptr<scene::SurfaceCoordinator> const surface_coordinator;
++    std::shared_ptr<scene::SessionCoordinator> const session_coordinator;
++    std::shared_ptr<scene::PromptSessionManager> const prompt_session_manager;
++
++private:
++/** @name callbacks from FocusController methods
++ * These functions are called while the input focus is locked.
++ * \warning DO NOT allow recursive calls to focus_next(), focussed_application() or set_focus_to()
++ * as these will deadlock.
++ * @{ */
++    virtual void setting_focus_to(std::shared_ptr<scene::Surface> const& next_focus);
++    virtual void setting_focus_to(std::shared_ptr<scene::Session> const& next_focus);
++/** @} */
++
++    std::mutex mutable focus_mutex;
++    std::weak_ptr<scene::Surface> focus_surface;
++    std::weak_ptr<scene::Session> focus_session;
++
++    void set_focus_to_locked(std::unique_lock<std::mutex> const& lock, std::shared_ptr<scene::Surface> const& next_focus);
++    void set_focus_to_locked(std::unique_lock<std::mutex> const& lock, std::shared_ptr<scene::Session> const& next_focus);
++};
++}
++}
++
++#endif /* MIR_SHELL_ABSTRACT_SHELL_H_ */
 === modified file 'include/server/mir/shell/shell.h'
 --- include/server/mir/shell/shell.h	2015-01-26 16:53:50 +0000
 +++ include/server/mir/shell/shell.h	2015-01-30 14:41:53 +0000
@@ -76,35 +76,15 @@
      virtual int set_surface_attribute(
          std::shared_ptr<scene::Session> const& session,
--        frontend::SurfaceId surface_id,
++        std::shared_ptr<scene::Surface> const& surface,
          MirSurfaceAttrib attrib,
          int value) = 0;
      virtual int get_surface_attribute(
--        std::shared_ptr<scene::Session> const& session,
--        frontend::SurfaceId surface_id,
++        std::shared_ptr<scene::Surface> const& surface,
          MirSurfaceAttrib attrib) = 0;
  /** @} */
  };
--
--/// A placeholder for stuff all shells will want
--class AbstractShell : public Shell
--{
--public:
--    AbstractShell(
--        std::shared_ptr<InputTargeter> const& input_targeter,
--        std::shared_ptr<scene::SurfaceCoordinator> const& surface_coordinator,
--        std::shared_ptr<scene::SessionCoordinator> const& session_coordinator,
--        std::shared_ptr<scene::PromptSessionManager> const& prompt_session_manager);
--
--    ~AbstractShell() noexcept;
--
--protected:
--    std::shared_ptr<InputTargeter> const input_targeter;
--    std::shared_ptr<scene::SurfaceCoordinator> const surface_coordinator;
--    std::shared_ptr<scene::SessionCoordinator> const session_coordinator;
--    std::shared_ptr<scene::PromptSessionManager> const prompt_session_manager;
--};
+ }
+ }
 === modified file 'include/server/mir/shell/shell_wrapper.h'
 --- include/server/mir/shell/shell_wrapper.h	2015-01-28 12:02:41 +0000
 +++ include/server/mir/shell/shell_wrapper.h	2015-01-30 14:41:53 +0000
@@ -61,13 +61,12 @@
      int set_surface_attribute(
          std::shared_ptr<scene::Session> const& session,
--        frontend::SurfaceId surface_id,
++        std::shared_ptr<scene::Surface> const& surface,
          MirSurfaceAttrib attrib,
          int value) override;
      int get_surface_attribute(
--        std::shared_ptr<scene::Session> const& session,
--        frontend::SurfaceId surface_id,
++        std::shared_ptr<scene::Surface> const& surface,
          MirSurfaceAttrib attrib) override;
  protected:
 === modified file 'server-ABI-sha1sums'
 --- server-ABI-sha1sums	2015-01-29 04:34:12 +0000
 +++ server-ABI-sha1sums	2015-01-30 14:41:53 +0000
@@ -103,14 +103,15 @@
  aceccc0bdeea5c90d6c5ea17ed4ce6b5dc1b0ed4  include/server/mir/scene/surface.h
 e22d751656ce2d9536afdf5659276ff9bbc46  include/server/mir/scene/surface_observer.h
 ef3e99901168cda296d74d05a979f47bf9c3ff1  include/server/mir/server_action_queue.h
--f7c31027e803d28e6221e523d7fb679189b6e1a0  include/server/mir/server.h
++82adb52457bf9caf913940e8eeddec4e116dd862  include/server/mir/server.h
 b500339bfccd07a9bed8298f75a68b18f5c  include/server/mir/server_status_listener.h
++921f0ae41c50965da6317184fd06286697704a6f  include/server/mir/shell/abstract_shell.h
 c04f32b60e680140148dc9dc2295de145b9c1  include/server/mir/shell/display_layout.h
 ee696afe779c1dc23e1f17e93eafca896a1a6  include/server/mir/shell/focus_controller.h
  f8d415af54b4a477338fb9dbe20db01aa4544029  include/server/mir/shell/host_lifecycle_event_listener.h
 f50c37bb8e36a1aa4918af6aa01b0f032ed0984  include/server/mir/shell/input_targeter.h
--455fbd79aa33d1a3fcf078c5e5b7a8575ee9eb8f  include/server/mir/shell/shell.h
--66140bd35f412fca4cb3eb58d890acecabeb333a  include/server/mir/shell/shell_wrapper.h
++9b567d3fc9a09fd3196fec2dad22ca967c45f442  include/server/mir/shell/shell.h
++e4786cdcd111bd6270db25d40129c4e415cb4347  include/server/mir/shell/shell_wrapper.h
 cc8c0b12ee4fd78d86c8f3309546e4dc68c9f  include/server/mir/terminate_with_current_exception.h
 b8c2a763c8f5f00b737c3a187db2304676f8076  include/server/mir/time/alarm.h
  a134c7b86e9c3b191f1004abe7bbdceed8ac42ee  include/server/mir/time/timer.h
 === modified file 'src/server/scene/basic_surface.cpp'
 --- src/server/scene/basic_surface.cpp	2015-01-22 03:10:13 +0000
 +++ src/server/scene/basic_surface.cpp	2015-01-30 14:41:53 +0000
@@ -27,7 +27,6 @@
  #include "mir/graphics/buffer.h"
  #include "mir/scene/scene_report.h"
--#include "mir/scene/surface_configurator.h"
  #include <boost/throw_exception.hpp>
@@ -116,7 +115,6 @@
      std::shared_ptr<mc::BufferStream> const& buffer_stream,
      std::shared_ptr<mi::InputChannel> const& input_channel,
      std::shared_ptr<input::InputSender> const& input_sender,
--    std::shared_ptr<SurfaceConfigurator> const& configurator,
      std::shared_ptr<mg::CursorImage> const& cursor_image,
      std::shared_ptr<SceneReport> const& report) :
      surface_name(name),
@@ -130,7 +128,6 @@
      surface_buffer_stream(buffer_stream),
      server_input_channel(input_channel),
      input_sender(input_sender),
--    configurator(configurator),
      cursor_image_(cursor_image),
      report(report),
      parent_(parent)
@@ -145,12 +142,10 @@
      std::shared_ptr<mc::BufferStream> const& buffer_stream,
      std::shared_ptr<mi::InputChannel> const& input_channel,
      std::shared_ptr<input::InputSender> const& input_sender,
--    std::shared_ptr<SurfaceConfigurator> const& configurator,
      std::shared_ptr<mg::CursorImage> const& cursor_image,
      std::shared_ptr<SceneReport> const& report) :
      BasicSurface(name, rect, std::shared_ptr<Surface>{nullptr}, nonrectangular,buffer_stream,
--                 input_channel, input_sender, configurator,
--                 cursor_image, report)
++                 input_channel, input_sender, cursor_image, report)
+ {
+ }
@@ -510,7 +505,7 @@
  int ms::BasicSurface::configure(MirSurfaceAttrib attrib, int value)
+ {
--    int result = configurator->select_attribute_value(*this, attrib, value);
++    int result = value;
      switch (attrib)
+     {
      case mir_surface_attrib_type:
@@ -540,8 +535,6 @@
          break;
+     }
--    configurator->attribute_set(*this, attrib, result);
--
      return result;
+ }
 === modified file 'src/server/scene/basic_surface.h'
 --- src/server/scene/basic_surface.h	2015-01-22 03:10:13 +0000
 +++ src/server/scene/basic_surface.h	2015-01-30 14:41:53 +0000
@@ -54,7 +54,6 @@
  namespace scene
+ {
  class SceneReport;
--class SurfaceConfigurator;
  class SurfaceObservers : public SurfaceObserver, BasicObservers<SurfaceObserver>
+ {
@@ -85,7 +84,6 @@
          std::shared_ptr<compositor::BufferStream> const& buffer_stream,
          std::shared_ptr<input::InputChannel> const& input_channel,
          std::shared_ptr<input::InputSender> const& sender,
--        std::shared_ptr<SurfaceConfigurator> const& configurator,
          std::shared_ptr<graphics::CursorImage> const& cursor_image,
          std::shared_ptr<SceneReport> const& report);
@@ -97,7 +95,6 @@
          std::shared_ptr<compositor::BufferStream> const& buffer_stream,
          std::shared_ptr<input::InputChannel> const& input_channel,
          std::shared_ptr<input::InputSender> const& sender,
--        std::shared_ptr<SurfaceConfigurator> const& configurator,
          std::shared_ptr<graphics::CursorImage> const& cursor_image,
          std::shared_ptr<SceneReport> const& report);
@@ -188,7 +185,6 @@
      std::shared_ptr<compositor::BufferStream> const surface_buffer_stream;
      std::shared_ptr<input::InputChannel> const server_input_channel;
      std::shared_ptr<input::InputSender> const input_sender;
--    std::shared_ptr<SurfaceConfigurator> const configurator;
      std::shared_ptr<graphics::CursorImage> cursor_image_;
      std::shared_ptr<SceneReport> const report;
      std::weak_ptr<Surface> const parent_;
 === modified file 'src/server/scene/default_configuration.cpp'
 --- src/server/scene/default_configuration.cpp	2015-01-29 04:34:12 +0000
 +++ src/server/scene/default_configuration.cpp	2015-01-30 14:41:53 +0000
@@ -74,7 +74,6 @@
                  the_buffer_stream_factory(),
                  the_input_channel_factory(),
                  the_input_sender(),
--                the_surface_configurator(),
                  the_default_cursor_image(),
                  the_scene_report());
          });
 === modified file 'src/server/scene/surface_allocator.cpp'
 --- src/server/scene/surface_allocator.cpp	2015-01-22 03:10:13 +0000
 +++ src/server/scene/surface_allocator.cpp	2015-01-30 14:41:53 +0000
@@ -39,13 +39,11 @@
      std::shared_ptr<BufferStreamFactory> const& stream_factory,
      std::shared_ptr<input::InputChannelFactory> const& input_factory,
      std::shared_ptr<input::InputSender> const& input_sender,
--    std::shared_ptr<SurfaceConfigurator> const& configurator,
      std::shared_ptr<mg::CursorImage> const& default_cursor_image,
      std::shared_ptr<SceneReport> const& report) :
      buffer_stream_factory(stream_factory),
      input_factory(input_factory),
      input_sender(input_sender),
--    configurator(configurator),
      default_cursor_image(default_cursor_image),
      report(report)
+ {
@@ -69,7 +67,6 @@
          buffer_stream,
          input_channel,
          input_sender,
--        configurator,
          default_cursor_image,
          report);
 === modified file 'src/server/scene/surface_allocator.h'
 --- src/server/scene/surface_allocator.h	2015-01-14 06:39:13 +0000
 +++ src/server/scene/surface_allocator.h	2015-01-30 14:41:53 +0000
@@ -44,7 +44,6 @@
      SurfaceAllocator(std::shared_ptr<BufferStreamFactory> const& bb_factory,
                       std::shared_ptr<input::InputChannelFactory> const& input_factory,
                       std::shared_ptr<input::InputSender> const& input_sender,
--                     std::shared_ptr<SurfaceConfigurator> const& configurator,
                       std::shared_ptr<graphics::CursorImage> const& default_cursor_image,
                       std::shared_ptr<SceneReport> const& report);
@@ -54,7 +53,6 @@
      std::shared_ptr<BufferStreamFactory> const buffer_stream_factory;
      std::shared_ptr<input::InputChannelFactory> const input_factory;
      std::shared_ptr<input::InputSender> const input_sender;
--    std::shared_ptr<SurfaceConfigurator> const configurator;
      std::shared_ptr<graphics::CursorImage> const default_cursor_image;
      std::shared_ptr<SceneReport> const report;
  };
 === modified file 'src/server/server.cpp'
 --- src/server/server.cpp	2015-01-29 04:34:12 +0000
 +++ src/server/server.cpp	2015-01-30 14:41:53 +0000
@@ -60,6 +60,7 @@
      MACRO(session_authorizer)\
      MACRO(session_listener)\
      MACRO(session_mediator_report)\
++    MACRO(shell)\
      MACRO(surface_configurator)
  #define FOREACH_ACCESSOR(MACRO)\
@@ -70,6 +71,7 @@
      MACRO(the_focus_controller)\
      MACRO(the_gl_config)\
      MACRO(the_graphics_platform)\
++    MACRO(the_input_targeter)\
      MACRO(the_logger)\
      MACRO(the_main_loop)\
      MACRO(the_prompt_session_listener)\
 === modified file 'src/server/shell/CMakeLists.txt'
 --- src/server/shell/CMakeLists.txt	2015-01-29 04:34:12 +0000
 +++ src/server/shell/CMakeLists.txt	2015-01-30 14:41:53 +0000
@@ -1,6 +1,7 @@
  set(
    SHELL_SOURCES
++  abstract_shell.cpp
    default_placement_strategy.cpp
    frontend_shell.cpp
    graphics_display_layout.cpp
 === added file 'src/server/shell/abstract_shell.cpp'
 --- src/server/shell/abstract_shell.cpp	1970-01-01 00:00:00 +0000
 +++ src/server/shell/abstract_shell.cpp	2015-01-30 14:41:53 +0000
@@ -0,0 +1,197 @@
++/*
++ * 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 "mir/shell/abstract_shell.h"
++#include "mir/shell/input_targeter.h"
++#include "mir/scene/prompt_session.h"
++#include "mir/scene/prompt_session_manager.h"
++#include "mir/scene/session_coordinator.h"
++#include "mir/scene/session.h"
++#include "mir/scene/surface.h"
++#include "mir/scene/surface_coordinator.h"
++
++namespace mf = mir::frontend;
++namespace ms = mir::scene;
++namespace msh = mir::shell;
++
++msh::AbstractShell::AbstractShell(
++    std::shared_ptr<InputTargeter> const& input_targeter,
++    std::shared_ptr<scene::SurfaceCoordinator> const& surface_coordinator,
++    std::shared_ptr<scene::SessionCoordinator> const& session_coordinator,
++    std::shared_ptr<scene::PromptSessionManager> const& prompt_session_manager) :
++    input_targeter(input_targeter),
++    surface_coordinator(surface_coordinator),
++    session_coordinator(session_coordinator),
++    prompt_session_manager(prompt_session_manager)
++{
++}
++
++msh::AbstractShell::~AbstractShell() noexcept
++{
++}
++
++std::shared_ptr<ms::Session> msh::AbstractShell::open_session(
++    pid_t client_pid,
++    std::string const& name,
++    std::shared_ptr<mf::EventSink> const& sink)
++{
++    return session_coordinator->open_session(client_pid, name, sink);
++}
++
++void msh::AbstractShell::close_session(
++    std::shared_ptr<ms::Session> const& session)
++{
++    prompt_session_manager->remove_session(session);
++    session_coordinator->close_session(session);
++}
++
++mf::SurfaceId msh::AbstractShell::create_surface(
++    std::shared_ptr<ms::Session> const& session,
++    ms::SurfaceCreationParameters const& params)
++{
++    return session->create_surface(params);
++}
++
++void msh::AbstractShell::destroy_surface(
++    std::shared_ptr<ms::Session> const& session,
++    mf::SurfaceId surface)
++{
++    session->destroy_surface(surface);
++}
++
++void msh::AbstractShell::handle_surface_created(
++    std::shared_ptr<ms::Session> const& /*session*/)
++{
++}
++
++std::shared_ptr<ms::PromptSession> msh::AbstractShell::start_prompt_session_for(
++    std::shared_ptr<ms::Session> const& session,
++    scene::PromptSessionCreationParameters const& params)
++{
++    return prompt_session_manager->start_prompt_session_for(session, params);
++}
++
++void msh::AbstractShell::add_prompt_provider_for(
++    std::shared_ptr<ms::PromptSession> const& prompt_session,
++    std::shared_ptr<ms::Session> const& session)
++{
++    prompt_session_manager->add_prompt_provider(prompt_session, session);
++}
++
++void msh::AbstractShell::stop_prompt_session(
++    std::shared_ptr<ms::PromptSession> const& prompt_session)
++{
++    prompt_session_manager->stop_prompt_session(prompt_session);
++}
++
++int msh::AbstractShell::set_surface_attribute(
++    std::shared_ptr<ms::Session> const& /*session*/,
++    std::shared_ptr<ms::Surface> const& surface,
++    MirSurfaceAttrib attrib,
++    int value)
++{
++    return surface->configure(attrib, value);
++}
++
++int msh::AbstractShell::get_surface_attribute(
++    std::shared_ptr<ms::Surface> const& surface,
++    MirSurfaceAttrib attrib)
++{
++    return surface->query(attrib);
++}
++
++
++void msh::AbstractShell::focus_next()
++{
++    std::unique_lock<std::mutex> lock(focus_mutex);
++    auto focus = focus_session.lock();
++
++    focus = session_coordinator->successor_of(focus);
++
++    set_focus_to_locked(lock, focus);
++}
++
++std::weak_ptr<ms::Session> msh::AbstractShell::focussed_application() const
++{
++    std::unique_lock<std::mutex> lg(focus_mutex);
++    return focus_session;
++}
++
++void msh::AbstractShell::set_focus_to(
++    std::shared_ptr<scene::Session> const& focus)
++{
++    std::unique_lock<std::mutex> lg(focus_mutex);
++    set_focus_to_locked(lg, focus);
++}
++
++void msh::AbstractShell::set_focus_to_locked(
++    std::unique_lock<std::mutex> const& /*lock*/,
++    std::shared_ptr<ms::Surface> const& surface)
++{
++    setting_focus_to(surface);
++
++    if (surface)
++    {
++        // Ensure the surface has really taken the focus before notifying it that it is focused
++        surface->take_input_focus(input_targeter);
++        if (auto current_focus = focus_surface.lock())
++            current_focus->configure(mir_surface_attrib_focus, mir_surface_unfocused);
++
++        surface->configure(mir_surface_attrib_focus, mir_surface_focused);
++        focus_surface = surface;
++    }
++    else
++    {
++        input_targeter->focus_cleared();
++    }
++}
++
++void msh::AbstractShell::set_focus_to_locked(
++    std::unique_lock<std::mutex> const& lock,
++    std::shared_ptr<ms::Session> const& session)
++{
++    setting_focus_to(session);
++
++    auto old_focus = focus_session.lock();
++
++    std::shared_ptr<ms::Surface> surface;
++
++    if (session)
++        surface = session->default_surface();
++
++    set_focus_to_locked(lock, surface);
++
++    focus_session = session;
++
++    if (session)
++    {
++        session_coordinator->set_focus_to(session);
++    }
++    else
++    {
++        session_coordinator->unset_focus();
++    }
++}
++
++void msh::AbstractShell::setting_focus_to(std::shared_ptr<ms::Surface> const& /*surface*/)
++{
++}
++
++void msh::AbstractShell::setting_focus_to(std::shared_ptr<ms::Session> const& /*session*/)
++{
++}
 === modified file 'src/server/shell/default_configuration.cpp'
 --- src/server/shell/default_configuration.cpp	2015-01-29 04:34:12 +0000
 +++ src/server/shell/default_configuration.cpp	2015-01-30 14:41:53 +0000
@@ -39,7 +39,8 @@
                  the_surface_coordinator(),
                  the_session_coordinator(),
                  the_prompt_session_manager(),
--                the_placement_strategy()));
++                the_placement_strategy(),
++                the_surface_configurator()));
          });
+ }
 === modified file 'src/server/shell/default_shell.cpp'
 --- src/server/shell/default_shell.cpp	2015-01-29 04:34:12 +0000
 +++ src/server/shell/default_shell.cpp	2015-01-30 14:41:53 +0000
@@ -24,41 +24,24 @@
  #include "mir/scene/session_coordinator.h"
  #include "mir/scene/session.h"
  #include "mir/scene/surface.h"
++#include "mir/scene/surface_configurator.h"
  #include "mir/scene/surface_coordinator.h"
  #include "mir/scene/surface_creation_parameters.h"
--#include <boost/throw_exception.hpp>
--
--#include <stdexcept>
--
  namespace mf = mir::frontend;
  namespace ms = mir::scene;
  namespace msh = mir::shell;
--msh::AbstractShell::AbstractShell(
--    std::shared_ptr<InputTargeter> const& input_targeter,
--    std::shared_ptr<scene::SurfaceCoordinator> const& surface_coordinator,
--    std::shared_ptr<scene::SessionCoordinator> const& session_coordinator,
--    std::shared_ptr<scene::PromptSessionManager> const& prompt_session_manager) :
--    input_targeter(input_targeter),
--    surface_coordinator(surface_coordinator),
--    session_coordinator(session_coordinator),
--    prompt_session_manager(prompt_session_manager)
--{
--}
--
--msh::AbstractShell::~AbstractShell() noexcept
--{
--}
--
  msh::DefaultShell::DefaultShell(
      std::shared_ptr<InputTargeter> const& input_targeter,
      std::shared_ptr<scene::SurfaceCoordinator> const& surface_coordinator,
      std::shared_ptr<scene::SessionCoordinator> const& session_coordinator,
      std::shared_ptr<scene::PromptSessionManager> const& prompt_session_manager,
--    std::shared_ptr<ms::PlacementStrategy> const& placement_strategy) :
++    std::shared_ptr<ms::PlacementStrategy> const& placement_strategy,
++    std::shared_ptr<ms::SurfaceConfigurator> const& surface_configurator) :
      AbstractShell(input_targeter, surface_coordinator, session_coordinator, prompt_session_manager),
--    placement_strategy(placement_strategy)
++    placement_strategy{placement_strategy},
++    surface_configurator{surface_configurator}
+ {
+ }
@@ -67,7 +50,7 @@
      std::string const& name,
      std::shared_ptr<mf::EventSink> const& sink)
+ {
--    auto const new_session = session_coordinator->open_session(client_pid, name, sink);
++    auto const new_session = AbstractShell::open_session(client_pid, name, sink);
      set_focus_to(new_session);
      return new_session;
+ }
@@ -75,135 +58,39 @@
  void msh::DefaultShell::close_session(
      std::shared_ptr<ms::Session> const& session)
+ {
--    prompt_session_manager->remove_session(session);
--    session_coordinator->close_session(session);
++    AbstractShell::close_session(session);
      set_focus_to(session_coordinator->successor_of(std::shared_ptr<ms::Session>()));
+ }
--void msh::DefaultShell::focus_next()
--{
--    std::unique_lock<std::mutex> lock(focus_application_mutex);
--    auto focus = focus_application.lock();
--
--    focus = session_coordinator->successor_of(focus);
--
--    set_focus_to_locked(lock, focus);
--}
--
--std::weak_ptr<ms::Session> msh::DefaultShell::focussed_application() const
--{
--    std::unique_lock<std::mutex> lg(focus_application_mutex);
--    return focus_application;
--}
--
--void msh::DefaultShell::set_focus_to(
--    std::shared_ptr<scene::Session> const& focus)
--{
--    std::unique_lock<std::mutex> lg(focus_application_mutex);
--    set_focus_to_locked(lg, focus);
--}
--
  void msh::DefaultShell::handle_surface_created(
      std::shared_ptr<ms::Session> const& session)
+ {
++    AbstractShell::handle_surface_created(session);
      set_focus_to(session);
+ }
--std::shared_ptr<ms::PromptSession> msh::DefaultShell::start_prompt_session_for(
--    std::shared_ptr<ms::Session> const& session,
--    scene::PromptSessionCreationParameters const& params)
--{
--    return prompt_session_manager->start_prompt_session_for(session, params);
--}
--
--void msh::DefaultShell::add_prompt_provider_for(
--    std::shared_ptr<ms::PromptSession> const& prompt_session,
--    std::shared_ptr<ms::Session> const& session)
--{
--    prompt_session_manager->add_prompt_provider(prompt_session, session);
--}
--
--void msh::DefaultShell::stop_prompt_session(std::shared_ptr<ms::PromptSession> const& prompt_session)
--{
--    prompt_session_manager->stop_prompt_session(prompt_session);
--}
--
  mf::SurfaceId msh::DefaultShell::create_surface(std::shared_ptr<ms::Session> const& session, ms::SurfaceCreationParameters const& params)
+ {
--    auto placed_params = placement_strategy->place(*session, params);
--    auto const result = session->create_surface(placed_params);
--    return result;
--}
--
--void msh::DefaultShell::destroy_surface(std::shared_ptr<ms::Session> const& session, mf::SurfaceId surface)
--{
--    session->destroy_surface(surface);
++    return AbstractShell::create_surface(session, placement_strategy->place(*session, params));
+ }
  int msh::DefaultShell::set_surface_attribute(
      std::shared_ptr<ms::Session> const& session,
--    mf::SurfaceId surface_id,
++    std::shared_ptr<ms::Surface> const& surface,
      MirSurfaceAttrib attrib,
      int value)
+ {
--    auto const surface = session->surface(surface_id);
--
--    // TODO scene::SurfaceConfigurator is really a DefaultShell strategy
--    // TODO it should be invoked from here around any changes to the surface
--
--    return surface->configure(attrib, value);
--}
--
--int msh::DefaultShell::get_surface_attribute(
--    std::shared_ptr<ms::Session> const& session,
--    mf::SurfaceId surface_id,
--    MirSurfaceAttrib attrib)
--{
--    auto const surface = session->surface(surface_id);
--
--    if (!surface)
--        BOOST_THROW_EXCEPTION(std::logic_error("invalid surface id"));
--
--    return surface->query(attrib);
--}
--
--
--inline void msh::DefaultShell::set_focus_to_locked(std::unique_lock<std::mutex> const&, std::shared_ptr<ms::Session> const& session)
--{
--    auto old_focus = focus_application.lock();
--
--    std::shared_ptr<ms::Surface> surface;
--
--    if (session)
--        surface = session->default_surface();
--
++    auto const configured_value = surface_configurator->select_attribute_value(*surface, attrib, value);
++
++    auto const result = AbstractShell::set_surface_attribute(session, surface, attrib, configured_value);
++
++    surface_configurator->attribute_set(*surface, attrib, result);
++
++    return result;
++}
++
++void msh::DefaultShell::setting_focus_to(std::shared_ptr<ms::Surface> const& surface)
++{
      if (surface)
--    {
--        std::lock_guard<std::mutex> lg(focus_surface_mutex);
--
--        // Ensure the surface has really taken the focus before notifying it that it is focused
          surface_coordinator->raise(surface);
--        surface->take_input_focus(input_targeter);
--
--        auto current_focus = focus_surface.lock();
--        if (current_focus)
--            current_focus->configure(mir_surface_attrib_focus, mir_surface_unfocused);
--        surface->configure(mir_surface_attrib_focus, mir_surface_focused);
--        focus_surface = surface;
--    }
--    else
--    {
--        input_targeter->focus_cleared();
--    }
--
--    focus_application = session;
--
--    if (session)
--    {
--        session_coordinator->set_focus_to(session);
--    }
--    else
--    {
--        session_coordinator->unset_focus();
--    }
+ }
 === modified file 'src/server/shell/default_shell.h'
 --- src/server/shell/default_shell.h	2015-01-30 10:22:51 +0000
 +++ src/server/shell/default_shell.h	2015-01-30 14:41:53 +0000
@@ -19,13 +19,11 @@
  #ifndef MIR_SHELL_DEFAULT_SHELL_H_
  #define MIR_SHELL_DEFAULT_SHELL_H_
--#include "mir/shell/shell.h"
--
--#include <mutex>
++#include "mir/shell/abstract_shell.h"
  namespace mir
+ {
--namespace scene { class PlacementStrategy; }
++namespace scene { class PlacementStrategy; class SurfaceConfigurator; }
  namespace shell
+ {
@@ -40,20 +38,8 @@
          std::shared_ptr<scene::SurfaceCoordinator> const& surface_coordinator,
          std::shared_ptr<scene::SessionCoordinator> const& session_coordinator,
          std::shared_ptr<scene::PromptSessionManager> const& prompt_session_manager,
--        std::shared_ptr<scene::PlacementStrategy> const& placement_strategy);
--
--/** @name these come from FocusController
-- * I think the FocusController interface is unnecessary as:
-- *   1. the functions are only meaningful in the context of implementing a Shell
-- *   2. the implementation of these functions is Shell behaviour
-- * Simply providing them as part of a public ShellLibrary is probably adequate.
-- *  @{ */
--    void focus_next() override;
--
--    std::weak_ptr<scene::Session> focussed_application() const override;
--
--    void set_focus_to(std::shared_ptr<scene::Session> const& focus) override;
--/** @} */
++        std::shared_ptr<scene::PlacementStrategy> const& placement_strategy,
++        std::shared_ptr<scene::SurfaceConfigurator> const& surface_configurator);
  /** @name these come from frontend::Shell
   *  @{ */
@@ -66,42 +52,20 @@
      void handle_surface_created(std::shared_ptr<scene::Session> const& session) override;
--    std::shared_ptr<scene::PromptSession> start_prompt_session_for(
--        std::shared_ptr<scene::Session> const& session,
--        scene::PromptSessionCreationParameters const& params) override;
--
--    void add_prompt_provider_for(
--        std::shared_ptr<scene::PromptSession> const& prompt_session,
--        std::shared_ptr<scene::Session> const& session) override;
--
--    void stop_prompt_session(std::shared_ptr<scene::PromptSession> const& prompt_session) override;
--
      frontend::SurfaceId create_surface(std::shared_ptr<scene::Session> const& session, scene::SurfaceCreationParameters const& params) override;
--    void destroy_surface(std::shared_ptr<scene::Session> const& session, frontend::SurfaceId surface) override;
--
      int set_surface_attribute(
          std::shared_ptr<scene::Session> const& session,
--        frontend::SurfaceId surface_id,
++        std::shared_ptr<scene::Surface> const& surface,
          MirSurfaceAttrib attrib,
          int value) override;
--
--    int get_surface_attribute(
--        std::shared_ptr<scene::Session> const& session,
--        frontend::SurfaceId surface_id,
--        MirSurfaceAttrib attrib) override;
  /** @} */
  private:
--    std::shared_ptr<scene::PlacementStrategy> const placement_strategy;  // TODO doesn't need to be a strategy
--
--    std::mutex mutable focus_surface_mutex;
--    std::weak_ptr<scene::Surface> focus_surface;
--
--    std::mutex mutable focus_application_mutex;
--    std::weak_ptr<scene::Session> focus_application;
--
--    void set_focus_to_locked(std::unique_lock<std::mutex> const& lock, std::shared_ptr<scene::Session> const& next_focus);
++    std::shared_ptr<scene::PlacementStrategy> const placement_strategy;
++    std::shared_ptr<scene::SurfaceConfigurator> const surface_configurator;
++
++    void setting_focus_to(std::shared_ptr<scene::Surface> const& surface) override;
  };
+ }
+ }
 === modified file 'src/server/shell/frontend_shell.cpp'
 --- src/server/shell/frontend_shell.cpp	2015-01-26 12:19:09 +0000
 +++ src/server/shell/frontend_shell.cpp	2015-01-30 14:41:53 +0000
@@ -91,7 +91,8 @@
      int value)
+ {
      auto const scene_session = std::dynamic_pointer_cast<ms::Session>(session);
--    return wrapped->set_surface_attribute(scene_session, surface_id, attrib, value);
++    auto const surface = scene_session->surface(surface_id);
++    return wrapped->set_surface_attribute(scene_session, surface, attrib, value);
+ }
  int msh::FrontendShell::get_surface_attribute(
@@ -100,5 +101,6 @@
      MirSurfaceAttrib attrib)
+ {
      auto const scene_session = std::dynamic_pointer_cast<ms::Session>(session);
--    return wrapped->get_surface_attribute(scene_session, surface_id, attrib);
++    auto const surface = scene_session->surface(surface_id);
++    return wrapped->get_surface_attribute(surface, attrib);
+ }
 === modified file 'src/server/shell/shell_wrapper.cpp'
 --- src/server/shell/shell_wrapper.cpp	2015-01-26 17:58:48 +0000
 +++ src/server/shell/shell_wrapper.cpp	2015-01-30 14:41:53 +0000
@@ -91,17 +91,16 @@
  int msh::ShellWrapper::set_surface_attribute(
      std::shared_ptr<ms::Session> const& session,
--    mf::SurfaceId surface_id,
++    std::shared_ptr<ms::Surface> const& surface,
      MirSurfaceAttrib attrib,
      int value)
+ {
--    return wrapped->set_surface_attribute(session, surface_id, attrib, value);
++    return wrapped->set_surface_attribute(session, surface, attrib, value);
+ }
  int msh::ShellWrapper::get_surface_attribute(
--    std::shared_ptr<ms::Session> const& session,
--    mf::SurfaceId surface_id,
++    std::shared_ptr<ms::Surface> const& surface,
      MirSurfaceAttrib attrib)
+ {
--    return wrapped->get_surface_attribute(session, surface_id, attrib);
++    return wrapped->get_surface_attribute(surface, attrib);
+ }
 === modified file 'src/server/symbols.map'
 --- src/server/symbols.map	2015-01-29 04:34:12 +0000
 +++ src/server/symbols.map	2015-01-30 14:41:53 +0000
@@ -21,135 +21,14 @@
      mir::compositor::DisplayBufferCompositorFactory::operator*;
      mir::compositor::DisplayBufferCompositor::operator*;
      mir::compositor::Scene::add_observer*;
--    mir::compositor::SceneElement::is_a_surface*;
--    mir::compositor::SceneElement::occluded*;
--    mir::compositor::SceneElement::operator*;
--    mir::compositor::SceneElement::renderable*;
--    mir::compositor::SceneElement::rendered*;
--    mir::compositor::SceneElement::?SceneElement*;
--    mir::compositor::SceneElement::SceneElement*;
      mir::compositor::Scene::register_compositor*;
      mir::compositor::Scene::remove_observer*;
      mir::compositor::Scene::Scene*;
      mir::compositor::Scene::scene_elements_for*;
      mir::compositor::Scene::unregister_compositor*;
--    mir::DefaultServerConfiguration::clock*;
--    mir::DefaultServerConfiguration::DefaultServerConfiguration*;
--    mir::DefaultServerConfiguration::is_key_repeat_enabled*;
--    mir::DefaultServerConfiguration::new_ipc_factory*;
--    mir::DefaultServerConfiguration::the_android_input_dispatcher*;
--    mir::DefaultServerConfiguration::the_buffer_allocator*;
--    mir::DefaultServerConfiguration::the_buffer_stream_factory*;
--    mir::DefaultServerConfiguration::the_clock*;
--    mir::DefaultServerConfiguration::the_composite_event_filter*;
--    mir::DefaultServerConfiguration::the_compositor*;
--    mir::DefaultServerConfiguration::the_compositor_report*;
--    mir::DefaultServerConfiguration::the_connection_creator*;
--    mir::DefaultServerConfiguration::the_connector*;
--    mir::DefaultServerConfiguration::the_connector_report*;
--    mir::DefaultServerConfiguration::the_coordinate_translator*;
--    mir::DefaultServerConfiguration::the_cursor*;
--    mir::DefaultServerConfiguration::the_cursor_images*;
--    mir::DefaultServerConfiguration::the_cursor_listener*;
--    mir::DefaultServerConfiguration::the_default_cursor_image*;
--    mir::DefaultServerConfiguration::the_dispatcher_policy*;
--    mir::DefaultServerConfiguration::the_dispatcher_thread*;
--    mir::DefaultServerConfiguration::the_display*;
--    mir::DefaultServerConfiguration::the_display_buffer_compositor_factory*;
--    mir::DefaultServerConfiguration::the_display_changer*;
--    mir::DefaultServerConfiguration::the_display_configuration_policy*;
--    mir::DefaultServerConfiguration::the_display_report*;
--    mir::DefaultServerConfiguration::the_emergency_cleanup*;
--    mir::DefaultServerConfiguration::the_event_hub*;
--    mir::DefaultServerConfiguration::the_fatal_error_strategy*;
--    mir::DefaultServerConfiguration::the_focus_controller*;
--    mir::DefaultServerConfiguration::the_frame_dropping_policy_factory*;
--    mir::DefaultServerConfiguration::the_frontend_display_changer*;
--    mir::DefaultServerConfiguration::the_frontend_shell*;
--    mir::DefaultServerConfiguration::the_gl_config*;
--    mir::DefaultServerConfiguration::the_global_event_sink*;
--    mir::DefaultServerConfiguration::the_gl_program_factory*;
--    mir::DefaultServerConfiguration::the_graphics_platform*;
--    mir::DefaultServerConfiguration::the_host_connection*;
--    mir::DefaultServerConfiguration::the_host_lifecycle_event_listener*;
--    mir::DefaultServerConfiguration::the_input_channel_factory*;
--    mir::DefaultServerConfiguration::the_input_dispatcher*;
--    mir::DefaultServerConfiguration::the_input_manager*;
--    mir::DefaultServerConfiguration::the_input_reader*;
--    mir::DefaultServerConfiguration::the_input_reader_policy*;
--    mir::DefaultServerConfiguration::the_input_reader_thread*;
--    mir::DefaultServerConfiguration::the_input_region*;
--    mir::DefaultServerConfiguration::the_input_registrar*;
--    mir::DefaultServerConfiguration::the_input_report*;
--    mir::DefaultServerConfiguration::the_input_scene*;
--    mir::DefaultServerConfiguration::the_input_sender*;
--    mir::DefaultServerConfiguration::the_input_send_observer*;
--    mir::DefaultServerConfiguration::the_input_target_enumerator*;
--    mir::DefaultServerConfiguration::the_input_targeter*;
--    mir::DefaultServerConfiguration::the_input_translator*;
--    mir::DefaultServerConfiguration::the_logger*;
--    mir::DefaultServerConfiguration::the_main_loop*;
--    mir::DefaultServerConfiguration::the_mediating_display_changer*;
--    mir::DefaultServerConfiguration::the_message_processor_report*;
--    mir::DefaultServerConfiguration::the_options*;
--    mir::DefaultServerConfiguration::the_pixel_buffer*;
--    mir::DefaultServerConfiguration::the_placement_strategy*;
--    mir::DefaultServerConfiguration::the_prompt_connection_creator*;
--    mir::DefaultServerConfiguration::the_prompt_connector*;
--    mir::DefaultServerConfiguration::the_prompt_session_listener*;
--    mir::DefaultServerConfiguration::the_prompt_session_manager*;
--    mir::DefaultServerConfiguration::the_renderer_factory*;
--    mir::DefaultServerConfiguration::the_scene*;
--    mir::DefaultServerConfiguration::the_scene_report*;
--    mir::DefaultServerConfiguration::the_screencast*;
--    mir::DefaultServerConfiguration::the_server_action_queue*;
--    mir::DefaultServerConfiguration::the_server_status_listener*;
--    mir::DefaultServerConfiguration::the_session_authorizer*;
--    mir::DefaultServerConfiguration::the_session_container*;
--    mir::DefaultServerConfiguration::the_session_coordinator*;
--    mir::DefaultServerConfiguration::the_session_event_handler_register*;
--    mir::DefaultServerConfiguration::the_session_event_sink*;
--    mir::DefaultServerConfiguration::the_session_listener*;
--    mir::DefaultServerConfiguration::the_session_mediator_report*;
--    mir::DefaultServerConfiguration::the_shared_library_prober_report*;
--    mir::DefaultServerConfiguration::the_shell*;
--    mir::DefaultServerConfiguration::the_shell_display_layout*;
--    mir::DefaultServerConfiguration::the_snapshot_strategy*;
--    mir::DefaultServerConfiguration::the_socket_file*;
--    mir::DefaultServerConfiguration::the_surface_configurator*;
--    mir::DefaultServerConfiguration::the_surface_coordinator*;
--    mir::DefaultServerConfiguration::the_surface_factory*;
--    mir::DefaultServerConfiguration::the_surface_stack_model*;
--    mir::DefaultServerConfiguration::the_touch_visualizer*;
--    mir::DefaultServerConfiguration::wrap_cursor_listener*;
--    mir::DefaultServerConfiguration::wrap_display_buffer_compositor_factory*;
--    mir::DefaultServerConfiguration::wrap_display_configuration_policy*;
--    mir::DefaultServerConfiguration::wrap_shell*;
--    mir::DisplayServer::?DisplayServer*;
--    mir::DisplayServer::DisplayServer*;
--    mir::DisplayServer::run*;
--    mir::DisplayServer::stop*;
--    mir::EmergencyCleanup::operator*;
--    mir::frontend::DisplayChanger::active_configuration*;
--    mir::frontend::DisplayChanger::configure*;
--    mir::frontend::DisplayChanger::?DisplayChanger*;
--    mir::frontend::DisplayChanger::DisplayChanger*;
--    mir::frontend::DisplayChanger::operator*;
--    mir::frontend::EventSink::?EventSink*;
--    mir::frontend::EventSink::EventSink*;
--    mir::frontend::EventSink::handle_display_config_change*;
--    mir::frontend::EventSink::handle_event*;
--    mir::frontend::EventSink::handle_lifecycle_event*;
--    mir::frontend::EventSink::operator*;
      mir::frontend::PromptSession::operator*;
      mir::frontend::PromptSession::?PromptSession*;
      mir::frontend::PromptSession::PromptSession*;
--    mir::frontend::Screencast::capture*;
--    mir::frontend::Screencast::create_session*;
--    mir::frontend::Screencast::destroy_session*;
--    mir::frontend::Screencast::operator*;
--    mir::frontend::Screencast::?Screencast*;
--    mir::frontend::Screencast::Screencast*;
      mir::frontend::SessionAuthorizer::configure_display_is_allowed*;
      mir::frontend::SessionAuthorizer::connection_is_allowed*;
      mir::frontend::SessionAuthorizer::operator*;
@@ -157,14 +36,11 @@
      mir::frontend::SessionAuthorizer::screencast_is_allowed*;
      mir::frontend::SessionAuthorizer::?SessionAuthorizer*;
      mir::frontend::SessionAuthorizer::SessionAuthorizer*;
--    mir::frontend::Session::create_surface*;
      mir::frontend::SessionCredentials::gid*;
      mir::frontend::SessionCredentials::pid*;
      mir::frontend::SessionCredentials::SessionCredentials*;
      mir::frontend::SessionCredentials::uid*;
--    mir::frontend::Session::destroy_surface*;
      mir::frontend::Session::get_surface*;
--    mir::frontend::Session::hide*;
      mir::frontend::SessionMediatorReport::session_configure_display_called*;
      mir::frontend::SessionMediatorReport::session_configure_surface_called*;
      mir::frontend::SessionMediatorReport::session_configure_surface_cursor_called*;
@@ -182,22 +58,10 @@
      mir::frontend::Session::operator*;
      mir::frontend::Session::?Session*;
      mir::frontend::Session::Session*;
--    mir::frontend::Session::show*;
--    mir::frontend::Shell::add_prompt_provider_for*;
--    mir::frontend::Shell::close_session*;
--    mir::frontend::Shell::handle_surface_created*;
--    mir::frontend::Shell::open_session*;
--    mir::frontend::Shell::operator*;
--    mir::frontend::Shell::?Shell*;
--    mir::frontend::Shell::Shell*;
--    mir::frontend::Shell::start_prompt_session_for*;
--    mir::frontend::Shell::stop_prompt_session*;
      mir::frontend::Surface::client_input_fd*;
      mir::frontend::Surface::client_size*;
--    mir::frontend::Surface::configure*;
      mir::frontend::Surface::operator*;
      mir::frontend::Surface::pixel_format*;
--    mir::frontend::Surface::query*;
      mir::frontend::Surface::set_cursor_image*;
      mir::frontend::Surface::supports_input*;
      mir::frontend::Surface::?Surface*;
@@ -250,10 +114,12 @@
      mir::MainLoop::run*;
      mir::MainLoop::stop*;
      mir::report_exception*;
--    mir::run_mir*;
      mir::scene::a_surface*;
      mir::scene::CoordinateTranslator::?CoordinateTranslator*;
      mir::scene::CoordinateTranslator::surface_to_screen*;
++    mir::scene::NullSessionListener::?NullSessionListener*;
++    mir::scene::NullSessionListener::NullSessionListener*;
++    mir::scene::NullSessionListener::operator*;
      mir::scene::NullSurfaceObserver::alpha_set_to*;
      mir::scene::NullSurfaceObserver::attrib_changed*;
      mir::scene::NullSurfaceObserver::client_surface_close_requested*;
@@ -287,8 +153,10 @@
      mir::scene::PromptSessionListener::prompt_provider_removed*;
      mir::scene::PromptSessionListener::?PromptSessionListener*;
      mir::scene::PromptSessionListener::PromptSessionListener*;
++    mir::scene::PromptSessionListener::resuming*;
      mir::scene::PromptSessionListener::starting*;
      mir::scene::PromptSessionListener::stopping*;
++    mir::scene::PromptSessionListener::suspending*;
      mir::scene::PromptSessionManager::add_prompt_provider*;
      mir::scene::PromptSessionManager::application_for*;
      mir::scene::PromptSessionManager::for_each_provider_in*;
@@ -297,10 +165,27 @@
      mir::scene::PromptSessionManager::?PromptSessionManager*;
      mir::scene::PromptSessionManager::PromptSessionManager*;
      mir::scene::PromptSessionManager::remove_session*;
++    mir::scene::PromptSessionManager::resume_prompt_session*;
      mir::scene::PromptSessionManager::start_prompt_session_for*;
      mir::scene::PromptSessionManager::stop_prompt_session*;
++    mir::scene::PromptSessionManager::suspend_prompt_session*;
++    mir::scene::PromptSession::resume*;
++    mir::scene::PromptSession::start*;
++    mir::scene::PromptSession::stop*;
++    mir::scene::PromptSession::suspend*;
++    mir::scene::SessionCoordinator::close_session*;
++    mir::scene::SessionCoordinator::open_session*;
++    mir::scene::SessionCoordinator::operator*;
++    mir::scene::SessionCoordinator::?SessionCoordinator*;
++    mir::scene::SessionCoordinator::SessionCoordinator*;
++    mir::scene::SessionCoordinator::set_focus_to*;
++    mir::scene::SessionCoordinator::successor_of*;
++    mir::scene::SessionCoordinator::unset_focus*;
++    mir::scene::Session::create_surface*;
      mir::scene::Session::default_surface*;
++    mir::scene::Session::destroy_surface*;
      mir::scene::Session::force_requests_to_complete*;
++    mir::scene::Session::hide*;
      mir::scene::SessionListener::destroying_surface*;
      mir::scene::SessionListener::focused*;
      mir::scene::SessionListener::operator*;
@@ -311,10 +196,14 @@
      mir::scene::SessionListener::surface_created*;
      mir::scene::SessionListener::unfocused*;
      mir::scene::Session::process_id*;
++    mir::scene::Session::resume_prompt_session*;
      mir::scene::Session::send_display_config*;
      mir::scene::Session::set_lifecycle_state*;
++    mir::scene::Session::show*;
      mir::scene::Session::start_prompt_session*;
      mir::scene::Session::stop_prompt_session*;
++    mir::scene::Session::surface*;
++    mir::scene::Session::suspend_prompt_session*;
      mir::scene::Session::take_snapshot*;
      mir::scene::Surface::add_observer*;
      mir::scene::Surface::allow_framedropping*;
@@ -330,6 +219,7 @@
      mir::scene::SurfaceConfigurator::select_attribute_value*;
      mir::scene::SurfaceConfigurator::?SurfaceConfigurator*;
      mir::scene::SurfaceConfigurator::SurfaceConfigurator*;
++    mir::scene::Surface::configure*;
      mir::scene::SurfaceCoordinator::add_surface*;
      mir::scene::SurfaceCoordinator::operator*;
      mir::scene::SurfaceCoordinator::raise*;
@@ -342,9 +232,15 @@
      mir::scene::SurfaceCreationParameters::of_pixel_format*;
      mir::scene::SurfaceCreationParameters::of_position*;
      mir::scene::SurfaceCreationParameters::of_size*;
++    mir::scene::SurfaceCreationParameters::of_type*;
      mir::scene::SurfaceCreationParameters::SurfaceCreationParameters*;
++    mir::scene::SurfaceCreationParameters::with_aux_rect*;
++    mir::scene::SurfaceCreationParameters::with_edge_attachment*;
      mir::scene::SurfaceCreationParameters::with_input_mode*;
      mir::scene::SurfaceCreationParameters::with_output_id*;
++    mir::scene::SurfaceCreationParameters::with_parent_id*;
++    mir::scene::SurfaceCreationParameters::with_preferred_orientation*;
++    mir::scene::SurfaceCreationParameters::with_state*;
      mir::scene::Surface::cursor_image*;
      mir::scene::Surface::force_requests_to_complete*;
      mir::scene::Surface::hide*;
@@ -366,6 +262,8 @@
      mir::scene::SurfaceObserver::?SurfaceObserver*;
      mir::scene::SurfaceObserver::SurfaceObserver*;
      mir::scene::SurfaceObserver::transformation_set_to*;
++    mir::scene::Surface::parent*;
++    mir::scene::Surface::query*;
      mir::scene::Surface::remove_observer*;
      mir::scene::Surface::request_client_surface_close*;
      mir::scene::Surface::resize*;
@@ -381,6 +279,7 @@
      mir::scene::Surface::take_input_focus*;
      mir::scene::Surface::top_left*;
      mir::scene::Surface::type*;
++    mir::scene::Surface::visible*;
      mir::ServerActionQueue::enqueue*;
      mir::ServerActionQueue::operator*;
      mir::ServerActionQueue::pause_processing_for*;
@@ -391,21 +290,6 @@
      mir::Server::add_emergency_cleanup*;
      mir::Server::add_init_callback*;
      mir::Server::apply_settings*;
--    mir::ServerConfiguration::operator*;
--    mir::ServerConfiguration::?ServerConfiguration*;
--    mir::ServerConfiguration::ServerConfiguration*;
--    mir::ServerConfiguration::the_compositor*;
--    mir::ServerConfiguration::the_connector*;
--    mir::ServerConfiguration::the_display*;
--    mir::ServerConfiguration::the_display_changer*;
--    mir::ServerConfiguration::the_emergency_cleanup*;
--    mir::ServerConfiguration::the_fatal_error_strategy*;
--    mir::ServerConfiguration::the_graphics_platform*;
--    mir::ServerConfiguration::the_input_dispatcher*;
--    mir::ServerConfiguration::the_input_manager*;
--    mir::ServerConfiguration::the_main_loop*;
--    mir::ServerConfiguration::the_prompt_connector*;
--    mir::ServerConfiguration::the_server_status_listener*;
      mir::Server::exited_normally*;
      mir::Server::get_options*;
      mir::Server::open_client_socket*;
@@ -423,6 +307,7 @@
      mir::Server::override_the_session_authorizer*;
      mir::Server::override_the_session_listener*;
      mir::Server::override_the_session_mediator_report*;
++    mir::Server::override_the_shell*;
      mir::Server::override_the_surface_configurator*;
      mir::Server::run*;
      mir::Server::Server*;
@@ -446,6 +331,7 @@
      mir::Server::the_focus_controller*;
      mir::Server::the_gl_config*;
      mir::Server::the_graphics_platform*;
++    mir::Server::the_input_targeter*;
      mir::Server::the_logger*;
      mir::Server::the_main_loop*;
      mir::Server::the_prompt_session_listener*;
@@ -462,6 +348,22 @@
      mir::Server::wrap_display_buffer_compositor_factory*;
      mir::Server::wrap_display_configuration_policy*;
      mir::Server::wrap_shell*;
++    mir::shell::AbstractShell::?AbstractShell*;
++    mir::shell::AbstractShell::AbstractShell*;
++    mir::shell::AbstractShell::add_prompt_provider_for*;
++    mir::shell::AbstractShell::close_session*;
++    mir::shell::AbstractShell::create_surface*;
++    mir::shell::AbstractShell::destroy_surface*;
++    mir::shell::AbstractShell::focus_next*;
++    mir::shell::AbstractShell::focussed_application*;
++    mir::shell::AbstractShell::get_surface_attribute*;
++    mir::shell::AbstractShell::handle_surface_created*;
++    mir::shell::AbstractShell::open_session*;
++    mir::shell::AbstractShell::set_focus_to*;
++    mir::shell::AbstractShell::set_surface_attribute*;
++    mir::shell::AbstractShell::setting_focus_to*;
++    mir::shell::AbstractShell::start_prompt_session_for*;
++    mir::shell::AbstractShell::stop_prompt_session*;
      mir::shell::DisplayLayout::clip_to_output*;
      mir::shell::DisplayLayout::?DisplayLayout*;
      mir::shell::DisplayLayout::DisplayLayout*;
@@ -486,20 +388,44 @@
      mir::shell::InputTargeter::?InputTargeter*;
      mir::shell::InputTargeter::InputTargeter*;
      mir::shell::InputTargeter::operator*;
++    mir::shell::SessionCoordinatorWrapper::add_prompt_provider_for*;
++    mir::shell::SessionCoordinatorWrapper::close_session*;
++    mir::shell::SessionCoordinatorWrapper::focus_next*;
++    mir::shell::SessionCoordinatorWrapper::focussed_application*;
++    mir::shell::SessionCoordinatorWrapper::handle_surface_created*;
++    mir::shell::SessionCoordinatorWrapper::open_session*;
++    mir::shell::SessionCoordinatorWrapper::SessionCoordinatorWrapper*;
++    mir::shell::SessionCoordinatorWrapper::set_focus_to*;
++    mir::shell::SessionCoordinatorWrapper::start_prompt_session_for*;
++    mir::shell::SessionCoordinatorWrapper::stop_prompt_session*;
++    mir::shell::Shell::add_prompt_provider_for*;
++    mir::shell::Shell::close_session*;
++    mir::shell::Shell::create_surface*;
++    mir::shell::Shell::destroy_surface*;
++    mir::shell::Shell::get_surface_attribute*;
++    mir::shell::Shell::handle_surface_created*;
++    mir::shell::Shell::open_session*;
++    mir::shell::Shell::set_surface_attribute*;
++    mir::shell::Shell::start_prompt_session_for*;
++    mir::shell::Shell::stop_prompt_session*;
      mir::shell::ShellWrapper::add_prompt_provider_for*;
      mir::shell::ShellWrapper::close_session*;
      mir::shell::ShellWrapper::create_surface*;
      mir::shell::ShellWrapper::destroy_surface*;
++    mir::shell::ShellWrapper::focus_next*;
      mir::shell::ShellWrapper::focussed_application*;
--    mir::shell::ShellWrapper::focus_next*;
      mir::shell::ShellWrapper::get_surface_attribute*;
      mir::shell::ShellWrapper::handle_surface_created*;
      mir::shell::ShellWrapper::open_session*;
++    mir::shell::ShellWrapper::set_focus_to*;
      mir::shell::ShellWrapper::set_surface_attribute*;
--    mir::shell::ShellWrapper::set_focus_to*;
++    mir::shell::ShellWrapper::ShellWrapper*;
      mir::shell::ShellWrapper::start_prompt_session_for*;
      mir::shell::ShellWrapper::stop_prompt_session*;
--    mir::shell::ShellWrapper::ShellWrapper*;
++    mir::shell::SurfaceCoordinatorWrapper::add_surface*;
++    mir::shell::SurfaceCoordinatorWrapper::raise*;
++    mir::shell::SurfaceCoordinatorWrapper::remove_surface*;
++    mir::shell::SurfaceCoordinatorWrapper::SurfaceCoordinatorWrapper*;
      mir::terminate_with_current_exception*;
      mir::time::Alarm::?Alarm*;
      mir::time::Alarm::Alarm*;
@@ -516,98 +442,9 @@
      mir::time::Timer::Timer*;
      non-virtual?thunk?to?mir::compositor::DisplayBufferCompositor::?DisplayBufferCompositor*;
      non-virtual?thunk?to?mir::compositor::DisplayBufferCompositorFactory::?DisplayBufferCompositorFactory*;
--    non-virtual?thunk?to?mir::compositor::SceneElement::?SceneElement*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::is_key_repeat_enabled*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::new_ipc_factory*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_android_input_dispatcher*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_buffer_allocator*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_buffer_stream_factory*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_clock*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_composite_event_filter*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_compositor*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_compositor_report*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_connection_creator*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_connector*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_connector_report*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_coordinate_translator*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_cursor*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_cursor_images*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_cursor_listener*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_default_cursor_image*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_dispatcher_policy*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_dispatcher_thread*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_display*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_display_buffer_compositor_factory*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_display_changer*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_display_configuration_policy*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_display_report*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_emergency_cleanup*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_event_hub*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_fatal_error_strategy*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_frame_dropping_policy_factory*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_frontend_display_changer*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_gl_config*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_global_event_sink*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_gl_program_factory*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_graphics_platform*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_host_connection*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_host_lifecycle_event_listener*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_channel_factory*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_dispatcher*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_manager*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_reader*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_reader_policy*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_reader_thread*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_region*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_registrar*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_report*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_scene*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_sender*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_send_observer*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_target_enumerator*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_targeter*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_input_translator*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_logger*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_main_loop*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_mediating_display_changer*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_message_processor_report*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_pixel_buffer*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_placement_strategy*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_prompt_connection_creator*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_prompt_connector*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_prompt_session_listener*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_prompt_session_manager*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_renderer_factory*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_scene*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_scene_report*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_screencast*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_server_action_queue*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_server_status_listener*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_session_authorizer*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_session_container*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_session_coordinator*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_session_event_handler_register*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_session_event_sink*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_session_listener*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_session_mediator_report*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_shared_library_prober_report*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_shell_display_layout*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_snapshot_strategy*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_socket_file*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_surface_configurator*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_surface_coordinator*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_surface_factory*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_surface_stack_model*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_touch_visualizer*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::wrap_cursor_listener*;
--    non-virtual?thunk?to?mir::DefaultServerConfiguration::wrap_display_configuration_policy*;
--    non-virtual?thunk?to?mir::frontend::DisplayChanger::?DisplayChanger*;
--    non-virtual?thunk?to?mir::frontend::EventSink::?EventSink*;
      non-virtual?thunk?to?mir::frontend::PromptSession::?PromptSession*;
--    non-virtual?thunk?to?mir::frontend::Screencast::?Screencast*;
      non-virtual?thunk?to?mir::frontend::SessionAuthorizer::?SessionAuthorizer*;
      non-virtual?thunk?to?mir::frontend::Session::?Session*;
--    non-virtual?thunk?to?mir::frontend::Shell::?Shell*;
      non-virtual?thunk?to?mir::frontend::Surface::?Surface*;
      non-virtual?thunk?to?mir::input::CursorImages::?CursorImages*;
      non-virtual?thunk?to?mir::input::CursorListener::?CursorListener*;
@@ -616,6 +453,7 @@
      non-virtual?thunk?to?mir::input::Surface::?Surface*;
      non-virtual?thunk?to?mir::input::TouchVisualizer::?TouchVisualizer*;
      non-virtual?thunk?to?mir::scene::CoordinateTranslator::?CoordinateTranslator*;
++    non-virtual?thunk?to?mir::scene::NullSessionListener::?NullSessionListener*;
      non-virtual?thunk?to?mir::scene::NullSurfaceObserver::alpha_set_to*;
      non-virtual?thunk?to?mir::scene::NullSurfaceObserver::attrib_changed*;
      non-virtual?thunk?to?mir::scene::NullSurfaceObserver::client_surface_close_requested*;
@@ -632,37 +470,64 @@
      non-virtual?thunk?to?mir::scene::PlacementStrategy::?PlacementStrategy*;
      non-virtual?thunk?to?mir::scene::PromptSessionListener::?PromptSessionListener*;
      non-virtual?thunk?to?mir::scene::PromptSessionManager::?PromptSessionManager*;
++    non-virtual?thunk?to?mir::scene::SessionCoordinator::?SessionCoordinator*;
      non-virtual?thunk?to?mir::scene::SessionListener::?SessionListener*;
      non-virtual?thunk?to?mir::scene::SurfaceBufferAccess::?SurfaceBufferAccess*;
      non-virtual?thunk?to?mir::scene::SurfaceConfigurator::?SurfaceConfigurator*;
      non-virtual?thunk?to?mir::scene::SurfaceCoordinator::?SurfaceCoordinator*;
      non-virtual?thunk?to?mir::scene::SurfaceObserver::?SurfaceObserver*;
      non-virtual?thunk?to?mir::ServerActionQueue::?ServerActionQueue*;
--    non-virtual?thunk?to?mir::ServerConfiguration::?ServerConfiguration*;
      non-virtual?thunk?to?mir::ServerStatusListener::?ServerStatusListener*;
++    non-virtual?thunk?to?mir::shell::AbstractShell::add_prompt_provider_for*;
++    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*;
++    non-virtual?thunk?to?mir::shell::AbstractShell::focus_next*;
++    non-virtual?thunk?to?mir::shell::AbstractShell::focussed_application*;
++    non-virtual?thunk?to?mir::shell::AbstractShell::get_surface_attribute*;
++    non-virtual?thunk?to?mir::shell::AbstractShell::handle_surface_created*;
++    non-virtual?thunk?to?mir::shell::AbstractShell::open_session*;
++    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::setting_focus_to*;
++    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::DisplayLayout::?DisplayLayout*;
      non-virtual?thunk?to?mir::shell::FocusController::?FocusController*;
      non-virtual?thunk?to?mir::shell::HostLifecycleEventListener::?HostLifecycleEventListener*;
      non-virtual?thunk?to?mir::shell::InputTargeter::?InputTargeter*;
++    non-virtual?thunk?to?mir::shell::SessionCoordinatorWrapper::close_session*;
++    non-virtual?thunk?to?mir::shell::SessionCoordinatorWrapper::focus_next*;
++    non-virtual?thunk?to?mir::shell::SessionCoordinatorWrapper::focussed_application*;
++    non-virtual?thunk?to?mir::shell::SessionCoordinatorWrapper::open_session*;
++    non-virtual?thunk?to?mir::shell::SessionCoordinatorWrapper::set_focus_to*;
++    non-virtual?thunk?to?mir::shell::ShellWrapper::add_prompt_provider_for*;
++    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*;
++    non-virtual?thunk?to?mir::shell::ShellWrapper::focus_next*;
++    non-virtual?thunk?to?mir::shell::ShellWrapper::focussed_application*;
++    non-virtual?thunk?to?mir::shell::ShellWrapper::get_surface_attribute*;
++    non-virtual?thunk?to?mir::shell::ShellWrapper::handle_surface_created*;
++    non-virtual?thunk?to?mir::shell::ShellWrapper::open_session*;
++    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*;
++    non-virtual?thunk?to?mir::shell::ShellWrapper::stop_prompt_session*;
++    non-virtual?thunk?to?mir::shell::SurfaceCoordinatorWrapper::add_surface*;
++    non-virtual?thunk?to?mir::shell::SurfaceCoordinatorWrapper::raise*;
++    non-virtual?thunk?to?mir::shell::SurfaceCoordinatorWrapper::remove_surface*;
      non-virtual?thunk?to?mir::time::Alarm::?Alarm*;
      non-virtual?thunk?to?mir::time::Timer::?Timer*;
      typeinfo?for?mir::compositor::Compositor;
      typeinfo?for?mir::compositor::DisplayBufferCompositor;
      typeinfo?for?mir::compositor::DisplayBufferCompositorFactory;
      typeinfo?for?mir::compositor::Scene;
--    typeinfo?for?mir::compositor::SceneElement;
--    typeinfo?for?mir::DefaultServerConfiguration;
--    typeinfo?for?mir::DisplayServer;
--    typeinfo?for?mir::EmergencyCleanup;
--    typeinfo?for?mir::frontend::DisplayChanger;
--    typeinfo?for?mir::frontend::EventSink;
      typeinfo?for?mir::frontend::PromptSession;
--    typeinfo?for?mir::frontend::Screencast;
      typeinfo?for?mir::frontend::Session;
      typeinfo?for?mir::frontend::SessionAuthorizer;
      typeinfo?for?mir::frontend::SessionCredentials;
      typeinfo?for?mir::frontend::SessionMediatorReport;
--    typeinfo?for?mir::frontend::Shell;
      typeinfo?for?mir::frontend::Surface;
      typeinfo?for?mir::input::CompositeEventFilter;
      typeinfo?for?mir::input::CursorImages;
@@ -676,6 +541,7 @@
      typeinfo?for?mir::input::TouchVisualizer::Spot;
      typeinfo?for?mir::MainLoop;
      typeinfo?for?mir::scene::CoordinateTranslator;
++    typeinfo?for?mir::scene::NullSessionListener;
      typeinfo?for?mir::scene::NullSurfaceObserver;
      typeinfo?for?mir::scene::Observer;
      typeinfo?for?mir::scene::PlacementStrategy;
@@ -695,33 +561,28 @@
      typeinfo?for?mir::scene::SurfaceObserver;
      typeinfo?for?mir::Server;
      typeinfo?for?mir::ServerActionQueue;
--    typeinfo?for?mir::ServerConfiguration;
      typeinfo?for?mir::ServerStatusListener;
++    typeinfo?for?mir::shell::AbstractShell;
      typeinfo?for?mir::shell::DisplayLayout;
      typeinfo?for?mir::shell::FocusController;
      typeinfo?for?mir::shell::FocusSetter;
      typeinfo?for?mir::shell::HostLifecycleEventListener;
      typeinfo?for?mir::shell::InputTargeter;
++    typeinfo?for?mir::shell::SessionCoordinatorWrapper;
++    typeinfo?for?mir::shell::Shell;
      typeinfo?for?mir::shell::ShellWrapper;
++    typeinfo?for?mir::shell::SurfaceCoordinatorWrapper;
      typeinfo?for?mir::time::Alarm;
      typeinfo?for?mir::time::Timer;
      vtable?for?mir::compositor::Compositor;
      vtable?for?mir::compositor::DisplayBufferCompositor;
      vtable?for?mir::compositor::DisplayBufferCompositorFactory;
      vtable?for?mir::compositor::Scene;
--    vtable?for?mir::compositor::SceneElement;
--    vtable?for?mir::DefaultServerConfiguration;
--    vtable?for?mir::DisplayServer;
--    vtable?for?mir::EmergencyCleanup;
--    vtable?for?mir::frontend::DisplayChanger;
--    vtable?for?mir::frontend::EventSink;
      vtable?for?mir::frontend::PromptSession;
--    vtable?for?mir::frontend::Screencast;
      vtable?for?mir::frontend::Session;
      vtable?for?mir::frontend::SessionAuthorizer;
      vtable?for?mir::frontend::SessionCredentials;
      vtable?for?mir::frontend::SessionMediatorReport;
--    vtable?for?mir::frontend::Shell;
      vtable?for?mir::frontend::Surface;
      vtable?for?mir::input::CompositeEventFilter;
      vtable?for?mir::input::CursorImages;
@@ -735,6 +596,7 @@
      vtable?for?mir::input::TouchVisualizer::Spot;
      vtable?for?mir::MainLoop;
      vtable?for?mir::scene::CoordinateTranslator;
++    vtable?for?mir::scene::NullSessionListener;
      vtable?for?mir::scene::NullSurfaceObserver;
      vtable?for?mir::scene::Observer;
      vtable?for?mir::scene::PlacementStrategy;
@@ -754,16 +616,37 @@
      vtable?for?mir::scene::SurfaceObserver;
      vtable?for?mir::Server;
      vtable?for?mir::ServerActionQueue;
--    vtable?for?mir::ServerConfiguration;
      vtable?for?mir::ServerStatusListener;
++    vtable?for?mir::shell::AbstractShell;
      vtable?for?mir::shell::DisplayLayout;
      vtable?for?mir::shell::FocusController;
      vtable?for?mir::shell::FocusSetter;
      vtable?for?mir::shell::HostLifecycleEventListener;
      vtable?for?mir::shell::InputTargeter;
++    vtable?for?mir::shell::SessionCoordinatorWrapper;
++    vtable?for?mir::shell::Shell;
++    vtable?for?mir::shell::ShellWrapper;
++    vtable?for?mir::shell::SurfaceCoordinatorWrapper;
      vtable?for?mir::time::Alarm;
      vtable?for?mir::time::Timer;
++# needed but not picked up by current version of script
++    virtual?thunk?to?mir::shell::AbstractShell::?AbstractShell*;
++    virtual?thunk?to?mir::shell::AbstractShell::add_prompt_provider_for*;
++    virtual?thunk?to?mir::shell::AbstractShell::close_session*;
++    virtual?thunk?to?mir::shell::AbstractShell::create_surface*;
++    virtual?thunk?to?mir::shell::AbstractShell::destroy_surface*;
++    virtual?thunk?to?mir::shell::AbstractShell::focus_next*;
++    virtual?thunk?to?mir::shell::AbstractShell::focussed_application*;
++    virtual?thunk?to?mir::shell::AbstractShell::get_surface_attribute*;
++    virtual?thunk?to?mir::shell::AbstractShell::handle_surface_created*;
++    virtual?thunk?to?mir::shell::AbstractShell::open_session*;
++    virtual?thunk?to?mir::shell::AbstractShell::set_focus_to*;
++    virtual?thunk?to?mir::shell::AbstractShell::set_surface_attribute*;
++    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*;
++
  # these symbols are needed by mir_proving_server but are not intended to be public
      mir::compositor::GLProgramFamily::*;
      mir::compositor::GLRenderer::GLRenderer*;
@@ -781,6 +664,103 @@
      typeinfo?for?mir::compositor::GLRenderer;
      vtable?for?mir::compositor::GLRenderer;
      vtable?for?mir::compositor::RecentlyUsedCache;
++
++# these symbols are needed by the test framework but are not intended to be public
++    mir::DefaultServerConfiguration::clock*;
++    mir::DefaultServerConfiguration::DefaultServerConfiguration*;
++    mir::DefaultServerConfiguration::is_key_repeat_enabled*;
++    mir::DefaultServerConfiguration::new_ipc_factory*;
++    mir::DefaultServerConfiguration::the_android_input_dispatcher*;
++    mir::DefaultServerConfiguration::the_buffer_allocator*;
++    mir::DefaultServerConfiguration::the_buffer_stream_factory*;
++    mir::DefaultServerConfiguration::the_clock*;
++    mir::DefaultServerConfiguration::the_composite_event_filter*;
++    mir::DefaultServerConfiguration::the_compositor*;
++    mir::DefaultServerConfiguration::the_compositor_report*;
++    mir::DefaultServerConfiguration::the_connection_creator*;
++    mir::DefaultServerConfiguration::the_connector*;
++    mir::DefaultServerConfiguration::the_connector_report*;
++    mir::DefaultServerConfiguration::the_coordinate_translator*;
++    mir::DefaultServerConfiguration::the_cursor*;
++    mir::DefaultServerConfiguration::the_cursor_images*;
++    mir::DefaultServerConfiguration::the_cursor_listener*;
++    mir::DefaultServerConfiguration::the_default_cursor_image*;
++    mir::DefaultServerConfiguration::the_dispatcher_policy*;
++    mir::DefaultServerConfiguration::the_dispatcher_thread*;
++    mir::DefaultServerConfiguration::the_display*;
++    mir::DefaultServerConfiguration::the_display_buffer_compositor_factory*;
++    mir::DefaultServerConfiguration::the_display_changer*;
++    mir::DefaultServerConfiguration::the_display_configuration_policy*;
++    mir::DefaultServerConfiguration::the_display_report*;
++    mir::DefaultServerConfiguration::the_emergency_cleanup*;
++    mir::DefaultServerConfiguration::the_event_hub*;
++    mir::DefaultServerConfiguration::the_fatal_error_strategy*;
++    mir::DefaultServerConfiguration::the_focus_controller*;
++    mir::DefaultServerConfiguration::the_frame_dropping_policy_factory*;
++    mir::DefaultServerConfiguration::the_frontend_display_changer*;
++    mir::DefaultServerConfiguration::the_frontend_shell*;
++    mir::DefaultServerConfiguration::the_gl_config*;
++    mir::DefaultServerConfiguration::the_global_event_sink*;
++    mir::DefaultServerConfiguration::the_gl_program_factory*;
++    mir::DefaultServerConfiguration::the_graphics_platform*;
++    mir::DefaultServerConfiguration::the_host_connection*;
++    mir::DefaultServerConfiguration::the_host_lifecycle_event_listener*;
++    mir::DefaultServerConfiguration::the_input_channel_factory*;
++    mir::DefaultServerConfiguration::the_input_dispatcher*;
++    mir::DefaultServerConfiguration::the_input_manager*;
++    mir::DefaultServerConfiguration::the_input_reader*;
++    mir::DefaultServerConfiguration::the_input_reader_policy*;
++    mir::DefaultServerConfiguration::the_input_reader_thread*;
++    mir::DefaultServerConfiguration::the_input_region*;
++    mir::DefaultServerConfiguration::the_input_registrar*;
++    mir::DefaultServerConfiguration::the_input_report*;
++    mir::DefaultServerConfiguration::the_input_scene*;
++    mir::DefaultServerConfiguration::the_input_sender*;
++    mir::DefaultServerConfiguration::the_input_send_observer*;
++    mir::DefaultServerConfiguration::the_input_target_enumerator*;
++    mir::DefaultServerConfiguration::the_input_targeter*;
++    mir::DefaultServerConfiguration::the_input_translator*;
++    mir::DefaultServerConfiguration::the_logger*;
++    mir::DefaultServerConfiguration::the_main_loop*;
++    mir::DefaultServerConfiguration::the_mediating_display_changer*;
++    mir::DefaultServerConfiguration::the_message_processor_report*;
++    mir::DefaultServerConfiguration::the_options*;
++    mir::DefaultServerConfiguration::the_pixel_buffer*;
++    mir::DefaultServerConfiguration::the_placement_strategy*;
++    mir::DefaultServerConfiguration::the_prompt_connection_creator*;
++    mir::DefaultServerConfiguration::the_prompt_connector*;
++    mir::DefaultServerConfiguration::the_prompt_session_listener*;
++    mir::DefaultServerConfiguration::the_prompt_session_manager*;
++    mir::DefaultServerConfiguration::the_renderer_factory*;
++    mir::DefaultServerConfiguration::the_scene*;
++    mir::DefaultServerConfiguration::the_scene_report*;
++    mir::DefaultServerConfiguration::the_screencast*;
++    mir::DefaultServerConfiguration::the_server_action_queue*;
++    mir::DefaultServerConfiguration::the_server_status_listener*;
++    mir::DefaultServerConfiguration::the_session_authorizer*;
++    mir::DefaultServerConfiguration::the_session_container*;
++    mir::DefaultServerConfiguration::the_session_coordinator*;
++    mir::DefaultServerConfiguration::the_session_event_handler_register*;
++    mir::DefaultServerConfiguration::the_session_event_sink*;
++    mir::DefaultServerConfiguration::the_session_listener*;
++    mir::DefaultServerConfiguration::the_session_mediator_report*;
++    mir::DefaultServerConfiguration::the_shared_library_prober_report*;
++    mir::DefaultServerConfiguration::the_shell*;
++    mir::DefaultServerConfiguration::the_shell_display_layout*;
++    mir::DefaultServerConfiguration::the_snapshot_strategy*;
++    mir::DefaultServerConfiguration::the_socket_file*;
++    mir::DefaultServerConfiguration::the_surface_configurator*;
++    mir::DefaultServerConfiguration::the_surface_coordinator*;
++    mir::DefaultServerConfiguration::the_surface_factory*;
++    mir::DefaultServerConfiguration::the_surface_stack_model*;
++    mir::DefaultServerConfiguration::the_touch_visualizer*;
++    mir::DefaultServerConfiguration::wrap_cursor_listener*;
++    mir::DefaultServerConfiguration::wrap_display_buffer_compositor_factory*;
++    mir::DefaultServerConfiguration::wrap_display_configuration_policy*;
++    mir::DefaultServerConfiguration::wrap_shell*;
++    typeinfo?for?mir::DefaultServerConfiguration;
++    mir::run_mir*;
++    mir::DisplayServer::stop*;
    };
   local: *;
  };
 === modified file 'tests/include/mir_test_doubles/mock_surface.h'
 --- tests/include/mir_test_doubles/mock_surface.h	2015-01-14 06:39:13 +0000
 +++ tests/include/mir_test_doubles/mock_surface.h	2015-01-30 14:41:53 +0000
@@ -43,7 +43,6 @@
              {},
              {},
              {},
--            {},
              mir::report::null_scene_report())
+     {
+     }
 === modified file 'tests/integration-tests/surface_composition.cpp'
 --- tests/integration-tests/surface_composition.cpp	2015-01-14 06:39:13 +0000
 +++ tests/integration-tests/surface_composition.cpp	2015-01-30 14:41:53 +0000
@@ -21,7 +21,6 @@
  #include "src/server/compositor/buffer_stream_surfaces.h"
  #include "src/server/compositor/buffer_queue.h"
--#include "mir_test_doubles/null_surface_configurator.h"
  #include "mir_test_doubles/stub_buffer_allocator.h"
  #include "mir_test_doubles/stub_frame_dropping_policy_factory.h"
  #include "mir_test_doubles/stub_input_sender.h"
@@ -53,7 +52,6 @@
              create_buffer_stream(),
              create_input_channel(),
              create_input_sender(),
--            create_surface_configurator(),
              create_cursor_image(),
              mr::null_scene_report());
@@ -83,10 +81,6 @@
      auto create_cursor_image() const
      -> std::shared_ptr<mg::CursorImage>  { return {}; }
--    auto create_surface_configurator() const
--    -> std::shared_ptr<ms::SurfaceConfigurator>
--    { return std::make_shared<mtd::NullSurfaceConfigurator>(); }
--
      auto create_input_sender() const
      -> std::shared_ptr<mi::InputSender>
      { return std::make_shared<mtd::StubInputSender>(); }
 === modified file 'tests/integration-tests/test_default_shell.cpp'
 --- tests/integration-tests/test_default_shell.cpp	2015-01-23 12:24:12 +0000
 +++ tests/integration-tests/test_default_shell.cpp	2015-01-30 14:41:53 +0000
@@ -32,6 +32,7 @@
  #include "mir_test_doubles/null_snapshot_strategy.h"
  #include "mir_test_doubles/null_event_sink.h"
  #include "mir_test_doubles/null_session_event_sink.h"
++#include "mir_test_doubles/mock_surface_configurator.h"
  #include "mir_test_doubles/null_prompt_session_manager.h"
  #include "mir_test_doubles/mock_input_targeter.h"
@@ -77,12 +78,15 @@
              mt::fake_shared(session_listener)
          };
++    NiceMock<mtd::MockSurfaceConfigurator> surface_configurator;
++
      msh::DefaultShell shell{
          mt::fake_shared(input_targeter),
          mt::fake_shared(surface_coordinator),
          mt::fake_shared(session_manager),
          std::make_shared<mtd::NullPromptSessionManager>(),
--        std::make_shared<NullPlacementStrategy>()};
++        std::make_shared<NullPlacementStrategy>(),
++        mt::fake_shared(surface_configurator)};
  };
+ }
@@ -197,10 +201,55 @@
      ON_CALL(app, default_surface()).WillByDefault(Return(mock_surface));
--
      InSequence seq;
      EXPECT_CALL(*mock_surface, take_input_focus(_));
      EXPECT_CALL(*mock_surface, configure(mir_surface_attrib_focus, mir_surface_focused)).Times(1);
      shell.set_focus_to(mt::fake_shared(app));
+ }
++
++TEST_F(TestDefaultShellAndFocusSelectionStrategy, configurator_selects_attribute_values)
++{
++    NiceMock<mtd::MockSceneSession> app;
++    auto const session = mt::fake_shared(app);
++    auto const surface = std::make_shared<NiceMock<mtd::MockSurface>>();
++    ON_CALL(*surface, configure(_, _)).WillByDefault(ReturnArg<1>());
++
++    InSequence seq;
++
++    EXPECT_CALL(surface_configurator, select_attribute_value(_, mir_surface_attrib_state, mir_surface_state_restored))
++        .WillOnce(Return(mir_surface_state_minimized));
++
++    EXPECT_CALL(*surface, configure(mir_surface_attrib_state, mir_surface_state_minimized));
++
++    EXPECT_CALL(surface_configurator, attribute_set(_, mir_surface_attrib_state, mir_surface_state_minimized));
++
++    EXPECT_THAT(
++        shell.set_surface_attribute(session, surface, mir_surface_attrib_state, mir_surface_state_restored),
++        Eq(mir_surface_state_minimized));
++}
++
++TEST_F(TestDefaultShellAndFocusSelectionStrategy, set_surface_attribute_returns_value_set_by_configurator)
++{
++    NiceMock<mtd::MockSceneSession> app;
++    auto const session = mt::fake_shared(app);
++    auto const surface = std::make_shared<NiceMock<mtd::MockSurface>>();
++    ON_CALL(*surface, configure(_, _)).WillByDefault(ReturnArg<1>());
++
++    ON_CALL(surface_configurator, select_attribute_value(_, Not(mir_surface_attrib_focus), _))
++        .WillByDefault(ReturnArg<1>());
++
++    ON_CALL(surface_configurator, select_attribute_value(_, mir_surface_attrib_focus, mir_surface_focused))
++        .WillByDefault(Return(mir_surface_unfocused));
++
++    ON_CALL(surface_configurator, select_attribute_value(_, mir_surface_attrib_focus, Not(mir_surface_focused)))
++        .WillByDefault(Return(mir_surface_focused));
++
++    EXPECT_THAT(
++        shell.set_surface_attribute(session, surface, mir_surface_attrib_focus, mir_surface_focused),
++        Eq(mir_surface_unfocused));
++
++    EXPECT_THAT(
++        shell.set_surface_attribute(session, surface, mir_surface_attrib_focus, mir_surface_unfocused),
++        Eq(mir_surface_focused));
++}
 === modified file 'tests/integration-tests/test_surface_stack_with_compositor.cpp'
 --- tests/integration-tests/test_surface_stack_with_compositor.cpp	2015-01-14 06:39:13 +0000
 +++ tests/integration-tests/test_surface_stack_with_compositor.cpp	2015-01-30 14:41:53 +0000
@@ -30,7 +30,6 @@
  #include "mir_test_doubles/stub_display_buffer.h"
  #include "mir_test_doubles/stub_buffer.h"
  #include "mir_test_doubles/stub_input_sender.h"
--#include "mir_test_doubles/null_surface_configurator.h"
  #include <condition_variable>
  #include <mutex>
@@ -138,7 +137,6 @@
              mock_buffer_stream,
              std::shared_ptr<mir::input::InputChannel>(),
              std::shared_ptr<mtd::StubInputSender>(),
--            std::make_shared<mtd::NullSurfaceConfigurator>(),
              std::shared_ptr<mg::CursorImage>(),
              null_scene_report)}
+     {
 === modified file 'tests/unit-tests/examples/test_demo_compositor.cpp'
 --- tests/unit-tests/examples/test_demo_compositor.cpp	2015-01-19 09:27:46 +0000
 +++ tests/unit-tests/examples/test_demo_compositor.cpp	2015-01-30 14:41:53 +0000
@@ -29,7 +29,6 @@
  #include "mir_test_doubles/stub_display_buffer.h"
  #include "mir_test_doubles/stub_buffer_stream.h"
  #include "mir_test_doubles/stub_renderable.h"
--#include "mir_test_doubles/null_surface_configurator.h"
  #include "mir_test/fake_shared.h"
  #include <gtest/gtest.h>
@@ -71,7 +70,6 @@
          std::make_shared<mtd::StubBufferStream>(),
          std::shared_ptr<mir::input::InputChannel>(),
          std::shared_ptr<mir::input::InputSender>(),
--        std::make_shared<mtd::NullSurfaceConfigurator>(),
          std::shared_ptr<mir::graphics::CursorImage>(),
          mir::report::null_scene_report()};
 === modified file 'tests/unit-tests/scene/test_basic_surface.cpp'
 --- tests/unit-tests/scene/test_basic_surface.cpp	2015-01-22 21:44:49 +0000
 +++ tests/unit-tests/scene/test_basic_surface.cpp	2015-01-30 14:41:53 +0000
@@ -24,7 +24,6 @@
  #include "mir/frontend/event_sink.h"
  #include "mir/geometry/rectangle.h"
  #include "mir/geometry/displacement.h"
--#include "mir/scene/surface_configurator.h"
  #include "mir/scene/null_surface_observer.h"
  #include "mir_test_doubles/mock_buffer_stream.h"
@@ -80,13 +79,6 @@
      void handle_display_config_change(mir::graphics::DisplayConfiguration const&) override {}
  };
--struct StubSurfaceConfigurator : ms::SurfaceConfigurator
--{
--    int select_attribute_value(ms::Surface const&, MirSurfaceAttrib, int value) override { return value; }
--
--    void attribute_set(ms::Surface const&, MirSurfaceAttrib, int) override { }
--};
--
  void post_a_frame(ms::BasicSurface& surface)
+ {
      /*
@@ -108,7 +100,6 @@
      std::function<void()> mock_change_cb{std::bind(&MockCallback::call, &mock_callback)};
      std::shared_ptr<testing::NiceMock<mtd::MockBufferStream>> mock_buffer_stream =
          std::make_shared<testing::NiceMock<mtd::MockBufferStream>>();
--    std::shared_ptr<StubSurfaceConfigurator> const stub_configurator = std::make_shared<StubSurfaceConfigurator>();
      std::shared_ptr<ms::SceneReport> const report = mr::null_scene_report();
      void const* compositor_id{nullptr};
      std::shared_ptr<ms::LegacySurfaceChangeNotification> observer =
@@ -123,7 +114,6 @@
          mock_buffer_stream,
          std::shared_ptr<mi::InputChannel>(),
          stub_input_sender,
--        stub_configurator,
          std::shared_ptr<mg::CursorImage>(),
          report};
@@ -153,7 +143,7 @@
          surfaces[i].reset(new ms::BasicSurface(
                  name, rect, false, mock_buffer_stream,
                  std::shared_ptr<mi::InputChannel>(), stub_input_sender,
--                stub_configurator, std::shared_ptr<mg::CursorImage>(), report)
++                std::shared_ptr<mg::CursorImage>(), report)
              );
          for (int j = 0; j < i; ++j)
@@ -173,7 +163,7 @@
          surfaces[i].reset(new ms::BasicSurface(
                  name, rect, false, mock_buffer_stream,
                  std::shared_ptr<mi::InputChannel>(), stub_input_sender,
--                stub_configurator, std::shared_ptr<mg::CursorImage>(), report)
++                std::shared_ptr<mg::CursorImage>(), report)
              );
          ASSERT_TRUE(surfaces[i]->compositor_snapshot(compositor_id)->id());
@@ -290,7 +280,6 @@
          mock_buffer_stream,
          std::shared_ptr<mi::InputChannel>(),
          stub_input_sender,
--        stub_configurator,
          std::shared_ptr<mg::CursorImage>(),
          report};
@@ -358,7 +347,6 @@
          mock_buffer_stream,
          std::shared_ptr<mi::InputChannel>(),
          stub_input_sender,
--        stub_configurator,
          std::shared_ptr<mg::CursorImage>(),
          report};
@@ -397,7 +385,6 @@
          mock_buffer_stream,
          std::shared_ptr<mi::InputChannel>(),
          stub_input_sender,
--        stub_configurator,
          std::shared_ptr<mg::CursorImage>(),
          report};
@@ -539,7 +526,6 @@
          mock_buffer_stream,
          std::shared_ptr<mi::InputChannel>(),
          stub_input_sender,
--        stub_configurator,
          std::shared_ptr<mg::CursorImage>(),
          report};
@@ -690,38 +676,6 @@
  INSTANTIATE_TEST_CASE_P(SurfaceFocusAttributeTest, BasicSurfaceAttributeTest,
     ::testing::Values(surface_focus_test_parameters));
--TEST_F(BasicSurfaceTest, configure_returns_value_set_by_configurator)
--{
--    using namespace testing;
--
--    struct FocusSwappingConfigurator : public StubSurfaceConfigurator
--    {
--        int select_attribute_value(ms::Surface const&, MirSurfaceAttrib attrib, int value) override
--        {
--            if (attrib != mir_surface_attrib_focus)
--                return value;
--            else if (value == mir_surface_focused)
--                return mir_surface_unfocused;
--            else
--                return mir_surface_focused;
--        }
--    };
--
--    ms::BasicSurface surface{
--        name,
--        rect,
--        false,
--        mock_buffer_stream,
--        std::shared_ptr<mi::InputChannel>(),
--        mt::fake_shared(mock_sender),
--        std::make_shared<FocusSwappingConfigurator>(),
--        nullptr,
--        report};
--
--    EXPECT_EQ(mir_surface_unfocused, surface.configure(mir_surface_attrib_focus, mir_surface_focused));
--    EXPECT_EQ(mir_surface_focused, surface.configure(mir_surface_attrib_focus, mir_surface_unfocused));
--}
--
  TEST_F(BasicSurfaceTest, calls_send_event_on_consume)
+ {
      using namespace ::testing;
@@ -733,7 +687,6 @@
          mock_buffer_stream,
          std::shared_ptr<mi::InputChannel>(),
          mt::fake_shared(mock_sender),
--        stub_configurator,
          nullptr,
          report};
 === modified file 'tests/unit-tests/scene/test_default_shell.cpp'
 --- tests/unit-tests/scene/test_default_shell.cpp	2015-01-23 14:37:11 +0000
 +++ tests/unit-tests/scene/test_default_shell.cpp	2015-01-30 14:41:53 +0000
@@ -33,6 +33,7 @@
  #include "mir_test_doubles/mock_session_listener.h"
  #include "mir_test_doubles/mock_surface.h"
  #include "mir_test_doubles/null_snapshot_strategy.h"
++#include "mir_test_doubles/null_surface_configurator.h"
  #include "mir_test_doubles/null_prompt_session_manager.h"
  #include "mir_test_doubles/stub_input_targeter.h"
@@ -118,7 +119,8 @@
          mt::fake_shared(surface_coordinator),
          mt::fake_shared(session_manager),
          std::make_shared<mtd::NullPromptSessionManager>(),
--        mt::fake_shared(placement_strategy)};
++        mt::fake_shared(placement_strategy),
++        std::make_shared<mtd::NullSurfaceConfigurator>()};
      void SetUp() override
+     {
 === modified file 'tests/unit-tests/scene/test_session_manager.cpp'
 --- tests/unit-tests/scene/test_session_manager.cpp	2015-01-23 14:37:11 +0000
 +++ tests/unit-tests/scene/test_session_manager.cpp	2015-01-30 14:41:53 +0000
@@ -31,7 +31,6 @@
  #include "mir_test_doubles/mock_session_listener.h"
  #include "mir_test_doubles/stub_buffer_stream.h"
  #include "mir_test_doubles/null_snapshot_strategy.h"
--#include "mir_test_doubles/null_surface_configurator.h"
  #include "mir_test_doubles/null_session_event_sink.h"
  #include "mir_test/fake_shared.h"
@@ -75,7 +74,6 @@
          ON_CALL(container, successor_of(_)).WillByDefault(Return((std::shared_ptr<ms::Session>())));
+     }
--    mtd::NullSurfaceConfigurator surface_configurator;
      std::shared_ptr<ms::Surface> dummy_surface = std::make_shared<ms::BasicSurface>(
          std::string("stub"),
          geom::Rectangle{{},{}},
@@ -83,7 +81,6 @@
          std::make_shared<mtd::StubBufferStream>(),
          std::shared_ptr<mi::InputChannel>(),
          std::shared_ptr<mi::InputSender>(),
--        mt::fake_shared<ms::SurfaceConfigurator>(surface_configurator),
          std::shared_ptr<mg::CursorImage>(),
          mir::report::null_scene_report());
      mtd::MockSurfaceCoordinator surface_coordinator;
 === modified file 'tests/unit-tests/scene/test_surface.cpp'
 --- tests/unit-tests/scene/test_surface.cpp	2015-01-22 21:44:49 +0000
 +++ tests/unit-tests/scene/test_surface.cpp	2015-01-30 14:41:53 +0000
@@ -33,7 +33,6 @@
  #include "mir_test_doubles/mock_input_sender.h"
  #include "mir_test_doubles/stub_input_channel.h"
  #include "mir_test_doubles/stub_input_sender.h"
--#include "mir_test_doubles/null_surface_configurator.h"
  #include "mir_test_doubles/null_event_sink.h"
  #include "mir_test/fake_shared.h"
  #include "mir_test/event_matchers.h"
@@ -196,7 +195,6 @@
              rect, false, mock_buffer_stream,
              std::make_shared<mtd::StubInputChannel>(),
              std::make_shared<mtd::StubInputSender>(),
--            std::make_shared<mtd::NullSurfaceConfigurator>(),
              nullptr /* cursor_image */, report)
+     {
+     }
@@ -457,7 +455,6 @@
          mock_buffer_stream,
          mt::fake_shared(channel),
          std::make_shared<mtd::StubInputSender>(),
--        std::make_shared<mtd::NullSurfaceConfigurator>(),
          std::shared_ptr<mg::CursorImage>(),
          report);
@@ -476,7 +473,6 @@
          mock_buffer_stream,
          std::make_shared<mtd::StubInputChannel>(),
          mt::fake_shared(mock_sender),
--        std::make_shared<mtd::NullSurfaceConfigurator>(),
          std::shared_ptr<mg::CursorImage>(),
          report);
 === modified file 'tests/unit-tests/scene/test_surface_impl.cpp'
 --- tests/unit-tests/scene/test_surface_impl.cpp	2015-01-21 00:49:28 +0000
 +++ tests/unit-tests/scene/test_surface_impl.cpp	2015-01-30 14:41:53 +0000
@@ -30,8 +30,6 @@
  #include "mir_test_doubles/mock_input_targeter.h"
  #include "mir_test_doubles/stub_input_sender.h"
  #include "mir_test_doubles/null_event_sink.h"
--#include "mir_test_doubles/null_surface_configurator.h"
--#include "mir_test_doubles/mock_surface_configurator.h"
  #include "mir_test/fake_shared.h"
  #include "mir_test/event_matchers.h"
@@ -79,11 +77,10 @@
          surface = std::make_shared<ms::BasicSurface>(std::string("stub"), geom::Rectangle{{},{}}, false,
              buffer_stream, nullptr /* input_channel */, stub_input_sender,
--            null_configurator, nullptr /* cursor_image */, report);
++            nullptr /* cursor_image */, report);
+     }
      mf::SurfaceId stub_id;
--    std::shared_ptr<ms::SurfaceConfigurator> null_configurator = std::make_shared<mtd::NullSurfaceConfigurator>();
      std::shared_ptr<ms::SceneReport> const report = mr::null_scene_report();
      std::shared_ptr<mtd::StubInputSender> const stub_input_sender = std::make_shared<mtd::StubInputSender>();
@@ -262,30 +259,6 @@
      surface->configure(mir_surface_attrib_focus, mir_surface_unfocused);
+ }
--TEST_F(Surface, configurator_selects_attribute_values)
--{
--    using namespace testing;
--
--    mtd::MockSurfaceConfigurator configurator;
--
--    EXPECT_CALL(configurator, select_attribute_value(_, mir_surface_attrib_state, mir_surface_state_restored)).Times(1)
--        .WillOnce(Return(mir_surface_state_minimized));
--    EXPECT_CALL(configurator, attribute_set(_, mir_surface_attrib_state, mir_surface_state_minimized)).Times(1);
--
--    ms::BasicSurface surf(
--        std::string("stub"),
--        geom::Rectangle{{},{}},
--        false,
--        buffer_stream,
--        std::shared_ptr<mi::InputChannel>(),
--        stub_input_sender,
--        mt::fake_shared(configurator),
--        std::shared_ptr<mg::CursorImage>(),
--        report);
--
--    EXPECT_EQ(mir_surface_state_minimized, surf.configure(mir_surface_attrib_state, mir_surface_state_restored));
--}
--
  TEST_F(Surface, take_input_focus)
+ {
      using namespace ::testing;
@@ -307,7 +280,6 @@
          stub_buffer_stream,
          std::shared_ptr<mi::InputChannel>(),
          stub_input_sender,
--        null_configurator,
          std::shared_ptr<mg::CursorImage>(),
          report);
@@ -352,7 +324,6 @@
          buffer_stream,
          std::shared_ptr<mi::InputChannel>(),
          stub_input_sender,
--        null_configurator,
          std::shared_ptr<mg::CursorImage>(),
          report);
 === modified file 'tests/unit-tests/scene/test_surface_stack.cpp'
 --- tests/unit-tests/scene/test_surface_stack.cpp	2015-01-20 03:51:03 +0000
 +++ tests/unit-tests/scene/test_surface_stack.cpp	2015-01-30 14:41:53 +0000
@@ -30,7 +30,6 @@
  #include "mir_test_doubles/stub_buffer_stream.h"
  #include "mir_test_doubles/stub_renderable.h"
  #include "mir_test_doubles/mock_buffer_stream.h"
--#include "mir_test_doubles/null_surface_configurator.h"
  #include <gmock/gmock.h>
  #include <gtest/gtest.h>
@@ -129,7 +128,6 @@
              std::make_shared<mtd::StubBufferStream>(),
              std::shared_ptr<mir::input::InputChannel>(),
              std::shared_ptr<mir::input::InputSender>(),
--            std::make_shared<mtd::NullSurfaceConfigurator>(),
              std::shared_ptr<mg::CursorImage>(),
              report);
@@ -142,7 +140,6 @@
              std::make_shared<mtd::StubBufferStream>(),
              std::shared_ptr<mir::input::InputChannel>(),
              std::shared_ptr<mir::input::InputSender>(),
--            std::make_shared<mtd::NullSurfaceConfigurator>(),
              std::shared_ptr<mg::CursorImage>(),
              report);
@@ -155,7 +152,6 @@
              std::make_shared<mtd::StubBufferStream>(),
              std::shared_ptr<mir::input::InputChannel>(),
              std::shared_ptr<mir::input::InputSender>(),
--            std::make_shared<mtd::NullSurfaceConfigurator>(),
              std::shared_ptr<mg::CursorImage>(),
              report);
@@ -168,7 +164,6 @@
              std::make_shared<mtd::StubBufferStream>(),
              std::shared_ptr<mir::input::InputChannel>(),
              std::shared_ptr<mir::input::InputSender>(),
--            std::make_shared<mtd::NullSurfaceConfigurator>(),
              std::shared_ptr<mg::CursorImage>(),
              report);
+     }
@@ -344,7 +339,6 @@
              std::make_shared<mtd::StubBufferStream>(),
              std::shared_ptr<mir::input::InputChannel>(),
              std::shared_ptr<mir::input::InputSender>(),
--            std::make_shared<mtd::NullSurfaceConfigurator>(),
              std::shared_ptr<mg::CursorImage>(),
              report);
          post_a_frame(*surface);
@@ -475,7 +469,6 @@
              std::make_shared<mtd::StubBufferStream>(),
              std::shared_ptr<mir::input::InputChannel>(),
              std::shared_ptr<mir::input::InputSender>(),
--            std::make_shared<mtd::NullSurfaceConfigurator>(),
              std::shared_ptr<mg::CursorImage>(),
              report);
@@ -509,7 +502,6 @@
          mock_stream,
          std::shared_ptr<mir::input::InputChannel>(),
          std::shared_ptr<mir::input::InputSender>(),
--        std::make_shared<mtd::NullSurfaceConfigurator>(),
          std::shared_ptr<mg::CursorImage>(),
          report);
      post_a_frame(*surface);
@@ -541,7 +533,6 @@
          mock_stream,
          std::shared_ptr<mir::input::InputChannel>(),
          std::shared_ptr<mir::input::InputSender>(),
--        std::make_shared<mtd::NullSurfaceConfigurator>(),
          std::shared_ptr<mg::CursorImage>(),
          report);
      post_a_frame(*surface);
@@ -567,7 +558,6 @@
              {},
              {},
              {},
--            {},
              mir::report::null_scene_report())
+     {
+     }