Merge lp:~alan-griffiths/mir/discussion-migrate-demo-shell into lp:mir

[Alan Griffiths]

examples: update the demo-shell example to use the mir::Server API

examples: update the demo-shell example to use the mir::Server API

This involves exposing stuff that had been "privatized" and this might not be the best way to expose the functionality needed. Hence I'd like some discussion about whether this is justified.

[Kevin DuBois (kdub)]

Our downstreams have been able to get along without our utility classes (
gl_program, gl_texture, gl_primitive, gl_renderer, etc) to this point, and re-exposing them exposes a lot of ABI that has been hidden and is not used. These classes are more utility classes of the way we've used GLES internally than a recommendation/suggestion to others as to how they should use GLES.

I think its possible to transition the demo shell from playground to examples with a bit of more in-depth "surgery" to have it target reimplementing our already-exposed /interfaces/ instead of overriding different components of utility classes.

review: Disapprove

[lp:~alan-griffiths/mir/discussion-migrate-demo-shell]

2139. By Alan Griffiths on 2014-12-10

merge lp:mir

2140. By Alan Griffiths on 2014-12-10

merge lp:~alan-griffiths/mir/migrate-render_surfaces

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2140
http://jenkins.qa.ubuntu.com/job/mir-ci/2337/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/444/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/444
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/418/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/334/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/418/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

I'm pretty sure playground/ can access a superset of what examples/ can. That's why it exists.

So there's no reason to republish all those headers just yet, is there?

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

Quoting the README:

    The Playground

    These are mir demos that excercise private in-flux mir functionality.
    As such functionality matures, related headers become public and the playground
    code may become an example of how to use such feature.

The reason for this MP is to drive a discussion of what is preventing users of our supported API doing what we do in the mir_demo_server_shell example.

As I see it the only real problem highlighted by this MP is that the DemoRenderer class that has been implemented using some of our private gl tools. That is I don't see that access to the_compositor_report() or the_input_scene() is a big deal.

So the question is: how do we serve our current and potential users better?

1. Provide an example of shell decorations etc that doesn't use Mir internals
2. Design a way for users to implement shell decorations that we're happy to publish
3. Ignore the issue

Using our private gl tools isn't the only implementation option and (as Kevin says) our existing downstreams haven't found a need for this approach. It would be good to have an example that is more like what we expect users to do.

review: Needs Information

[Daniel van Vugt (vanvugt)]

Definitely this migration is something that will have to happen in future. I was leaning toward keeping things as private as possible for as long as possible. That means I expected to keep much of this private (so we can freely change interfaces) until such time as some new shell developer asks us to expose parts. Putting things in the public API prematurely and then having to change them is a painful issue we keep encountering. So I'd prefer to keep as much as possible private for as long as possible to minimize the problem. We all share the goal of wanting releases in future that don't bump the server ABI, so letting it stabilize privately still feels like a good idea to me...

On a more practical note:
(1) Needs Fixing: mir_demo_server_shell now crashes immediately on startup.

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

OK, I didn't really think this would land in this form - I was more interested in highlighting the gaps between what we our supported API allows and what we believe reasonable Mir users would want to do.

Unmerged revisions

2140. By Alan Griffiths on 2014-12-10

merge lp:~alan-griffiths/mir/migrate-render_surfaces

2139. By Alan Griffiths on 2014-12-10

merge lp:mir

2138. By Alan Griffiths on 2014-12-09

merge lp:~alan-griffiths/mir/migrate-render_surfaces/

2137. By Alan Griffiths on 2014-12-09

Move demo-shell to examples

2136. By Alan Griffiths on 2014-12-09

Publish headers referenced by demo shell

2135. By Alan Griffiths on 2014-12-09

Tidy up demo code

2134. By Alan Griffiths on 2014-12-09

Delete dead code

2133. By Alan Griffiths on 2014-12-09

BFI migration of demo shell away from legacy API

2132. By Alan Griffiths on 2014-12-09

merge lp:~alan-griffiths/mir/migrate-render_surfaces

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-12-05 03:26:03 +0000
+++ CMakeLists.txt	2014-12-10 12:04:19 +0000
@@ -191,7 +191,6 @@
 add_subdirectory(benchmarks/)
 add_subdirectory(tools/)
 add_subdirectory(examples/)
-add_subdirectory(playground/)
 add_subdirectory(guides/)
 add_subdirectory(cmake/)
 
 
