Mir

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

move-miral-to-mir
Merge into development-branch

Proposed by Alan Griffiths on 2017-08-21

Status:	Superseded
Proposed branch:	lp:~alan-griffiths/mir/move-miral-to-mir
Merge into:	lp:mir
Diff against target:	18084 lines (+17390/-2) 127 files modified CMakeLists.txt (+0/-2) cmake/FindPIL.cmake (+8/-0) debian/changelog (+3/-0) debian/control (+51/-0) debian/libmiral-dev.install (+3/-0) debian/libmiral2.install (+1/-0) debian/libmiral2.symbols (+399/-0) debian/libmirclientcpp-dev.install (+2/-0) debian/miral-examples.install (+9/-0) examples/CMakeLists.txt (+3/-0) examples/miral-kiosk/CMakeLists.txt (+12/-0) examples/miral-kiosk/kiosk_main.cpp (+94/-0) examples/miral-kiosk/kiosk_window_manager.cpp (+148/-0) examples/miral-kiosk/kiosk_window_manager.h (+52/-0) examples/miral-kiosk/sw_splash.cpp (+173/-0) examples/miral-kiosk/sw_splash.h (+44/-0) examples/miral-shell/CMakeLists.txt (+65/-0) examples/miral-shell/decoration_provider.cpp (+666/-0) examples/miral-shell/decoration_provider.h (+119/-0) examples/miral-shell/desktop/CMakeLists.txt (+12/-0) examples/miral-shell/desktop/miral-shell.desktop.in (+18/-0) examples/miral-shell/desktop/ubuntu-logo.svg (+27/-0) examples/miral-shell/floating_window_manager.cpp (+801/-0) examples/miral-shell/floating_window_manager.h (+146/-0) examples/miral-shell/miral-app.sh (+51/-0) examples/miral-shell/miral-desktop.sh (+45/-0) examples/miral-shell/miral-run.sh (+17/-0) examples/miral-shell/miral-screencast.sh (+48/-0) examples/miral-shell/miral-xrun.sh (+45/-0) examples/miral-shell/shell_main.cpp (+98/-0) examples/miral-shell/spinner/CMakeLists.txt (+67/-0) examples/miral-shell/spinner/eglapp.cpp (+83/-0) examples/miral-shell/spinner/eglapp.h (+33/-0) examples/miral-shell/spinner/eglspinner.cpp (+372/-0) examples/miral-shell/spinner/miregl.cpp (+239/-0) examples/miral-shell/spinner/miregl.h (+67/-0) examples/miral-shell/spinner/png2header.py (+87/-0) examples/miral-shell/spinner/splash.h (+45/-0) examples/miral-shell/tiling_window_manager.cpp (+688/-0) examples/miral-shell/tiling_window_manager.h (+140/-0) examples/miral-shell/titlebar_config.cpp (+38/-0) examples/miral-shell/titlebar_config.h (+30/-0) include/miral/mir/client/blob.h (+50/-0) include/miral/mir/client/connection.h (+54/-0) include/miral/mir/client/cookie.h (+50/-0) include/miral/mir/client/display_config.h (+78/-0) include/miral/mir/client/surface.h (+50/-0) include/miral/mir/client/window.h (+53/-0) include/miral/mir/client/window_id.h (+48/-0) include/miral/mir/client/window_spec.h (+253/-0) include/miral/miral/active_outputs.h (+74/-0) include/miral/miral/add_init_callback.h (+47/-0) include/miral/miral/append_event_filter.h (+44/-0) include/miral/miral/application.h (+42/-0) include/miral/miral/application_authorizer.h (+103/-0) include/miral/miral/application_info.h (+55/-0) include/miral/miral/canonical_window_manager.h (+59/-0) include/miral/miral/command_line_option.h (+109/-0) include/miral/miral/cursor_theme.h (+44/-0) include/miral/miral/debug_extension.h (+47/-0) include/miral/miral/display_configuration_option.h (+30/-0) include/miral/miral/internal_client.h (+88/-0) include/miral/miral/keymap.h (+58/-0) include/miral/miral/output.h (+113/-0) include/miral/miral/runner.h (+74/-0) include/miral/miral/set_command_line_handler.h (+50/-0) include/miral/miral/set_terminator.h (+47/-0) include/miral/miral/set_window_management_policy.h (+55/-0) include/miral/miral/version.h (+67/-0) include/miral/miral/window.h (+82/-0) include/miral/miral/window_info.h (+130/-0) include/miral/miral/window_management_options.h (+65/-0) include/miral/miral/window_management_policy.h (+194/-0) include/miral/miral/window_management_policy_addendum2.h (+70/-0) include/miral/miral/window_management_policy_addendum3.h (+68/-0) include/miral/miral/window_manager_tools.h (+254/-0) include/miral/miral/window_specification.h (+134/-0) include/miral/miral/workspace_policy.h (+88/-0) src/CMakeLists.txt (+1/-0) src/miral/CMakeLists.txt (+139/-0) src/miral/active_outputs.cpp (+65/-0) src/miral/add_init_callback.cpp (+33/-0) src/miral/append_event_filter.cpp (+48/-0) src/miral/application.cpp (+51/-0) src/miral/application_authorizer.cpp (+129/-0) src/miral/application_info.cpp (+99/-0) src/miral/basic_window_manager.cpp (+2234/-0) src/miral/basic_window_manager.h (+272/-0) src/miral/both_versions.h (+33/-0) src/miral/canonical_window_manager.cpp (+77/-0) src/miral/command_line_option.cpp (+210/-0) src/miral/coordinate_translator.cpp (+51/-0) src/miral/coordinate_translator.h (+52/-0) src/miral/cursor_theme.cpp (+62/-0) src/miral/debug_extension.cpp (+51/-0) src/miral/display_configuration_listeners.cpp (+120/-0) src/miral/display_configuration_listeners.h (+67/-0) src/miral/display_configuration_option.cpp (+115/-0) src/miral/internal_client.cpp (+215/-0) src/miral/join_client_threads.h (+24/-0) src/miral/keymap.cpp (+173/-0) src/miral/miral.pc.in (+9/-0) src/miral/mirclientcpp.pc.in (+7/-0) src/miral/mru_window_list.cpp (+65/-0) src/miral/mru_window_list.h (+46/-0) src/miral/output.cpp (+117/-0) src/miral/runner.cpp (+278/-0) src/miral/set_command_line_handler.cpp (+33/-0) src/miral/set_terminator.cpp (+33/-0) src/miral/set_window_management_policy.cpp (+91/-0) src/miral/symbols.map (+438/-0) src/miral/version.h.in (+67/-0) src/miral/window.cpp (+127/-0) src/miral/window_info.cpp (+594/-0) src/miral/window_management_options.cpp (+99/-0) src/miral/window_management_policy.cpp (+37/-0) src/miral/window_management_trace.cpp (+798/-0) src/miral/window_management_trace.h (+146/-0) src/miral/window_manager_tools.cpp (+141/-0) src/miral/window_manager_tools_implementation.h (+108/-0) src/miral/window_specification.cpp (+587/-0) src/miral/workspace_policy.cpp (+29/-0) src/miral/xcursor.c (+899/-0) src/miral/xcursor.h (+62/-0) src/miral/xcursor_loader.cpp (+215/-0) src/miral/xcursor_loader.h (+66/-0) tools/update_package_abis.sh (+1/-0)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/move-miral-to-mir
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Needs Fixing on 2017-08-23
Mir development team		2017-08-21	Pending
Review via email: mp+329316@code.launchpad.net

Commit message

Incorporate miral project into mir source tree

Description of the change

Incorporate miral project into mir source tree

This is a first-cut:

1. It lacks the miral-test build (as that needs rework to fit)
2. There's no attempt to remove code obsoleted by MirAL

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2017-08-23:

Artful/armhf:

"18:00:14 sbuild-build-depends-mir-dummy:armhf : Depends: python-pil:armhf but it is not going to be installed"

Why not? Artful appears to have it.

Zesty/armhf:

18:00:18 /usr/bin/python2.7: 1: /usr/bin/python2.7: Syntax error: word unexpected (expecting ")")
18:00:18 dpkg: error processing package python2.7-minimal:armhf (--configure):
18:00:18 subprocess installed post-installation script returned error exit status 2
18:00:18 dpkg: dependency problems prevent configuration of python-minimal:armhf:
18:00:18 python-minimal:armhf depends on python2.7-minimal (>= 2.7.13-1~); however:
18:00:18 Package python2.7-minimal:armhf is not configured yet.
18:00:18
18:00:18 dpkg: error processing package python-minimal:armhf (--configure):
18:00:18 dependency problems - leaving unconfigured
18:00:18 Errors were encountered while processing:
18:00:18 python2.7-minimal:armhf
18:00:18 python-minimal:armhf

Python 2.7!?

Oh...

$ apt depends python-pil
python-pil
Depends: python (<< 2.8)
...

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Preview Diff

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

The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes:

Alan Griffiths

Emanuele Antonio Faraone

Gerry Boland

Mir development team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2017-08-10 10:25:55 +0000
 +++ CMakeLists.txt	2017-08-23 11:59:25 +0000
@@ -81,8 +81,6 @@
  endif()
  # Link time optimization allows leaner, cleaner libraries
--message(STATUS "CMAKE_C_COMPILER: " ${CMAKE_C_COMPILER})
--
  option(MIR_LINK_TIME_OPTIMIZATION "Enables the linker to optimize binaries." OFF)
  if(MIR_LINK_TIME_OPTIMIZATION)
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto -ffat-lto-objects")
 === added file 'cmake/FindPIL.cmake'
 --- cmake/FindPIL.cmake	1970-01-01 00:00:00 +0000
 +++ cmake/FindPIL.cmake	2017-08-23 11:59:25 +0000
@@ -0,0 +1,8 @@
++execute_process(
++  COMMAND python3 -c "from PIL import Image"
++  RESULT_VARIABLE HAVE_PIL
++)
++
++if (NOT ${HAVE_PIL} EQUAL 0)
++  message(FATAL_ERROR "Python Imaging Library (PIL) not found")
++endif()
 === modified file 'debian/changelog'
 --- debian/changelog	2017-08-16 13:52:52 +0000
 +++ debian/changelog	2017-08-23 11:59:25 +0000
@@ -3,6 +3,7 @@
    * New upstream release 1.0.0(https://launchpad.net/mir/+milestone/1.0.0)
      - ABI summary:
        . mirclient ABI unchanged at 9
++      . miral ABI introduced at 2
        . mirserver ABI bumped to 45
        . mircommon ABI unchanged at 7
        . mirplatform ABI unchanged at 61
@@ -15,6 +16,8 @@
        . Update licences to (L)GPL3 or (L)GPL2.
        . [mir_demo_client_display_config] add orientation changing
        . RPC: Don't require the server ACK client's buffer-release requests.
++      . Added libmirclientcpp to Mir source package
++      . Added libmiral to Mir source package
      - Bugs fixed:
        . Fix handling of invalid display configuration. (LP: #1643446)
        . Move full responsibility for buffer IPC into frontend. (LP: #1395421)
 === modified file 'debian/control'
 --- debian/control	2017-08-02 13:18:44 +0000
 +++ debian/control	2017-08-23 11:59:25 +0000
@@ -45,6 +45,7 @@
                 libcapnp-dev,
                 capnproto,
                 libepoxy-dev,
++               python3-pil:native,
  Standards-Version: 3.9.4
  Homepage: https://launchpad.net/mir
  # If you aren't a member of ~mir-team but need to upload packaging changes,
@@ -477,3 +478,53 @@
+  .
   Contains header files that define the interfaces through which platforms and
   renderers access the functionality needed to render with GL.
++
++Package: libmiral2
++Section: libs
++Architecture: linux-any
++Multi-Arch: same
++Pre-Depends: ${misc:Pre-Depends}
++Depends: ${misc:Depends},
++         ${shlibs:Depends},
++Description: Display server for Ubuntu - ABI preserving abstraction layer
++ MirAL provides an ABI-stable abstraction layer for Mir based shells,
++ insulating them from mirserver ABI breaks.
++ .
++ Contains the shared library containing MirAL abstraction layer.
++
++Package: libmiral-dev
++Section: libdevel
++Architecture: linux-any
++Multi-Arch: same
++Pre-Depends: ${misc:Pre-Depends}
++Depends: libmiral2 (= ${binary:Version}),
++         libmirclientcpp-dev (= ${binary:Version}),
++         ${misc:Depends},
++Description: Developer files for the Mir ABI-stable abstraction layer
++ MirAL provides an ABI-stable abstraction layer for Mir based shells,
++ insulating them from mirserver ABI breaks.
++ .
++ Contains header files required for development using the MirAL abstraction
++ layer.
++
++Package: libmirclientcpp-dev
++Section: libdevel
++Architecture: linux-any
++Multi-Arch: same
++Pre-Depends: ${misc:Pre-Depends}
++Depends: libmirclient-dev,
++Description: A C++ wrapper for libmirclient-dev
++ Provides RAII (and other facilities) for Mir client library types.
++ .
++ Contains header files useful for C++ development against Mir.
++
++Package: miral-examples
++Architecture: linux-any
++Depends: ${misc:Depends},
++         ${shlibs:Depends},
++Recommends: dmz-cursor-theme,
++Description: Display server for Ubuntu - demonstration programs
++ MirAL provides an ABI-stable abstraction layer for Mir based shells,
++ insulating them from mirserver ABI breaks.
++ .
++ Contains demo applications that use the MirAL abstraction layer
 === added file 'debian/libmiral-dev.install'
 --- debian/libmiral-dev.install	1970-01-01 00:00:00 +0000
 +++ debian/libmiral-dev.install	2017-08-23 11:59:25 +0000
@@ -0,0 +1,3 @@
++usr/include/miral/miral/*
++usr/lib/*/pkgconfig/miral.pc
++usr/lib/*/libmiral.so
 === added file 'debian/libmiral2.install'
 --- debian/libmiral2.install	1970-01-01 00:00:00 +0000
 +++ debian/libmiral2.install	2017-08-23 11:59:25 +0000
@@ -0,0 +1,1 @@
++usr/lib/*/libmiral.so.2
 === added file 'debian/libmiral2.symbols'
 --- debian/libmiral2.symbols	1970-01-01 00:00:00 +0000
 +++ debian/libmiral2.symbols	2017-08-23 11:59:25 +0000
@@ -0,0 +1,399 @@
++libmiral.so.2 libmiral2 #MINVER#
++ MIRAL_1.0@MIRAL_1.0 1.0.0
++ (c++)"miral::WindowInfo::height_inc(mir::geometry::detail::IntWrapper<mir::geometry::DeltaYTag>)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::max_aspect(miral::WindowSpecification::AspectRatio)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::max_height(mir::geometry::detail::IntWrapper<mir::geometry::HeightTag>)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::min_aspect(miral::WindowSpecification::AspectRatio)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::min_height(mir::geometry::detail::IntWrapper<mir::geometry::HeightTag>)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::remove_child(miral::Window const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::restore_rect(mir::geometry::Rectangle const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::needs_titlebar(MirSurfaceType)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::confine_pointer(MirPointerConfinementState)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::preferred_orientation(MirOrientationMode)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::name(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::type(MirSurfaceType)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::state(MirSurfaceState)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::parent(miral::Window const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::userdata(std::shared_ptr<void>)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::add_child(miral::Window const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::max_width(mir::geometry::detail::IntWrapper<mir::geometry::WidthTag>)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::min_width(mir::geometry::detail::IntWrapper<mir::geometry::WidthTag>)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::output_id(mir::optional_value<int>)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::width_inc(mir::geometry::detail::IntWrapper<mir::geometry::DeltaXTag>)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::WindowInfo(miral::Window const&, miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::WindowInfo(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::WindowInfo()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::WindowInfo(miral::Window const&, miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::WindowInfo(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::WindowInfo()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::~WindowInfo()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::~WindowInfo()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::operator=(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CursorTheme::CursorTheme(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CursorTheme::CursorTheme(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CursorTheme::~CursorTheme()@MIRAL_1.0" 1.0.0
++ (c++)"miral::CursorTheme::~CursorTheme()@MIRAL_1.0" 1.0.0
++ (c++)"miral::SetTerminator::SetTerminator(std::function<void (int)> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::SetTerminator::SetTerminator(std::function<void (int)> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::SetTerminator::~SetTerminator()@MIRAL_1.0" 1.0.0
++ (c++)"miral::SetTerminator::~SetTerminator()@MIRAL_1.0" 1.0.0
++ (c++)"miral::DebugExtension::enable()@MIRAL_1.0" 1.0.0
++ (c++)"miral::DebugExtension::disable()@MIRAL_1.0" 1.0.0
++ (c++)"miral::DebugExtension::DebugExtension(miral::DebugExtension const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::DebugExtension::DebugExtension()@MIRAL_1.0" 1.0.0
++ (c++)"miral::DebugExtension::DebugExtension(miral::DebugExtension const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::DebugExtension::DebugExtension()@MIRAL_1.0" 1.0.0
++ (c++)"miral::DebugExtension::operator=(miral::DebugExtension const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::AddInitCallback::AddInitCallback(std::function<void ()> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::AddInitCallback::AddInitCallback(std::function<void ()> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::AddInitCallback::~AddInitCallback()@MIRAL_1.0" 1.0.0
++ (c++)"miral::AddInitCallback::~AddInitCallback()@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::add_window(miral::Window const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::remove_window(miral::Window const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::userdata(std::shared_ptr<void>)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::ApplicationInfo(miral::ApplicationInfo const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::ApplicationInfo(std::shared_ptr<mir::scene::Session> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::ApplicationInfo()@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::ApplicationInfo(miral::ApplicationInfo const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::ApplicationInfo(std::shared_ptr<mir::scene::Session> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::ApplicationInfo()@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::~ApplicationInfo()@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::~ApplicationInfo()@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::operator=(miral::ApplicationInfo const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::AppendEventFilter::AppendEventFilter(std::function<int (MirEvent const*)> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::AppendEventFilter::AppendEventFilter(std::function<int (MirEvent const*)> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::AppendEventFilter::operator()(mir::Server&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(miral::CommandLineOption const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (mir::optional_value<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (mir::optional_value<bool> const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (mir::optional_value<int> const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (bool)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (bool)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (double)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, double)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (int)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(miral::CommandLineOption const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (mir::optional_value<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (mir::optional_value<bool> const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (mir::optional_value<int> const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (bool)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (bool)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (double)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, double)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (int)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::~CommandLineOption()@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::~CommandLineOption()@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::operator=(miral::CommandLineOption const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::raise_tree(miral::Window const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::force_close(miral::Window const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::modify_window(miral::Window const&, miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::modify_window(miral::WindowInfo&, miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::active_display()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::find_application(std::function<bool (miral::ApplicationInfo const&)> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::invoke_under_lock(std::function<void ()> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::drag_active_window(mir::geometry::Displacement)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::ask_client_to_close(miral::Window const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::for_each_application(std::function<void (miral::ApplicationInfo&)> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::select_active_window(miral::Window const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::focus_next_application()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::focus_next_within_application()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::WindowManagerTools(miral::WindowManagerToolsImplementation*)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::WindowManagerTools(miral::WindowManagerTools const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::WindowManagerTools(miral::WindowManagerToolsImplementation*)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::WindowManagerTools(miral::WindowManagerTools const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::~WindowManagerTools()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::~WindowManagerTools()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::operator=(miral::WindowManagerTools const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::height_inc()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::input_mode()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::max_aspect()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::max_height()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::min_aspect()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::min_height()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::input_shape()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::shell_chrome()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::confine_pointer()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::placement_hints()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::preferred_orientation()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::window_placement_gravity()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::aux_rect_placement_offset()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::aux_rect_placement_gravity()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::name[abi:cxx11]()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::size()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::type()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::state()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::parent()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::aux_rect()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::top_left()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::userdata()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::max_width()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::min_width()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::output_id()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::width_inc()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::WindowSpecification(mir::scene::SurfaceCreationParameters const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::WindowSpecification(mir::shell::SurfaceSpecification const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::WindowSpecification(miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::WindowSpecification()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::WindowSpecification(mir::scene::SurfaceCreationParameters const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::WindowSpecification(mir::shell::SurfaceSpecification const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::WindowSpecification(miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::WindowSpecification()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::~WindowSpecification()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::~WindowSpecification()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::operator=(miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsMonitor::add_listener(miral::ActiveOutputsListener*)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsMonitor::delete_listener(miral::ActiveOutputsListener*)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsMonitor::ActiveOutputsMonitor(miral::ActiveOutputsMonitor const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsMonitor::ActiveOutputsMonitor()@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsMonitor::ActiveOutputsMonitor(miral::ActiveOutputsMonitor const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsMonitor::ActiveOutputsMonitor()@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsMonitor::~ActiveOutputsMonitor()@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsMonitor::~ActiveOutputsMonitor()@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsMonitor::operator=(miral::ActiveOutputsMonitor const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsMonitor::operator()(mir::Server&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsListener::advise_output_end()@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsListener::advise_output_begin()@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsListener::advise_output_create(miral::Output const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsListener::advise_output_delete(miral::Output const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsListener::advise_output_update(miral::Output const&, miral::Output const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::SetCommandLineHandler::SetCommandLineHandler(std::function<void (int, char const* const*)> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::SetCommandLineHandler::SetCommandLineHandler(std::function<void (int, char const* const*)> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::SetCommandLineHandler::~SetCommandLineHandler()@MIRAL_1.0" 1.0.0
++ (c++)"miral::SetCommandLineHandler::~SetCommandLineHandler()@MIRAL_1.0" 1.0.0
++ (c++)"miral::StartupInternalClient::StartupInternalClient(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<void (miral::toolkit::Connection)>, std::function<void (std::weak_ptr<mir::scene::Session>)>)@MIRAL_1.0" 1.0.0
++ (c++)"miral::StartupInternalClient::StartupInternalClient(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<void (miral::toolkit::Connection)>, std::function<void (std::weak_ptr<mir::scene::Session>)>)@MIRAL_1.0" 1.0.0
++ (c++)"miral::StartupInternalClient::~StartupInternalClient()@MIRAL_1.0" 1.0.0
++ (c++)"miral::StartupInternalClient::~StartupInternalClient()@MIRAL_1.0" 1.0.0
++ (c++)"miral::StartupInternalClient::operator()(mir::Server&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationCredentials::ApplicationCredentials(mir::frontend::SessionCredentials const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationCredentials::ApplicationCredentials(mir::frontend::SessionCredentials const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::InternalClientLauncher::InternalClientLauncher()@MIRAL_1.0" 1.0.0
++ (c++)"miral::InternalClientLauncher::InternalClientLauncher()@MIRAL_1.0" 1.0.0
++ (c++)"miral::InternalClientLauncher::~InternalClientLauncher()@MIRAL_1.0" 1.0.0
++ (c++)"miral::InternalClientLauncher::~InternalClientLauncher()@MIRAL_1.0" 1.0.0
++ (c++)"miral::InternalClientLauncher::operator()(mir::Server&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagementPolicy::advise_end()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagementPolicy::advise_begin()@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagementPolicy::advise_raise(std::vector<miral::Window, std::allocator<miral::Window> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagementPolicy::advise_resize(miral::WindowInfo const&, mir::geometry::Size const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagementPolicy::advise_move_to(miral::WindowInfo const&, mir::geometry::Point)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagementPolicy::advise_new_app(miral::ApplicationInfo&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagementPolicy::advise_delete_app(miral::ApplicationInfo const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagementPolicy::advise_focus_lost(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagementPolicy::advise_new_window(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagementPolicy::advise_focus_gained(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagementPolicy::advise_state_change(miral::WindowInfo const&, MirSurfaceState)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagementPolicy::advise_delete_window(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::equivalent_display_area(miral::Output const&, miral::Output const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::SetWindowManagmentPolicy::SetWindowManagmentPolicy(std::function<std::unique_ptr<miral::WindowManagementPolicy, std::default_delete<miral::WindowManagementPolicy> > (miral::WindowManagerTools const&)> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::SetWindowManagmentPolicy::SetWindowManagmentPolicy(std::function<std::unique_ptr<miral::WindowManagementPolicy, std::default_delete<miral::WindowManagementPolicy> > (miral::WindowManagerTools const&)> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::SetWindowManagmentPolicy::~SetWindowManagmentPolicy()@MIRAL_1.0" 1.0.0
++ (c++)"miral::SetWindowManagmentPolicy::~SetWindowManagmentPolicy()@MIRAL_1.0" 1.0.0
++ (c++)"miral::apply_lifecycle_state_to(std::shared_ptr<mir::scene::Session> const&, MirLifecycleState)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CanonicalWindowManagerPolicy::place_new_surface(miral::ApplicationInfo const&, miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CanonicalWindowManagerPolicy::advise_focus_gained(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CanonicalWindowManagerPolicy::handle_raise_window(miral::WindowInfo&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CanonicalWindowManagerPolicy::handle_window_ready(miral::WindowInfo&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CanonicalWindowManagerPolicy::handle_modify_window(miral::WindowInfo&, miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CanonicalWindowManagerPolicy::confirm_inherited_move(miral::WindowInfo const&, mir::geometry::Displacement)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CanonicalWindowManagerPolicy::CanonicalWindowManagerPolicy(miral::WindowManagerTools const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::CanonicalWindowManagerPolicy::CanonicalWindowManagerPolicy(miral::WindowManagerTools const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::BasicSetApplicationAuthorizer::BasicSetApplicationAuthorizer(std::function<std::shared_ptr<miral::ApplicationAuthorizer> ()> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::BasicSetApplicationAuthorizer::BasicSetApplicationAuthorizer(std::function<std::shared_ptr<miral::ApplicationAuthorizer> ()> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::BasicSetApplicationAuthorizer::~BasicSetApplicationAuthorizer()@MIRAL_1.0" 1.0.0
++ (c++)"miral::BasicSetApplicationAuthorizer::~BasicSetApplicationAuthorizer()@MIRAL_1.0" 1.0.0
++ (c++)"miral::BasicSetApplicationAuthorizer::operator()(mir::Server&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::display_configuration_options(mir::Server&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::kill(std::shared_ptr<mir::scene::Session> const&, int)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Keymap::set_keymap(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Keymap::Keymap(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Keymap::Keymap(miral::Keymap const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Keymap::Keymap()@MIRAL_1.0" 1.0.0
++ (c++)"miral::Keymap::Keymap(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Keymap::Keymap(miral::Keymap const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Keymap::Keymap()@MIRAL_1.0" 1.0.0
++ (c++)"miral::Keymap::~Keymap()@MIRAL_1.0" 1.0.0
++ (c++)"miral::Keymap::~Keymap()@MIRAL_1.0" 1.0.0
++ (c++)"miral::Keymap::operator=(miral::Keymap const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::Output(mir::graphics::DisplayConfigurationOutput const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::Output(miral::Output const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::Output(mir::graphics::DisplayConfigurationOutput const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::Output(miral::Output const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::~Output()@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::~Output()@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::operator=(miral::Output const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Window::resize(mir::geometry::Size const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Window::move_to(mir::geometry::Point)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Window::Window(std::shared_ptr<mir::scene::Session> const&, std::shared_ptr<mir::scene::Surface> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Window::Window()@MIRAL_1.0" 1.0.0
++ (c++)"miral::Window::Window(std::shared_ptr<mir::scene::Session> const&, std::shared_ptr<mir::scene::Surface> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::Window::Window()@MIRAL_1.0" 1.0.0
++ (c++)"miral::Window::~Window()@MIRAL_1.0" 1.0.0
++ (c++)"miral::Window::~Window()@MIRAL_1.0" 1.0.0
++ (c++)"miral::pid_of(std::shared_ptr<mir::scene::Session> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::name_of[abi:cxx11](std::shared_ptr<mir::scene::Session> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::MirRunner::add_stop_callback(std::function<void ()> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::MirRunner::add_start_callback(std::function<void ()> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::MirRunner::set_exception_handler(std::function<void ()> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::MirRunner::stop()@MIRAL_1.0" 1.0.0
++ (c++)"miral::MirRunner::run_with(std::initializer_list<std::function<void (mir::Server&)> >)@MIRAL_1.0" 1.0.0
++ (c++)"miral::MirRunner::MirRunner(int, char const**)@MIRAL_1.0" 1.0.0
++ (c++)"miral::MirRunner::MirRunner(int, char const**, char const*)@MIRAL_1.0" 1.0.0
++ (c++)"miral::MirRunner::MirRunner(int, char const**)@MIRAL_1.0" 1.0.0
++ (c++)"miral::MirRunner::MirRunner(int, char const**, char const*)@MIRAL_1.0" 1.0.0
++ (c++)"miral::MirRunner::~MirRunner()@MIRAL_1.0" 1.0.0
++ (c++)"miral::MirRunner::~MirRunner()@MIRAL_1.0" 1.0.0
++ (c++)"miral::operator==(miral::Output::PhysicalSizeMM const&, miral::Output::PhysicalSizeMM const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::operator==(miral::Window const&, std::shared_ptr<mir::scene::Surface> const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::operator==(miral::Window const&, miral::Window const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::operator==(std::shared_ptr<mir::scene::Surface> const&, miral::Window const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::height_inc() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::is_visible() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::max_aspect() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::max_height() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::min_aspect() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::min_height() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::can_morph_to(MirSurfaceType) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::restore_rect() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::can_be_active() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::has_output_id() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::confine_pointer() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::constrain_resize(mir::geometry::Point&, mir::geometry::Size&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::must_have_parent() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::must_not_have_parent() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::preferred_orientation() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::name[abi:cxx11]() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::type() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::state() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::parent() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::window() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::children() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::userdata() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::max_width() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::min_width() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::output_id() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowInfo::width_inc() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::CursorTheme::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::SetTerminator::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::DebugExtension::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::AddInitCallback::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::application() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::name[abi:cxx11]() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::windows() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationInfo::userdata() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::CommandLineOption::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::active_window() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::id_for_window[abi:cxx11](miral::Window const&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::count_applications() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::info_for_window_id(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::place_and_size_for_state(miral::WindowSpecification&, miral::WindowInfo const&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::info_for(miral::Window const&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::info_for(std::weak_ptr<mir::scene::Session> const&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::info_for(std::weak_ptr<mir::scene::Surface> const&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::window_at(mir::geometry::Point) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::height_inc() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::input_mode() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::max_aspect() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::max_height() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::min_aspect() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::min_height() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::input_shape() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::shell_chrome() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::confine_pointer() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::placement_hints() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::preferred_orientation() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::window_placement_gravity() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::aux_rect_placement_offset() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::aux_rect_placement_gravity() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::name[abi:cxx11]() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::size() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::type() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::state() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::parent() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::update(mir::scene::SurfaceCreationParameters&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::aux_rect() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::top_left() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::userdata() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::max_width() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::min_width() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::output_id() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowSpecification::width_inc() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::ActiveOutputsMonitor::process_outputs(std::function<void (std::vector<miral::Output, std::allocator<miral::Output> > const&)> const&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerOptions::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::SetCommandLineHandler::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationCredentials::gid() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationCredentials::pid() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::ApplicationCredentials::uid() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::InternalClientLauncher::launch(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::function<void (miral::toolkit::Connection)> const&, std::function<void (std::weak_ptr<mir::scene::Session>)> const&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::SetWindowManagmentPolicy::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::BasicSetApplicationAuthorizer::the_application_authorizer() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Keymap::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::power_mode() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::form_factor() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::orientation() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::pixel_format() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::refresh_rate() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::is_same_output(miral::Output const&) const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::physical_size_mm() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::type() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::used() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::scale() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::valid() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::extents() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Output::connected() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Window::application() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Window::size() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Window::top_left() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Window::operator std::shared_ptr<mir::scene::Surface>() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Window::operator std::weak_ptr<mir::scene::Surface>() const@MIRAL_1.0" 1.0.0
++ (c++)"miral::Window::operator bool() const@MIRAL_1.0" 1.0.0
++ (c++)"typeinfo for miral::ActiveOutputsListener@MIRAL_1.0" 1.0.0
++ (c++)"typeinfo for miral::WindowManagementPolicy@MIRAL_1.0" 1.0.0
++ (c++)"typeinfo for miral::CanonicalWindowManagerPolicy@MIRAL_1.0" 1.0.0
++ (c++)"vtable for miral::ActiveOutputsListener@MIRAL_1.0" 1.0.0
++ (c++)"vtable for miral::WindowManagementPolicy@MIRAL_1.0" 1.0.0
++ (c++)"vtable for miral::CanonicalWindowManagerPolicy@MIRAL_1.0" 1.0.0
++ MIRAL_1.1@MIRAL_1.1 1.0.0
++ (c++)"miral::WindowInfo::needs_titlebar(MirWindowType)@MIRAL_1.1" 1.0.0
++ (c++)"miral::WindowInfo::type(MirWindowType)@MIRAL_1.1" 1.0.0
++ (c++)"miral::WindowInfo::state(MirWindowState)@MIRAL_1.1" 1.0.0
++ (c++)"miral::WindowManagementPolicy::advise_state_change(miral::WindowInfo const&, MirWindowState)@MIRAL_1.1" 1.0.0
++ (c++)"miral::WindowInfo::can_morph_to(MirWindowType) const@MIRAL_1.1" 1.0.0
++ (c++)"miral::CanonicalWindowManagerPolicy::place_new_window(miral::ApplicationInfo const&, miral::WindowSpecification const&)@MIRAL_1.1" 1.0.0
++ MIRAL_1.2@MIRAL_1.2 1.0.0
++ (c++)"miral::StartupInternalClient::StartupInternalClient(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<void (mir::client::Connection)>, std::function<void (std::weak_ptr<mir::scene::Session>)>)@MIRAL_1.2" 1.0.0
++ (c++)"miral::InternalClientLauncher::launch(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::function<void (mir::client::Connection)> const&, std::function<void (std::weak_ptr<mir::scene::Session>)> const&) const@MIRAL_1.2" 1.0.0
++ (c++)"miral::WindowInfo::shell_chrome(MirShellChrome)@MIRAL_1.2" 1.0.0
++ (c++)"miral::WindowInfo::shell_chrome() const@MIRAL_1.2" 1.0.0
++ (c++)"miral::WindowManagerTools::drag_window(miral::Window const&, mir::geometry::Displacement)@MIRAL_1.2" 1.0.0
++ (c++)"typeinfo for miral::ApplicationAuthorizer@MIRAL_1.0" 1.0.0
++ (c++)"typeinfo for miral::ApplicationAuthorizer1@MIRAL_1.2" 1.0.0
++ MIRAL_1.3@MIRAL_1.3 1.0.0
++ (c++)"miral::operator<(miral::Window const&, miral::Window const&)@MIRAL_1.0" 1.0.0
++ (c++)"miral::WindowManagerTools::create_workspace()@MIRAL_1.3" 1.0.0
++ (c++)"miral::WindowManagerTools::add_tree_to_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.0.0
++ (c++)"miral::WindowManagerTools::focus_prev_within_application()@MIRAL_1.3" 1.0.0
++ (c++)"miral::WindowManagerTools::remove_tree_from_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.0.0
++ (c++)"miral::WindowManagerTools::move_workspace_content_to_workspace(std::shared_ptr<miral::Workspace> const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.0.0
++ (c++)"miral::WorkspacePolicy::advise_adding_to_workspace(std::shared_ptr<miral::Workspace> const&, std::vector<miral::Window, std::allocator<miral::Window> > const&)@MIRAL_1.3" 1.0.0
++ (c++)"miral::WorkspacePolicy::advise_removing_from_workspace(std::shared_ptr<miral::Workspace> const&, std::vector<miral::Window, std::allocator<miral::Window> > const&)@MIRAL_1.3" 1.0.0
++ (c++)"miral::WindowManagerTools::for_each_window_in_workspace(std::shared_ptr<miral::Workspace> const&, std::function<void (miral::Window const&)> const&)@MIRAL_1.3" 1.0.0
++ (c++)"miral::WindowManagerTools::for_each_workspace_containing(miral::Window const&, std::function<void (std::shared_ptr<miral::Workspace> const&)> const&)@MIRAL_1.3" 1.0.0
++ (c++)"typeinfo for miral::WorkspacePolicy@MIRAL_1.3" 1.0.0
++ (c++)"vtable for miral::WorkspacePolicy@MIRAL_1.3" 1.0.0
++ MIRAL_1.3.1@MIRAL_1.3.1 1.0.0
++ (c++)"miral::SetWindowManagementPolicy::SetWindowManagementPolicy(std::function<std::unique_ptr<miral::WindowManagementPolicy, std::default_delete<miral::WindowManagementPolicy> > (miral::WindowManagerTools const&)> const&)@MIRAL_1.3.1" 1.0.0
++ (c++)"miral::SetWindowManagementPolicy::SetWindowManagementPolicy(std::function<std::unique_ptr<miral::WindowManagementPolicy, std::default_delete<miral::WindowManagementPolicy> > (miral::WindowManagerTools const&)> const&)@MIRAL_1.3.1" 1.0.0
++ (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.0.0
++ (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.0.0
++ (c++)"miral::SetWindowManagementPolicy::operator()(mir::Server&) const@MIRAL_1.3.1" 1.0.0
++ MIRAL_1.4.0@MIRAL_1.4.0 1.0.0
++ (c++)"miral::WindowManagerTools::end_drag_and_drop()@MIRAL_1.4.0" 1.0.0
++ (c++)"miral::WindowManagerTools::start_drag_and_drop(miral::WindowInfo&, std::vector<unsigned char, std::allocator<unsigned char> > const&)@MIRAL_1.4.0" 1.0.0
++ (c++)"typeinfo for miral::WindowManagementPolicyAddendum2@MIRAL_1.4.0" 1.0.0
++ MIRAL_1.5.0@MIRAL_1.5.0 1.0.0
++ (c++)"miral::pre_init(miral::CommandLineOption const&)@MIRAL_1.5.0" 1.0.0
++ (c++)"typeinfo for miral::WindowManagementPolicyAddendum3@MIRAL_1.5.0" 1.0.0
++ (c++)"miral::WindowManagerTools::active_output()@MIRAL_1.5.0" 1.0.0
 \ No newline at end of file
 === added file 'debian/libmirclientcpp-dev.install'
 --- debian/libmirclientcpp-dev.install	1970-01-01 00:00:00 +0000
 +++ debian/libmirclientcpp-dev.install	2017-08-23 11:59:25 +0000
@@ -0,0 +1,2 @@
++usr/include/miral/mir/*/*
++usr/lib/*/pkgconfig/mirclientcpp.pc
 === added file 'debian/miral-examples.install'
 --- debian/miral-examples.install	1970-01-01 00:00:00 +0000
 +++ debian/miral-examples.install	2017-08-23 11:59:25 +0000
@@ -0,0 +1,9 @@
++usr/bin/miral-shell
++usr/bin/miral-run
++usr/bin/miral-kiosk
++usr/bin/miral-xrun
++usr/bin/miral-screencast
++usr/bin/miral-desktop
++usr/bin/miral-app
++usr/share/applications/miral-shell.desktop
++usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg
 === modified file 'examples/CMakeLists.txt'
 --- examples/CMakeLists.txt	2017-07-14 11:29:56 +0000
 +++ examples/CMakeLists.txt	2017-08-23 11:59:25 +0000
@@ -1,3 +1,6 @@
++add_subdirectory(miral-kiosk)
++add_subdirectory(miral-shell)
++
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -fno-strict-aliasing -Wextra")
  add_library(eglapp STATIC
 === added directory 'examples/miral-kiosk'
 === added file 'examples/miral-kiosk/CMakeLists.txt'
 --- examples/miral-kiosk/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ examples/miral-kiosk/CMakeLists.txt	2017-08-23 11:59:25 +0000
@@ -0,0 +1,12 @@
++include_directories(
++    ${PROJECT_SOURCE_DIR}/include/miral
++    ${PROJECT_SOURCE_DIR}/include/client
++)
++
++mir_add_wrapped_executable(miral-kiosk
++    kiosk_main.cpp
++    kiosk_window_manager.cpp    kiosk_window_manager.h
++    sw_splash.cpp               sw_splash.h
++)
++
++target_link_libraries(miral-kiosk miral)
 === added file 'examples/miral-kiosk/kiosk_main.cpp'
 --- examples/miral-kiosk/kiosk_main.cpp	1970-01-01 00:00:00 +0000
 +++ examples/miral-kiosk/kiosk_main.cpp	2017-08-23 11:59:25 +0000
@@ -0,0 +1,94 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * under the terms of the GNU General Public License version 2 or 3 as 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 "kiosk_window_manager.h"
++
++#include <miral/runner.h>
++#include <miral/application_authorizer.h>
++#include <miral/command_line_option.h>
++#include <miral/keymap.h>
++#include <miral/set_window_management_policy.h>
++#include <miral/internal_client.h>
++
++#include <unistd.h>
++#include <atomic>
++
++namespace
++{
++struct KioskAuthorizer : miral::ApplicationAuthorizer
++{
++    KioskAuthorizer(SwSplash const& splash) : splash{splash}{}
++
++    virtual bool connection_is_allowed(miral::ApplicationCredentials const& creds) override
++    {
++        // Allow internal applications and (optionally) only ones that start "immediately"
++        // (For the sake of an example "immediately" means while the spash is running)
++        return getpid() == creds.pid() || !startup_only || splash.session().lock();
++    }
++
++    virtual bool configure_display_is_allowed(miral::ApplicationCredentials const& /*creds*/) override
++    {
++        return false;
++    }
++
++    virtual bool set_base_display_configuration_is_allowed(miral::ApplicationCredentials const& /*creds*/) override
++    {
++        return false;
++    }
++
++    virtual bool screencast_is_allowed(miral::ApplicationCredentials const& /*creds*/) override
++    {
++        return true;
++    }
++
++    virtual bool prompt_session_is_allowed(miral::ApplicationCredentials const& /*creds*/) override
++    {
++        return false;
++    }
++
++    static std::atomic<bool> startup_only;
++
++    SwSplash splash;
++};
++
++std::atomic<bool> KioskAuthorizer::startup_only{false};
++}
++
++int main(int argc, char const* argv[])
++{
++    using namespace miral;
++
++    SwSplash splash;
++
++    CommandLineOption startup_only{
++        [&](bool startup_only) {KioskAuthorizer::startup_only = startup_only; },
++        "kiosk-startup-apps-only",
++        "Only allow applications to connect during startup",
++        KioskAuthorizer::startup_only};
++
++    return MirRunner{argc, argv}.run_with(
++        {
++            CommandLineOption{[&](std::string const& ) { },
++                              "desktop_file_hint", "Ignored for Unity8 compatability", "miral-shell.desktop"},
++            set_window_management_policy<KioskWindowManagerPolicy>(splash),
++            SetApplicationAuthorizer<KioskAuthorizer>{splash},
++            Keymap{},
++            startup_only,
++            StartupInternalClient{"Intro", splash}
++        });
++}
 === added file 'examples/miral-kiosk/kiosk_window_manager.cpp'
 --- examples/miral-kiosk/kiosk_window_manager.cpp	1970-01-01 00:00:00 +0000
 +++ examples/miral-kiosk/kiosk_window_manager.cpp	2017-08-23 11:59:25 +0000
@@ -0,0 +1,148 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 or 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored By: Alan Griffiths <alan@octopull.co.uk>
++ */
++
++#include "kiosk_window_manager.h"
++
++#include <miral/application_info.h>
++#include <miral/window_info.h>
++#include <miral/window_manager_tools.h>
++
++#include <linux/input.h>
++
++namespace ms = mir::scene;
++using namespace miral;
++
++KioskWindowManagerPolicy::KioskWindowManagerPolicy(WindowManagerTools const& tools, SwSplash const& splash) :
++    CanonicalWindowManagerPolicy{tools},
++    splash{splash}
++{
++}
++
++bool KioskWindowManagerPolicy::handle_keyboard_event(MirKeyboardEvent const* event)
++{
++    auto const action = mir_keyboard_event_action(event);
++    auto const scan_code = mir_keyboard_event_scan_code(event);
++    auto const modifiers = mir_keyboard_event_modifiers(event) & modifier_mask;
++
++    if (action == mir_keyboard_action_down &&
++            modifiers == mir_input_event_modifier_alt &&
++            scan_code == KEY_TAB)
++    {
++        tools.focus_next_application();
++
++        return true;
++    }
++    else if (action == mir_keyboard_action_down &&
++            modifiers == mir_input_event_modifier_alt &&
++            scan_code == KEY_GRAVE)
++    {
++        tools.focus_next_within_application();
++
++        return true;
++    }
++    else if (action == mir_keyboard_action_down &&
++             modifiers == (mir_input_event_modifier_alt | mir_input_event_modifier_shift) &&
++             scan_code == KEY_GRAVE)
++    {
++        tools.focus_prev_within_application();
++
++        return true;
++    }
++    else if (action == mir_keyboard_action_down && scan_code == KEY_F4)
++    {
++        switch (modifiers & modifier_mask)
++        {
++        case mir_input_event_modifier_alt:
++            tools.ask_client_to_close(tools.active_window());;
++            return true;
++
++        default:
++            break;
++        }
++    }
++
++    return false;
++}
++
++bool KioskWindowManagerPolicy::handle_touch_event(MirTouchEvent const* event)
++{
++    auto const count = mir_touch_event_point_count(event);
++
++    long total_x = 0;
++    long total_y = 0;
++
++    for (auto i = 0U; i != count; ++i)
++    {
++        total_x += mir_touch_event_axis_value(event, i, mir_touch_axis_x);
++        total_y += mir_touch_event_axis_value(event, i, mir_touch_axis_y);
++    }
++
++    Point const cursor{total_x/count, total_y/count};
++
++    tools.select_active_window(tools.window_at(cursor));
++
++    return false;
++}
++
++bool KioskWindowManagerPolicy::handle_pointer_event(MirPointerEvent const* event)
++{
++    auto const action = mir_pointer_event_action(event);
++
++    Point const cursor{
++        mir_pointer_event_axis_value(event, mir_pointer_axis_x),
++        mir_pointer_event_axis_value(event, mir_pointer_axis_y)};
++
++    if (action == mir_pointer_action_button_down)
++    {
++        tools.select_active_window(tools.window_at(cursor));
++    }
++
++    return false;
++}
++
++void KioskWindowManagerPolicy::advise_focus_gained(WindowInfo const& info)
++{
++    CanonicalWindowManagerPolicy::advise_focus_gained(info);
++
++    if (auto session = splash.session().lock())
++    {
++        auto const& app_info = tools.info_for(session);
++
++        for (auto const& s : app_info.windows())
++            tools.raise_tree(s);
++    }
++}
++
++void KioskWindowManagerPolicy::advise_new_window(WindowInfo const& window_info)
++{
++    // We do this here, not in place_new_window() so that clients get a resize event.
++    // This shouldn't be necessary, but works better with the gtk-mir backend.
++    if (window_info.type() == mir_window_type_normal &&
++        !window_info.parent() &&
++        window_info.state() == mir_window_state_restored)
++    {
++        WindowSpecification specification;
++
++        specification.state() = mir_window_state_maximized;
++
++        tools.place_and_size_for_state(specification, window_info);
++        tools.modify_window(window_info.window(), specification);
++    }
++
++    CanonicalWindowManagerPolicy::advise_new_window(window_info);
++}
 === added file 'examples/miral-kiosk/kiosk_window_manager.h'
 --- examples/miral-kiosk/kiosk_window_manager.h	1970-01-01 00:00:00 +0000
 +++ examples/miral-kiosk/kiosk_window_manager.h	2017-08-23 11:59:25 +0000
@@ -0,0 +1,52 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 or 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored By: Alan Griffiths <alan@octopull.co.uk>
++ */
++
++#ifndef MIRAL_KIOSK_WINDOW_MANAGER_H
++#define MIRAL_KIOSK_WINDOW_MANAGER_H
++
++#include "sw_splash.h"
++
++#include <miral/canonical_window_manager.h>
++
++using namespace mir::geometry;
++
++class KioskWindowManagerPolicy : public miral::CanonicalWindowManagerPolicy
++{
++public:
++    KioskWindowManagerPolicy(miral::WindowManagerTools const& tools, SwSplash const&);
++
++    void advise_focus_gained(miral::WindowInfo const& info) override;
++
++    virtual void advise_new_window(miral::WindowInfo const& window_info) override;
++
++    bool handle_keyboard_event(MirKeyboardEvent const* event) override;
++    bool handle_touch_event(MirTouchEvent const* event) override;
++    bool handle_pointer_event(MirPointerEvent const* event) override;
++
++private:
++    static const int modifier_mask =
++        mir_input_event_modifier_alt |
++        mir_input_event_modifier_shift |
++        mir_input_event_modifier_sym |
++        mir_input_event_modifier_ctrl |
++        mir_input_event_modifier_meta;
++
++    SwSplash const splash;
++};
++
++#endif /* MIRAL_KIOSK_WINDOW_MANAGER_H */
 === added file 'examples/miral-kiosk/sw_splash.cpp'
 --- examples/miral-kiosk/sw_splash.cpp	1970-01-01 00:00:00 +0000
 +++ examples/miral-kiosk/sw_splash.cpp	2017-08-23 11:59:25 +0000
@@ -0,0 +1,173 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 or 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Alan Griffiths <alan@octopull.co.uk>
++ */
++
++#include "sw_splash.h"
++
++#include <mir/client/display_config.h>
++#include <mir/client/surface.h>
++#include <mir/client/window.h>
++#include <mir/client/window_spec.h>
++
++#include <mir_toolkit/mir_buffer_stream.h>
++
++#include <chrono>
++#include <cstring>
++#include <thread>
++#include <mutex>
++
++namespace
++{
++MirPixelFormat find_8888_format(MirConnection* connection)
++{
++    unsigned int const num_formats = 32;
++    MirPixelFormat pixel_formats[num_formats];
++    unsigned int valid_formats;
++    mir_connection_get_available_surface_formats(connection, pixel_formats, num_formats, &valid_formats);
++
++    for (unsigned int i = 0; i < num_formats; ++i)
++    {
++        MirPixelFormat cur_pf = pixel_formats[i];
++        if (cur_pf == mir_pixel_format_abgr_8888 ||
++            cur_pf == mir_pixel_format_argb_8888)
++        {
++            return cur_pf;
++        }
++    }
++
++    for (unsigned int i = 0; i < num_formats; ++i)
++    {
++        MirPixelFormat cur_pf = pixel_formats[i];
++        if (cur_pf == mir_pixel_format_xbgr_8888 ||
++            cur_pf == mir_pixel_format_xrgb_8888)
++        {
++            return cur_pf;
++        }
++    }
++
++    return *pixel_formats;
++}
++
++auto create_window(MirConnection* connection, mir::client::Surface const& surface) -> mir::client::Window
++{
++    int id = 0;
++    int width = 0;
++    int height = 0;
++
++    mir::client::DisplayConfig{connection}.for_each_output([&](MirOutput const* output)
++        {
++            if (mir_output_get_connection_state(output) == mir_output_connection_state_connected &&
++                mir_output_is_enabled(output))
++            {
++                id = mir_output_get_id(output);
++
++                MirOutputMode const* mode = mir_output_get_current_mode(output);
++                width = mir_output_mode_get_width(mode);
++                height = mir_output_mode_get_height(mode);
++            }
++        });
++
++    return mir::client::WindowSpec::for_normal_window(connection, width, height)
++        .set_name("splash")
++        .set_fullscreen_on_output(id)
++        .add_surface(surface, width, height, 0, 0)
++        .create_window();
++}
++
++void render_pattern(MirGraphicsRegion *region, uint8_t pattern[])
++{
++    char *row = region->vaddr;
++
++    for (int j = 0; j < region->height; j++)
++    {
++        uint32_t *pixel = (uint32_t*)row;
++
++        for (int i = 0; i < region->width; i++)
++            memcpy(pixel+i, pattern, sizeof pixel[i]);
++
++        row += region->stride;
++    }
++}
++}
++
++struct SwSplash::Self
++{
++    std::mutex mutex;
++    std::weak_ptr<mir::scene::Session> session;
++};
++
++SwSplash::SwSplash() : self{std::make_shared<Self>()} {}
++
++SwSplash::~SwSplash() = default;
++
++void SwSplash::operator()(std::weak_ptr<mir::scene::Session> const& session)
++{
++    std::lock_guard<decltype(self->mutex)> lock{self->mutex};
++    self->session = session;
++}
++
++auto SwSplash::session() const -> std::weak_ptr<mir::scene::Session>
++{
++    std::lock_guard<decltype(self->mutex)> lock{self->mutex};
++    return self->session;
++}
++
++void SwSplash::operator()(MirConnection* connection)
++{
++    MirPixelFormat pixel_format = find_8888_format(connection);
++
++    uint8_t pattern[4] = { 0x14, 0x48, 0xDD, 0xFF };
++
++    switch(pixel_format)
++    {
++    case mir_pixel_format_abgr_8888:
++    case mir_pixel_format_xbgr_8888:
++        std::swap(pattern[2],pattern[0]);
++        break;
++
++    case mir_pixel_format_argb_8888:
++    case mir_pixel_format_xrgb_8888:
++        break;
++
++    default:
++        return;
++    };
++
++
++    mir::client::Surface surface{mir_connection_create_render_surface_sync(connection, 42, 42)};
++    MirBufferStream* buffer_stream = mir_render_surface_get_buffer_stream(surface, 42, 42, pixel_format);
++
++    auto const window = create_window(connection, surface);
++
++    MirGraphicsRegion graphics_region;
++
++    auto const time_limit = std::chrono::steady_clock::now() + std::chrono::seconds(2);
++
++    do
++    {
++        mir_buffer_stream_get_graphics_region(buffer_stream, &graphics_region);
++
++        render_pattern(&graphics_region, pattern);
++        mir_buffer_stream_swap_buffers_sync(buffer_stream);
++
++        for (auto& x : pattern)
++            x =  3*x/4;
++
++        std::this_thread::sleep_for(std::chrono::milliseconds(200));
++    }
++    while (std::chrono::steady_clock::now() < time_limit);
++}
 === added file 'examples/miral-kiosk/sw_splash.h'
 --- examples/miral-kiosk/sw_splash.h	1970-01-01 00:00:00 +0000
 +++ examples/miral-kiosk/sw_splash.h	2017-08-23 11:59:25 +0000
@@ -0,0 +1,44 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 or 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Alan Griffiths <alan@octopull.co.uk>
++ */
++
++#ifndef MIRAL_SHELL_SW_SPLASH_H
++#define MIRAL_SHELL_SW_SPLASH_H
++
++#include <mir_toolkit/client_types.h>
++
++#include <memory>
++
++namespace mir { class Server; namespace scene { class Session; }}
++
++// A very simple s/w rendered splash animation
++class SwSplash
++{
++public:
++    SwSplash();
++    ~SwSplash();
++
++    void operator()(MirConnection* connection);
++    void operator()(std::weak_ptr<mir::scene::Session> const& session);
++    auto session() const -> std::weak_ptr<mir::scene::Session>;
++
++private:
++    struct Self;
++    std::shared_ptr<Self> const self;
++};
++
++#endif //MIRAL_SHELL_SW_SPLASH_H
 === added directory 'examples/miral-shell'
 === added file 'examples/miral-shell/CMakeLists.txt'
 --- examples/miral-shell/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/CMakeLists.txt	2017-08-23 11:59:25 +0000
@@ -0,0 +1,65 @@
++include_directories(
++        ${PROJECT_SOURCE_DIR}/include/miral
++        ${PROJECT_SOURCE_DIR}/include/client
++)
++
++add_subdirectory(spinner)
++add_subdirectory(desktop)
++
++add_custom_target(miral-run ALL
++    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-run.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-run
++)
++
++install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-run
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
++)
++
++add_custom_target(miral-xrun ALL
++    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-xrun.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-xrun
++)
++
++install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-xrun
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
++)
++
++add_custom_target(miral-screencast ALL
++    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-screencast.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-screencast
++)
++
++install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-screencast
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
++)
++
++add_custom_target(miral-desktop ALL
++    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-desktop.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-desktop
++)
++
++install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-desktop
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
++)
++
++add_custom_target(miral-app ALL
++    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-app.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-app
++)
++
++install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-app
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
++)
++
++mir_add_wrapped_executable(miral-shell
++    shell_main.cpp
++    tiling_window_manager.cpp   tiling_window_manager.h
++        floating_window_manager.cpp floating_window_manager.h
++    decoration_provider.cpp     decoration_provider.h
++    titlebar_config.cpp         titlebar_config.h
++)
++
++pkg_check_modules(FREETYPE freetype2 REQUIRED)
++target_include_directories(miral-shell PRIVATE ${FREETYPE_INCLUDE_DIRS})
++target_compile_definitions(miral-shell PRIVATE -DTYPO_SUPPORTS_FREETYPE)
++target_link_libraries(miral-shell
++    miral-spinner
++    miral
++    ${FREETYPE_LIBRARIES}
++)
++
 === added file 'examples/miral-shell/decoration_provider.cpp'
 --- examples/miral-shell/decoration_provider.cpp	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/decoration_provider.cpp	2017-08-23 11:59:25 +0000
@@ -0,0 +1,666 @@
++/*
++ * Copyright © 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 or 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Alan Griffiths <alan@octopull.co.uk>
++ */
++
++#include "decoration_provider.h"
++#include "titlebar_config.h"
++
++#include <mir/client/display_config.h>
++#include <mir/client/window_spec.h>
++
++#include <mir_toolkit/mir_buffer_stream.h>
++
++#include <ft2build.h>
++#include FT_FREETYPE_H
++
++#include <locale>
++#include <codecvt>
++#include <string>
++#include <cstring>
++#include <sstream>
++
++#include <iostream>
++
++namespace
++{
++int const title_bar_height = 12;
++char const* const wallpaper_name = "wallpaper";
++
++void null_window_callback(MirWindow*, void*) {}
++
++struct preferred_codecvt : std::codecvt_byname<wchar_t, char, std::mbstate_t>
++{
++    preferred_codecvt() : std::codecvt_byname<wchar_t, char, std::mbstate_t>("") {}
++    ~preferred_codecvt() = default;
++};
++
++struct Printer
++{
++    Printer();
++    ~Printer();
++    Printer(Printer const&) = delete;
++    Printer& operator=(Printer const&) = delete;
++
++    void print(MirGraphicsRegion const& region, std::string const& title, int const intensity);
++    void printhelp(MirGraphicsRegion const& region);
++
++private:
++    std::wstring_convert<preferred_codecvt> converter;
++
++    bool working = false;
++    FT_Library lib;
++    FT_Face face;
++};
++
++void paint_surface(MirBufferStream* buffer_stream, std::string const& title, int const intensity)
++{
++    // TODO sometimes buffer_stream is nullptr - find out why (and fix).
++    // (Only observed when creating a lot of clients at once)
++    if (!buffer_stream)
++        return;
++
++    MirGraphicsRegion region;
++    mir_buffer_stream_get_graphics_region(buffer_stream, &region);
++
++    char* row = region.vaddr;
++
++    for (int j = 0; j != region.height; ++j)
++    {
++        memset(row, intensity, 4*region.width);
++        row += region.stride;
++    }
++
++    static Printer printer;
++    printer.print(region, title, intensity);
++
++    mir_buffer_stream_swap_buffers_sync(buffer_stream);
++}
++
++Printer::Printer()
++{
++    if (FT_Init_FreeType(&lib))
++        return;
++
++    if (FT_New_Face(lib, titlebar::font_file().c_str(), 0, &face))
++    {
++        std::cerr << "WARNING: failed to load titlebar font: \"" <<  titlebar::font_file() << "\"\n";
++        FT_Done_FreeType(lib);
++        return;
++    }
++
++    FT_Set_Pixel_Sizes(face, 0, 10);
++    working = true;
++}
++
++Printer::~Printer()
++{
++    if (working)
++    {
++        FT_Done_Face(face);
++        FT_Done_FreeType(lib);
++    }
++}
++
++void Printer::print(MirGraphicsRegion const& region, std::string const& title_, int const intensity)
++try
++{
++    if (!working)
++        return;
++
++    auto title = converter.from_bytes(title_);
++
++    int base_x = 2;
++    int base_y = region.height-2;
++
++    for (auto const& ch : title)
++    {
++        FT_Load_Glyph(face, FT_Get_Char_Index(face, ch), FT_LOAD_DEFAULT);
++        auto const glyph = face->glyph;
++        FT_Render_Glyph(glyph, FT_RENDER_MODE_NORMAL);
++
++        auto const& bitmap = glyph->bitmap;
++        auto const x = base_x + glyph->bitmap_left;
++
++        if (static_cast<int>(x + bitmap.width) <= region.width)
++        {
++            unsigned char* src = bitmap.buffer;
++
++            auto const y = base_y - glyph->bitmap_top;
++            char* dest = region.vaddr + y*region.stride + 4*x;
++
++            for (auto row = 0u; row != std::min(bitmap.rows, glyph->bitmap_top+2u); ++row)
++            {
++                for (auto col = 0u; col != bitmap.width; ++col)
++                    memset(dest+ 4*col, (intensity*(0xff^src[col]))/0xff, 4);
++
++                src += bitmap.pitch;
++                dest += region.stride;
++            }
++        }
++
++        base_x += glyph->advance.x >> 6;
++        base_y += glyph->advance.y >> 6;
++    }
++}
++catch (...)
++{
++    std::cerr << "WARNING: failed render title: \"" <<  title_ << "\"\n";
++}
++
++void Printer::printhelp(MirGraphicsRegion const& region)
++{
++    if (!working)
++        return;
++
++    static char const* const helptext[] =
++        {
++            "Welcome to miral-shell",
++            "",
++            "Keyboard shortcuts:",
++            "",
++            "  o Switch apps: Alt-Tab, tap or click on the corresponding window",
++            "  o Next (previous) app window: Alt-` (Alt-Shift-`)",
++            "",
++            "  o Move window: Alt-leftmousebutton drag (three finger drag)",
++            "  o Resize window: Alt-middle_button drag (three finger pinch)",
++            "",
++            "  o Maximize/restore current window (to display size). : Alt-F11",
++            "  o Maximize/restore current window (to display height): Shift-F11",
++            "  o Maximize/restore current window (to display width) : Ctrl-F11",
++            "",
++            "  o Switch workspace: Meta-Alt-[F1|F2|F3|F4]",
++            "  o Switch workspace taking active window: Meta-Ctrl-[F1|F2|F3|F4]",
++            "",
++            "  o To exit: Ctrl-Alt-BkSp",
++        };
++
++    int help_width = 0;
++    unsigned int help_height = 0;
++    unsigned int line_height = 0;
++
++    for (auto const* rawline : helptext)
++    {
++        int line_width = 0;
++
++        auto const line = converter.from_bytes(rawline);
++
++        auto const fwidth = std::min(region.width / 60, 20);
++
++        FT_Set_Pixel_Sizes(face, fwidth, 0);
++
++        for (auto const& ch : line)
++        {
++            FT_Load_Glyph(face, FT_Get_Char_Index(face, ch), FT_LOAD_DEFAULT);
++            auto const glyph = face->glyph;
++            FT_Render_Glyph(glyph, FT_RENDER_MODE_NORMAL);
++
++            line_width += glyph->advance.x >> 6;
++            line_height = std::max(line_height, glyph->bitmap.rows + glyph->bitmap.rows/2);
++        }
++
++        if (help_width < line_width) help_width = line_width;
++        help_height += line_height;
++    }
++
++    int base_y = (region.height - help_height)/2;
++
++    for (auto const* rawline : helptext)
++    {
++        int base_x = (region.width - help_width)/2;
++
++        auto const line = converter.from_bytes(rawline);
++
++        for (auto const& ch : line)
++        {
++            FT_Load_Glyph(face, FT_Get_Char_Index(face, ch), FT_LOAD_DEFAULT);
++            auto const glyph = face->glyph;
++            FT_Render_Glyph(glyph, FT_RENDER_MODE_NORMAL);
++
++            auto const& bitmap = glyph->bitmap;
++            auto const x = base_x + glyph->bitmap_left;
++
++            if (static_cast<int>(x + bitmap.width) <= region.width)
++            {
++                unsigned char* src = bitmap.buffer;
++
++                auto const y = base_y - glyph->bitmap_top;
++                char* dest = region.vaddr + y * region.stride + 4 * x;
++
++                for (auto row = 0u; row != bitmap.rows; ++row)
++                {
++                    for (auto col = 0u; col != 4 * bitmap.width; ++col)
++                        dest[col] |= src[col / 4]/2;
++
++                    src += bitmap.pitch;
++                    dest += region.stride;
++
++                    if (dest > region.vaddr + region.height * region.stride)
++                        break;
++                }
++            }
++
++            base_x += glyph->advance.x >> 6;
++        }
++        base_y += line_height;
++    }
++}
++
++void render_background(MirBufferStream* buffer_stream, MirGraphicsRegion& graphics_region)
++{
++    static uint8_t const pattern[4] = {0x00, 0x00, 0x00, 0x00 };
++
++    char* row = (&graphics_region)->vaddr;
++
++    for (int j = 0; j < (&graphics_region)->height; j++)
++    {
++        uint32_t* pixel = (uint32_t*)row;
++
++        for (int i = 0; i < (&graphics_region)->width; i++)
++            memcpy(pixel + i, pattern, sizeof pixel[i]);
++
++        row += (&graphics_region)->stride;
++    }
++
++    static Printer printer;
++    printer.printhelp(*&graphics_region);
++
++    mir_buffer_stream_swap_buffers_sync(buffer_stream);
++}
++}
++
++using namespace mir::client;
++using namespace mir::geometry;
++
++DecorationProvider::DecorationProvider(miral::WindowManagerTools const& tools) : tools{tools}
++{
++
++}
++
++DecorationProvider::~DecorationProvider()
++{
++}
++
++void DecorationProvider::stop()
++{
++    enqueue_work([this]
++        {
++            std::lock_guard<decltype(mutex)> lock{mutex};
++            window_to_titlebar.clear();
++        });
++
++    enqueue_work([this]
++        {
++            if (connection)
++            {
++                wallpaper.erase(begin(wallpaper), end(wallpaper));
++            }
++            connection.reset();
++        });
++    stop_work();
++}
++
++void DecorationProvider::operator()(Connection connection)
++{
++    this->connection = connection;
++
++    DisplayConfig const display_conf{this->connection};
++
++    display_conf.for_each_output([this](MirOutput const* output)
++        {
++            if (!mir_output_is_enabled(output))
++                return;
++
++            auto const mode = mir_output_get_current_mode(output);
++            auto const output_id = mir_output_get_id(output);
++            auto const width = mir_output_mode_get_width(mode);
++            auto const height = mir_output_mode_get_height(mode);
++
++            Surface surface{mir_connection_create_render_surface_sync(DecorationProvider::connection, width, height)};
++
++            auto const buffer_stream =
++                mir_render_surface_get_buffer_stream(surface, width, height, mir_pixel_format_xrgb_8888);
++
++            auto window = WindowSpec::for_gloss(DecorationProvider::connection, width, height)
++                .set_fullscreen_on_output(output_id)
++                .set_event_handler(&handle_event_for_background, this)
++                .add_surface(surface, width, height, 0, 0)
++                .set_name(wallpaper_name).create_window();
++
++            wallpaper.push_back(Wallpaper{surface, window, buffer_stream});
++
++            MirGraphicsRegion graphics_region;
++            mir_buffer_stream_get_graphics_region(buffer_stream, &graphics_region);
++            render_background(buffer_stream, graphics_region);
++        });
++
++    start_work();
++}
++
++void DecorationProvider::operator()(std::weak_ptr<mir::scene::Session> const& session)
++{
++    std::lock_guard<decltype(mutex)> lock{mutex};
++    this->weak_session = session;
++}
++
++auto DecorationProvider::session() const -> std::shared_ptr<mir::scene::Session>
++{
++    std::lock_guard<decltype(mutex)> lock{mutex};
++    return weak_session.lock();
++}
++
++void DecorationProvider::handle_event(MirWindow* window, MirEvent const* ev, void* context_)
++{
++    auto* const context = (Data*)context_;
++
++    switch (mir_event_get_type(ev))
++    {
++    case mir_event_type_resize:
++    {
++        MirResizeEvent const* resize = mir_event_get_resize_event(ev);
++        int const new_width = mir_resize_event_get_width(resize);
++        int const new_height = mir_resize_event_get_height(resize);
++        mir_render_surface_set_size(context->surface, new_width, new_height);
++        WindowSpec::for_changes(context->connection)
++            .add_surface(context->surface, new_width, new_height, 0, 0)
++            .apply_to(window);
++        break;
++    }
++
++    default:
++        break;
++    }
++}
++
++void DecorationProvider::create_titlebar_for(miral::Window const& window)
++{
++    if (is_decoration(window)) return;
++
++    enqueue_work([this, window]
++        {
++            auto const width = window.size().width.as_int();
++            std::ostringstream buffer;
++            buffer << std::shared_ptr<mir::scene::Surface>(window).get();
++
++            Surface surface{mir_connection_create_render_surface_sync(this->connection, width, title_bar_height)};
++
++            std::lock_guard<decltype(mutex)> lock{mutex};
++
++            auto const data = &window_to_titlebar[window];
++            data->connection = connection;
++            data->surface = surface;
++            data->stream = mir_render_surface_get_buffer_stream(surface, width, title_bar_height, mir_pixel_format_xrgb_8888);
++            windows_awaiting_titlebar[buffer.str()] = window;
++
++            WindowSpec::for_gloss(connection, width, title_bar_height)
++                .add_surface(surface, width, title_bar_height, 0, 0)
++                .set_name(buffer.str().c_str())
++                .set_event_handler(&handle_event, data)
++                .create_window(insert, data);
++        });
++}
++
++void DecorationProvider::paint_titlebar_for(miral::WindowInfo const& info, int intensity)
++{
++    if (auto data = find_titlebar_data(info.window()))
++    {
++        data->intensity = intensity;
++
++        auto const title = info.name();
++
++        enqueue_work([this, stream=data->stream, title, intensity]{ paint_surface(stream, title, intensity); });
++    }
++}
++
++void DecorationProvider::destroy_titlebar_for(miral::Window const& window)
++{
++    if (auto data = find_titlebar_data(window))
++    {
++        if (auto surface = data->titlebar.exchange(nullptr))
++        {
++            enqueue_work([surface]
++                 {
++                     mir_window_release(surface, &null_window_callback, nullptr);
++                 });
++        }
++
++        if (data->titlebar.load())
++        {
++            enqueue_work([this, window]
++                {
++                    std::lock_guard<decltype(mutex)> lock{mutex};
++                    window_to_titlebar.erase(window);
++                });
++        }
++        else
++        {
++            data->on_create = [this, window](MirWindow*)
++                {
++                    enqueue_work([this, window]
++                        {
++                            std::lock_guard<decltype(mutex)> lock{mutex};
++                            window_to_titlebar.erase(window);
++                        });
++                };
++        }
++    }
++}
++
++void DecorationProvider::resize_titlebar_for(miral::WindowInfo const& window_info, Size const& size)
++{
++    auto const window = window_info.window();
++
++    if (window.size().width == size.width)
++        return;
++
++    if (auto titlebar_window = find_titlebar_window(window))
++    {
++        titlebar_window.resize({size.width, title_bar_height});
++
++        repaint_titlebar_for(window_info);
++    }
++}
++
++void DecorationProvider::place_new_decoration(miral::WindowSpecification& window_spec)
++{
++    auto const name = window_spec.name().value();
++    if (name == wallpaper_name) return;
++
++    std::lock_guard<decltype(mutex)> lock{mutex};
++
++    auto const scene_surface = windows_awaiting_titlebar[name].lock();
++    windows_awaiting_titlebar.erase(name);
++
++    auto& parent_info = tools.info_for(scene_surface);
++    auto const parent_window = parent_info.window();
++
++    window_spec.parent() = scene_surface;
++    window_spec.size() = Size{parent_window.size().width, Height{title_bar_height}};
++    window_spec.top_left() = parent_window.top_left() - Displacement{0, title_bar_height};
++}
++
++void DecorationProvider::advise_new_titlebar(miral::WindowInfo const& window_info)
++{
++    if (window_info.name() == wallpaper_name) return;
++
++    {
++        std::lock_guard<decltype(mutex)> lock{mutex};
++
++        window_to_titlebar[window_info.parent()].window = window_info.window();
++    }
++
++    tools.raise_tree(window_info.parent());
++}
++
++void DecorationProvider::advise_state_change(miral::WindowInfo const& window_info, MirWindowState state)
++{
++    if (auto titlebar = find_titlebar_window(window_info.window()))
++    {
++        miral::WindowSpecification modifications;
++        switch (state)
++        {
++        case mir_window_state_hidden:
++        case mir_window_state_minimized:
++        case mir_window_state_fullscreen:
++            modifications.state() = mir_window_state_hidden;
++            break;
++
++        default:
++            modifications.state() = mir_window_state_restored;
++            break;
++        }
++
++        tools.modify_window(titlebar, modifications);
++        repaint_titlebar_for(window_info);
++    }
++}
++
++void DecorationProvider::repaint_titlebar_for(miral::WindowInfo const& window_info)
++{
++    if (auto data = find_titlebar_data(window_info.window()))
++    {
++        auto const title = window_info.name();
++
++        enqueue_work([this, stream=data->stream, title, intensity=data->intensity.load()]
++            { paint_surface(stream, title, intensity); });
++    }
++}
++
++DecorationProvider::Data::~Data()
++{
++    if (auto surface = titlebar.exchange(nullptr))
++        mir_window_release(surface, &null_window_callback, nullptr);
++}
++
++void DecorationProvider::insert(MirWindow* surface, Data* data)
++{
++    data->on_create(surface);
++    data->titlebar = surface;
++}
++
++DecorationProvider::Data* DecorationProvider::find_titlebar_data(miral::Window const& window)
++{
++    std::lock_guard<decltype(mutex)> lock{mutex};
++
++    auto const find = window_to_titlebar.find(window);
++
++    return (find != window_to_titlebar.end()) ? &find->second : nullptr;
++}
++
++miral::Window DecorationProvider::find_titlebar_window(miral::Window const& window) const
++{
++    std::lock_guard<decltype(mutex)> lock{mutex};
++
++    auto const find = window_to_titlebar.find(window);
++
++    return (find != window_to_titlebar.end()) ? find->second.window : miral::Window{};
++}
++
++bool DecorationProvider::is_decoration(miral::Window const& window) const
++{
++    return window.application() == session();
++}
++
++bool DecorationProvider::is_titlebar(miral::WindowInfo const& window_info) const
++{
++    return window_info.window().application() == session() && window_info.name() != wallpaper_name;
++}
++
++void DecorationProvider::handle_event_for_background(MirWindow* window, MirEvent const* event, void* context)
++{
++    static_cast<DecorationProvider*>(context)->handle_event_for_background(window, event);
++}
++
++void DecorationProvider::handle_event_for_background(MirWindow* window, MirEvent const* ev)
++{
++    switch (mir_event_get_type(ev))
++    {
++    case mir_event_type_resize:
++    {
++        MirResizeEvent const* resize = mir_event_get_resize_event(ev);
++        int const new_width = mir_resize_event_get_width(resize);
++        int const new_height = mir_resize_event_get_height(resize);
++
++        enqueue_work([window, new_width, new_height, this]()
++            {
++                auto found = find_if(begin(wallpaper), end(wallpaper), [&](Wallpaper const& w) { return w.window == window;});
++                if (found == end(wallpaper)) return;
++
++                mir_buffer_stream_set_size(found->stream, new_width, new_height);
++                mir_render_surface_set_size(found->surface, new_width, new_height);
++
++                WindowSpec::for_changes(connection)
++                    .add_surface(found->surface, new_width, new_height, 0, 0)
++                    .apply_to(window);
++
++                MirGraphicsRegion graphics_region;
++
++                // We expect a buffer of the right size so we shouldn't need to limit repaints
++                // but we also to avoid an infinite loop.
++                int repaint_limit = 3;
++
++                do
++                {
++                    mir_buffer_stream_get_graphics_region(found->stream, &graphics_region);
++                    render_background(found->stream, graphics_region);
++                }
++                while ((new_width != graphics_region.width || new_height != graphics_region.height)
++                       && --repaint_limit != 0);
++            });
++        break;
++    }
++
++    default:
++        break;
++    }
++}
++
++Worker::~Worker()
++{
++}
++
++void Worker::do_work()
++{
++    while (!work_done)
++    {
++        WorkQueue::value_type work;
++        {
++            std::unique_lock<decltype(work_mutex)> lock{work_mutex};
++            work_cv.wait(lock, [this] { return !work_queue.empty(); });
++            work = work_queue.front();
++            work_queue.pop();
++        }
++
++        work();
++    }
++}
++
++void Worker::enqueue_work(std::function<void()> const& functor)
++{
++    std::lock_guard<decltype(work_mutex)> lock{work_mutex};
++    work_queue.push(functor);
++    work_cv.notify_one();
++}
++
++void Worker::start_work()
++{
++    do_work();
++}
++
++void Worker::stop_work()
++{
++    enqueue_work([this] { work_done = true; });
++}
 === added file 'examples/miral-shell/decoration_provider.h'
 --- examples/miral-shell/decoration_provider.h	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/decoration_provider.h	2017-08-23 11:59:25 +0000
@@ -0,0 +1,119 @@
++/*
++ * Copyright © 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 or 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Alan Griffiths <alan@octopull.co.uk>
++ */
++
++#ifndef MIRAL_SHELL_DECORATION_PROVIDER_H
++#define MIRAL_SHELL_DECORATION_PROVIDER_H
++
++
++#include <miral/window_manager_tools.h>
++
++#include <mir/client/connection.h>
++#include <mir/client/surface.h>
++#include <mir/client/window.h>
++
++#include <mir/geometry/rectangle.h>
++#include <mir_toolkit/client_types.h>
++
++#include <atomic>
++#include <map>
++#include <mutex>
++#include <condition_variable>
++#include <queue>
++
++class Worker
++{
++public:
++    ~Worker();
++
++    void start_work();
++    void enqueue_work(std::function<void()> const& functor);
++    void stop_work();
++
++private:
++    using WorkQueue = std::queue<std::function<void()>>;
++
++    std::mutex mutable work_mutex;
++    std::condition_variable work_cv;
++    WorkQueue work_queue;
++    bool work_done = false;
++
++    void do_work();
++};
++
++class DecorationProvider : Worker
++{
++public:
++    DecorationProvider(miral::WindowManagerTools const& tools);
++    ~DecorationProvider();
++
++    void operator()(mir::client::Connection connection);
++    void operator()(std::weak_ptr<mir::scene::Session> const& session);
++
++    auto session() const -> std::shared_ptr<mir::scene::Session>;
++
++    void create_titlebar_for(miral::Window const& window);
++    void place_new_decoration(miral::WindowSpecification& window_spec);
++    void paint_titlebar_for(miral::WindowInfo const& window, int intensity);
++    void destroy_titlebar_for(miral::Window const& window);
++    void resize_titlebar_for(miral::WindowInfo const& window_info, mir::geometry::Size const& size);
++    void advise_new_titlebar(miral::WindowInfo const& window_info);
++    void advise_state_change(miral::WindowInfo const& window_info, MirWindowState state);
++
++    void stop();
++
++    bool is_decoration(miral::Window const& window) const;
++    bool is_titlebar(miral::WindowInfo const& window_info) const;
++
++private:
++    struct Data
++    {
++        MirConnection* connection{nullptr};
++        mir::client::Surface surface;
++        MirBufferStream* stream{nullptr};
++        std::atomic<MirWindow*> titlebar{nullptr};
++        std::atomic<int> intensity{0xff};
++        std::function<void(MirWindow* surface)> on_create{[](MirWindow*){}};
++        miral::Window window;
++
++        ~Data();
++    };
++
++    using SurfaceMap = std::map<std::weak_ptr<mir::scene::Surface>, Data, std::owner_less<std::weak_ptr<mir::scene::Surface>>>;
++    using TitleMap = std::map<std::string, std::weak_ptr<mir::scene::Surface>>;
++
++    miral::WindowManagerTools tools;
++    std::mutex mutable mutex;
++    mir::client::Connection connection;
++    struct Wallpaper { mir::client::Surface surface; mir::client::Window window; MirBufferStream* stream; };
++    std::vector<Wallpaper> wallpaper;
++    std::weak_ptr<mir::scene::Session> weak_session;
++
++    SurfaceMap window_to_titlebar;
++    TitleMap windows_awaiting_titlebar;
++
++    static void insert(MirWindow* surface, Data* data);
++    Data* find_titlebar_data(miral::Window const& window);
++    miral::Window find_titlebar_window(miral::Window const& window) const;
++    void repaint_titlebar_for(miral::WindowInfo const& window_info);
++    static void handle_event(MirWindow* window, MirEvent const* ev, void* context_);
++    static void handle_event_for_background(MirWindow* window, MirEvent const* event, void* context_);
++    void handle_event_for_background(MirWindow* window, MirEvent const* ev);
++};
++
++
++#endif //MIRAL_SHELL_DECORATION_PROVIDER_H
 === added directory 'examples/miral-shell/desktop'
 === added file 'examples/miral-shell/desktop/CMakeLists.txt'
 --- examples/miral-shell/desktop/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/desktop/CMakeLists.txt	2017-08-23 11:59:25 +0000
@@ -0,0 +1,12 @@
++set(ICON_NAME ubuntu-logo)
++set(PROGRAM_NAME miral-app)
++
++configure_file(miral-shell.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/miral-shell.desktop @ONLY)
++
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miral-shell.desktop
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
++)
++
++install(FILES ${ICON_NAME}.svg
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
++)
 === added file 'examples/miral-shell/desktop/miral-shell.desktop.in'
 --- examples/miral-shell/desktop/miral-shell.desktop.in	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/desktop/miral-shell.desktop.in	2017-08-23 11:59:25 +0000