=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2014-12-10 12:04:19 +0000
+++ examples/CMakeLists.txt	2014-12-10 12:04:19 +0000
@@ -193,3 +193,5 @@
 install(TARGETS mir_demo_standalone_render_overlays
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
+
+add_subdirectory(demo-shell/)
 
=== renamed directory 'playground/demo-shell' => 'examples/demo-shell'
=== modified file 'examples/demo-shell/CMakeLists.txt'
--- playground/demo-shell/CMakeLists.txt	2014-12-09 17:26:28 +0000
+++ examples/demo-shell/CMakeLists.txt	2014-12-10 12:04:19 +0000
@@ -1,3 +1,7 @@
+include_directories(
+  ${PROJECT_SOURCE_DIR}/examples/
+)
+
 add_library(demo-shell STATIC
   demo_compositor.cpp
   demo_renderer.cpp
@@ -11,7 +15,6 @@
 target_link_libraries(mir_demo_server_shell
   demo-shell
   mirserver
-  playgroundserverconfig
   exampleserverconfig
 )
 
 
=== modified file 'examples/demo-shell/demo_shell.cpp'
--- playground/demo-shell/demo_shell.cpp	2014-12-09 17:26:28 +0000
+++ examples/demo-shell/demo_shell.cpp	2014-12-10 12:04:19 +0000
@@ -21,10 +21,11 @@
 #include "demo_compositor.h"
 #include "window_manager.h"
 #include "server_example_fullscreen_placement_strategy.h"
-#include "../server_configuration.h"
+#include "server_example_input_event_filter.h"
+#include "server_example_display_configuration_policy.h"
 
-#include "mir/options/default_configuration.h"
-#include "mir/run_mir.h"
+#include "mir/server.h"
+#include "mir/options/option.h"
 #include "mir/report_exception.h"
 #include "mir/graphics/display.h"
 #include "mir/input/composite_event_filter.h"
@@ -48,6 +49,14 @@
 {
 namespace examples
 {
+class NestedLifecycleEventListener : public msh::HostLifecycleEventListener
+{
+public:
+    virtual void lifecycle_event_occurred(MirLifecycleState state) override
+    {
+        printf("Lifecycle event occurred : state = %d\n", state);
+    }
+};
 
 class DisplayBufferCompositorFactory : public mc::DisplayBufferCompositorFactory
 {
@@ -72,103 +81,57 @@
     std::shared_ptr<mc::CompositorReport> const report;
 };
 
-class DemoServerConfiguration : public mir::examples::ServerConfiguration
+auto make_window_manager_for(Server& server)
+-> std::shared_ptr<mir::input::EventFilter>
 {
-public:
-    DemoServerConfiguration(int argc, char const* argv[],
-                            std::initializer_list<std::shared_ptr<mi::EventFilter>> const& filter_list)
-      : ServerConfiguration([argc, argv]
-        {
-            auto result = std::make_shared<mo::DefaultConfiguration>(argc, argv);
-
-            namespace po = boost::program_options;
-
-            result->add_options()
-                ("fullscreen-surfaces", "Make all surfaces fullscreen");
-
-            return result;
-        }()),
-        filter_list(filter_list)
-    {
-    }
-
-
-    std::shared_ptr<compositor::DisplayBufferCompositorFactory> the_display_buffer_compositor_factory() override
-    {
-        return display_buffer_compositor_factory(
-            [this]()
-            {
-                return std::make_shared<me::DisplayBufferCompositorFactory>(
-                    the_gl_program_factory(),
-                    the_compositor_report());
-            });
-    }
-
-    std::shared_ptr<ms::PlacementStrategy> the_placement_strategy() override
-    {
-        return shell_placement_strategy(
-            [this]() -> std::shared_ptr<ms::PlacementStrategy>
-            {
-                if (the_options()->is_set("fullscreen-surfaces"))
-                    return std::make_shared<me::FullscreenPlacementStrategy>(the_shell_display_layout());
-                else
-                    return DefaultServerConfiguration::the_placement_strategy();
-            });
-    }
-
-    std::shared_ptr<mi::CompositeEventFilter> the_composite_event_filter() override
-    {
-        auto composite_filter = ServerConfiguration::the_composite_event_filter();
-        for (auto const& filter : filter_list)
-            composite_filter->append(filter);
-
-        return composite_filter;
-    }
-
-    class NestedLifecycleEventListener : public msh::HostLifecycleEventListener
-    {
-    public:
-        virtual void lifecycle_event_occurred(MirLifecycleState state) override
-        {
-            printf("Lifecycle event occurred : state = %d\n", state);
-        }
-    };
-
-    std::shared_ptr<msh::HostLifecycleEventListener> the_host_lifecycle_event_listener() override
-    {
-       return host_lifecycle_event_listener(
-           []()
-           {
-               return std::make_shared<NestedLifecycleEventListener>();
-           });
-    }
-
-private:
-    std::vector<std::shared_ptr<mi::EventFilter>> const filter_list;
-};
-
+    auto const wm = std::make_shared<me::WindowManager>();
+    // We use this strange two stage initialization to avoid a circular dependency between the EventFilters
+    // and the SessionStore
+    server.add_init_callback([&]
+        {
+            server.the_composite_event_filter()->append(wm);
+
+            wm->set_focus_controller(server.the_focus_controller());
+            wm->set_display(server.the_display());
+            wm->set_compositor(server.the_compositor());
+            wm->set_input_scene(server.the_input_scene());
+        });
+
+    return wm;
+}
 }
 }
 
 int main(int argc, char const* argv[])
 try
 {
-    auto wm = std::make_shared<me::WindowManager>();
-    me::DemoServerConfiguration config(argc, argv, {wm});
-
-    mir::run_mir(config, [&config, &wm](mir::DisplayServer&)
+    mir::Server server;
+
+    auto const quit_filter = me::make_quit_filter_for(server);
+    auto const wm = me::make_window_manager_for(server);
+
+    me::add_display_configuration_options_to(server);
+    me::add_fullscreen_option_to(server);
+
+    server.override_the_host_lifecycle_event_listener([]
+       {
+           return std::make_shared<me::NestedLifecycleEventListener>();
+       });
+
+    server.override_the_display_buffer_compositor_factory([&]
         {
-            // We use this strange two stage initialization to avoid a circular dependency between the EventFilters
-            // and the SessionStore
-            wm->set_focus_controller(config.the_focus_controller());
-            wm->set_display(config.the_display());
-            wm->set_compositor(config.the_compositor());
-            wm->set_input_scene(config.the_input_scene());
+            return std::make_shared<me::DisplayBufferCompositorFactory>(
+                server.the_gl_program_factory(),
+                server.the_compositor_report());
         });
-    return 0;
+
+    server.set_command_line(argc, argv);
+    server.apply_settings();
+    server.run();
+    return server.exited_normally() ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 catch (...)
 {
-    mir::report_exception(std::cerr);
-    return 1;
+    mir::report_exception();
+    return EXIT_FAILURE;
 }
 
=== renamed file 'src/include/platform/mir/graphics/gl_primitive.h' => 'include/platform/mir/graphics/gl_primitive.h'
=== renamed file 'src/include/platform/mir/graphics/gl_program.h' => 'include/platform/mir/graphics/gl_program.h'
=== renamed file 'src/include/platform/mir/graphics/gl_program_factory.h' => 'include/platform/mir/graphics/gl_program_factory.h'
=== renamed file 'src/include/platform/mir/graphics/gl_texture.h' => 'include/platform/mir/graphics/gl_texture.h'
=== renamed file 'src/include/platform/mir/graphics/gl_texture_cache.h' => 'include/platform/mir/graphics/gl_texture_cache.h'
=== renamed file 'src/include/server/mir/compositor/compositor_report.h' => 'include/server/mir/compositor/compositor_report.h'
=== renamed file 'src/include/server/mir/compositor/destination_alpha.h' => 'include/server/mir/compositor/destination_alpha.h'
=== renamed file 'src/include/server/mir/compositor/gl_renderer.h' => 'include/server/mir/compositor/gl_renderer.h'
=== renamed file 'src/include/server/mir/compositor/recently_used_cache.h' => 'include/server/mir/compositor/recently_used_cache.h'
=== renamed file 'src/include/server/mir/compositor/renderer.h' => 'include/server/mir/compositor/renderer.h'
=== renamed file 'src/include/server/mir/compositor/renderer_factory.h' => 'include/server/mir/compositor/renderer_factory.h'
=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2014-12-10 12:04:19 +0000
+++ include/server/mir/default_server_configuration.h	2014-12-10 12:04:19 +0000
@@ -320,10 +320,11 @@
     virtual std::shared_ptr<time::Clock> the_clock();
     virtual std::shared_ptr<ServerActionQueue> the_server_action_queue();
 
+    virtual std::shared_ptr<graphics::GLProgramFactory> the_gl_program_factory();
+
 protected:
     std::shared_ptr<options::Option> the_options() const;
 
-    virtual std::shared_ptr<graphics::GLProgramFactory> the_gl_program_factory();
     virtual std::shared_ptr<input::InputChannelFactory> the_input_channel_factory();
     virtual std::shared_ptr<scene::MediatingDisplayChanger> the_mediating_display_changer();
     virtual std::shared_ptr<frontend::ProtobufIpcFactory> new_ipc_factory(
 
=== renamed file 'src/include/server/mir/input/input_channel_factory.h' => 'include/server/mir/input/input_channel_factory.h'
=== renamed file 'src/include/server/mir/input/scene.h' => 'include/server/mir/input/scene.h'
=== modified file 'include/server/mir/server.h'
--- include/server/mir/server.h	2014-12-10 12:04:19 +0000
+++ include/server/mir/server.h	2014-12-10 12:04:19 +0000
@@ -27,10 +27,24 @@
 
 namespace mir
 {
-namespace compositor { class Compositor; class DisplayBufferCompositorFactory; }
+namespace compositor { class Compositor; class CompositorReport; class DisplayBufferCompositorFactory; }
 namespace frontend { class SessionAuthorizer; class Session; class SessionMediatorReport; }
-namespace graphics { class Platform; class Display; class GLConfig; class DisplayConfigurationPolicy; }
-namespace input { class CompositeEventFilter; class InputDispatcher; class CursorListener; class TouchVisualizer; }
+namespace graphics
+{
+class Platform;
+class Display;
+class GLConfig;
+class GLProgramFactory;
+class DisplayConfigurationPolicy;
+}
+namespace input
+{
+class CompositeEventFilter;
+class CursorListener;
+class InputDispatcher;
+class Scene;
+class TouchVisualizer;
+}
 namespace logging { class Logger; }
 namespace options { class Option; }
 namespace shell { class FocusController; class FocusSetter; class DisplayLayout; class HostLifecycleEventListener; }
@@ -279,6 +293,9 @@
     /// \return the composite event filter.
     auto the_composite_event_filter() const -> std::shared_ptr<input::CompositeEventFilter>;
 
+    /// \return the compositor report.
+    auto the_compositor_report() const -> std::shared_ptr<compositor::CompositorReport>;
+
     /// \return the cursor listener.
     auto the_cursor_listener() const -> std::shared_ptr<input::CursorListener>;
 
@@ -291,9 +308,15 @@
     /// \return the GL config.
     auto the_gl_config() const -> std::shared_ptr<graphics::GLConfig>;
 
+    /// \return the GL program factory.
+    auto the_gl_program_factory() const -> std::shared_ptr<graphics::GLProgramFactory>;
+
     /// \return the graphics platform.
     auto the_graphics_platform() const -> std::shared_ptr<graphics::Platform>;
 
+    /// \return the input scene
+    auto the_input_scene() const -> std::shared_ptr<input::Scene>;
+
     /// \return the main loop.
     auto the_main_loop() const -> std::shared_ptr<MainLoop>;
 
 
=== removed directory 'playground'
=== removed file 'playground/CMakeLists.txt'
--- playground/CMakeLists.txt	2014-12-10 12:04:19 +0000
+++ playground/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-
-include_directories(
-  ${PROJECT_SOURCE_DIR}/src/include/server
-  ${PROJECT_SOURCE_DIR}/src/include/platform
-  ${PROJECT_SOURCE_DIR}/src/include/common
-  ${PROJECT_SOURCE_DIR}/include/client
-  ${PROJECT_SOURCE_DIR}/include/server
-  ${PROJECT_SOURCE_DIR}/include/platform
-  ${PROJECT_SOURCE_DIR}/examples/
-)
-
-add_library(playgroundserverconfig STATIC
-    server_configuration.cpp
-)
-
-add_subdirectory(demo-shell/)
 
=== removed file 'playground/README'
--- playground/README	2014-09-10 01:45:14 +0000
+++ playground/README	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-The Playground
-
-These are mir demos that excercise private in-flux mir functionality.
-As such functionality matures, related headers become public and the playground
-code may become an example of how to use such feature.
-
 
=== removed file 'playground/server_configuration.cpp'
--- playground/server_configuration.cpp	2014-12-08 17:10:25 +0000
+++ playground/server_configuration.cpp	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright © 2013-2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alexandros Frantzis <[e-mail]>
- */
-
-#include "server_configuration.h"
-#include "mir/options/default_configuration.h"
-#include "mir/input/composite_event_filter.h"
-#include "mir/main_loop.h"
-
-#include "server_example_display_configuration_policy.h"
-#include "server_example_input_event_filter.h"
-
-namespace me = mir::examples;
-namespace mg = mir::graphics;
-
-me::ServerConfiguration::ServerConfiguration(std::shared_ptr<options::DefaultConfiguration> const& configuration_options) :
-    DefaultServerConfiguration(configuration_options)
-{
-    namespace po = boost::program_options;
-
-    configuration_options->add_options()
-        (me::display_config_opt, po::value<std::string>()->default_value(me::clone_opt_val),
-            me::display_config_descr);
-}
-
-me::ServerConfiguration::ServerConfiguration(int argc, char const** argv) :
-    ServerConfiguration(std::make_shared<options::DefaultConfiguration>(argc, argv))
-{
-}
-
-std::shared_ptr<mg::DisplayConfigurationPolicy>
-me::ServerConfiguration::the_display_configuration_policy()
-{
-    return display_configuration_policy(
-        [this]() -> std::shared_ptr<mg::DisplayConfigurationPolicy>
-        {
-            auto display_config = the_options()->get<std::string>(me::display_config_opt);
-
-            if (display_config == me::sidebyside_opt_val)
-                return std::make_shared<SideBySideDisplayConfigurationPolicy>();
-            else if (display_config == me::single_opt_val)
-                return std::make_shared<SingleDisplayConfigurationPolicy>();
-            else
-                return DefaultServerConfiguration::the_display_configuration_policy();
-        });
-}
-
-std::shared_ptr<mir::input::CompositeEventFilter>
-me::ServerConfiguration::the_composite_event_filter()
-{
-    if (!quit_filter)
-        quit_filter = std::make_shared<me::QuitFilter>([this] { the_main_loop()->stop(); });
-
-    auto composite_filter = DefaultServerConfiguration::the_composite_event_filter();
-    composite_filter->append(quit_filter);
-
-    return composite_filter;
-}
 
=== removed file 'playground/server_configuration.h'
--- playground/server_configuration.h	2014-10-15 11:15:21 +0000
+++ playground/server_configuration.h	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright © 2013-2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alexandros Frantzis <[e-mail]>
- */
-
-#ifndef MIR_EXAMPLES_SERVER_CONFIGURATION_H_
-#define MIR_EXAMPLES_SERVER_CONFIGURATION_H_
-
-#include "mir/default_server_configuration.h"
-
-namespace mir
-{
-namespace options
-{
-class DefaultConfiguration;
-}
-
-namespace examples
-{
-
-class ServerConfiguration : public DefaultServerConfiguration
-{
-public:
-    ServerConfiguration(int argc, char const** argv);
-    explicit ServerConfiguration(std::shared_ptr<options::DefaultConfiguration> const& configuration_options);
-
-    std::shared_ptr<graphics::DisplayConfigurationPolicy> the_display_configuration_policy() override;
-    std::shared_ptr<input::CompositeEventFilter> the_composite_event_filter() override;
-
-private:
-    std::shared_ptr<input::EventFilter> quit_filter;
-};
-
-}
-}
-
-#endif /* MIR_EXAMPLES_SERVER_CONFIGURATION_H_ */
 
=== modified file 'server-ABI-sha1sums'
--- server-ABI-sha1sums	2014-12-10 12:04:19 +0000
+++ server-ABI-sha1sums	2014-12-10 12:04:19 +0000
@@ -55,7 +55,7 @@
 d49eae4f986645b32e29ce2c1f99f524703ba3c0  include/server/mir/compositor/display_buffer_compositor.h
 878ab5c4007d16dac213a3eb0105421d8ffad206  include/server/mir/compositor/scene_element.h
 4fcf34e424128b87ddc76733594e32e09ebbd486  include/server/mir/compositor/scene.h
-27a9e95846f83126b6aed4f910188c6d2491c47c  include/server/mir/default_server_configuration.h
[phone]d104d97c29d41d03657190b7af114525  include/server/mir/default_server_configuration.h
 af1ff0714be973ac76d56006a2e5991f68cd1dec  include/server/mir/display_server.h
 a35c5495d8fd28fc0e375b17495fc5caab51b329  include/server/mir/emergency_cleanup.h
 938de641cb0e01e1098b007b39b151a7dfe4adc1  include/server/mir/frontend/display_changer.h
@@ -104,7 +104,7 @@
 587e22d751656ce2d9536afdf5659276ff9bbc46  include/server/mir/scene/surface_observer.h
 7ef3e99901168cda296d74d05a979f47bf9c3ff1  include/server/mir/server_action_queue.h
 8d83a51c278b8b71866d2178d9b6387c1f91a7d0  include/server/mir/server_configuration.h
-e56a255135af4099001b7e31f76530b40d3bd7fa  include/server/mir/server.h
+7861509c90830bd7127c74f83f92c1da77543eac  include/server/mir/server.h
 86098b500339bfccd07a9bed8298f75a68b18f5c  include/server/mir/server_status_listener.h
 860c04f32b60e680140148dc9dc2295de145b9c1  include/server/mir/shell/display_layout.h
 6a2107b01feae13060d5c305804906e53c52e0be  include/server/mir/shell/focus_controller.h
 
=== modified file 'src/server/server.cpp'
--- src/server/server.cpp	2014-12-10 12:04:19 +0000
+++ src/server/server.cpp	2014-12-10 12:04:19 +0000
@@ -67,10 +67,13 @@
 #define FOREACH_ACCESSOR(MACRO)\
     MACRO(the_compositor)\
     MACRO(the_composite_event_filter)\
+    MACRO(the_compositor_report)\
     MACRO(the_display)\
     MACRO(the_focus_controller)\
     MACRO(the_gl_config)\
+    MACRO(the_gl_program_factory)\
     MACRO(the_graphics_platform)\
+    MACRO(the_input_scene)\
     MACRO(the_main_loop)\
     MACRO(the_prompt_session_listener)\
     MACRO(the_session_authorizer)\
 
=== modified file 'src/server/symbols.map'
--- src/server/symbols.map	2014-12-10 12:04:19 +0000
+++ src/server/symbols.map	2014-12-10 12:04:19 +0000
@@ -443,11 +443,14 @@
     mir::Server::supported_pixel_formats*;
     mir::Server::the_composite_event_filter*;
     mir::Server::the_compositor*;
+    mir::Server::the_compositor_report*;
     mir::Server::the_cursor_listener*;
     mir::Server::the_display*;
     mir::Server::the_focus_controller*;
     mir::Server::the_gl_config*;
+    mir::Server::the_gl_program_factory*;
     mir::Server::the_graphics_platform*;
+    mir::Server::the_input_scene*;
     mir::Server::the_main_loop*;
     mir::Server::the_prompt_session_listener*;
     mir::Server::the_prompt_session_manager*;
 
=== modified file 'tests/unit-tests/examples/test_demo_compositor.cpp'
--- tests/unit-tests/examples/test_demo_compositor.cpp	2014-12-05 03:26:03 +0000
+++ tests/unit-tests/examples/test_demo_compositor.cpp	2014-12-10 12:04:19 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "playground/demo-shell/demo_compositor.h"
+#include "examples/demo-shell/demo_compositor.h"
 
 #include "mir/geometry/rectangle.h"
 #include "mir/compositor/scene_element.h"
 
=== modified file 'tests/unit-tests/examples/test_demo_renderer.cpp'
--- tests/unit-tests/examples/test_demo_renderer.cpp	2014-12-05 03:26:03 +0000
+++ tests/unit-tests/examples/test_demo_renderer.cpp	2014-12-10 12:04:19 +0000
@@ -21,7 +21,7 @@
 #include "mir_test_doubles/fake_renderable.h"
 #include "mir_test_doubles/stub_gl_program_factory.h"
 #include "mir_test_doubles/mock_gl.h"
-#include "playground/demo-shell/demo_renderer.h"
+#include "examples/demo-shell/demo_renderer.h"
 #include <gtest/gtest.h>
 
 namespace mtd = mir::test::doubles;