@@ -0,0 +1,18 @@
++[Desktop Entry]
++Version=1.0
++Name=Miral Shell
++GenericName=Mir Shell
++Comment=A Mir Shell
++Keywords=Mir;Server;Shell
++Type=Application
++Icon=@ICON_NAME@
++Exec=@PROGRAM_NAME@
++Terminal=false
++Categories=Utility
++#MimeType=
++X-Ubuntu-Touch=true
++X-Ubuntu-Gettext-Domain=miral-shell
++X-Ubuntu-Single-Instance=true
++X-Ubuntu-Default-Department-ID=miral-shell
++#X-Screenshot=
++X-Ubuntu-Splash-Color=#FFFFFF
 === added file 'examples/miral-shell/desktop/ubuntu-logo.svg'
 --- examples/miral-shell/desktop/ubuntu-logo.svg	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/desktop/ubuntu-logo.svg	2017-08-23 11:59:25 +0000
@@ -0,0 +1,27 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
++	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
++]>
++<svg version="1.1"
++	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
++	 x="0px" y="0px" width="285px" height="285px" viewBox="-0.866 -0.866 285 285" enable-background="new -0.866 -0.866 285 285"
++	 xml:space="preserve">
++<defs>
++</defs>
++<path fill="#DD4814" d="M283.465,141.734c0,78.273-63.457,141.73-141.734,141.73S0,220.008,0,141.734C0,63.455,63.453,0,141.73,0
++	S283.465,63.455,283.465,141.734z"/>
++<path fill="#FFFFFF" d="M45.356,122.812c-10.453,0-18.923,8.47-18.923,18.923c0,10.449,8.47,18.92,18.923,18.92
++	c10.449,0,18.92-8.471,18.92-18.92C64.276,131.281,55.806,122.812,45.356,122.812z M180.463,208.814
++	c-9.051,5.225-12.149,16.793-6.926,25.84c5.226,9.051,16.793,12.151,25.844,6.926c9.048-5.224,12.148-16.792,6.923-25.842
++	C201.08,206.691,189.511,203.59,180.463,208.814z M86.458,141.732c0-18.701,9.293-35.219,23.504-45.221L96.128,73.338
++	c-16.56,11.064-28.878,27.978-33.995,47.788c5.977,4.872,9.796,12.291,9.796,20.608c0,8.315-3.819,15.734-9.797,20.605
++	c5.116,19.812,17.435,36.726,33.995,47.789l13.835-23.175C95.751,176.953,86.458,160.436,86.458,141.732z M141.733,86.457
++	c28.877,0,52.564,22.141,55.047,50.373l26.968-0.394c-1.327-20.844-10.432-39.562-24.425-53.319
++	c-7.194,2.718-15.505,2.306-22.688-1.842c-7.192-4.152-11.705-11.156-12.941-18.757c-6.992-1.935-14.351-2.99-21.96-2.99
++	c-13.086,0-25.449,3.072-36.431,8.512l13.146,23.56C125.526,88.307,133.412,86.457,141.733,86.457z M141.733,197.008
++	c-8.322,0-16.207-1.85-23.285-5.143L105.3,215.427c10.983,5.438,23.347,8.511,36.433,8.511c7.609,0,14.968-1.055,21.961-2.99
++	c1.236-7.601,5.75-14.605,12.943-18.76c7.183-4.146,15.494-4.558,22.688-1.839c13.992-13.758,23.097-32.476,24.422-53.32
++	l-26.968-0.394C194.298,174.871,170.61,197.008,141.733,197.008z M180.46,74.649c9.05,5.227,20.619,2.126,25.842-6.921
++	c5.226-9.051,2.128-20.619-6.923-25.845c-9.049-5.224-20.617-2.124-25.843,6.927C168.312,57.857,171.412,69.426,180.46,74.649z"/>
++</svg>
 === added file 'examples/miral-shell/floating_window_manager.cpp'
 --- examples/miral-shell/floating_window_manager.cpp	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/floating_window_manager.cpp	2017-08-23 11:59:25 +0000
@@ -0,0 +1,801 @@
++/*
++ * Copyright © 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 or 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Alan Griffiths <alan@octopull.co.uk>
++ */
++
++#include "floating_window_manager.h"
++#include "decoration_provider.h"
++
++#include <miral/application_info.h>
++#include <miral/internal_client.h>
++#include <miral/window_info.h>
++#include <miral/window_manager_tools.h>
++
++#include <linux/input.h>
++#include <csignal>
++
++using namespace miral;
++
++namespace
++{
++DeltaY const title_bar_height{12};
++
++struct PolicyData
++{
++    bool in_hidden_workspace{false};
++
++    MirWindowState old_state;
++};
++
++inline PolicyData& policy_data_for(WindowInfo const& info)
++{
++    return *std::static_pointer_cast<PolicyData>(info.userdata());
++}
++}
++
++FloatingWindowManagerPolicy::FloatingWindowManagerPolicy(
++    WindowManagerTools const& tools,
++    SpinnerSplash const& spinner,
++    miral::InternalClientLauncher const& launcher,
++    std::function<void()>& shutdown_hook) :
++    CanonicalWindowManagerPolicy(tools),
++    spinner{spinner},
++    decoration_provider{std::make_unique<DecorationProvider>(tools)}
++{
++    launcher.launch("decorations", *decoration_provider);
++    shutdown_hook = [this] { decoration_provider->stop(); };
++
++    for (auto key : {KEY_F1, KEY_F2, KEY_F3, KEY_F4})
++        key_to_workspace[key] = this->tools.create_workspace();
++
++    active_workspace = key_to_workspace[KEY_F1];
++}
++
++FloatingWindowManagerPolicy::~FloatingWindowManagerPolicy() = default;
++
++bool FloatingWindowManagerPolicy::handle_pointer_event(MirPointerEvent const* event)
++{
++    auto const action = mir_pointer_event_action(event);
++    auto const modifiers = mir_pointer_event_modifiers(event) & modifier_mask;
++    Point const cursor{
++        mir_pointer_event_axis_value(event, mir_pointer_axis_x),
++        mir_pointer_event_axis_value(event, mir_pointer_axis_y)};
++
++    bool consumes_event = false;
++    bool is_resize_event = false;
++
++    if (action == mir_pointer_action_button_down)
++    {
++        if (auto const window = tools.window_at(cursor))
++            tools.select_active_window(window);
++    }
++    else if (action == mir_pointer_action_motion &&
++             modifiers == mir_input_event_modifier_alt)
++    {
++        if (mir_pointer_event_button_state(event, mir_pointer_button_primary))
++        {
++            if (auto const target = tools.window_at(old_cursor))
++            {
++                if (tools.select_active_window(target) == target)
++                    tools.drag_active_window(cursor - old_cursor);
++            }
++            consumes_event = true;
++        }
++
++        if (mir_pointer_event_button_state(event, mir_pointer_button_tertiary))
++        {
++            {   // Workaround for lp:1627697
++                auto now = std::chrono::steady_clock::now();
++                if (resizing && now < last_resize+std::chrono::milliseconds(20))
++                    return true;
++
++                last_resize = now;
++            }
++
++            if (!resizing)
++                tools.select_active_window(tools.window_at(old_cursor));
++            is_resize_event = resize(tools.active_window(), cursor, old_cursor);
++            consumes_event = true;
++        }
++    }
++
++    if (!consumes_event && action == mir_pointer_action_motion && !modifiers)
++    {
++        if (mir_pointer_event_button_state(event, mir_pointer_button_primary))
++        {
++            if (auto const possible_titlebar = tools.window_at(old_cursor))
++            {
++                auto const& info = tools.info_for(possible_titlebar);
++                if (decoration_provider->is_titlebar(info))
++                {
++                    if (tools.select_active_window(info.parent()) == info.parent())
++                        tools.drag_active_window(cursor - old_cursor);
++                    consumes_event = true;
++                }
++            }
++        }
++    }
++
++    if (resizing && !is_resize_event)
++        end_resize();
++
++    resizing = is_resize_event;
++    old_cursor = cursor;
++    return consumes_event;
++}
++
++void FloatingWindowManagerPolicy::end_resize()
++{
++    if (!resizing  && !pinching)
++        return;
++
++    if (auto window = tools.active_window())
++    {
++        auto& window_info = tools.info_for(window);
++
++        auto new_size = window.size();
++        auto new_pos  = window.top_left();
++        window_info.constrain_resize(new_pos, new_size);
++
++        WindowSpecification modifications;
++        modifications.top_left() = new_pos;
++        modifications.size() = new_size;
++        tools.modify_window(window_info, modifications);
++    }
++
++    resizing = false;
++    pinching = false;
++}
++
++bool FloatingWindowManagerPolicy::handle_touch_event(MirTouchEvent const* event)
++{
++    auto const count = mir_touch_event_point_count(event);
++
++    long total_x = 0;
++    long total_y = 0;
++
++    for (auto i = 0U; i != count; ++i)
++    {
++        total_x += mir_touch_event_axis_value(event, i, mir_touch_axis_x);
++        total_y += mir_touch_event_axis_value(event, i, mir_touch_axis_y);
++    }
++
++    Point cursor{total_x/count, total_y/count};
++
++    bool is_drag = true;
++    for (auto i = 0U; i != count; ++i)
++    {
++        switch (mir_touch_event_action(event, i))
++        {
++        case mir_touch_action_up:
++            return false;
++
++        case mir_touch_action_down:
++            is_drag = false;
++            continue;
++
++        default:
++            continue;
++        }
++    }
++
++    int touch_pinch_top = std::numeric_limits<int>::max();
++    int touch_pinch_left = std::numeric_limits<int>::max();
++    int touch_pinch_width = 0;
++    int touch_pinch_height = 0;
++
++    for (auto i = 0U; i != count; ++i)
++    {
++        for (auto j = 0U; j != i; ++j)
++        {
++            int dx = mir_touch_event_axis_value(event, i, mir_touch_axis_x) -
++                     mir_touch_event_axis_value(event, j, mir_touch_axis_x);
++
++            int dy = mir_touch_event_axis_value(event, i, mir_touch_axis_y) -
++                     mir_touch_event_axis_value(event, j, mir_touch_axis_y);
++
++            if (touch_pinch_width < dx)
++                touch_pinch_width = dx;
++
++            if (touch_pinch_height < dy)
++                touch_pinch_height = dy;
++        }
++
++        int const x = mir_touch_event_axis_value(event, i, mir_touch_axis_x);
++
++        int const y = mir_touch_event_axis_value(event, i, mir_touch_axis_y);
++
++        if (touch_pinch_top > y)
++            touch_pinch_top = y;
++
++        if (touch_pinch_left > x)
++            touch_pinch_left = x;
++    }
++
++    bool consumes_event = false;
++    if (is_drag)
++    {
++        if (count == 3)
++        {
++            if (auto window = tools.active_window())
++            {
++                auto const old_size = window.size();
++                auto const delta_width = DeltaX{touch_pinch_width - old_touch_pinch_width};
++                auto const delta_height = DeltaY{touch_pinch_height - old_touch_pinch_height};
++
++                auto new_width = std::max(old_size.width + delta_width, Width{5});
++                auto new_height = std::max(old_size.height + delta_height, Height{5});
++                Displacement movement{
++                    DeltaX{touch_pinch_left - old_touch_pinch_left},
++                    DeltaY{touch_pinch_top  - old_touch_pinch_top}};
++
++                auto& window_info = tools.info_for(window);
++                keep_window_within_constraints(window_info, movement, new_width, new_height);
++
++                auto new_pos = window.top_left() + movement;
++                Size new_size{new_width, new_height};
++
++                {   // Workaround for lp:1627697
++                    auto now = std::chrono::steady_clock::now();
++                    if (pinching && now < last_resize+std::chrono::milliseconds(20))
++                        return true;
++
++                    last_resize = now;
++                }
++
++                WindowSpecification modifications;
++                modifications.top_left() = new_pos;
++                modifications.size() = new_size;
++                tools.modify_window(window_info, modifications);
++                pinching = true;
++            }
++            consumes_event = true;
++        }
++    }
++    else
++    {
++        if (auto const& window = tools.window_at(cursor))
++            tools.select_active_window(window);
++    }
++
++    if (!consumes_event && pinching)
++        end_resize();
++
++    old_cursor = cursor;
++    old_touch_pinch_top = touch_pinch_top;
++    old_touch_pinch_left = touch_pinch_left;
++    old_touch_pinch_width = touch_pinch_width;
++    old_touch_pinch_height = touch_pinch_height;
++    return consumes_event;
++}
++
++void FloatingWindowManagerPolicy::advise_new_window(WindowInfo const& window_info)
++{
++    CanonicalWindowManagerPolicy::advise_new_window(window_info);
++
++    auto const parent = window_info.parent();
++
++    if (decoration_provider->is_titlebar(window_info))
++    {
++        decoration_provider->advise_new_titlebar(window_info);
++
++        if (tools.active_window() == parent)
++            decoration_provider->paint_titlebar_for(tools.info_for(parent), 0xFF);
++        else
++            decoration_provider->paint_titlebar_for(tools.info_for(parent), 0x3F);
++    }
++
++    if (!parent)
++        tools.add_tree_to_workspace(window_info.window(), active_workspace);
++    else
++    {
++        if (policy_data_for(tools.info_for(parent)).in_hidden_workspace)
++            apply_workspace_hidden_to(window_info.window());
++    }
++}
++
++void FloatingWindowManagerPolicy::handle_window_ready(WindowInfo& window_info)
++{
++    if (window_info.window().application() != spinner.session() && window_info.needs_titlebar(window_info.type()))
++        decoration_provider->create_titlebar_for(window_info.window());
++
++    CanonicalWindowManagerPolicy::handle_window_ready(window_info);
++    keep_spinner_on_top();
++}
++
++void FloatingWindowManagerPolicy::advise_focus_lost(WindowInfo const& info)
++{
++    CanonicalWindowManagerPolicy::advise_focus_lost(info);
++
++    decoration_provider->paint_titlebar_for(info, 0x3F);
++}
++
++void FloatingWindowManagerPolicy::advise_focus_gained(WindowInfo const& info)
++{
++    CanonicalWindowManagerPolicy::advise_focus_gained(info);
++
++    decoration_provider->paint_titlebar_for(info, 0xFF);
++    keep_spinner_on_top();
++}
++
++void FloatingWindowManagerPolicy::keep_spinner_on_top()
++{
++    // Frig to force the spinner to the top
++    if (auto const spinner_session = spinner.session())
++    {
++        auto const& spinner_info = tools.info_for(spinner_session);
++
++        for (auto const& window : spinner_info.windows())
++            tools.raise_tree(window);
++    }
++}
++
++void FloatingWindowManagerPolicy::advise_state_change(WindowInfo const& window_info, MirWindowState state)
++{
++    CanonicalWindowManagerPolicy::advise_state_change(window_info, state);
++
++    decoration_provider->advise_state_change(window_info, state);
++}
++
++void FloatingWindowManagerPolicy::advise_resize(WindowInfo const& window_info, Size const& new_size)
++{
++    CanonicalWindowManagerPolicy::advise_resize(window_info, new_size);
++
++    decoration_provider->resize_titlebar_for(window_info, new_size);
++}
++
++void FloatingWindowManagerPolicy::advise_delete_window(WindowInfo const& window_info)
++{
++    CanonicalWindowManagerPolicy::advise_delete_window(window_info);
++
++    decoration_provider->destroy_titlebar_for(window_info.window());
++}
++
++bool FloatingWindowManagerPolicy::handle_keyboard_event(MirKeyboardEvent const* event)
++{
++    auto const action = mir_keyboard_event_action(event);
++    auto const scan_code = mir_keyboard_event_scan_code(event);
++    auto const modifiers = mir_keyboard_event_modifiers(event) & modifier_mask;
++
++    // Switch workspaces
++    if (action == mir_keyboard_action_down &&
++        modifiers == (mir_input_event_modifier_alt | mir_input_event_modifier_meta))
++    {
++        auto const found = key_to_workspace.find(scan_code);
++
++        if (found != key_to_workspace.end())
++        {
++            switch_workspace_to(found->second);
++            return true;
++        }
++    }
++
++    // Switch workspace taking the active window
++    if (action == mir_keyboard_action_down &&
++        modifiers == (mir_input_event_modifier_ctrl | mir_input_event_modifier_meta))
++    {
++        auto const found = key_to_workspace.find(scan_code);
++
++        if (found != key_to_workspace.end())
++        {
++            switch_workspace_to(found->second, tools.active_window());
++            return true;
++        }
++    }
++
++    if (action != mir_keyboard_action_repeat)
++        end_resize();
++
++    if (action == mir_keyboard_action_down && scan_code == KEY_F11)
++    {
++        switch (modifiers)
++        {
++        case mir_input_event_modifier_alt:
++            toggle(mir_window_state_maximized);
++            return true;
++
++        case mir_input_event_modifier_shift:
++            toggle(mir_window_state_vertmaximized);
++            return true;
++
++        case mir_input_event_modifier_ctrl:
++            toggle(mir_window_state_horizmaximized);
++            return true;
++
++        case mir_input_event_modifier_meta:
++            toggle(mir_window_state_fullscreen);
++            return true;
++
++        default:
++            break;
++        }
++    }
++    else if (action == mir_keyboard_action_down && scan_code == KEY_F4)
++    {
++        switch (modifiers)
++        {
++        case mir_input_event_modifier_alt|mir_input_event_modifier_shift:
++            if (auto const& window = tools.active_window())
++                kill(window.application(), SIGTERM);
++            return true;
++
++        case mir_input_event_modifier_alt:
++            tools.ask_client_to_close(tools.active_window());;
++            return true;
++
++        default:
++            break;
++        }
++    }
++    else if (action == mir_keyboard_action_down &&
++             modifiers == mir_input_event_modifier_alt &&
++             scan_code == KEY_TAB)
++    {
++        tools.focus_next_application();
++
++        return true;
++    }
++    else if (action == mir_keyboard_action_down &&
++             modifiers == mir_input_event_modifier_alt &&
++             scan_code == KEY_GRAVE)
++    {
++        tools.focus_next_within_application();
++
++        return true;
++    }
++    else if (action == mir_keyboard_action_down &&
++             modifiers == (mir_input_event_modifier_alt | mir_input_event_modifier_shift) &&
++             scan_code == KEY_GRAVE)
++    {
++        tools.focus_prev_within_application();
++
++        return true;
++    }
++    else if (action == mir_keyboard_action_down &&
++             modifiers == (mir_input_event_modifier_ctrl|mir_input_event_modifier_meta))
++    {
++        if (auto active_window = tools.active_window())
++        {
++            auto active_output = tools.active_output();
++            auto& window_info = tools.info_for(active_window);
++            WindowSpecification modifications;
++
++            switch (scan_code)
++            {
++            case KEY_LEFT:
++                modifications.state() = mir_window_state_vertmaximized;
++                tools.place_and_size_for_state(modifications, window_info);
++                modifications.top_left() = active_output.top_left + title_bar_height;
++                break;
++
++            case KEY_RIGHT:
++                modifications.state() = mir_window_state_vertmaximized;
++                tools.place_and_size_for_state(modifications, window_info);
++                modifications.top_left() = active_output.top_right() -
++                    as_displacement({active_window.size().width, 0}) + title_bar_height;
++                break;
++
++            case KEY_UP:
++                modifications.state() = mir_window_state_horizmaximized;
++                tools.place_and_size_for_state(modifications, window_info);
++
++                modifications.top_left() = active_output.top_left + title_bar_height;
++                break;
++
++            case KEY_DOWN:
++                modifications.state() = mir_window_state_horizmaximized;
++                tools.place_and_size_for_state(modifications, window_info);
++
++                modifications.top_left() = active_output.bottom_right() - as_displacement(
++                    modifications.size().is_set() ? modifications.size().value() : active_window.size());
++                break;
++
++            default:
++                return false;
++            }
++
++            tools.modify_window(window_info, modifications);
++            return true;
++        }
++    }
++
++    return false;
++}
++
++void FloatingWindowManagerPolicy::toggle(MirWindowState state)
++{
++    if (auto const window = tools.active_window())
++    {
++        auto& info = tools.info_for(window);
++
++        WindowSpecification modifications;
++
++        modifications.state() = (info.state() == state) ? mir_window_state_restored : state;
++        tools.place_and_size_for_state(modifications, info);
++        tools.modify_window(info, modifications);
++    }
++}
++
++bool FloatingWindowManagerPolicy::resize(Window const& window, Point cursor, Point old_cursor)
++{
++    if (!window)
++        return false;
++
++    auto& window_info = tools.info_for(window);
++
++    auto const top_left = window.top_left();
++    Rectangle const old_pos{top_left, window.size()};
++
++    if (!resizing)
++    {
++        auto anchor = old_pos.bottom_right();
++
++        for (auto const& corner : {
++            old_pos.top_right(),
++            old_pos.bottom_left(),
++            top_left})
++        {
++            if ((old_cursor - anchor).length_squared() <
++                (old_cursor - corner).length_squared())
++            {
++                anchor = corner;
++            }
++        }
++
++        left_resize = anchor.x != top_left.x;
++        top_resize  = anchor.y != top_left.y;
++    }
++
++    int const x_sign = left_resize? -1 : 1;
++    int const y_sign = top_resize?  -1 : 1;
++
++    auto movement = cursor-old_cursor;
++
++    auto new_width = old_pos.size.width + x_sign * movement.dx;
++    auto new_height = old_pos.size.height + y_sign * movement.dy;
++
++    keep_window_within_constraints(window_info, movement, new_width, new_height);
++
++    Size new_size{new_width, new_height};
++    Point new_pos = top_left + left_resize*movement.dx + top_resize*movement.dy;
++
++    WindowSpecification modifications;
++    modifications.top_left() = new_pos;
++    modifications.size() = new_size;
++    tools.modify_window(window, modifications);
++
++    return true;
++}
++
++void FloatingWindowManagerPolicy::keep_window_within_constraints(
++    WindowInfo const& window_info, Displacement& movement, Width& new_width, Height& new_height) const
++{
++    switch (window_info.state())
++    {
++    case mir_window_state_maximized:
++    case mir_window_state_fullscreen:
++        new_width = window_info.window().size().width;
++        new_height = window_info.window().size().height;
++        movement = {0, 0};
++        break;
++
++    case mir_window_state_vertmaximized:
++        new_height = window_info.window().size().height;
++        movement.dy = DeltaY{0};
++        break;
++
++    case mir_window_state_horizmaximized:
++        new_width = window_info.window().size().width;
++        movement.dx - DeltaX{0};
++        break;
++
++    default:;
++    }
++
++    auto const min_width  = std::max(window_info.min_width(), Width{5});
++    auto const min_height = std::max(window_info.min_height(), Height{5});
++
++    if (new_width < min_width)
++    {
++        new_width = min_width;
++        if (movement.dx > DeltaX{0})
++            movement.dx = DeltaX{0};
++    }
++
++    if (new_height < min_height)
++    {
++        new_height = min_height;
++        if (movement.dy > DeltaY{0})
++            movement.dy = DeltaY{0};
++    }
++
++    auto const max_width  = window_info.max_width();
++    auto const max_height = window_info.max_height();
++
++    if (new_width > max_width)
++    {
++        new_width = max_width;
++        if (movement.dx < DeltaX{0})
++            movement.dx = DeltaX{0};
++    }
++
++    if (new_height > max_height)
++    {
++        new_height = max_height;
++        if (movement.dy < DeltaY{0})
++            movement.dy = DeltaY{0};
++    }
++}
++
++WindowSpecification FloatingWindowManagerPolicy::place_new_window(
++    ApplicationInfo const& app_info, WindowSpecification const& request_parameters)
++{
++    auto parameters = CanonicalWindowManagerPolicy::place_new_window(app_info, request_parameters);
++
++    bool const needs_titlebar = WindowInfo::needs_titlebar(parameters.type().value());
++
++    if (parameters.state().value() != mir_window_state_fullscreen && needs_titlebar)
++        parameters.top_left() = Point{parameters.top_left().value().x, parameters.top_left().value().y + title_bar_height};
++
++    if (app_info.application() == decoration_provider->session())
++        decoration_provider->place_new_decoration(parameters);
++
++    parameters.userdata() = std::make_shared<PolicyData>();
++    return parameters;
++}
++
++void FloatingWindowManagerPolicy::advise_adding_to_workspace(
++    std::shared_ptr<Workspace> const& workspace, std::vector<Window> const& windows)
++{
++    if (windows.empty())
++        return;
++
++    for (auto const& window : windows)
++    {
++        if (workspace == active_workspace)
++        {
++            apply_workspace_visible_to(window);
++        }
++        else
++        {
++            apply_workspace_hidden_to(window);
++        }
++    }
++}
++
++auto FloatingWindowManagerPolicy::confirm_placement_on_display(
++    miral::WindowInfo const& /*window_info*/, MirWindowState new_state, Rectangle const& new_placement) -> Rectangle
++{
++    switch (new_state)
++    {
++    default:
++        return new_placement;
++
++    case mir_window_state_maximized:
++    case mir_window_state_vertmaximized:
++        auto result = new_placement;
++
++        result.top_left.y = result.top_left.y  + title_bar_height;
++        result.size.height = result.size.height - title_bar_height;
++        return result;
++    }
++}
++
++void FloatingWindowManagerPolicy::switch_workspace_to(
++    std::shared_ptr<Workspace> const& workspace,
++    Window const& window)
++{
++    if (workspace == active_workspace)
++        return;
++
++    auto const old_active = active_workspace;
++    active_workspace = workspace;
++
++    auto const old_active_window = tools.active_window();
++
++    if (!old_active_window)
++    {
++        // If there's no active window, the first shown grabs focus: get the right one
++        if (auto const ww = workspace_to_active[workspace])
++        {
++            tools.for_each_workspace_containing(ww, [&](std::shared_ptr<miral::Workspace> const& ws)
++                {
++                    if (ws == workspace)
++                    {
++                        apply_workspace_visible_to(ww);
++                    }
++                });
++        }
++    }
++
++    tools.remove_tree_from_workspace(window, old_active);
++    tools.add_tree_to_workspace(window, active_workspace);
++
++    tools.for_each_window_in_workspace(active_workspace, [&](Window const& window)
++        {
++            if (decoration_provider->is_decoration(window))
++                return; // decorations are taken care of automatically
++
++            apply_workspace_visible_to(window);
++        });
++
++    bool hide_old_active = false;
++    tools.for_each_window_in_workspace(old_active, [&](Window const& window)
++        {
++            if (decoration_provider->is_decoration(window))
++                return; // decorations are taken care of automatically
++
++            if (window == old_active_window)
++            {
++                // If we hide the active window focus will shift: do that last
++                hide_old_active = true;
++                return;
++            }
++
++            apply_workspace_hidden_to(window);
++        });
++
++    if (hide_old_active)
++    {
++        apply_workspace_hidden_to(old_active_window);
++
++        // Remember the old active_window when we switch away
++        workspace_to_active[old_active] = old_active_window;
++    }
++}
++
++void FloatingWindowManagerPolicy::apply_workspace_hidden_to(Window const& window)
++{
++    auto const& window_info = tools.info_for(window);
++    auto& pdata = policy_data_for(window_info);
++    if (!pdata.in_hidden_workspace)
++    {
++        pdata.in_hidden_workspace = true;
++        pdata.old_state = window_info.state();
++
++        WindowSpecification modifications;
++        modifications.state() = mir_window_state_hidden;
++        tools.place_and_size_for_state(modifications, window_info);
++        tools.modify_window(window_info.window(), modifications);
++    }
++}
++
++void FloatingWindowManagerPolicy::apply_workspace_visible_to(Window const& window)
++{
++    auto const& window_info = tools.info_for(window);
++    auto& pdata = policy_data_for(window_info);
++    if (pdata.in_hidden_workspace)
++    {
++        pdata.in_hidden_workspace = false;
++        WindowSpecification modifications;
++        modifications.state() = pdata.old_state;
++        tools.place_and_size_for_state(modifications, window_info);
++        tools.modify_window(window_info.window(), modifications);
++    }
++}
++
++void FloatingWindowManagerPolicy::handle_modify_window(WindowInfo& window_info, WindowSpecification const& modifications)
++{
++    auto mods = modifications;
++
++    auto& pdata = policy_data_for(window_info);
++
++    if (pdata.in_hidden_workspace && mods.state().is_set())
++        pdata.old_state = mods.state().consume();
++
++    CanonicalWindowManagerPolicy::handle_modify_window(window_info, mods);
++}
++
 === added file 'examples/miral-shell/floating_window_manager.h'
 --- examples/miral-shell/floating_window_manager.h	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/floating_window_manager.h	2017-08-23 11:59:25 +0000
@@ -0,0 +1,146 @@
++/*
++ * Copyright © 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 or 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty ofb
++ * 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 MIRAL_SHELL_FLOATING_WINDOW_MANAGER_H
++#define MIRAL_SHELL_FLOATING_WINDOW_MANAGER_H
++
++#include <miral/canonical_window_manager.h>
++#include <miral/window_management_policy_addendum3.h>
++#include <miral/workspace_policy.h>
++
++
++#include "spinner/splash.h"
++
++#include <chrono>
++#include <map>
++
++namespace miral { class InternalClientLauncher; }
++
++using namespace mir::geometry;
++
++class DecorationProvider;
++
++class FloatingWindowManagerPolicy : public miral::CanonicalWindowManagerPolicy,
++    public miral::WorkspacePolicy, public miral::WindowManagementPolicyAddendum3
++{
++public:
++    FloatingWindowManagerPolicy(
++        miral::WindowManagerTools const& tools,
++        SpinnerSplash const& spinner,
++        miral::InternalClientLauncher const& launcher,
++        std::function<void()>& shutdown_hook);
++    ~FloatingWindowManagerPolicy();
++
++    virtual miral::WindowSpecification place_new_window(
++        miral::ApplicationInfo const& app_info, miral::WindowSpecification const& request_parameters) override;
++
++    /** @name example event handling:
++     *  o Switch apps: Alt+Tab, tap or click on the corresponding window
++     *  o Switch window: Alt+`, tap or click on the corresponding window
++     *  o Move window: Alt-leftmousebutton drag (three finger drag)
++     *  o Resize window: Alt-middle_button drag (three finger pinch)
++     *  o Maximize/restore current window (to display size): Alt-F11
++     *  o Maximize/restore current window (to display height): Shift-F11
++     *  o Maximize/restore current window (to display width): Ctrl-F11
++     *  o Switch workspace . . . . . . . . . . : Meta-Alt-[F1|F2|F3|F4]
++     *  o Switch workspace taking active window: Meta-Ctrl-[F1|F2|F3|F4]
++     *  @{ */
++    bool handle_pointer_event(MirPointerEvent const* event) override;
++    bool handle_touch_event(MirTouchEvent const* event) override;
++    bool handle_keyboard_event(MirKeyboardEvent const* event) override;
++    /** @} */
++
++    /** @name track events that affect titlebar
++     *  @{ */
++    void advise_new_window(miral::WindowInfo const& window_info) override;
++    void handle_window_ready(miral::WindowInfo& window_info) override;
++    void advise_focus_lost(miral::WindowInfo const& info) override;
++    void advise_focus_gained(miral::WindowInfo const& info) override;
++    void advise_state_change(miral::WindowInfo const& window_info, MirWindowState state) override;
++    void advise_resize(miral::WindowInfo const& window_info, Size const& new_size) override;
++    void advise_delete_window(miral::WindowInfo const& window_info) override;
++
++    void handle_modify_window(miral::WindowInfo& window_info, miral::WindowSpecification const& modifications) override;
++    /** @} */
++
++protected:
++    static const int modifier_mask =
++        mir_input_event_modifier_alt |
++        mir_input_event_modifier_shift |
++        mir_input_event_modifier_sym |
++        mir_input_event_modifier_ctrl |
++        mir_input_event_modifier_meta;
++
++private:
++    void toggle(MirWindowState state);
++
++    bool resize(miral::Window const& window, Point cursor, Point old_cursor);
++
++    Point old_cursor{};
++
++    bool resizing = false;
++    bool left_resize = false;
++    bool top_resize  = false;
++
++    int old_touch_pinch_top = 0;
++    int old_touch_pinch_left = 0;
++    int old_touch_pinch_width = 0;
++    int old_touch_pinch_height = 0;
++    bool pinching = false;
++
++    SpinnerSplash const spinner;
++
++    std::unique_ptr<DecorationProvider> const decoration_provider;
++
++    void end_resize();
++
++    void keep_window_within_constraints(
++        miral::WindowInfo const& window_info,
++        Displacement& movement,
++        Width& new_width,
++        Height& new_height) const;
++
++    // Workaround for lp:1627697
++    std::chrono::steady_clock::time_point last_resize;
++
++    void advise_adding_to_workspace(
++        std::shared_ptr<miral::Workspace> const& workspace,
++        std::vector<miral::Window> const& windows) override;
++
++    auto confirm_placement_on_display(
++        miral::WindowInfo const& window_info,
++        MirWindowState new_state,
++        Rectangle const& new_placement) -> Rectangle override;
++
++    // Switch workspace, taking window (if not null)
++    void switch_workspace_to(
++        std::shared_ptr<miral::Workspace> const& workspace,
++        miral::Window const& window = miral::Window{});
++
++    std::shared_ptr<miral::Workspace> active_workspace;
++    std::map<int, std::shared_ptr<miral::Workspace>> key_to_workspace;
++    std::map<std::shared_ptr<miral::Workspace>, miral::Window> workspace_to_active;
++
++    void apply_workspace_visible_to(miral::Window const& window);
++
++    void apply_workspace_hidden_to(miral::Window const& window);
++
++    void keep_spinner_on_top();
++};
++
++#endif //MIRAL_SHELL_FLOATING_WINDOW_MANAGER_H
 === added file 'examples/miral-shell/miral-app.sh'
 --- examples/miral-shell/miral-app.sh	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/miral-app.sh	2017-08-23 11:59:25 +0000
@@ -0,0 +1,51 @@
++#! /bin/bash
++
++miral_server=miral-shell
++launcher='gnome-terminal --app-id com.canonical.miral.Terminal'
++hostsocket=
++bindir=$(dirname $0)
++
++if [ -n "${MIR_SOCKET}" ]
++then
++  if [ ! -e "${MIR_SOCKET}" ]
++  then
++    echo "Error: Host endpoint '${MIR_SOCKET}' does not exists"; exit 1
++  fi
++  hostsocket='--host-socket ${MIR_SOCKET}'
++fi
++
++socket=${XDG_RUNTIME_DIR}/miral_socket
++
++while [ $# -gt 0 ]
++do
++  if [ "$1" == "--help" -o "$1" == "-h" ]
++  then
++    echo "$(basename $0) - Handy launch script for a hosted miral \"desktop session\""
++    echo "Usage: $(basename $0) [options] [shell options]"
++    echo "Options are:"
++    echo "    -kiosk               use miral-kiosk instead of ${miral_server}"
++    echo "    -launcher <launcher> use <launcher> instead of '${launcher}'"
++    echo "    -socket   <socket>   set the mir socket [${socket}]"
++    echo "    -bindir   <bindir>   path to the miral executable [${bindir}]"
++    exit 0
++    elif [ "$1" == "-kiosk" ];              then miral_server=miral-kiosk
++    elif [ "$1" == "-launcher" ];           then shift; launcher=$1
++    elif [ "$1" == "-socket" ];             then shift; socket=$1
++    elif [ "$1" == "-bindir" ];             then shift; bindir=$1
++    elif [ "${1:0:2}" == "--" ];            then break
++    fi
++    shift
++done
++
++if [ "${bindir}" != "" ]; then bindir="${bindir}/"; fi
++
++if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
++
++sh -c "${bindir}${miral_server} $* ${hostsocket} --file ${socket} --desktop_file_hint=miral-shell.desktop"&
++
++while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
++
++unset QT_QPA_PLATFORMTHEME
++MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir dbus-run-session -- ${launcher}
++killall ${bindir}${miral_server}
++
 === added file 'examples/miral-shell/miral-desktop.sh'
 --- examples/miral-shell/miral-desktop.sh	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/miral-desktop.sh	2017-08-23 11:59:25 +0000
@@ -0,0 +1,45 @@
++#! /bin/bash
++
++socket=${XDG_RUNTIME_DIR}/miral_socket
++miral_server=miral-shell
++launcher='gnome-terminal --app-id com.canonical.miral.Terminal'
++bindir=$(dirname $0)
++vt=4
++
++while [ $# -gt 0 ]
++do
++  if [ "$1" == "--help" -o "$1" == "-h" ]
++  then
++    echo "$(basename $0) - Handy launch script for a miral \"desktop session\""
++    echo "Usage: $(basename $0) [options] [shell options]"
++    echo "Options are:"
++    echo "    -kiosk               use miral-kiosk instead of ${miral_server}"
++    echo "    -launcher <launcher> use <launcher> instead of '${launcher}'"
++    echo "    -vt       <termid>   set the virtual terminal [${vt}]"
++    echo "    -socket   <socket>   set the mir socket [${socket}]"
++    echo "    -bindir   <bindir>   path to the miral executable [${bindir}]"
++    exit 0
++    elif [ "$1" == "-kiosk" ];              then miral_server=miral-kiosk
++    elif [ "$1" == "-launcher" ];           then shift; launcher=$1
++    elif [ "$1" == "-vt" ];                 then shift; vt=$1
++    elif [ "$1" == "-socket" ];             then shift; socket=$1
++    elif [ "$1" == "-bindir" ];             then shift; bindir=$1/
++    elif [ "${1:0:2}" == "--" ];            then break
++    fi
++    shift
++done
++
++if [ "${bindir}" != "" ]; then bindir="${bindir}/"; fi
++
++if [ -e "${socket}" ]; then echo "Error: '${socket}' already exists"; exit 1 ;fi
++
++sudo ls >> /dev/null
++oldvt=$(sudo fgconsole)
++sudo sh -c "LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ${bindir}${miral_server} --vt ${vt} --arw-file --file ${socket} $*; chvt ${oldvt}"&
++
++while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
++
++unset QT_QPA_PLATFORMTHEME
++MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir dbus-run-session -- ${launcher}
++sudo killall ${bindir}${miral_server}
++
 === added file 'examples/miral-shell/miral-run.sh'
 --- examples/miral-shell/miral-run.sh	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/miral-run.sh	2017-08-23 11:59:25 +0000
@@ -0,0 +1,17 @@
++#!/bin/sh
++
++if   [ -e "${XDG_RUNTIME_DIR}/miral_socket" ];
++then
++  socket=${XDG_RUNTIME_DIR}/miral_socket
++elif [ -e "${XDG_RUNTIME_DIR}/mir_socket" ];
++then
++  socket=${XDG_RUNTIME_DIR}/mir_socket
++else
++  echo "Error: Cannot detect Mir endpoint"; exit 1
++fi
++
++if [ "$1" = "gnome-terminal" ]
++then extras='--app-id com.canonical.miral.Terminal'
++fi
++unset QT_QPA_PLATFORMTHEME
++MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir "$@" ${extras}&
 === added file 'examples/miral-shell/miral-screencast.sh'
 --- examples/miral-shell/miral-screencast.sh	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/miral-screencast.sh	2017-08-23 11:59:25 +0000
@@ -0,0 +1,48 @@
++#!/bin/bash
++width=1920
++height=1080
++output=screencast.mp4
++socket=${XDG_RUNTIME_DIR}/miral_socket
++if [ -v MIR_SERVER ]; then socket=${MIR_SERVER}; fi
++
++while [ $# -gt 0 ]
++do
++  if [ "$1" == "--help" -o "$1" == "-h" ]
++  then
++    echo "$(basename $0) - screencast capture script for use with Mir servers"
++    echo "Usage: $0 [options]"
++    echo "Options are:"
++    echo "    --width   set the capture width   [${width}]"
++    echo "    --height  set the capture height  [${height}]"
++    echo "    --output  set the output filename [${output}]"
++    echo "    --socket  set the mir socket      [${socket}]"
++    echo "    --tmpfile specify the temporary work file"
++    exit 0
++  elif [ "$1" == "--socket" ]; then shift; socket=$1
++  elif [ "$1" == "--output" ]; then shift; output=$1
++  elif [ "$1" == "--width"  ]; then shift; width=$1
++  elif [ "$1" == "--height" ]; then shift; height=$1
++  elif [ "$1" == "--tmpfile" ]; then shift; tempfile=$1
++  fi
++  shift
++done
++
++echo width = ${width}
++echo height = ${height}
++echo output = ${output}
++echo socket = ${socket}
++
++if ! which mirscreencast >> /dev/null ; then echo "Need mirscreencast - run \"sudo apt install mir-utils\""; exit 1 ;fi
++if ! which mencoder >> /dev/null ;      then echo "Need mencoder - run \"sudo apt install mencoder\""; exit 1 ;fi
++
++if [ -e ${output} ]; then echo "Output exists, moving to ${output}~"; mv ${output} ${output}~ ;fi
++while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
++
++if [ ! -v tempfile ]; then tempfile=$(mktemp); fi
++mirscreencast --size ${width} ${height} -m ${socket} -f ${tempfile}& mirscreencast_pid=$!
++trap 'kill ${mirscreencast_pid}; rm -f -- "${tempfile}"; exit 0' INT TERM HUP EXIT
++
++sleep 1; # don't lose the next message in the spew from mirscreencast
++read -rsp $'\n\nPress enter when recording complete...'
++
++mencoder -demuxer rawvideo -rawvideo fps=60:w=${width}:h=${height}:format=bgra -ovc x264 -o ${output} ${tempfile}
 === added file 'examples/miral-shell/miral-xrun.sh'
 --- examples/miral-shell/miral-xrun.sh	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/miral-xrun.sh	2017-08-23 11:59:25 +0000
@@ -0,0 +1,45 @@
++#!/bin/bash
++port=0
++
++while [ -e "/tmp/.X11-unix/X${port}" ]; do
++    let port+=1
++done
++
++unset QT_QPA_PLATFORMTHEME
++unset GDK_BACKEND
++unset QT_QPA_PLATFORM
++unset SDL_VIDEODRIVER
++
++if   [ -e "${XDG_RUNTIME_DIR}/miral_socket" ];
++then
++  socket=${XDG_RUNTIME_DIR}/miral_socket
++elif [ -e "${XDG_RUNTIME_DIR}/mir_socket" ];
++then
++  socket=${XDG_RUNTIME_DIR}/mir_socket
++else
++  echo "Error: Cannot detect Mir endpoint"; exit 1
++fi
++
++while [ $# -gt 0 ]
++do
++  if [ "$1" == "--help" -o "$1" == "-h" ]
++  then
++    echo "$(basename $0) - Handy launch script for providing an Xmir X11 server"
++    echo "Usage: $(basename $0) [options] command"
++    echo "Options are:"
++    echo "    -force  set toolkit environment variables to force X11 use"
++    exit 0
++  elif [ "$1" == "-force" ];
++  then
++    export XDG_SESSION_TYPE=x11
++    export GDK_BACKEND=x11
++    export QT_QPA_PLATFORM=xcb
++    export SDL_VIDEODRIVER=x11
++  else break
++  fi
++  shift
++done
++
++MIR_SOCKET=${socket} Xmir -rootless :${port} & pid=$!
++DISPLAY=:${port} "$@"
++kill ${pid}
 === added file 'examples/miral-shell/shell_main.cpp'
 --- examples/miral-shell/shell_main.cpp	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/shell_main.cpp	2017-08-23 11:59:25 +0000
@@ -0,0 +1,98 @@
++/*
++ * Copyright © 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * under the terms of the GNU General Public License version 2 or 3 as 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 "tiling_window_manager.h"
++#include "floating_window_manager.h"
++#include "titlebar_config.h"
++#include "spinner/splash.h"
++
++#include <miral/display_configuration_option.h>
++#include <miral/runner.h>
++#include <miral/window_management_options.h>
++#include <miral/append_event_filter.h>
++#include <miral/debug_extension.h>
++#include <miral/internal_client.h>
++#include <miral/command_line_option.h>
++#include <miral/cursor_theme.h>
++#include <miral/keymap.h>
++
++#include <linux/input.h>
++
++int main(int argc, char const* argv[])
++{
++    using namespace miral;
++
++    std::function<void()> shutdown_hook{[]{}};
++
++    SpinnerSplash spinner;
++    InternalClientLauncher launcher;
++    ActiveOutputsMonitor outputs_monitor;
++    WindowManagerOptions window_managers
++        {
++            add_window_manager_policy<FloatingWindowManagerPolicy>("floating", spinner, launcher, shutdown_hook),
++            add_window_manager_policy<TilingWindowManagerPolicy>("tiling", spinner, launcher, outputs_monitor),
++        };
++
++    MirRunner runner{argc, argv};
++
++    runner.add_stop_callback([&] { shutdown_hook(); });
++
++    auto const quit_on_ctrl_alt_bksp = [&](MirEvent const* event)
++        {
++            if (mir_event_get_type(event) != mir_event_type_input)
++                return false;
++
++            MirInputEvent const* input_event = mir_event_get_input_event(event);
++            if (mir_input_event_get_type(input_event) != mir_input_event_type_key)
++                return false;
++
++            MirKeyboardEvent const* kev = mir_input_event_get_keyboard_event(input_event);
++            if (mir_keyboard_event_action(kev) != mir_keyboard_action_down)
++                return false;
++
++            MirInputEventModifiers mods = mir_keyboard_event_modifiers(kev);
++            if (!(mods & mir_input_event_modifier_alt) || !(mods & mir_input_event_modifier_ctrl))
++                return false;
++
++            if (mir_keyboard_event_scan_code(kev) != KEY_BACKSPACE)
++                return false;
++
++            runner.stop();
++            return true;
++        };
++
++    Keymap config_keymap;
++    DebugExtension debug_extensions;
++
++    return runner.run_with(
++        {
++            CommandLineOption{[&](std::string const& ) { },
++                              "desktop_file_hint", "Ignored for Unity8 compatibility", "miral-shell.desktop"},
++            CursorTheme{"DMZ-White"},
++            window_managers,
++            display_configuration_options,
++            launcher,
++            outputs_monitor,
++            config_keymap,
++            debug_extensions,
++            AppendEventFilter{quit_on_ctrl_alt_bksp},
++            StartupInternalClient{"Intro", spinner},
++            pre_init(CommandLineOption{[&](std::string const& typeface) { ::titlebar::font_file(typeface); },
++                              "shell-titlebar-font", "font file to use for titlebars", ::titlebar::font_file()})
++        });
++}
 === added directory 'examples/miral-shell/spinner'
 === added file 'examples/miral-shell/spinner/CMakeLists.txt'
 --- examples/miral-shell/spinner/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/spinner/CMakeLists.txt	2017-08-23 11:59:25 +0000
@@ -0,0 +1,67 @@
++# -*- Mode: CMake; indent-tabs-mode: nil; tab-width: 2 -*-
++#
++# Copyright © 2014 Canonical Ltd.
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License version 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/>.
++
++pkg_check_modules(GLIB REQUIRED glib-2.0)
++find_package(GLESv2 REQUIRED)
++find_package(PIL REQUIRED)
++
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overlength-strings")
++
++
++function(png2header png header varname)
++  add_custom_command(
++    OUTPUT ${header}
++    COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/png2header.py ${png} ${varname} > ${header}
++    DEPENDS ${png} ${CMAKE_CURRENT_SOURCE_DIR}/png2header.py
++  )
++endfunction()
++
++png2header(
++  ${CMAKE_CURRENT_SOURCE_DIR}/spinner-glow.png
++  ${CMAKE_CURRENT_BINARY_DIR}/spinner_glow.h
++  spinner_glow
++)
++
++png2header(
++  ${CMAKE_CURRENT_SOURCE_DIR}/spinner-logo.png
++  ${CMAKE_CURRENT_BINARY_DIR}/spinner_logo.h
++  spinner_logo
++)
++
++include_directories(
++  ${GLIB_INCLUDE_DIRS}
++  ${GLESv2_INCLUDE_DIRS}
++  ${CMAKE_CURRENT_BINARY_DIR}
++)
++
++add_library(miral-spinner STATIC
++  eglapp.cpp
++  eglapp.h
++  eglspinner.cpp
++  miregl.h
++  miregl.cpp
++  splash.h
++  ${CMAKE_CURRENT_BINARY_DIR}/spinner_logo.h
++  ${CMAKE_CURRENT_BINARY_DIR}/spinner_glow.h
++)
++
++target_link_libraries(miral-spinner
++  mirclientcpp
++  EGL
++  ${GLIB_LDFLAGS}
++  ${GLESv2_LIBRARIES}
++  ${MIRCLIENT_LDFLAGS}
++)
 === added file 'examples/miral-shell/spinner/eglapp.cpp'
 --- examples/miral-shell/spinner/eglapp.cpp	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/spinner/eglapp.cpp	2017-08-23 11:59:25 +0000
@@ -0,0 +1,83 @@
++/*
++ * Copyright © 2013, 2015 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * under the terms of the GNU General Public License version 2 or 3 as 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/>.
++ */
++
++#include "eglapp.h"
++
++#include <mir/client/display_config.h>
++
++#include "miregl.h"
++
++
++float mir_eglapp_background_opacity = 1.0f;
++
++
++namespace
++{
++MirPixelFormat select_pixel_format(MirConnection* connection)
++{
++    unsigned int format[mir_pixel_formats];
++    unsigned int nformats;
++
++    mir_connection_get_available_surface_formats(
++        connection,
++        (MirPixelFormat*) format,
++        mir_pixel_formats,
++        &nformats);
++
++    auto const pixel_format = (MirPixelFormat) format[0];
++
++    printf("Server supports %d of %d surface pixel formats. Using format: %d\n",
++           nformats, mir_pixel_formats, pixel_format);
++
++    return pixel_format;
++}
++}
++
++std::vector<std::shared_ptr<MirEglSurface>> mir_eglapp_init(MirConnection* const connection)
++{
++    char const * const name = "eglappsurface";
++
++    if (!mir_connection_is_valid(connection))
++        throw std::runtime_error("Can't get connection");
++
++    auto const pixel_format = select_pixel_format(connection);
++
++    auto const mir_egl_app = make_mir_eglapp(connection, pixel_format);
++
++    std::vector<std::shared_ptr<MirEglSurface>> result;
++
++    mir::client::DisplayConfig{connection}.for_each_output([&](MirOutput const* output)
++        {
++            if (mir_output_get_connection_state(output) == mir_output_connection_state_connected &&
++                mir_output_is_enabled(output))
++            {
++                auto const mode = mir_output_get_current_mode(output);
++                auto const output_id = mir_output_get_id(output);
++
++                printf("Active output [%u] at (%d, %d) is %dx%d\n",
++                       output_id,
++                       mir_output_get_position_x(output), mir_output_get_position_y(output),
++                       mir_output_mode_get_width(mode), mir_output_mode_get_height(mode));
++
++                result.push_back(std::make_shared<MirEglSurface>(mir_egl_app, name, output));
++            }
++        });
++
++    if (result.empty())
++        throw std::runtime_error("No active outputs found.");
++
++    return result;
++}
 === added file 'examples/miral-shell/spinner/eglapp.h'
 --- examples/miral-shell/spinner/eglapp.h	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/spinner/eglapp.h	2017-08-23 11:59:25 +0000
@@ -0,0 +1,33 @@
++/*
++ * Copyright © 2013 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * under the terms of the GNU General Public License version 2 or 3 as 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/>.
++ *
++ * Author: Daniel van Vugt <daniel.van.vugt@canonical.com>
++ */
++
++#ifndef __EGLAPP_H__
++#define __EGLAPP_H__
++
++#include <mir_toolkit/client_types.h>
++
++#include <memory>
++#include <vector>
++
++class MirEglSurface;
++
++extern float mir_eglapp_background_opacity;
++
++std::vector<std::shared_ptr<MirEglSurface>> mir_eglapp_init(MirConnection* const connection);
++
++#endif
 === added file 'examples/miral-shell/spinner/eglspinner.cpp'
 --- examples/miral-shell/spinner/eglspinner.cpp	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/spinner/eglspinner.cpp	2017-08-23 11:59:25 +0000
@@ -0,0 +1,372 @@
++/*
++ * Copyright © 2013-2015 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * under the terms of the GNU General Public License version 2 or 3 as 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/>.
++ *
++ * Authors: Daniel van Vugt <daniel.van.vugt@canonical.com>
++ *          Mirco Müller <mirco.mueller@canonical.com>
++ *          Alan Griffiths <alan@octopull.co.uk>
++ *          Kevin DuBois <kevin.dubois@canonical.com>
++ */
++
++#include "splash.h"
++
++#include <chrono>
++
++#include "eglapp.h"
++#include "miregl.h"
++#include <assert.h>
++#include <glib.h>
++#include <string.h>
++#include <GLES2/gl2.h>
++#include <sys/stat.h>
++#include <signal.h>
++#include <atomic>
++#include <mutex>
++
++#include <mir_toolkit/mir_client_library.h>
++
++#include "spinner_glow.h"
++#include "spinner_logo.h"
++
++static GLuint load_shader(const char *src, GLenum type)
++{
++    GLuint shader = glCreateShader(type);
++    if (shader)
++    {
++        GLint compiled;
++        glShaderSource(shader, 1, &src, NULL);
++        glCompileShader(shader);
++        glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
++        if (!compiled)
++        {
++            GLchar log[1024];
++            glGetShaderInfoLog(shader, sizeof log - 1, NULL, log);
++            log[sizeof log - 1] = '\0';
++            printf("load_shader compile failed: %s\n", log);
++            glDeleteShader(shader);
++            shader = 0;
++        }
++    }
++    return shader;
++}
++
++// Colours from http://design.ubuntu.com/brand/colour-palette
++//#define MID_AUBERGINE   0.368627451f, 0.152941176f, 0.31372549f
++//#define ORANGE          0.866666667f, 0.282352941f, 0.141414141f
++//#define WARM_GREY       0.682352941f, 0.654901961f, 0.623529412f
++//#define COOL_GREY       0.2f,         0.2f,         0.2f
++#define LIGHT_AUBERGINE 0.466666667f, 0.297297297f, 0.435294118f
++//#define DARK_AUBERGINE  0.17254902f,  0.0f,         0.117647059f
++//#define BLACK           0.0f,         0.0f,         0.0f
++//#define WHITE           1.0f,         1.0f,         1.0f
++
++template <typename Image>
++void uploadTexture (GLuint id, Image& image)
++{
++    glBindTexture(GL_TEXTURE_2D, id);
++
++    glTexImage2D(GL_TEXTURE_2D,
++                 0,
++                 GL_RGBA,
++                 image.width,
++                 image.height,
++                 0,
++                 GL_RGBA,
++                 GL_UNSIGNED_BYTE,
++                 image.pixel_data);
++    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
++    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
++    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
++    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
++    glBindTexture(GL_TEXTURE_2D, 0);
++}
++
++GLuint createShaderProgram(const char* vertexShaderSrc, const char* fragmentShaderSrc)
++{
++    if (!vertexShaderSrc || !fragmentShaderSrc)
++        return 0;
++
++    GLuint vShaderId = 0;
++    vShaderId = load_shader(vertexShaderSrc, GL_VERTEX_SHADER);
++    assert(vShaderId);
++
++    GLuint fShaderId = 0;
++    fShaderId = load_shader(fragmentShaderSrc, GL_FRAGMENT_SHADER);
++    assert(fShaderId);
++
++    GLuint progId = 0;
++    progId = glCreateProgram();
++    assert(progId);
++    glAttachShader(progId, vShaderId);
++    glAttachShader(progId, fShaderId);
++    glLinkProgram(progId);
++
++    GLint linked = 0;
++    glGetProgramiv(progId, GL_LINK_STATUS, &linked);
++    if (!linked)
++    {
++        GLchar log[1024];
++        glGetProgramInfoLog(progId, sizeof log - 1, NULL, log);
++        log[sizeof log - 1] = '\0';
++        printf("Link failed: %s\n", log);
++        return 0;
++    }
++
++    return progId;
++}
++
++typedef struct _AnimationValues
++{
++    double lastTimeStamp;
++    GLfloat angle;
++    GLfloat fadeBackground;
++    GLfloat fadeLogo;
++    GLfloat fadeGlow;
++} AnimationValues;
++
++bool updateAnimation (GTimer* timer, AnimationValues* anim)
++{
++    if (!timer || !anim)
++        return false;
++
++    //1.) 0.0   - 0.6:   logo fades in fully
++    //2.) 0.0   - 6.0:   logo does one full spin 360°
++    //3.) 6.0   - 6.833: glow fades in fully, black-background fades out to 50%
++    //4.) 6.833 - 7.666: glow fades out fully, black-background fades out to 0%
++    //5.) 7.666 - 8.266: logo fades out fully
++    //8.266..:       now spinner can be closed as all its elements are faded out
++
++    // Hacked to run three times as fast
++    double elapsed = 3*g_timer_elapsed (timer, NULL);
++    double dt = elapsed - anim->lastTimeStamp;
++    anim->lastTimeStamp = elapsed;
++
++    // step 1.)
++    if (elapsed < 0.6f)
++        anim->fadeLogo += 1.6f * dt;
++
++    // step 2.)
++    anim->angle -= (0.017453292519943f * 360.0f / 18.0f) * dt;
++
++    // step 3.) glow
++    if (elapsed > 6.0f && elapsed < 6.833f)
++        anim->fadeGlow += 1.2f * dt;
++
++    // step 3.) background
++    if (elapsed > 0.6f && elapsed < 6.833f)
++    { if (anim->fadeBackground > 0) anim->fadeBackground -= 0.15f * dt; else anim->fadeBackground = 0; }
++
++    // step 4.) glow
++    if (elapsed > 7.0f)
++        anim->fadeGlow -= 0.6f * dt;
++
++    // step 5.)
++    if (elapsed > 6.833f)
++        anim->fadeLogo -= 1.6f * dt;
++
++    return elapsed < 8.266f;
++}
++
++namespace
++{
++const char vShaderSrcSpinner[] =
++    "attribute vec4 vPosition;                       \n"
++    "attribute vec2 aTexCoords;                      \n"
++    "uniform float theta;                            \n"
++    "varying vec2 vTexCoords;                        \n"
++    "void main()                                     \n"
++    "{                                               \n"
++    "    float c = cos(theta);                       \n"
++    "    float s = sin(theta);                       \n"
++    "    mat2 m;                                     \n"
++    "    m[0] = vec2(c, s);                          \n"
++    "    m[1] = vec2(-s, c);                         \n"
++    "    vTexCoords = m * aTexCoords + vec2 (0.5, 0.5); \n"
++    "    gl_Position = vec4(vPosition.xy, -1.0, 1.0); \n"
++    "}                                               \n";
++
++const char fShaderSrcGlow[] =
++    "precision mediump float;                             \n"
++    "varying vec2 vTexCoords;                             \n"
++    "uniform sampler2D uSampler;                          \n"
++    "uniform float uFadeGlow;                             \n"
++    "void main()                                          \n"
++    "{                                                    \n"
++    "    vec4 col = texture2D(uSampler, vTexCoords);      \n"
++    "    col = col * uFadeGlow;                           \n"
++    "    gl_FragColor = col;                              \n"
++    "}                                                    \n";
++
++const char fShaderSrcLogo[] =
++    "precision mediump float;                             \n"
++    "varying vec2 vTexCoords;                             \n"
++    "uniform sampler2D uSampler;                          \n"
++    "uniform float uFadeLogo;                             \n"
++    "void main()                                          \n"
++    "{                                                    \n"
++    "    vec4 col = texture2D(uSampler, vTexCoords);      \n"
++    "    col = col * uFadeLogo;                           \n"
++    "    gl_FragColor = col;                              \n"
++    "}                                                    \n";
++
++std::atomic<bool> dying{false};
++void lifecycle_event_callback(MirConnection* /*connection*/, MirLifecycleState state, void* context)
++{
++    if (state == mir_lifecycle_connection_lost)
++        static_cast<decltype(dying)*>(context)->store(true);
++}
++}
++
++struct SpinnerSplash::Self
++{
++    std::mutex mutex;
++    std::weak_ptr<mir::scene::Session> session;
++};
++
++SpinnerSplash::SpinnerSplash() : self{std::make_shared<Self>()} {}
++
++SpinnerSplash::~SpinnerSplash() = default;
++
++void SpinnerSplash::operator()(std::weak_ptr<mir::scene::Session> const& session)
++{
++    std::lock_guard<decltype(self->mutex)> lock{self->mutex};
++    self->session = session;
++}
++
++auto SpinnerSplash::session() const
++-> std::shared_ptr<mir::scene::Session>
++{
++    std::lock_guard<decltype(self->mutex)> lock{self->mutex};
++    return self->session.lock();
++}
++
++void SpinnerSplash::operator()(MirConnection* const connection)
++try
++{
++    GLuint prog[2];
++    GLuint texture[2];
++    GLint vpos[2];
++    GLint theta;
++    GLint fadeGlow;
++    GLint fadeLogo;
++    GLint aTexCoords[2];
++    GLint sampler[2];
++
++    mir_connection_set_lifecycle_event_callback(connection, &lifecycle_event_callback, &dying);
++    auto const windows = mir_eglapp_init(connection);
++
++    if (!windows.size()) return;
++
++    double pixelSize = 10 * 11.18;
++    const GLfloat texCoordsSpinner[] =
++    {
++        -0.5f, 0.5f,
++        -0.5f, -0.5f,
++        0.5f, 0.5f,
++        0.5f, -0.5f,
++    };
++
++    prog[0] = createShaderProgram(vShaderSrcSpinner, fShaderSrcGlow);
++    prog[1] = createShaderProgram(vShaderSrcSpinner, fShaderSrcLogo);
++
++    // setup proper GL-blending
++    glEnable(GL_BLEND);
++    glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
++    glBlendEquation(GL_FUNC_ADD);
++
++    // get locations of shader-attributes/uniforms
++    vpos[0] = glGetAttribLocation(prog[0], "vPosition");
++    aTexCoords[0] = glGetAttribLocation(prog[0], "aTexCoords");
++    theta = glGetUniformLocation(prog[0], "theta");
++    sampler[0] = glGetUniformLocation(prog[0], "uSampler");
++    fadeGlow = glGetUniformLocation(prog[0], "uFadeGlow");
++    vpos[1] = glGetAttribLocation(prog[1], "vPosition");
++    aTexCoords[1] = glGetAttribLocation(prog[1], "aTexCoords");
++    sampler[1] = glGetUniformLocation(prog[1], "uSampler");
++    fadeLogo = glGetUniformLocation(prog[1], "uFadeLogo");
++
++    // create and upload spinner-artwork
++    // note that the embedded image data has pre-multiplied alpha
++    glGenTextures(2, texture);
++    uploadTexture(texture[0], spinner_glow);
++    uploadTexture(texture[1], spinner_logo);
++
++    // bunch of shader-attributes to enable
++    glVertexAttribPointer(aTexCoords[0], 2, GL_FLOAT, GL_FALSE, 0, texCoordsSpinner);
++    glVertexAttribPointer(aTexCoords[1], 2, GL_FLOAT, GL_FALSE, 0, texCoordsSpinner);
++    glEnableVertexAttribArray(vpos[0]);
++    glEnableVertexAttribArray(vpos[1]);
++    glEnableVertexAttribArray(aTexCoords[0]);
++    glEnableVertexAttribArray(aTexCoords[1]);
++    glActiveTexture(GL_TEXTURE0);
++
++    AnimationValues anim = {0.0, 0.0, 1.0, 0.0, 0.0};
++    GTimer* timer = g_timer_new();
++
++    do
++    {
++        for (auto const& surface : windows)
++            surface->paint([&](unsigned int width, unsigned int height)
++            {
++                GLfloat halfRealWidth = ((2.0 / width) * pixelSize) / 2.0;
++                GLfloat halfRealHeight = ((2.0 / height) * pixelSize) / 2.0;
++
++                const GLfloat vertices[] =
++                    {
++                        halfRealWidth,  halfRealHeight,
++                        halfRealWidth, -halfRealHeight,
++                        -halfRealWidth, halfRealHeight,
++                        -halfRealWidth,-halfRealHeight,
++                    };
++
++                glVertexAttribPointer(vpos[0], 2, GL_FLOAT, GL_FALSE, 0, vertices);
++                glVertexAttribPointer(vpos[1], 2, GL_FLOAT, GL_FALSE, 0, vertices);
++
++                glViewport(0, 0, width, height);
++
++                GLfloat color[] = {LIGHT_AUBERGINE};
++                for (auto& c : color) { c*= anim.fadeBackground; }
++
++                glClearColor(color[0], color[1], color[2], anim.fadeBackground);
++                glClear(GL_COLOR_BUFFER_BIT);
++
++                // draw glow
++                glUseProgram(prog[0]);
++                glBindTexture(GL_TEXTURE_2D, texture[0]);
++                glUniform1i(sampler[0], 0);
++                glUniform1f(theta, anim.angle);
++                glUniform1f(fadeGlow, anim.fadeGlow);
++                glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
++
++                // draw logo
++                glUseProgram(prog[1]);
++                glBindTexture(GL_TEXTURE_2D, texture[1]);
++                glUniform1i(sampler[1], 0);
++                glUniform1f(theta, anim.angle);
++                glUniform1f(fadeLogo, anim.fadeLogo);
++                glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
++            });
++
++        if (dying.load())
++            throw std::runtime_error("Server disconnected");
++    }
++    while (updateAnimation(timer, &anim));
++
++    glDeleteTextures(2, texture);
++    g_timer_destroy (timer);
++}
++catch (std::exception const& x)
++{
++    printf("%s\n", x.what());
++}
 === added file 'examples/miral-shell/spinner/miregl.cpp'
 --- examples/miral-shell/spinner/miregl.cpp	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/spinner/miregl.cpp	2017-08-23 11:59:25 +0000
@@ -0,0 +1,239 @@
++/*
++ * Copyright © 2015 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * under the terms of the GNU General Public License version 2 or 3 as 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/>.
++ */
++
++#include "miregl.h"
++#include <miral/window_specification.h>
++#include <mir/client/window_spec.h>
++#include <mir_toolkit/mir_client_library.h>
++
++#include <cstring>
++
++#include <GLES2/gl2.h>
++
++using namespace mir::client;
++
++class MirEglApp
++{
++public:
++    MirEglApp(MirConnection* const connection, MirPixelFormat pixel_format);
++
++    EGLSurface create_surface(MirRenderSurface* surface);
++
++    void make_current(EGLSurface eglsurface) const;
++
++    void swap_buffers(EGLSurface eglsurface) const;
++
++    void destroy_surface(EGLSurface eglsurface) const;
++
++    void get_surface_size(EGLSurface eglsurface, int* width, int* height) const;
++
++    void set_swap_interval(EGLSurface eglsurface, int interval) const;
++
++    bool supports_surfaceless_context();
++
++    ~MirEglApp();
++
++    MirConnection* const connection;
++private:
++    EGLDisplay egldisplay;
++    EGLContext eglctx;
++    EGLConfig eglconfig;
++    EGLint neglconfigs;
++    EGLSurface dummy_surface;
++};
++
++std::shared_ptr<MirEglApp> make_mir_eglapp(
++    MirConnection* const connection, MirPixelFormat const& pixel_format)
++{
++    return std::make_shared<MirEglApp>(connection, pixel_format);
++}
++
++MirEglSurface::MirEglSurface(
++    std::shared_ptr<MirEglApp> const& mir_egl_app,
++    char const* name,
++    MirOutput const* output)
++:
++    mir_egl_app{mir_egl_app}
++{
++    auto const mode = mir_output_get_current_mode(output);
++    auto const output_id = mir_output_get_id(output);
++    auto const width = mir_output_mode_get_width(mode);
++    auto const height = mir_output_mode_get_height(mode);
++
++    surface = Surface{mir_connection_create_render_surface_sync(mir_egl_app->connection, width, height)};
++
++    eglsurface = mir_egl_app->create_surface(surface);
++
++    window = WindowSpec::for_normal_window(mir_egl_app->connection, width, height)
++        .add_surface(surface, width, height, 0, 0)
++        .set_name(name)
++        .set_fullscreen_on_output(output_id)
++        .create_window();
++
++    if (!mir_window_is_valid(window))
++        throw std::runtime_error(std::string("Can't create a window ") + mir_window_get_error_message(window));
++
++    mir_egl_app->set_swap_interval(eglsurface, -1);
++}
++
++MirEglSurface::~MirEglSurface()
++{
++    mir_egl_app->destroy_surface(eglsurface);
++}
++
++void MirEglSurface::egl_make_current()
++{
++    mir_egl_app->get_surface_size(eglsurface, &width_, &height_);
++    mir_egl_app->make_current(eglsurface);
++}
++
++void MirEglSurface::swap_buffers()
++{
++    mir_egl_app->swap_buffers(eglsurface);
++}
++
++unsigned int MirEglSurface::width() const
++{
++    return width_;
++}
++
++unsigned int MirEglSurface::height() const
++{
++    return height_;
++}
++
++MirEglApp::MirEglApp(MirConnection* const connection, MirPixelFormat pixel_format) :
++    connection{connection},
++    dummy_surface{EGL_NO_SURFACE}
++{
++    unsigned int bpp = 8*MIR_BYTES_PER_PIXEL(pixel_format);
++
++    EGLint attribs[] =
++        {
++            EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
++            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
++            EGL_COLOR_BUFFER_TYPE, EGL_RGB_BUFFER,
++            EGL_BUFFER_SIZE, (EGLint) bpp,
++            EGL_NONE
++        };
++
++    egldisplay = eglGetDisplay((EGLNativeDisplayType)(connection));
++    if (egldisplay == EGL_NO_DISPLAY)
++        throw std::runtime_error("Can't eglGetDisplay");
++
++    EGLint major;
++    EGLint minor;
++    if (!eglInitialize(egldisplay, &major, &minor))
++        throw std::runtime_error("Can't eglInitialize");
++
++    if (major != 1 || minor != 4)
++        throw std::runtime_error("EGL version is not 1.4");
++
++    if (!eglChooseConfig(egldisplay, attribs, &eglconfig, 1, &neglconfigs))
++        throw std::runtime_error("Could not eglChooseConfig");
++
++    if (neglconfigs == 0)
++        throw std::runtime_error("No EGL config available");
++
++    EGLint ctxattribs[] =
++        {
++            EGL_CONTEXT_CLIENT_VERSION, 2,
++            EGL_NONE
++        };
++
++    eglctx = eglCreateContext(egldisplay, eglconfig, EGL_NO_CONTEXT, ctxattribs);
++    if (eglctx == EGL_NO_CONTEXT)
++        throw std::runtime_error("eglCreateContext failed");
++
++    if (!supports_surfaceless_context())
++    {
++        static EGLint const dummy_pbuffer_attribs[] =
++        {
++             EGL_WIDTH, 1,
++             EGL_HEIGHT, 1,
++             EGL_NONE
++        };
++
++        dummy_surface = eglCreatePbufferSurface(egldisplay, eglconfig, dummy_pbuffer_attribs);
++        if (dummy_surface == EGL_NO_SURFACE)
++            throw std::runtime_error("eglCreatePbufferSurface failed");
++    }
++
++    make_current(dummy_surface);
++}
++
++EGLSurface MirEglApp::create_surface(MirRenderSurface* surface)
++{
++    auto const eglsurface = eglCreateWindowSurface(
++        egldisplay,
++        eglconfig,
++        (EGLNativeWindowType)surface, NULL);
++
++    if (eglsurface == EGL_NO_SURFACE)
++        throw std::runtime_error("eglCreateWindowSurface failed");
++
++    return eglsurface;
++}
++
++void MirEglApp::make_current(EGLSurface eglsurface) const
++{
++    if (!eglMakeCurrent(egldisplay, eglsurface, eglsurface, eglctx))
++        throw std::runtime_error("Can't eglMakeCurrent");
++}
++
++void MirEglApp::swap_buffers(EGLSurface eglsurface) const
++{
++    eglSwapBuffers(egldisplay, eglsurface);
++}
++
++void MirEglApp::destroy_surface(EGLSurface eglsurface) const
++{
++    eglDestroySurface(egldisplay, eglsurface);
++}
++
++void MirEglApp::get_surface_size(EGLSurface eglsurface, int* width, int* height) const
++{
++    eglQuerySurface(egldisplay, eglsurface, EGL_WIDTH, width);
++    eglQuerySurface(egldisplay, eglsurface, EGL_HEIGHT, height);
++}
++
++void MirEglApp::set_swap_interval(EGLSurface eglsurface, int interval) const
++{
++    auto const previous_surface = eglGetCurrentSurface(EGL_DRAW);
++
++    make_current(eglsurface);
++    eglSwapInterval(egldisplay, interval);
++
++    if (previous_surface != EGL_NO_SURFACE)
++        make_current(previous_surface);
++}
++
++bool MirEglApp::supports_surfaceless_context()
++{
++    auto const extensions = eglQueryString(egldisplay, EGL_EXTENSIONS);
++    if (!extensions)
++        return false;
++    return std::strstr(extensions, "EGL_KHR_surfaceless_context") != nullptr;
++}
++
++MirEglApp::~MirEglApp()
++{
++    eglMakeCurrent(egldisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
++    if (dummy_surface != EGL_NO_SURFACE)
++        destroy_surface(dummy_surface);
++    eglDestroyContext(egldisplay, eglctx);
++    eglTerminate(egldisplay);
++}
 === added file 'examples/miral-shell/spinner/miregl.h'
 --- examples/miral-shell/spinner/miregl.h	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/spinner/miregl.h	2017-08-23 11:59:25 +0000
@@ -0,0 +1,67 @@
++/*
++ * Copyright © 2015 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * under the terms of the GNU General Public License version 2 or 3 as 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/>.
++ */
++
++#ifndef UNITYSYSTEMCOMPOSITOR_MIREGL_H
++#define UNITYSYSTEMCOMPOSITOR_MIREGL_H
++
++#include <mir/client/surface.h>
++#include <mir/client/window.h>
++
++#include <EGL/egl.h>
++
++#include <memory>
++
++class MirEglApp;
++class MirEglSurface;
++
++std::shared_ptr<MirEglApp> make_mir_eglapp(
++    MirConnection* const connection,
++    MirPixelFormat const& pixel_format);
++
++class MirEglSurface
++{
++public:
++    MirEglSurface(
++        std::shared_ptr<MirEglApp> const& mir_egl_app,
++        char const* name,
++        MirOutput const* output);
++
++    ~MirEglSurface();
++
++    template<typename Painter>
++    void paint(Painter const& functor)
++    {
++        egl_make_current();
++        functor(width(), height());
++        swap_buffers();
++    }
++
++private:
++    void egl_make_current();
++
++    void swap_buffers();
++    unsigned int width() const;
++    unsigned int height() const;
++
++    std::shared_ptr<MirEglApp> const mir_egl_app;
++    mir::client::Surface surface;
++    mir::client::Window window;
++    EGLSurface eglsurface;
++    int width_;
++    int height_;
++};
++
++#endif //UNITYSYSTEMCOMPOSITOR_MIREGL_H
 === added file 'examples/miral-shell/spinner/png2header.py'
 --- examples/miral-shell/spinner/png2header.py	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/spinner/png2header.py	2017-08-23 11:59:25 +0000
@@ -0,0 +1,87 @@
++#!/usr/bin/env python
++# coding: utf-8
++
++# Copyright © 2015 Canonical Ltd.
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License version 2 or 3
++# as published by the Free Software Foundation.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++#
++# Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
++
++import sys
++from PIL import Image
++
++def premultiply(image):
++    pixels = image.load()
++    for i in range(image.size[0]):
++        for j in range(image.size[1]):
++            orig = pixels[i,j]
++            m = orig[3] / 255.0
++            pixels[i,j] = (int(orig[0] * m) , int(orig[1] * m), int(orig[2] * m), orig[3])
++
++def tocstring(data):
++    result = ''
++    line_chars = 0
++    line_limit = 80
++
++    for c in data:
++        if line_chars == 0:
++            result += '    "'
++
++        s = '\\%o' % c
++        result += s
++        line_chars += len(s)
++
++        if line_chars >= line_limit:
++            result += '"\n'
++            line_chars = 0
++
++    if line_chars != 0:
++        result += '"'
++
++    return result
++
++def bytes_per_pixel(image):
++    if image.mode == 'RGBA':
++        return 4
++    elif image.mode == 'RGB':
++        return 3
++    else:
++        raise "Unsupported image mode %s" % image.mode
++
++def export(image, variable_name):
++    image_info = (image.size[0], image.size[1], bytes_per_pixel(image))
++    print("static const struct {")
++    print("    unsigned int width;")
++    print("    unsigned int height;")
++    print("    unsigned int bytes_per_pixel; /* 3:RGB, 4:RGBA */")
++    print("    unsigned char pixel_data[%d * %d * %d + 1];" % image_info)
++    print("} %s = {" % variable_name)
++    print("    %d, %d, %d," % image_info)
++    print(tocstring(image.tobytes()))
++    print("};")
++
++def show_usage():
++    print("Usage: ./png2header.py PNGFILE VARNAME > HEADER_FILE", file=sys.stderr)
++    print("Convert a PNG image to an embeddable C/C++ header file", file=sys.stderr)
++
++if len(sys.argv) < 3:
++    show_usage()
++    sys.exit(1)
++
++image_filename = sys.argv[1]
++variable_name = sys.argv[2]
++
++image = Image.open(image_filename)
++if image.mode == 'RGBA':
++    premultiply(image)
++export(image, variable_name)
 === added file 'examples/miral-shell/spinner/spinner-glow.png'
 Binary files examples/miral-shell/spinner/spinner-glow.png	1970-01-01 00:00:00 +0000 and examples/miral-shell/spinner/spinner-glow.png	2017-08-23 11:59:25 +0000 differ
 === added file 'examples/miral-shell/spinner/spinner-logo.png'
 Binary files examples/miral-shell/spinner/spinner-logo.png	1970-01-01 00:00:00 +0000 and examples/miral-shell/spinner/spinner-logo.png	2017-08-23 11:59:25 +0000 differ
 === added file 'examples/miral-shell/spinner/splash.h'
 --- examples/miral-shell/spinner/splash.h	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/spinner/splash.h	2017-08-23 11:59:25 +0000
@@ -0,0 +1,45 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 or 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Alan Griffiths <alan@octopull.co.uk>
++ */
++
++#ifndef MIRAL_SHELL_SPINNER_SPLASH_H
++#define MIRAL_SHELL_SPINNER_SPLASH_H
++
++#include <mir_toolkit/client_types.h>
++
++#include <memory>
++
++namespace mir { namespace scene { class Session; }}
++
++namespace mir { class Server; namespace scene { class Session; }}
++
++class SpinnerSplash
++{
++public:
++    SpinnerSplash();
++    ~SpinnerSplash();
++
++    void operator()(MirConnection* connection);
++    void operator()(std::weak_ptr<mir::scene::Session> const& session);
++    auto session() const -> std::shared_ptr<mir::scene::Session>;
++
++private:
++    struct Self;
++    std::shared_ptr<Self> const self;
++};
++
++#endif //MIRAL_SHELL_SPINNER_SPLASH_H
 === added file 'examples/miral-shell/tiling_window_manager.cpp'
 --- examples/miral-shell/tiling_window_manager.cpp	1970-01-01 00:00:00 +0000
 +++ examples/miral-shell/tiling_window_manager.cpp	2017-08-23 11:59:25 +0000
@@ -0,0 +1,688 @@
++/*
++ * Copyright © 2015-2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 or 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored By: Alan Griffiths <alan@octopull.co.uk>
++ */
++
++#include "tiling_window_manager.h"
++
++#include <miral/application_info.h>
++#include <miral/window_info.h>
++#include <miral/window_manager_tools.h>
++#include <miral/output.h>
++
++#include <linux/input.h>
++#include <algorithm>
++#include <csignal>
++
++namespace ms = mir::scene;
++using namespace miral;
++
++namespace
++{
++struct TilingWindowManagerPolicyData
++{
++    Rectangle tile;
++    Rectangle old_tile;
++};
++
++template<class Info>
++inline Rectangle& tile_for(Info& info)
++{
++    return std::static_pointer_cast<TilingWindowManagerPolicyData>(info.userdata())->tile;
++}
++
++template<class Info>
++inline Rectangle const& tile_for(Info const& info)
++{
++    return std::static_pointer_cast<TilingWindowManagerPolicyData>(info.userdata())->tile;
++}
++}
++
++void TilingWindowManagerPolicy::MRUTileList::push(std::shared_ptr<void> const& tile)
++{
++    tiles.erase(remove(begin(tiles), end(tiles), tile), end(tiles));
++    tiles.push_back(tile);
++}
++
++void TilingWindowManagerPolicy::MRUTileList::erase(std::shared_ptr<void> const& tile)
++{
++    tiles.erase(remove(begin(tiles), end(tiles), tile), end(tiles));
++}
++
++void TilingWindowManagerPolicy::MRUTileList::enumerate(Enumerator const& enumerator) const
++{
++    for (auto i = tiles.rbegin(); i != tiles.rend(); ++i)
++        enumerator(const_cast<std::shared_ptr<void> const&>(*i));
++}
++
++// Demonstrate implementing a simple tiling algorithm
++
++TilingWindowManagerPolicy::TilingWindowManagerPolicy(
++    WindowManagerTools const& tools,
++    SpinnerSplash const& spinner,
++    miral::InternalClientLauncher const& launcher,
++    miral::ActiveOutputsMonitor& outputs_monitor) :
++    tools{tools},
++    spinner{spinner},
++    launcher{launcher},
++    outputs_monitor{outputs_monitor}
++{
++    outputs_monitor.add_listener(this);
++}
++
++TilingWindowManagerPolicy::~TilingWindowManagerPolicy()
++{
++    outputs_monitor.delete_listener(this);
++}
++
++void TilingWindowManagerPolicy::click(Point cursor)
++{
++    auto const window = tools.window_at(cursor);
++    tools.select_active_window(window);
++}
++
++void TilingWindowManagerPolicy::resize(Point cursor)
++{
++    if (auto const application = application_under(cursor))
++    {
++        if (application == application_under(old_cursor))
++        {
++            if (auto const window = tools.select_active_window(tools.window_at(old_cursor)))
++            {
++                resize(window, cursor, old_cursor, tile_for(tools.info_for(application)));
++            }
++        }
++    }
++}
++
++auto TilingWindowManagerPolicy::place_new_window(
++    ApplicationInfo const& app_info,
++    WindowSpecification const& request_parameters)
++    -> WindowSpecification
++{
++    auto parameters = request_parameters;
++
++    parameters.userdata() = app_info.userdata();
++    parameters.state() = parameters.state().is_set() ?
++                         transform_set_state(parameters.state().value()) : mir_window_state_restored;
++
++    if (app_info.application() != spinner.session())
++    {
++        Rectangle const& tile = tile_for(app_info);
++
++        if (!parameters.parent().is_set() || !parameters.parent().value().lock())
++        {
++            if (app_info.windows().empty())
++            {
++                parameters.top_left() = tile.top_left;
++                parameters.size() = tile.size;
++            }
++            else
++            {
++                auto top_level_windows = count_if(begin(app_info.windows()), end(app_info.windows()), [this]
++                    (Window const& window){ return !tools.info_for(window).parent(); });
++
++                parameters.top_left() = tile.top_left + top_level_windows*Displacement{15, 15};
++            }
++        }
++
++        clip_to_tile(parameters, tile);
++    }
++
++    return parameters;
++}
++
++void TilingWindowManagerPolicy::advise_new_window(WindowInfo const& window_info)
++{
++    if (window_info.type() == mir_window_type_normal &&
++        !window_info.parent() &&
++        window_info.state() == mir_window_state_restored)
++    {
++        WindowSpecification specification;
++
++        specification.state() = mir_window_state_maximized;
++
++        tools.place_and_size_for_state(specification, window_info);
++        constrain_size_and_place(specification, window_info.window(), tile_for(window_info));
++        tools.modify_window(window_info.window(), specification);
++    }
++}
++
++void TilingWindowManagerPolicy::handle_window_ready(WindowInfo& window_info)
++{
++    if (window_info.can_be_active())
++        tools.select_active_window(window_info.window());
++
++    if (spinner.session() != window_info.window().application())
++    {
++        tiles.push(window_info.userdata());
++        dirty_tiles = true;
++    }
++}
++
++namespace
++{
++template<typename ValueType>
++void reset(mir::optional_value<ValueType>& option)
++{
++    if (option.is_set()) option.consume();
++}
++}
++
++void TilingWindowManagerPolicy::handle_modify_window(
++    miral::WindowInfo& window_info,
++    miral::WindowSpecification const& modifications)
++{
++    auto const window = window_info.window();
++    auto const tile = tile_for(window_info);
++    auto mods = modifications;
++
++    constrain_size_and_place(mods, window, tile);
++
++    reset(mods.output_id());
++
++    tools.modify_window(window_info, mods);
++}
++
++void TilingWindowManagerPolicy::constrain_size_and_place(
++    WindowSpecification& mods, Window const& window, Rectangle const& tile) const
++{
++    if (mods.size().is_set())
++    {
++        auto width = std::min(tile.size.width, mods.size().value().width);
++        auto height = std::min(tile.size.height, mods.size().value().height);
++
++        mods.size() = Size{width, height};
++    }
++
++    if (mods.top_left().is_set())
++    {
++        auto x = std::max(tile.top_left.x, mods.top_left().value().x);
++        auto y = std::max(tile.top_left.y, mods.top_left().value().y);
++
++        mods.top_left() = Point{x, y};
++    }
++
++    auto top_left = mods.top_left().is_set() ? mods.top_left().value() : window.top_left();
++    auto bottom_right = top_left + as_displacement(mods.size().is_set() ? mods.size().value() : window.size());
++    auto overhang = bottom_right - tile.bottom_right();
++
++    if (overhang.dx > DeltaX{0}) top_left = top_left - overhang.dx;
++    if (overhang.dy > DeltaY{0}) top_left = top_left - overhang.dy;
++
++    if (top_left != window.top_left())
++        mods.top_left() = top_left;
++    else
++        reset(mods.top_left());
++}
++
++auto TilingWindowManagerPolicy::transform_set_state(MirWindowState value)
++-> MirWindowState
++{
++    switch (value)
++    {
++    default:
++        return mir_window_state_restored;
++
++    case mir_window_state_hidden:
++    case mir_window_state_minimized:
++        return mir_window_state_hidden;
++    }
++}
++
++void TilingWindowManagerPolicy::drag(Point cursor)
++{
++    if (auto const application = application_under(cursor))
++    {
++        if (application == application_under(old_cursor))
++        {
++            if (auto const window = tools.select_active_window(tools.window_at(old_cursor)))
++            {
++
++                auto const tile = tile_for(tools.info_for(application));
++                WindowSpecification mods;
++                mods.top_left() = window.top_left() + (cursor-old_cursor);
++                constrain_size_and_place(mods, window, tile);
++                tools.modify_window(window, mods);
++            }
++        }
++    }
++}
++
++void TilingWindowManagerPolicy::handle_raise_window(WindowInfo& window_info)
++{
++    tools.select_active_window(window_info.window());
++}
++
++bool TilingWindowManagerPolicy::handle_keyboard_event(MirKeyboardEvent const* event)
++{
++    auto const action = mir_keyboard_event_action(event);
++    auto const scan_code = mir_keyboard_event_scan_code(event);
++    auto const modifiers = mir_keyboard_event_modifiers(event) & modifier_mask;
++
++    if (action == mir_keyboard_action_down && scan_code == KEY_F12 &&
++        (modifiers & modifier_mask) == mir_input_event_modifier_alt)
++    {
++        launcher.launch("Spinner", spinner);
++        return true;
++    }
++
++    if (action == mir_keyboard_action_down && scan_code == KEY_F11)
++    {
++        switch (modifiers & modifier_mask)
++        {
++        case mir_input_event_modifier_alt:
++            toggle(mir_window_state_maximized);
++            return true;
++
++        case mir_input_event_modifier_shift:
++            toggle(mir_window_state_vertmaximized);
++            return true;
++
++        case mir_input_event_modifier_ctrl:
++            toggle(mir_window_state_horizmaximized);
++            return true;
++
++        default:
++            break;
++        }
++    }
++    else if (action == mir_keyboard_action_down && scan_code == KEY_F4)
++    {
++        switch (modifiers & modifier_mask)
++        {
++        case mir_input_event_modifier_alt|mir_input_event_modifier_shift:
++            if (auto const& window = tools.active_window())
++                kill(window.application(), SIGTERM);
++            return true;
++
++        case mir_input_event_modifier_alt:
++            tools.ask_client_to_close(tools.active_window());;
++            return true;
++
++        default:
++            break;
++        }
++    }
++    else if (action == mir_keyboard_action_down &&
++            modifiers == mir_input_event_modifier_alt &&
++            scan_code == KEY_TAB)
++    {
++        tools.focus_next_application();
++
++        return true;
++    }
++    else if (action == mir_keyboard_action_down &&
++            modifiers == mir_input_event_modifier_alt &&
++            scan_code == KEY_GRAVE)
++    {
++        tools.focus_next_within_application();
++
++        return true;
++    }
++    else if (action == mir_keyboard_action_down &&
++             modifiers == (mir_input_event_modifier_alt | mir_input_event_modifier_shift) &&
++             scan_code == KEY_GRAVE)
++    {
++        tools.focus_prev_within_application();
++
++        return true;
++    }
++
++    return false;
++}
++
++bool TilingWindowManagerPolicy::handle_touch_event(MirTouchEvent const* event)
++{
++    auto const count = mir_touch_event_point_count(event);
++
++    long total_x = 0;
++    long total_y = 0;
++
++    for (auto i = 0U; i != count; ++i)
++    {
++        total_x += mir_touch_event_axis_value(event, i, mir_touch_axis_x);
++        total_y += mir_touch_event_axis_value(event, i, mir_touch_axis_y);
++    }
++
++    Point const cursor{total_x/count, total_y/count};
++
++    bool is_drag = true;
++    for (auto i = 0U; i != count; ++i)
++    {
++        switch (mir_touch_event_action(event, i))
++        {
++        case mir_touch_action_up:
++            return false;
++
++        case mir_touch_action_down:
++            is_drag = false;
++            continue;
++
++        default:
++            continue;
++        }
++    }
++
++    bool consumes_event = false;
++    if (is_drag)
++    {
++        switch (count)
++        {
++        case 4:
++            resize(cursor);
++            consumes_event = true;
++            break;
++
++        case 3:
++            drag(cursor);
++            consumes_event = true;
++            break;
++        }
++    }
++    else
++    {
++        if (auto const& window = tools.window_at(cursor))
++            tools.select_active_window(window);
++    }
++
++    old_cursor = cursor;
++    return consumes_event;
++}
++
++bool TilingWindowManagerPolicy::handle_pointer_event(MirPointerEvent const* event)
++{
++    auto const action = mir_pointer_event_action(event);
++    auto const modifiers = mir_pointer_event_modifiers(event) & modifier_mask;
++    Point const cursor{
++        mir_pointer_event_axis_value(event, mir_pointer_axis_x),
++        mir_pointer_event_axis_value(event, mir_pointer_axis_y)};
++
++    bool consumes_event = false;
++
++    if (action == mir_pointer_action_button_down)
++    {
++        click(cursor);
++    }
++    else if (action == mir_pointer_action_motion &&
++             modifiers == mir_input_event_modifier_alt)
++    {
++        if (mir_pointer_event_button_state(event, mir_pointer_button_primary))
++        {
++            drag(cursor);
++            consumes_event = true;
++        }
++        else if (mir_pointer_event_button_state(event, mir_pointer_button_tertiary))
++        {
++            resize(cursor);
++            consumes_event = true;
++        }
++    }
++
++    old_cursor = cursor;
++    return consumes_event;
++}
++
++void TilingWindowManagerPolicy::toggle(MirWindowState state)
++{
++    if (auto window = tools.active_window())
++    {
++        auto& window_info = tools.info_for(window);
++
++        if (window_info.state() == state)
++            state = mir_window_state_restored;
++
++        WindowSpecification mods;
++        mods.state() = transform_set_state(state);
++        tools.modify_window(window_info, mods);
++    }
++}
++
++auto TilingWindowManagerPolicy::application_under(Point position)
++-> Application
++{
++    return tools.find_application([&, this](ApplicationInfo const& info)
++        { return spinner.session() != info.application() && tile_for(info).contains(position);});
++}
++
++void TilingWindowManagerPolicy::update_tiles(Rectangles const& outputs)
++{
++    auto const tile_count = tiles.count();
++
++    if (tile_count < 1 || outputs.size() < 1) return;
++
++    auto const bounding_rect = outputs.bounding_rectangle();
++
++    auto const total_width  = bounding_rect.size.width.as_int();
++    auto const total_height = bounding_rect.size.height.as_int();
++
++    auto index = 0;
++
++    if (tile_count < 3)
++    {
++        tiles.enumerate([&](std::shared_ptr<void> const& userdata)
++            {
++                auto const tile_data = std::static_pointer_cast<TilingWindowManagerPolicyData>(userdata);
++                tile_data->old_tile = tile_data->tile;
++
++                auto const x = (total_width * index) / tile_count;
++                ++index;
++                auto const dx = (total_width * index) / tile_count - x;
++
++                tile_data->tile = Rectangle{{x,  0}, {dx, total_height}};
++            });
++    }
++    else
++    {
++        tiles.enumerate([&](std::shared_ptr<void> const& userdata)
++            {
++                auto const tile_data = std::static_pointer_cast<TilingWindowManagerPolicyData>(userdata);
++                tile_data->old_tile = tile_data->tile;
++
++                auto const dx = total_width/2;
++                if (!index)
++                {
++                    tile_data->tile = Rectangle{{0,  0}, {dx, total_height}};
++                }
++                else
++                {
++                    auto const x = dx;
++                    auto const y = total_height*(index-1) / (tile_count-1);
++                    auto const dy = total_height / (tile_count-1);
++                    tile_data->tile = Rectangle{{x,  y}, {dx, dy}};
++                }
++
++                ++index;
++            });
++    }
++
++    tools.for_each_application([&](ApplicationInfo& info)
++        {
++            if (spinner.session() == info.application())
++                return;
++
++            auto const tile_data = std::static_pointer_cast<TilingWindowManagerPolicyData>(info.userdata());
++            update_surfaces(info, tile_data->old_tile, tile_data->tile);
++        });
++}
++
++void TilingWindowManagerPolicy::update_surfaces(ApplicationInfo& info, Rectangle const& old_tile, Rectangle const& new_tile)
++{
++    for (auto const& window : info.windows())
++    {
++        if (window)
++        {
++            auto& window_info = tools.info_for(window);
++
++            if (!window_info.parent())
++            {
++                auto const new_pos = window.top_left() + (new_tile.top_left - old_tile.top_left);
++                auto const offset = new_pos - new_tile.top_left;
++
++                // For now just scale if was filling width/height of tile
++                auto const old_size = window.size();
++                auto const scaled_width  = old_size.width  == old_tile.size.width  ? new_tile.size.width  : old_size.width;
++                auto const scaled_height = old_size.height == old_tile.size.height ? new_tile.size.height : old_size.height;
++
++                auto width  = std::min(new_tile.size.width.as_int()  - offset.dx.as_int(), scaled_width.as_int());
++                auto height = std::min(new_tile.size.height.as_int() - offset.dy.as_int(), scaled_height.as_int());
++
++                WindowSpecification modifications;
++                modifications.top_left() = new_pos;
++                modifications.size() = {width, height};
++                tools.modify_window(window_info, modifications);
++            }
++        }
++    }
++}
++
++void TilingWindowManagerPolicy::clip_to_tile(miral::WindowSpecification& parameters, Rectangle const& tile)
++{
++    auto const displacement = parameters.top_left().value() - tile.top_left;
++
++    auto width = std::min(tile.size.width.as_int()-displacement.dx.as_int(), parameters.size().value().width.as_int());
++    auto height = std::min(tile.size.height.as_int()-displacement.dy.as_int(), parameters.size().value().height.as_int());
++
++    parameters.size() = Size{width, height};
++}
++
++void TilingWindowManagerPolicy::resize(Window window, Point cursor, Point old_cursor, Rectangle bounds)
++{
++    auto const top_left = window.top_left();
++
++    auto const old_displacement = old_cursor - top_left;
++    auto const new_displacement = cursor - top_left;
++
++    auto const scale_x = float(new_displacement.dx.as_int())/std::max(1.0f, float(old_displacement.dx.as_int()));
++    auto const scale_y = float(new_displacement.dy.as_int())/std::max(1.0f, float(old_displacement.dy.as_int()));
++
++    if (scale_x <= 0.0f || scale_y <= 0.0f) return;
++
++    auto const old_size = window.size();
++    Size new_size{scale_x*old_size.width, scale_y*old_size.height};
++
++    auto const size_limits = as_size(bounds.bottom_right() - top_left);
++
++    if (new_size.width > size_limits.width)
++        new_size.width = size_limits.width;
++
++    if (new_size.height > size_limits.height)
++        new_size.height = size_limits.height;
++
++    window.resize(new_size);
++}
++
++void TilingWindowManagerPolicy::advise_focus_gained(WindowInfo const& info)
++{
++    tools.raise_tree(info.window());
++
++    if (auto const spinner_session = spinner.session())
++    {
++        auto const& spinner_info = tools.info_for(spinner_session);
++
++        if (spinner_info.windows().size() > 0)
++            tools.raise_tree(spinner_info.windows()[0]);
++    }
++    else
++    {
++        tiles.push(info.userdata());
++        dirty_tiles = true;
++    }
++}
++
++void TilingWindowManagerPolicy::advise_new_app(miral::ApplicationInfo& application)
++{
++    if (spinner.session() == application.application())
++        return;
++