Merge lp:~mir-team/mir/1.0-artful into lp:mir/ubuntu

[Alan Griffiths]

Mir 0.28 release to artful

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4282
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/130/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5103
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5341
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5328
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5328
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5328
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5147
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5147/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5147
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5147/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5147
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5147/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5147
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5147/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5147
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5147/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5147
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5147/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5147
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5147/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5147
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5147/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

To be noted that this causes the miral-examples package to be deprecated and removed by mir-demos. A dist-upgrade is needed to do this. But all packages installed/upgraded ok.

It is a large diff, but it mainly consists of 2 changes:
1. adding MirAL from lp:miral to Mir itself, and adapting the tests to suit
2. relicencing changes, which touch every file
MirAL's inter-operability with Mir has long been good quality, and in my testing of lp:mir this hasn't changed.

I've run through the testing plan, found no new issues

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2017-05-08 03:04:26 +0000
+++ .bzrignore	2017-10-11 15:01:23 +0000
@@ -2,4 +2,6 @@
 .project
 include/server/mir/version.h
 include/client/mir_toolkit/version.h
+include/miral/version.h
 build-*
+cmake-*

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-05-25 08:58:03 +0000
+++ CMakeLists.txt	2017-10-11 15:01:23 +0000
@@ -1,7 +1,7 @@
 # Copyright © 2012 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
+# 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,
@@ -28,7 +28,7 @@
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 0)
-set(MIR_VERSION_MINOR 27)
+set(MIR_VERSION_MINOR 28)
 set(MIR_VERSION_PATCH 0)
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
@@ -53,6 +53,7 @@
 include (cmake/EnableCoverageReport.cmake)
 include (cmake/MirCommon.cmake)
 include (GNUInstallDirs)
+include (cmake/Doxygen.cmake)
 
 set(build_types "None;Debug;Release;RelWithDebInfo;MinSizeRel;Coverage;AddressSanitizer;ThreadSanitizer;UBSanitizer")
 # Change informational string for CMAKE_BUILD_TYPE
@@ -73,6 +74,16 @@
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-mismatched-tags")
 endif()
 
+# GCC 7.1 fixed a bug in the ARM ABI, which results in some std::vector methods
+# (among others) generating this warning.
+#
+# There's nothing we can do about it; everything just needs to be rebuilt with
+# GCC 7.1.
+check_cxx_compiler_flag(-Wpsabi HAS_W_PSABI)
+if(HAS_W_PSABI)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi")
+endif()
+
 option(MIR_USE_LD_GOLD "Enables the \"gold\" linker." OFF)
 if(MIR_USE_LD_GOLD)
   set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=gold")
@@ -81,8 +92,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")
@@ -207,6 +216,8 @@
 
 pkg_check_modules(UDEV REQUIRED libudev)
 pkg_check_modules(GLIB REQUIRED glib-2.0)
+pkg_check_modules(WAYLAND_SERVER REQUIRED wayland-server)
+pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client)
 
 include_directories (SYSTEM ${GLESv2_INCLUDE_DIRS})
 include_directories (SYSTEM ${EGL_INCLUDE_DIRS})
@@ -291,7 +302,7 @@
 
   # There's no nice way to format this. Thanks CMake.
   mir_add_test(NAME LGPL-required
-    COMMAND /bin/sh -c "! grep -rl 'GNU General' ${PROJECT_SOURCE_DIR}/src/client ${PROJECT_SOURCE_DIR}/include/client ${PROJECT_SOURCE_DIR}/src/common ${PROJECT_SOURCE_DIR}/include/common ${PROJECT_SOURCE_DIR}/src/include/common ${PROJECT_SOURCE_DIR}/src/platform ${PROJECT_SOURCE_DIR}/include/platform ${PROJECT_SOURCE_DIR}/src/include/platform ${PROJECT_SOURCE_DIR}/src/capnproto"
+    COMMAND /bin/sh -c "! grep -rl 'GNU General' ${PROJECT_SOURCE_DIR}/src/client ${PROJECT_SOURCE_DIR}/include/client ${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/include/core ${PROJECT_SOURCE_DIR}/src/common ${PROJECT_SOURCE_DIR}/include/common ${PROJECT_SOURCE_DIR}/src/include/common ${PROJECT_SOURCE_DIR}/src/platform ${PROJECT_SOURCE_DIR}/include/platform ${PROJECT_SOURCE_DIR}/src/include/platform ${PROJECT_SOURCE_DIR}/src/platforms ${PROJECT_SOURCE_DIR}/include/platforms ${PROJECT_SOURCE_DIR}/src/include/platforms ${PROJECT_SOURCE_DIR}/src/renderers ${PROJECT_SOURCE_DIR}/include/renderers ${PROJECT_SOURCE_DIR}/src/include/renderers ${PROJECT_SOURCE_DIR}/src/capnproto"
   )
   mir_add_test(NAME GPL-required
     COMMAND /bin/sh -c "! grep -rl 'GNU Lesser' ${PROJECT_SOURCE_DIR}/src/server ${PROJECT_SOURCE_DIR}/include/server ${PROJECT_SOURCE_DIR}/src/include/server ${PROJECT_SOURCE_DIR}/tests ${PROJECT_SOURCE_DIR}/examples"
@@ -302,7 +313,6 @@
 endif ()
 
 enable_coverage_report(mirserver)
-include (cmake/Doxygen.cmake)
 include (cmake/ABICheck.cmake)
 
 add_custom_target(ptest

=== added file 'COPYING.GPL2'
--- COPYING.GPL2	1970-01-01 00:00:00 +0000
+++ COPYING.GPL2	2017-10-11 15:01:23 +0000
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    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, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

=== renamed file 'COPYING.GPL' => 'COPYING.GPL3'
=== added file 'COPYING.LGPL2'
--- COPYING.LGPL2	1970-01-01 00:00:00 +0000
+++ COPYING.LGPL2	2017-10-11 15:01:23 +0000
@@ -0,0 +1,481 @@
+                  GNU LIBRARY GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+

+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+

+                  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+

+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+

+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+

+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+

+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+

+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+

+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+

+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library 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
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

=== renamed file 'COPYING.LGPL' => 'COPYING.LGPL3'
=== modified file 'HACKING.md'
--- HACKING.md	2017-05-08 03:04:26 +0000
+++ HACKING.md	2017-10-11 15:01:23 +0000
@@ -1,38 +1,6 @@
 Mir hacking guide
 =================
 
-Getting Mir
------------
-
-If you're reading this file then you've probably solved this one. ;)
-
-However, for completeness Mir is a project on LaunchPad (https://launchpad.net/mir)
-to grab a copy use the command:
-
-    $ bzr branch lp:mir
-
-
-Getting dependencies
---------------------
-To succesfully build Mir there are a few packages required:
-
-    $ apt-get install devscripts equivs cmake
-    $ mk-build-deps --install --tool "apt-get -y" --build-dep debian/control
-
-
-Building Mir
------------
-
-Mir is built using cmake. There are other options, but here's one way to
-build the system:
-
-    $ mkdir build
-    $ cd build
-    $ cmake ..
-    $ make -j 8
-    $ ctest
-
-
 Coding Mir
 ----------
 
@@ -109,7 +77,7 @@
 you need to know to get it working, and also to prevent your existing X server
 from dying at the same time.
 
- - \ref using_mir_on_pc
+ - \ref getting_and_using_mir
 
 You can configure Mir to provide runtime information helpful for debugging
 by enabling component reports:

=== modified file 'README.md'
--- README.md	2013-04-24 05:22:20 +0000
+++ README.md	2017-10-11 15:01:23 +0000
@@ -9,7 +9,7 @@
 License (server)
 -------
 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
+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,
@@ -23,7 +23,7 @@
 License (client)
 -------
 This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License version 3 as
+it under the terms of the GNU Lesser 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,

=== modified file 'benchmarks/benchmark_multiplexing_dispatchable.cpp'
--- benchmarks/benchmark_multiplexing_dispatchable.cpp	2015-06-17 05:20:42 +0000
+++ benchmarks/benchmark_multiplexing_dispatchable.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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,

=== modified file 'benchmarks/frame-uniformity/frame_uniformity_test.cpp'
--- benchmarks/frame-uniformity/frame_uniformity_test.cpp	2014-10-22 19:27:20 +0000
+++ benchmarks/frame-uniformity/frame_uniformity_test.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * 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
+ * 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,

=== modified file 'benchmarks/frame-uniformity/frame_uniformity_test.h'
--- benchmarks/frame-uniformity/frame_uniformity_test.h	2015-06-25 03:00:08 +0000
+++ benchmarks/frame-uniformity/frame_uniformity_test.h	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * 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
+ * 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,

=== modified file 'benchmarks/frame-uniformity/main.cpp'
--- benchmarks/frame-uniformity/main.cpp	2015-04-28 07:54:10 +0000
+++ benchmarks/frame-uniformity/main.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * 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
+ * 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,

=== modified file 'benchmarks/frame-uniformity/touch_measuring_client.cpp'
--- benchmarks/frame-uniformity/touch_measuring_client.cpp	2017-05-08 03:04:26 +0000
+++ benchmarks/frame-uniformity/touch_measuring_client.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * 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
+ * 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,

=== modified file 'benchmarks/frame-uniformity/touch_measuring_client.h'
--- benchmarks/frame-uniformity/touch_measuring_client.h	2015-06-25 03:00:08 +0000
+++ benchmarks/frame-uniformity/touch_measuring_client.h	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * 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
+ * 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,

=== modified file 'benchmarks/frame-uniformity/touch_producing_server.cpp'
--- benchmarks/frame-uniformity/touch_producing_server.cpp	2016-01-29 08:18:22 +0000
+++ benchmarks/frame-uniformity/touch_producing_server.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * 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
+ * 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,

=== modified file 'benchmarks/frame-uniformity/touch_producing_server.h'
--- benchmarks/frame-uniformity/touch_producing_server.h	2016-01-29 08:18:22 +0000
+++ benchmarks/frame-uniformity/touch_producing_server.h	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * 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
+ * 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,

=== modified file 'benchmarks/frame-uniformity/touch_samples.cpp'
--- benchmarks/frame-uniformity/touch_samples.cpp	2015-06-17 05:20:42 +0000
+++ benchmarks/frame-uniformity/touch_samples.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * 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
+ * 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,

=== modified file 'benchmarks/frame-uniformity/touch_samples.h'
--- benchmarks/frame-uniformity/touch_samples.h	2014-10-22 14:08:51 +0000
+++ benchmarks/frame-uniformity/touch_samples.h	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * 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
+ * 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,

=== modified file 'benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp'
--- benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp	2016-01-29 08:18:22 +0000
+++ benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * 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
+ * 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,

=== modified file 'benchmarks/frame-uniformity/vsync_simulating_graphics_platform.h'
--- benchmarks/frame-uniformity/vsync_simulating_graphics_platform.h	2016-01-29 08:18:22 +0000
+++ benchmarks/frame-uniformity/vsync_simulating_graphics_platform.h	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * 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
+ * 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,

=== added file 'cmake/FindPIL.cmake'
--- cmake/FindPIL.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindPIL.cmake	2017-10-11 15:01:23 +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 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2017-05-08 03:04:26 +0000
+++ cmake/MirCommon.cmake	2017-10-11 15:01:23 +0000
@@ -26,6 +26,7 @@
     set(VALGRIND_CMD "${VALGRIND_EXECUTABLE}" "--error-exitcode=1" "--trace-children=yes")
     set(VALGRIND_CMD ${VALGRIND_CMD} "--leak-check=full" "--show-leak-kinds=definite" "--errors-for-leak-kinds=definite")
     set(VALGRIND_CMD ${VALGRIND_CMD} "--track-fds=yes")
+    set(VALGRIND_CMD ${VALGRIND_CMD} "--track-origins=yes")
     set(VALGRIND_CMD ${VALGRIND_CMD} "--num-callers=128")
     set(VALGRIND_CMD ${VALGRIND_CMD} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_generic")
     set(VALGRIND_CMD ${VALGRIND_CMD} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_glibc_2.23")

=== modified file 'debian/changelog'
--- debian/changelog	2017-06-30 12:00:38 +0000
+++ debian/changelog	2017-10-11 15:01:23 +0000
@@ -1,3 +1,61 @@
+mir (0.28.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release 0.28.0(https://launchpad.net/mir/+milestone/0.28.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
+      . mirprotobuf ABI unchanged at 3
+      . mirplatformgraphics ABI unchanged at 13
+      . mirclientplatform ABI unchanged at 5
+      . mirinputplatform ABI unchanged at 7
+      . mircore ABI unchanged at 1
+    - Enhancements:
+      . Update licences to (L)GPL3 or (L)GPL2.
+      . Initial support for Wayland clients
+      . [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
+      . Various small improvements to miral-shell example
+      . [libmiral, miral-shell] handle display reconfiguration better and allow
+        shells to customize maximized placements.
+      . Enable CommandLineOptions to be processed before server initialization
+    - Bugs fixed:
+      . Fix handling of invalid display configuration. (LP: #1643446)
+      . Move full responsibility for buffer IPC into frontend. (LP: #1395421)
+      . Don't destroy an IPC "closure" object when it may yet be used
+        (LP: #1672960)
+      . [mesa-kms] Respect display orientation when painting cursor.
+        (LP: #1610078)
+      . Respect cursor hotspot when hosted on Mir. (LP: #1705284)
+      . mcl::BufferVault: Fix lock inversion.
+      . Handle mir_event_type_close_window in examples (LP: #1706004),
+        (LP: #1705439)
+      . Drop BufferStream::suitable_for_cursor()
+      . Only notify resize events for valid surfaces (LP: #1643446)
+      . Don't leak DRM fds in platform-eglstream probe.
+      . Remove obsolete & broken example code. (LP: #1663130)
+      . Move buffer-release IPC to a dedicated IPC thread. (LP: #1395421)
+      . [NestedServerWithTwoDisplays] Look for the last of a series of
+        synthetic events to ensure that the queue is drained before the test
+        exits. (LP: #1709666)
+      . floating window manager allows resizing maximized windows (LP: #1704776)
+      . [miral-shell] doesn't work with breeze X cursor theme (LP: #1699084)
+      . [miral-shell] Don't allow splashscreen to be occluded (LP: #1705973)
+      . [miral-shell] Update maximized windows on display changes (LP: #1705695)
+      . Make racy DragAndDrop test reliable. (LP: #1704780)
+      . [libmiral] Define default window settings in one place and clamp the
+        actual values to avoid ldiv0. (LP: #1717061)
+      . [miral-kiosk] Apply fullscreen logic when hidden windows are restored.
+        (LP: #1717910)
+      . [mir-on-x11] Less annoying clipping of Mir-on-X11 window when it exceeds
+        display bounds. (LP: #1668599)
+
+ -- Alan Griffiths <[e-mail]>  Thu, 10 Aug 2017 11:54:30 +0000
+
 mir (0.27.0+17.10.20170630-0ubuntu1) artful; urgency=medium
 
   [ Daniel van Vugt ]

=== modified file 'debian/control'
--- debian/control	2017-06-28 16:02:35 +0000
+++ debian/control	2017-10-11 15:01:23 +0000
@@ -31,6 +31,7 @@
                libudev-dev,
                libgtest-dev,
                google-mock (>= 1.6.0+svn437),
+               libxml++2.6-dev,
 # only enable valgrind once it's been tested to work on each architecture:
                valgrind [amd64 i386 armhf arm64],
                libglib2.0-dev,
@@ -45,6 +46,8 @@
                libcapnp-dev,
                capnproto,
                libepoxy-dev,
+               python3-pil:native,
+               linux-libc-dev,
 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,
@@ -67,7 +70,7 @@
 
 #TODO: Packaging infrastructure for better dependency generation,
 #      ala pkg-xorg's xviddriver:Provides and ABI detection.
-Package: libmirserver44
+Package: libmirserver45
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -146,7 +149,7 @@
 Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver44 (= ${binary:Version}),
+Depends: libmirserver45 (= ${binary:Version}),
          libmirplatform-dev (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libglm-dev,
@@ -195,6 +198,9 @@
 Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
+Breaks: libmirclientcpp-dev
+Replaces: libmirclientcpp-dev
+Provides: libmirclientcpp-dev (=1.5)
 Depends: libmirclient9 (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libmircookie-dev (= ${binary:Version}),
@@ -233,7 +239,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libmirclient-debug-extension1 (= ${binary:Version}),
-	 ${misc:Depends},
+         ${misc:Depends},
          ${shlibs:Depends},
 Description: Display server for Ubuntu - client debug interface headers
  Mir is a display server running on linux systems, with a focus on efficiency,
@@ -254,9 +260,13 @@
 
 Package: mir-demos
 Architecture: linux-any
+Breaks: miral-examples
+Replaces: miral-examples
+Provides: miral-examples (=1.5)
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Recommends: fonts-liberation
+Recommends: dmz-cursor-theme,
+            fonts-liberation
 Description: Display server for Ubuntu - demonstration programs
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -477,3 +487,33 @@
  .
  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 (= ${libmiral2:Version}),
+# ${source:Version} is technically incorrect, but Launchpad doesn't do BinNMUs
+# so it's harmless.
+         libmirclient-dev (= ${source: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.

=== modified file 'debian/copyright'
--- debian/copyright	2017-05-08 03:04:26 +0000
+++ debian/copyright	2017-10-11 15:01:23 +0000
@@ -1,11 +1,11 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Mir
-Upstream-Contact: Thomas Voß <[e-mail]>
+Upstream-Contact: Alan Griffiths <[e-mail]>
 Source: http://launchpad.net/mir
 
 Files: *
-Copyright: 2012-2013, Canonical Ltd.
-License: GPL-3
+Copyright: 2012-2017, Canonical Ltd.
+License: GPL-3 or GPL-2
  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.
@@ -18,6 +18,31 @@
  On Debian systems, the full text of the GNU General Public
  License version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+Files: include/client/* include/common/* include/core/* include/platform/* include/platforms/* include/renderers/*
+           src/client/*     src/common/*     src/core/*     src/platform/*     src/platforms/*     src/renderers/*
+Copyright: 2012-2017, Canonical Ltd.
+License: LGPL-3 or LGPL-2
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/LGPL-3'.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/LGPL-2'.
 
 Files: include/test/mir_test/gmock_fixes.h:
 Copyright:
@@ -49,20 +74,3 @@
  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files: include/client/* include/common/* src/client/* src/common/*
-Copyright: 2012-2013, Canonical Ltd.
-License: LGPL-3
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
- .
- On Debian systems, the full text of the GNU Lesser General Public
- License version 3 can be found in the file
- `/usr/share/common-licenses/LGPL-3'.
-

=== added file 'debian/libmiral-dev.install'
--- debian/libmiral-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libmiral-dev.install	2017-10-11 15:01:23 +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-10-11 15:01:23 +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-10-11 15:01:23 +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.1.0
+ (c++)"miral::WindowInfo::needs_titlebar(MirWindowType)@MIRAL_1.1" 1.1.0
+ (c++)"miral::WindowInfo::type(MirWindowType)@MIRAL_1.1" 1.1.0
+ (c++)"miral::WindowInfo::state(MirWindowState)@MIRAL_1.1" 1.1.0
+ (c++)"miral::WindowManagementPolicy::advise_state_change(miral::WindowInfo const&, MirWindowState)@MIRAL_1.1" 1.1.0
+ (c++)"miral::WindowInfo::can_morph_to(MirWindowType) const@MIRAL_1.1" 1.1.0
+ (c++)"miral::CanonicalWindowManagerPolicy::place_new_window(miral::ApplicationInfo const&, miral::WindowSpecification const&)@MIRAL_1.1" 1.1.0
+ MIRAL_1.2@MIRAL_1.2 1.2.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.2.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.2.0
+ (c++)"miral::WindowInfo::shell_chrome(MirShellChrome)@MIRAL_1.2" 1.2.0
+ (c++)"miral::WindowInfo::shell_chrome() const@MIRAL_1.2" 1.2.0
+ (c++)"miral::WindowManagerTools::drag_window(miral::Window const&, mir::geometry::Displacement)@MIRAL_1.2" 1.2.0
+ (c++)"typeinfo for miral::ApplicationAuthorizer@MIRAL_1.0" 1.2.0
+ (c++)"typeinfo for miral::ApplicationAuthorizer1@MIRAL_1.2" 1.2.0
+ MIRAL_1.3@MIRAL_1.3 1.3.0
+ (c++)"miral::operator<(miral::Window const&, miral::Window const&)@MIRAL_1.0" 1.3.0
+ (c++)"miral::WindowManagerTools::create_workspace()@MIRAL_1.3" 1.3.0
+ (c++)"miral::WindowManagerTools::add_tree_to_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.3.0
+ (c++)"miral::WindowManagerTools::focus_prev_within_application()@MIRAL_1.3" 1.3.0
+ (c++)"miral::WindowManagerTools::remove_tree_from_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.3.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.3.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.3.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.3.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.3.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.3.0
+ (c++)"typeinfo for miral::WorkspacePolicy@MIRAL_1.3" 1.3.0
+ (c++)"vtable for miral::WorkspacePolicy@MIRAL_1.3" 1.3.0
+ MIRAL_1.3.1@MIRAL_1.3.1 1.3.1
+ (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.3.1
+ (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.3.1
+ (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.3.1
+ (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.3.1
+ (c++)"miral::SetWindowManagementPolicy::operator()(mir::Server&) const@MIRAL_1.3.1" 1.3.1
+ MIRAL_1.4.0@MIRAL_1.4.0 1.4.0
+ (c++)"miral::WindowManagerTools::end_drag_and_drop()@MIRAL_1.4.0" 1.4.0
+ (c++)"miral::WindowManagerTools::start_drag_and_drop(miral::WindowInfo&, std::vector<unsigned char, std::allocator<unsigned char> > const&)@MIRAL_1.4.0" 1.4.0
+ (c++)"typeinfo for miral::WindowManagementPolicyAddendum2@MIRAL_1.4.0" 1.4.0
+ MIRAL_1.5.0@MIRAL_1.5.0 1.5.0
+ (c++)"miral::pre_init(miral::CommandLineOption const&)@MIRAL_1.5.0" 1.5.0
+ (c++)"typeinfo for miral::WindowManagementPolicyAddendum3@MIRAL_1.5.0" 1.5.0
+ (c++)"miral::WindowManagerTools::active_output()@MIRAL_1.5.0" 1.5.0
\ No newline at end of file

=== modified file 'debian/libmirclient-dev.install'
--- debian/libmirclient-dev.install	2017-05-17 04:48:46 +0000
+++ debian/libmirclient-dev.install	2017-10-11 15:01:23 +0000
@@ -1,8 +1,10 @@
 usr/include/mirclient/mir_toolkit/*.h
 usr/include/mirclient/mir_toolkit/extensions/*.h
+usr/include/mirclient/mir/client/*.h
 usr/include/mirclient/mir/events/*.h
 usr/include/mirclient/mir/event_printer.h
 usr/include/mirclient/mir_toolkit/events
 usr/include/mirclient/mir_toolkit/rs/mir_render_surface.h
 usr/lib/*/pkgconfig/mirclient.pc
+usr/lib/*/pkgconfig/mirclientcpp.pc
 usr/lib/*/libmirclient.so

=== renamed file 'debian/libmirserver44.install' => 'debian/libmirserver45.install'
--- debian/libmirserver44.install	2017-05-08 03:04:26 +0000
+++ debian/libmirserver45.install	2017-10-11 15:01:23 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.44
+usr/lib/*/libmirserver.so.45

=== modified file 'debian/mir-demos.install'
--- debian/mir-demos.install	2015-06-17 05:20:42 +0000
+++ debian/mir-demos.install	2017-10-11 15:01:23 +0000
@@ -1,3 +1,11 @@
 usr/bin/mir_demo_*
-usr/bin/mir_proving_*
 usr/lib/*/libmir_demo_*
+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 'debian/rules'
--- debian/rules	2017-06-28 16:02:35 +0000
+++ debian/rules	2017-10-11 15:01:23 +0000
@@ -1,10 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_HOST_ARCH_ENDIAN ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
-EXACT_PACKAGE_VERSION = $(shell dpkg-parsechangelog | grep Version | cut -d' ' -f 2)
-DISTRIB_CODENAME = $(shell grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2)
+include /usr/share/dpkg/default.mk
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
@@ -57,16 +53,25 @@
 override_dh_auto_build-indep:
 	dh_auto_build -- doc
 
+# Reconstruct the MirAL version
+MIRAL_VERSION_MAJOR = $(shell perl -n -e '/^set\(MIRAL_VERSION_MAJOR ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt)
+MIRAL_VERSION_MINOR = $(shell perl -n -e '/^set\(MIRAL_VERSION_MINOR ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt)
+MIRAL_VERSION_PATCH = $(shell perl -n -e '/^set\(MIRAL_VERSION_PATCH ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt)
+MIRAL_RELEASE=$(MIRAL_VERSION_MAJOR).$(MIRAL_VERSION_MINOR).$(MIRAL_VERSION_PATCH)
+MIRAL_VERSION=$(MIRAL_RELEASE).$(DEB_VERSION)
+
 # TODO: we'll use a symbol file once mir is abi stable
 override_dh_makeshlibs:
-	dh_makeshlibs -V -Nmir-test-tools
+	dh_makeshlibs -Nlibmiral2 -V -Nmir-test-tools
+	# libmiral2 *has* a symbols file, so we don't need to -V it!
+	dh_makeshlibs -plibmiral2 -- -v$(MIRAL_RELEASE)
 
 override_dh_install:
 # Nothing outside Mir should link to libmirprotobuf directly.
 # Delete the symlink so that --fail-missing doesn't think we've missed it
 # accidentally.
 	-rm debian/tmp/usr/lib/*/libmirprotobuf.so
-ifeq ($(filter xenial yakkety zesty,$(DISTRIB_CODENAME)),)
+ifeq ($(filter xenial yakkety zesty,$(DEB_DISTRIBUTION)),)
 	dh_install
 else
 	# xenial, yakkety & zesty predate dh_missing
@@ -80,3 +85,7 @@
 # Don't try to find dependencies of libraries used as test data
 override_dh_shlibdeps:
 	dh_shlibdeps -Xmir-test-data
+
+override_dh_gencontrol:
+	dh_gencontrol -Nlibmiral2 -Nlibmiral-dev
+	dh_gencontrol -plibmiral2 -plibmiral-dev -- -v$(MIRAL_VERSION) -V'libmiral2:Version=$(MIRAL_VERSION)'

=== modified file 'doc/Doxyfile.in'
--- doc/Doxyfile.in	2017-05-08 03:04:26 +0000
+++ doc/Doxyfile.in	2017-10-11 15:01:23 +0000
@@ -784,7 +784,8 @@
 INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/README.md \
                          @CMAKE_CURRENT_SOURCE_DIR@/HACKING.md \
                          @CMAKE_CURRENT_SOURCE_DIR@/doc \
-                         @CMAKE_CURRENT_SOURCE_DIR@/examples \
+                         @CMAKE_CURRENT_SOURCE_DIR@/examples/miral-kiosk \
+                         @CMAKE_CURRENT_SOURCE_DIR@/examples/miral-shell \
                          @CMAKE_CURRENT_SOURCE_DIR@/include \
                          @MIR_GENERATED_INCLUDE_DIRECTORIES_FLATTENED@
 
@@ -859,7 +860,9 @@
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                =
+EXCLUDE                = @CMAKE_CURRENT_SOURCE_DIR@/include/server \
+                         @CMAKE_CURRENT_SOURCE_DIR@/include/platform \
+                         @CMAKE_CURRENT_SOURCE_DIR@/include/platforms
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -875,7 +878,11 @@
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */include/test/*
+EXCLUDE_PATTERNS       = *.capnp.c++ \
+                         */detail/* \
+                         @CMAKE_CURRENT_SOURCE_DIR@/examples/multi_stream.cpp \
+                         @CMAKE_CURRENT_SOURCE_DIR@/examples/uses_non_client_symbol.cpp \
+                         @CMAKE_CURRENT_SOURCE_DIR@/examples/miral-shell/titlebar_config.*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the

=== removed file 'doc/building_source_for_pc.md'
--- doc/building_source_for_pc.md	2017-05-08 03:04:26 +0000
+++ doc/building_source_for_pc.md	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-Building the source for a PC {#building_source_for_pc}
-============================
-
-Getting Mir
------------
-
-Mir is a project on Launchpad (https://launchpad.net/mir). To grab a copy use
-the command:
-
-    $ bzr branch lp:mir
-
-The command above will download the latest development version of Mir into
-the 'mir' directory (called the 'project directory' from now on).
-
-Getting dependencies
---------------------
-
-To succesfully build Mir there are a few packages required. The easiest way
-to get them is to use the packaging build dependencies:
-
-    $ sudo apt-get install devscripts equivs cmake
-
-Then, in the project directory:
-
-    $ sudo mk-build-deps -i
-
-
-Building Mir
-------------
-
-Mir is built using CMake. You first need to create the build directory and
-configure the build. In the project directory do:
-
-    $ mkdir build
-    $ cd build
-    $ cmake .. (possibly passing configuration options to CMake)
-
-There are many configuration options for the Mir project. The default options
-will work fine, but you may want to customize the build depending on your
-needs. The best way to get an overview and set them is to use the cmake-gui
-tool:
-
-    $ cmake-gui ..
-
-The next step is to build the source and run the tests:
-
-    $ make (-j8)
-    $ ctest
-
-
-Running Mir
------------
-
-The binaries created in the bin subdirectory of the project directory can be
-used directly. For example,
-
-    $ bin/mir_demo_server --launch-client bin/mir_demo_client_multiwin
-
-Other examples described elsewhere in this documentation assume you're using the
-installed version and simply need "bin/" adding to specify the local build.  
-
-
-Install Mir
------------
-
-*It should not be necessary to install Mir for experimental purposes (see 
-"Running Mir" above).* Further, if you are using an Ubuntu derived disto then
-there's likely to be existing Mir binaries elsewhere that may interact badly 
-with a second install.
-
-To install Mir just use the normal make install command:
-
-    $ sudo make install
-
-This will install the Mir libraries, executable, example clients and header
-files to the configured installation location (/usr/local by default).
-
-NB You may need "sudo ldconfig" to refresh the cache before the installed
-programs work.
-
-If you install to a non-standard location, keep in mind that you will probably 
-need to properly set the PKG_CONFIG_PATH environment variable to allow other
-applications to build against Mir, and LD_LIBRARY_PATH to allow applications to
-find the Mir libraries at runtime.
-
-
-Building Mesa
--------------
-
-*The Mesa packages shipped with Ubuntu are already built with the relevant Mir patches
-and should work out of the box with Mir.*
-
-For GL accelerated clients to use Mir they need to use a patched version of Mesa
-that supports Mir.
-
-The patch is hosted on GitHub:
-
-    $ git clone https://github.com/RAOF/mesa.git
-
-Compile as per normal instructions and pass --with-egl-platforms="mir,drm" to
-the configure options. You will need libmirclient installed as shown above.

=== removed file 'doc/demo_server_controls.md'
--- doc/demo_server_controls.md	2017-05-08 03:04:26 +0000
+++ doc/demo_server_controls.md	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-Demo Server {#demo_server}
-===========
-
-Mir's demo server (`mir_demo_server`) is an example of using the Mir to
-build a server. It uses only functionality supported by the public Mir API.
-
-Running Demo Server
--------------------
-
-Remember to always run `mir_demo_server` as root on PC (not required on
-Android), as this is required for input device support (open bug
-https://bugs.launchpad.net/mir/+bug/1286252);
-
-    sudo mir_demo_server
-
-And if you're not already on the VT you wish to use, that needs to be
-specified:
-
-    sudo mir_demo_server --vt 1
-
-There are plenty more options available if you run:
-
-    mir_demo_server --help
-
-The following operations are supported:
-
- - Quit (shut down the Mir server): *Ctrl-Alt-Backspace*
- - Switch back to X: *Ctrl-Alt-F7*
- - Switch virtual terminals (VTs): *Ctrl-Alt-(F1-F12)*
- - Switch apps: *Alt-Tab*, tap or click on the corresponding app
- - Close app: *Alt-F4*
- - Switch window within app: *Alt-`*, tap or click on the window
- - Close surface: *Ctrl-F4*
- - Move window: *Alt-leftmousebutton* drag
- - Resize window: *Alt-middle_button* drag
- - Maximize/restore current window: *Alt-F11*
- - Vertically maximize/restore current window: *Shift-F11*
- - Horizontally maximize/restore current window: *Ctrl-F11*
-
-For those writing client code request to set the surface attribute
-`mir_surface_attrib_state` are honoured:
- - `mir_window_state_restored`: restores the window 
- - `mir_window_state_maximized`: maximizes size
- - `mir_window_state_vertmaximized`: maximizes height
- - `mir_window_state_horizmaximized`: maximizes width
-
-For a quick demo try:
-
-    sudo DISPLAY= mir_demo_server --vt 1 --launch bin/mir_demo_client_egltriangle\
-     --test-client bin/mir_demo_client_multiwin --test-timeout 60
-
-(Remember to unwrap the line)
-
-### Tiling Window Manager
-
-One option that needs elaboration is "--window-manager tiling".
-
-This starts a (rather primitive) tiling window manager. It tracks the available
-displays and splits the available workspace into "tiles" (one per client).
-
-For a quick demo try:
-
-    sudo DISPLAY= mir_demo_server --vt 1 --launch bin/mir_demo_client_egltriangle\
-     --test-client bin/mir_demo_client_multiwin --test-timeout 60\
-     --window-manager tiling
-
-(Remember to unwrap the line)
-
-Want more? Log your requests at: https://bugs.launchpad.net/mir/+filebug

=== removed file 'doc/demo_shell_controls.md'
--- doc/demo_shell_controls.md	2016-01-29 08:18:22 +0000
+++ doc/demo_shell_controls.md	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-Demo Shell Controls {#demo_shell_controls}
-===================
-
-Mir's demo shell (`mir_proving_server`) is a basic environment for testing
-Mir server features as well as running natively ported apps/toolkits. It is
-still primitive and requires some explaining to make proper use of, so read
-on.
-
-Running Demo Shell
-------------------
-
-Remember to always run `mir_proving_server` as root on PC (not required on
-Android), as this is required for input device support (open bug
-https://bugs.launchpad.net/mir/+bug/1286252);
-
-    sudo mir_proving_server
-
-And if you're not already on the VT you wish to use, that needs to be
-specified:
-
-    sudo mir_proving_server --vt 1
-
-There are plenty more options available if you run:
-
-    mir_proving_server --help
-
-Controls
---------
-
-All controls have a keyboard/mouse combination and where possible also have
-touch alternatives for phones/tablets:
-
- - Quit the shell (shut down the Mir server): *Ctrl-Alt-Backspace*
- - Switch back to X: *Ctrl-Alt-F7*
- - Switch virtual terminals (VTs): *Ctrl-Alt-(F1-F12)*
- - Switch apps: *Alt-Tab* or *4-finger swipe left/right*
- - Switch windows of the current app: *Alt-grave*
- - Ask an app to close: *Alt-F4* (it may refuse or not understand)
- - Move window: *Alt-leftmousebutton* or *3-finger drag*
- - Resize window: *Alt-middlemousebutton* or *3-finger pinch/zoom*
- - Toggle negative rendering: *Super-N*
- - Toggle high-contrast rendering: *Super-C*
- - Sleep/wake all displays: *Alt-P* or *Android power button*
- - Rotate the focussed monitor: *Ctrl-Alt-(Left/Right/Up/Down)* or
-   *Volume up/down while touching the screen*
- - Change display mode of the focussed monitor: *Ctrl-Alt-(=/-)*
- - Reset display mode to default, on focussed monitor: *Ctrl-Alt-0*
- - Adjust window opacity/alpha: *Alt-mousewheel*
- - Zoom in/out: *Super-mousewheel*
-
-*Super* means the Windows key on a PC, or the search key on a Chromebook.
-
-Want more? Log your requests at: https://bugs.launchpad.net/mir/+filebug

=== added file 'doc/getting_and_using_mir.md'
--- doc/getting_and_using_mir.md	1970-01-01 00:00:00 +0000
+++ doc/getting_and_using_mir.md	2017-10-11 15:01:23 +0000
@@ -0,0 +1,106 @@
+Getting and Using Mir  {#getting_and_using_mir}
+=====================
+
+Getting Mir examples
+--------------------
+
+You can install the Mir examples as follows:
+
+    $ sudo apt install mir-demos qterminal
+    $ sudo apt install mir-graphics-drivers-desktop qtubuntu-desktop
+
+Using Mir examples
+------------------
+
+For convenient testing there's a "miral-app" script that wraps the commands used
+to start a server and then launches a terminal (as the current user):
+
+    $ miral-app
+
+To run independently of X11 you need to grant access to the graphics hardware
+(by running as root) and specify a VT to run in. There's a "miral-desktop"
+script that wraps to start the server (as root) and then launch a terminal
+(as the current user):
+
+    $ miral-desktop
+    
+For more options see *Options when running the Mir example shell* below.
+    
+### Running applications on Mir
+
+If you use the command-line launched by miral-app or miral-desktop native Mir
+applications (which include native Mir clients and those that use SDL or the 
+GTK+, Qt toolkits) can be started as usual:
+
+    $ mir_demo_client_egltriangle
+    $ gedit
+    $ sudo apt install kate neverball 
+    $ kate
+    $ neverball
+
+From outside the MirAL session GTK+, Qt and SDL applications can still be run
+using the miral-run script:
+
+    $ miral-run gedit
+    $ miral-run 7kaa
+
+### Running for X11 applications
+
+If you want to run X11 applications that do not have native Mir support in the
+toolkit they use then the answer is Xmir: an X11 server that runs on Mir. First
+you need Xmir installed:
+
+    $ sudo apt install xmir
+
+Then once you have started a miral shell (as above) you can use miral-xrun to
+run applications under Xmir:
+
+    $ miral-xrun firefox
+
+This automatically starts a Xmir X11 server on a new $DISPLAY for the
+application to use. You can use miral-xrun both from a command-line outside the
+miral-shell or, for example, from the terminal running in the shell.
+
+### Options when running the Mir example shell
+
+#### Script Options
+
+Both the "miral-app" and "miral-desktop" scripts provide options for using an
+alternative example shell (miral-kiosk) and an alternative to gnome-terminal.
+
+    -kiosk               use miral-kiosk instead of miral-shell
+    -launcher <launcher> use <launcher> instead of qterminal
+
+In addition miral-desktop has the option to set the VT that is used:
+
+    -vt       <termid>   set the virtual terminal [4]
+
+There are some additional options (listed with "-h") but those are the important
+ones.
+
+#### miral-shell Options
+
+The scripts can also be used to pass options to Mir: they pass everything on
+the command-line following the first thing they don't understand. These can be
+listed by `miral-shell --help`. Most of these options are inherited from Mir,
+but the following MirAL specific are likely to be of interest:
+
+    --window-management-trace           log trace message
+
+Probably the main use for MirAL is to test window-management (either of a
+toolkit or of a server) and this logs all calls to and from the window 
+management policy. This option is supported directly in the MirAL library and
+works for any MirAL based shell - even one you write yourself.
+
+    --keymap arg (=us)                  keymap <layout>[+<variant>[+<options>]]
+                                        , e,g, "gb" or "cz+qwerty" or 
+                                        "de++compose:caps"
+
+For those of us not in the USA this is very useful. Both the -shell and -kiosk
+examples support this option.
+
+    --window-manager arg (=floating)   window management strategy 
+                                       [{floating|tiling|system-compositor}]
+
+Is only supported by miral-shell and its main use is to allow an alternative
+"tiling" window manager to be selected.

=== added file 'doc/getting_involved_in_mir.md'
--- doc/getting_involved_in_mir.md	1970-01-01 00:00:00 +0000
+++ doc/getting_involved_in_mir.md	2017-10-11 15:01:23 +0000
@@ -0,0 +1,106 @@
+Getting Involved in Mir  {#getting_involved_in_mir}
+=======================
+
+Getting involved
+----------------
+
+The best place to ask questions and discuss about the Mir project is
+the \#ubuntu-mir IRC channel on freenode.
+
+The Mir project is hosted on Launchpad: https://launchpad.net/mir
+
+Building Mir
+------------
+
+These instructions assume that you’re using Ubuntu 16.04LTS or later, I’ve not
+earlier Ubuntu versions or other distributions.
+
+You’ll need a few development and utility packages installed, along with the
+Mir graphics drivers:
+
+    $ sudo apt install devscripts equivs bzr
+    $ sudo apt install mir-graphics-drivers-desktop
+
+If you’re working on a phone or tablet use mir-graphics-drivers-android in
+place of mir-graphics-drivers-desktop. (See \ref building_source_for_arm for
+more on this.)
+
+With these installed you can checkout and build Mir:
+
+    $ bzr branch lp:mir
+    $ sudo mk-build-deps -i
+    $ mkdir mir/build
+    $ cd  mir/build
+    $ cmake ..
+    $ make
+
+This creates an example shell (miral-shell) in the bin directory. This can be
+run directly:
+
+    $ bin/miral-shell
+
+With the default options this runs in a window on X (which is convenient for
+development).
+
+The miral-shell example is simple, don’t expect to see a sophisticated launcher
+by default. You can start mir apps from the command-line. For example:
+
+    $ bin/miral-run gnome-terminal
+
+That’s right, a lot of standard GTK+ applications will “just work” (the GDK
+toolkit has a Mir backend). Any that assume the existence of an X11 and bypass
+the toolkit my making X11 protocol calls will have problems though.
+
+To exit from miral-shell press Ctrl-Alt-BkSp.
+
+You can install the Mir examples, headers and libraries you've built with:
+  
+    $ sudo make install
+
+### Preparing a VM to run Mir
+
+Especially if you want to debug the shell without locking your system this might be a helpful setup:
+
+- \ref setup_kvm_for_mir
+- \ref setup_vmware_for_mir
+
+### Contributing to Mir
+
+Currently, the Mir code activity is performed on a development branch:
+lp:~mir-team/mir/development-branch
+
+This development branch is promoted to the branch used for the ubuntu archive
+and touch images. Please submit any merge proposals against the development
+branch.
+
+Please file bug reports at: https://bugs.launchpad.net/mir
+
+The Mir development mailing list can be found at: https://lists.ubuntu.com/mailman/listinfo/Mir-devel
+
+The Mir coding guidelines are [here](cppguide/index.html).
+
+### Working on Mir code
+
+ - \ref md_README  "Mir Read me"
+ - \ref md_HACKING "Mir hacking guide"
+ - \ref component_reports
+ - \ref dso_versioning_guide
+ - \ref abi_compatibility_tools
+ - \ref performance_framework
+ - \ref latency "Measuring visual latency"
+
+Building Mesa
+-------------
+
+*The Mesa packages shipped with Ubuntu are already built with the relevant Mir patches
+and should work out of the box with Mir.*
+
+For GL accelerated clients to use Mir they need to use a patched version of Mesa
+that supports Mir.
+
+The patch is hosted on GitHub:
+
+    $ git clone https://github.com/RAOF/mesa.git
+
+Compile as per normal instructions and pass --with-egl-platforms="mir,drm" to
+the configure options. You will need libmirclient installed as shown above.

=== removed file 'doc/installing_prebuilt_on_pc.md'
--- doc/installing_prebuilt_on_pc.md	2016-01-29 08:18:22 +0000
+++ doc/installing_prebuilt_on_pc.md	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-Installing pre-built packages on a PC {#installing_prebuilt_on_pc}
-=====================================
-
-Install Ubuntu 13.10 or later if you haven't done so already.  Uninstall any
-proprietary drivers (-nvidia, -fglrx) and reboot on the FOSS drivers.
-
-       sudo apt-get update
-       sudo apt-get install mir-demos

=== added file 'doc/introducing_the_miral_api.md'
--- doc/introducing_the_miral_api.md	1970-01-01 00:00:00 +0000
+++ doc/introducing_the_miral_api.md	2017-10-11 15:01:23 +0000
@@ -0,0 +1,25 @@
+Introducing the Miral API {#introducing_the_miral_api}
+=========================
+
+The main() program
+------------------
+
+The main() program from miral-shell looks like this:
+
+\include shell_main.cpp
+
+This shell is providing FloatingWindowManagerPolicy, TilingWindowManagerPolicy
+and SpinnerSplash. The rest is from MirAL.
+
+If you look for the corresponding code in lp:qtmir and lp:mir you’ll find it
+less clear, more verbose and scattered over multiple files.
+
+A shell has to provide a window management policy (miral-shell provides two: 
+FloatingWindowManagerPolicy and TilingWindowManagerPolicy). A window management
+policy needs to implement the \ref miral::WindowManagementPolicy interface for
+handling a set of window management events.
+
+The way these events are handled determines the behaviour of the shell.
+
+The \ref miral::WindowManagerTools interface provides the principle methods for
+a window management policy to control Mir. 

=== modified file 'doc/mainpage.md'
--- doc/mainpage.md	2017-05-08 03:04:26 +0000
+++ doc/mainpage.md	2017-10-11 15:01:23 +0000
@@ -3,104 +3,66 @@
 
 Mir is a next generation display server targeted as a replacement for the X
 window server system to unlock next-generation user experiences for devices
-ranging from Linux desktop to mobile devices powered by Ubuntu. The primary
-purpose of Mir is to enable the development of the next generation
-[Unity](http://unity.ubuntu.com).
+ranging from Linux desktop to mobile and IoT devices powered by Ubuntu.
+
+ - If you want to use the Mir snaps, see: 
+   [Run a kiosk snap on Ubuntu Core](https://developer.ubuntu.com/core/examples/snaps-on-mir)
+
+ - If you want to try out the Mir demos on desktop, see: \ref getting_and_using_mir
+
+ - If you want to get involved in Mir development, see: \ref getting_involved_in_mir
+
+Using Mir for client development
+--------------------------------
+
+This is usually something you don't need to do explicitly, it is normally 
+handled by a GUI toolkit (or library).
+
+A toolkit can run on Mir in three ways: using Wayland protocols, using the Mir 
+client API or using X11 translation by the Xmir server.
+
+ - Qt, has "wayland" and "mir" plugins that can be selected by setting
+   the QT_QPA_PLATFORM environment variable to "wayland" or "ubuntumirclient" 
+   respectively.
+
+ - SDL can be built with "wayland" and "mir" support and these options selected
+   by setting the SDL_VIDEODRIVER environment variable to "wayland" or "mir".
+   
+If want to use the Mir client library directly (e.g. you are working on "mir" 
+support for a toolkit or library) Install the headers and libraries for using
+libmirclient in development:
+
+    $ sudo apt install libmirclient-dev
+
+A `miral.pc` file is provided for use with `pkg-config` or other tools. For
+example:
+
+    $ pkg-config --cflags mirclient
+
+The client API documentation is here: \ref mir_toolkit
+
+Using Mir for server development
+--------------------------------
+
+Install the headers and libraries for using libmiral in development:
+
+    $ sudo apt install libmiral-dev
+
+A `miral.pc` file is provided for use with `pkg-config` or other tools. For
+example: 
+
+    $ pkg-config --cflags miral
+
+The server API is introduced here: \ref introducing_the_miral_api
+
+The Mir Documentation
+---------------------
+
+The Mir documentation can be installed and read like this:
+
+    $ sudo apt install mir-doc
+    $ xdg-open /usr/share/doc/mir-doc/html/index.html
 
 More detailed information about the motivation, scope, and high-level design
 of Mir can be found at http://wiki.ubuntu.com/MirSpec .
 
-Getting and installing Mir
---------------------------
-
-### Using pre-built packages
-
-If you just want to try out mir, or write client applications, then the easiest
-way is to use the pre-built packages:
-
- - \ref installing_prebuilt_on_pc
-
-### Building and installing from source
-
-If you are curious about Mir internals or intend to contribute to it, you should
-get the source and build it:
-
- - \ref building_source_for_pc
- - \ref building_source_for_arm
-
-### Preparing a VM to run Mir
-
-Especially if you want to debug the shell without locking your system this might be a helpful setup:
-
-- \ref setup_kvm_for_mir
-- \ref setup_vmware_for_mir
-
-Using Mir
----------
-
- - \ref using_mir_on_pc
- - \ref demo_shell_controls
- - \ref demo_server
-
-Getting involved
-----------------
-
-The best place to ask questions and discuss about the Mir project is
-the \#ubuntu-mir IRC channel on freenode.
-
-The Mir project is hosted on Launchpad: https://launchpad.net/mir
-
-Currently, the Mir code activity is performed on a development branch:
-lp:~mir-team/mir/development-branch
-
-Approximately fortnightly, this development branch is promoted to the branch
-used for the ubuntu archive and touch images. Please submit any merge proposals 
-against the development branch.
-
-Please file bug reports at: https://bugs.launchpad.net/mir
-
-The Mir development mailing list can be found at: https://lists.ubuntu.com/mailman/listinfo/Mir-devel
-
-The Mir coding guidelines are [here](cppguide/index.html).
-
-Writing client applications
----------------------------
-
- - \ref mir_toolkit "Mir API Documentation"
- - \subpage basic.c "basic.c: A basic Mir client (which does nothing)"
-
-Writing server applications
----------------------------
-
-Mir server is written as a library which allows the server code to be adapted
-for bespoke applications.
-
- - \subpage server_example.cpp 
-   "server_example.cpp: a test executable hosting the following"
- - \subpage server_example_input_event_filter.cpp 
-   "server_example_input_event_filter.cpp: provide a Quit command"
- - \subpage server_example_display_configuration_policy.cpp 
-   "server_example_display_configuration_policy.cpp: configuring display layout"
- - \subpage server_example_input_filter.cpp 
-   "server_example_input_filter.cpp: print input events to stdout"
- - \subpage server_example_log_options.cpp 
-   "server_example_log_options.cpp: replace Mir logger with glog"
- - \subpage server_example_basic_window_manager.h 
-   "server_example_basic_window_manager.h: How to wire up a window manager"
- - \subpage server_example_window_management.cpp 
-   "server_example_window_management.cpp: simple window management examples"
- - \subpage server_example_canonical_window_manager.cpp 
-   "server_example_canonical_window_manager.cpp: canonical window management policy"
- - \subpage server_example_custom_compositor.cpp 
-   "server_example_custom_compositor.cpp: demonstrate writing an alternative GL rendering code"
-
-Working on Mir code
--------------------
-
- - \ref md_README  "Mir Read me"
- - \ref md_HACKING "Mir hacking guide"
- - \ref component_reports
- - \ref dso_versioning_guide
- - \ref abi_compatibility_tools
- - \ref performance_framework
- - \ref latency "Measuring visual latency"

=== removed file 'doc/using_mir_on_pc.md'
--- doc/using_mir_on_pc.md	2016-01-29 08:18:22 +0000
+++ doc/using_mir_on_pc.md	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-Using Mir on a PC {#using_mir_on_pc}
-=================
-
-Before you begin
-----------------
-
-Make sure your hardware is supported. That means you're using a Mesa driver,
-of which intel, radeon, and nouveau families are supported. If you're logged
-in to X then run this command to verify an appropriate DRI driver is active:
-
-    sudo pmap `pidof X` | grep dri.so
-
-or
-
-    lsmod | grep drm
-
-Before you can use Mir you need to ensure you have the proper custom Mesa
-build installed. If you are running Ubuntu 13.10 or later
-(see \ref installing_prebuilt_on_pc), you should be good to go.
-
-If you built Mir from source code (see \ref building_source_for_pc), you
-need to ensure you are using the proper Mesa at runtime. You can do that by
-installing the Mesa packages from Ubuntu 13.10 (or later) or by building the
-custom Mesa yourself and ensuring it can be found by Mir, e.g., by using
-`LD_LIBRARY_PATH`.
-
-### Getting some example client applications
-
-You can get some example programs by installing the `mir-demos` package:
-
-    $ sudo apt-get install mir-demos
-
-If you are building from source you can find client applications in the `bin/`
-subdirectory of the build directory.
-
-Running Mir
------------
-
-Mir can run run either natively on mesa-kms or as an X application.
-
-### Running Mir on X
-
-To run Mir as an X client start it from an X terminal:
-
-    $ mir_demo_server --launch-client mir_demo_client_multiwin
-    
-You can start additional Mir clients, for example (in a new terminal):
-
-    $ mir_demo_egltriangle
-    
-To exit from Mir:
- 
-    <Ctrl+Alt+BkSp>
-    
-Note: up to Mir 0.18 it is also necessary to specify `--platform-input-lib` when
-starting the server:
-  - for Mir-0.17 add: `--platform-input-lib server-mesa-x11.so.6`
-  - for Mir-0.18 add: `--platform-input-lib server-mesa-x11.so.7`
-
-### Running Mir natively
-
-To run Mir natively on a PC/desktop/laptop:
-
-    $ sudo DISPLAY= mir_demo_server --vt 1 --arw-file
-    
-This will switch you to a Mir session on VT1. Switch back to your X-based 
-desktop:
-
-    <Ctrl+Alt+F7>
-    
-In a new terminal:
-
-    $ mir_demo_client_multiwin -m /tmp/mir_socket
-    
-Switch back to Mir.
-
-    <Ctrl+Alt+F1>
-    
-Watch your friends be amazed!
-
-To exit from Mir:
-
-    <Ctrl+Alt+BkSp>
-
-In case you accidentally killed your X login and ended up with a failsafe
-screen, you might find on subsequent reboots you can't log in to X at all any
-more (it instantly and silently takes you back to the login screen).  The fix
-for this is to log in to a VT and:
-
-    $ rm .Xauthority
-    $ sudo restart lightdm

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2017-06-06 16:26:18 +0000
+++ examples/CMakeLists.txt	2017-10-11 15:01:23 +0000
@@ -1,14 +1,5 @@
-mir_add_wrapped_executable(mir_demo_standalone_render_surfaces
-  render_surfaces.cpp
-  buffer_render_target.cpp
-  image_renderer.cpp
-)
-
-target_link_libraries(mir_demo_standalone_render_surfaces
-  mirserver
-  exampleserverconfig
-  ${Boost_LIBRARIES}
-)
+add_subdirectory(miral-kiosk)
+add_subdirectory(miral-shell)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -fno-strict-aliasing -Wextra")
 
@@ -18,26 +9,17 @@
 )
 
 add_library(exampleserverconfig STATIC
-  server_example_basic_window_manager.cpp
-  server_example_basic_window_manager.h
-  server_example_canonical_window_manager.cpp
-  server_example_display_configuration_policy.cpp
   server_example_input_device_config.cpp
   server_example_input_event_filter.cpp
   server_example_log_options.cpp
   server_example_input_filter.cpp
   server_example_host_lifecycle_event.cpp
-  server_example_window_management.cpp
   server_example_custom_compositor.cpp
   server_example_adorning_compositor.cpp
-  server_example_cursor_images.cpp
-  server_example_cursor_images.h
-  xcursor_loader.cpp
-  xcursor_loader.h
-  xcursor.c
-  xcursor.h
 )
 
+target_link_libraries(exampleserverconfig mirserver)
+
 target_link_libraries(eglapp
   mirclient
   ${EGL_LIBRARIES}
@@ -184,6 +166,7 @@
 add_library(mirdraw STATIC graphics_utils.cpp)
 
 include_directories(
+  ${PROJECT_SOURCE_DIR}/include/miral
   ${PROJECT_SOURCE_DIR}/include/server
   ${PROJECT_SOURCE_DIR}/include/client
   ${PROJECT_SOURCE_DIR}/include/platform
@@ -192,17 +175,6 @@
   ${GL_INCLUDE_DIRS}
 )
 
-mir_add_wrapped_executable(mir_demo_standalone_render_to_fb
-    render_to_fb.cpp
-)
-
-target_link_libraries(mir_demo_standalone_render_to_fb
-    mirserver
-    mirdraw
-    ${GL_LIBRARIES}
-    ${Boost_LIBRARIES}
-)
-
 add_library(mir_demo_server_loadable MODULE
   server_example.cpp
   glog_logger.cpp
@@ -210,7 +182,8 @@
 )
 
 target_link_libraries(mir_demo_server_loadable
-  mirserver
+  miral-shell-lib
+  miral
   exampleserverconfig
   ${GLog_LIBRARY}
   ${GFlags_LIBRARY}
@@ -229,9 +202,6 @@
   dl
 )
 
-mir_add_wrapped_executable(mir_demo_server_minimal server_minimal.cpp)
-target_link_libraries(mir_demo_server_minimal mirserver)
-
 if (MIR_ENABLE_TESTS)
   add_executable(mir_symbol_test
       uses_non_client_symbol.cpp
@@ -268,15 +238,6 @@
   endif ()
 endif ()
 
-add_executable(mir_cursor_theme_dump
-  cursor-theme-dump.cpp
-)
-
-target_link_libraries(mir_cursor_theme_dump
-  exampleserverconfig
-  mirserver
-)
-
 mir_add_wrapped_executable(mir_demo_client_multistream
   multi_stream.cpp
 )
@@ -313,6 +274,15 @@
   mirclient
 )
 
+include_directories(${MIR_GENERATED_INCLUDE_DIRECTORIES})
+
+mir_add_wrapped_executable(mir_demo_client_wayland wayland_client.c)
+target_link_libraries(mir_demo_client_wayland
+
+  ${WAYLAND_CLIENT_LIBRARIES}
+)
+
 mir_add_wrapped_executable(mir_demo_client_screencast screencast.cpp)
 
 target_link_libraries(mir_demo_client_screencast mirclient)
+

=== modified file 'examples/animated_cursor_demo_client.c'
--- examples/animated_cursor_demo_client.c	2017-05-19 13:51:47 +0000
+++ examples/animated_cursor_demo_client.c	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2015 Canonical LTD
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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,

=== modified file 'examples/as_render_target.h'
--- examples/as_render_target.h	2015-10-01 08:58:30 +0000
+++ examples/as_render_target.h	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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,

=== modified file 'examples/basic.c'
--- examples/basic.c	2017-05-19 13:49:04 +0000
+++ examples/basic.c	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2012 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
+ * 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,
@@ -41,16 +41,12 @@
 /// \snippet basic.c surface_release_tag
 ///\subsection connection_release We release our connection
 /// \snippet basic.c connection_release_tag
-///\subsection get the raw, platform-specific buffer handle for the current buffer
-/// \snippet basic.c get_current_buffer_tag
+///\subsection get graphics region for the current buffer
+/// \snippet basic.c get_graphics_region_tag
 /// \example basic.c A simple mir client
 ///\section MirDemoState MirDemoState
 /// The handles needs to be accessible both to callbacks and to the control function.
 /// \snippet basic.c MirDemoState_tag
-///\section Callbacks Callbacks
-/// This program opens a mir connection and creates a surface. The handles
-/// needs to be accessible both to callbacks and to the control function.
-/// \snippet basic.c Callback_tag
 
 ///\internal [MirDemoState_tag]
 // Utility structure for the state of a single surface session.
@@ -143,11 +139,12 @@
     {
         // We can query the current graphics buffer attributes
         {
+            ///\internal [get_graphics_region_tag]
             MirGraphicsRegion graphics_region;
             mir_buffer_stream_get_graphics_region(bs, &graphics_region);
 
-            ///\internal [get_current_buffer_tag]
-            // In a real application we'd render into the current buffer
+            ///\internal [get_graphics_region_tag]
+            // In a real application we'd render into the graphics_region
         }
 
         ///\internal [swap_buffers_tag]

=== modified file 'examples/buffer_render_target.cpp'
--- examples/buffer_render_target.cpp	2016-01-29 08:18:22 +0000
+++ examples/buffer_render_target.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2012 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
+ * 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,

=== modified file 'examples/buffer_render_target.h'
--- examples/buffer_render_target.h	2015-02-22 07:46:25 +0000
+++ examples/buffer_render_target.h	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2012 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
+ * 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,

=== modified file 'examples/camera.c'
--- examples/camera.c	2017-05-19 13:49:04 +0000
+++ examples/camera.c	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * 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 3 as
+ * 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,

=== modified file 'examples/chain_jumping_buffers.c'
--- examples/chain_jumping_buffers.c	2017-05-19 13:54:14 +0000
+++ examples/chain_jumping_buffers.c	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * 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 3 as
+ * 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,

=== modified file 'examples/client_helpers.cpp'
--- examples/client_helpers.cpp	2017-06-06 14:57:41 +0000
+++ examples/client_helpers.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2015-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 3 as
+ * 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,
@@ -18,6 +18,8 @@
 
 #include "client_helpers.h"
 #include "mir_toolkit/mir_client_library.h"
+#include <unistd.h>
+#include <signal.h>
 
 namespace me = mir::examples;
 
@@ -89,6 +91,10 @@
         break;
     }
 
+    case mir_event_type_close_window:
+        kill(getpid(), SIGTERM);
+        break;
+
     default:
         break;
     }

=== modified file 'examples/client_helpers.h'
--- examples/client_helpers.h	2017-06-06 14:57:41 +0000
+++ examples/client_helpers.h	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2015-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 3 as
+ * 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,

=== modified file 'examples/client_touch_validator.cpp'
--- examples/client_touch_validator.cpp	2017-06-06 15:41:28 +0000
+++ examples/client_touch_validator.cpp	2017-10-11 15:01:23 +0000
@@ -4,7 +4,7 @@
  * Copyright © 2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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,

=== removed file 'examples/cursor-theme-dump.cpp'
--- examples/cursor-theme-dump.cpp	2016-01-29 08:18:22 +0000
+++ examples/cursor-theme-dump.cpp	1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-/*
- * Copyright © 2015 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alan Griffiths <[e-mail]>
- */
-
-#include "xcursor_loader.h"
-
-#include "mir/graphics/cursor_image.h"
-#include <mir_toolkit/cursors.h>
-
-#include <fstream>
-
-using namespace mir::examples;
-using namespace mir::geometry;
-
-namespace
-{
-auto const cursor_names = {
-    mir_arrow_cursor_name,
-    mir_busy_cursor_name,
-    mir_caret_cursor_name,
-    mir_default_cursor_name,
-    mir_pointing_hand_cursor_name,
-    mir_open_hand_cursor_name,
-    mir_closed_hand_cursor_name,
-    mir_horizontal_resize_cursor_name,
-    mir_vertical_resize_cursor_name,
-    mir_diagonal_resize_bottom_to_top_cursor_name,
-    mir_diagonal_resize_top_to_bottom_cursor_name,
-    mir_omnidirectional_resize_cursor_name,
-    mir_vsplit_resize_cursor_name,
-    mir_hsplit_resize_cursor_name,
-    mir_crosshair_cursor_name };
-}
-
-
-int main(int argc, char const* argv[])
-try
-{
-    if (argc != 2)
-    {
-        puts("Usage mir_cursor_theme_dump <cursor theme>\n");
-        exit(-1);
-    }
-
-    auto const theme = argv[1];
-    std::ofstream output(std::string{theme} + "-theme.h");
-
-    output << "#include <initializer_list>\n"
-      "\n"
-      "namespace\n"
-      "{\n"
-        "struct CursorData\n"
-        "{\n"
-        "    CursorData(char const* name, unsigned int hotspot_x, unsigned int hotspot_y, char const* pixel_data) :\n"
-        "        name(name), hotspot_x(hotspot_x), hotspot_y(hotspot_y), pixel_data(reinterpret_cast<unsigned char const*>(pixel_data)) {}\n"
-        "\n"
-        "    unsigned int const width{" << mir::input::default_cursor_size.width.as_int() << "};\n"
-        "    unsigned int const height{" << mir::input::default_cursor_size.height.as_int() << "};\n"
-        "    char const* const name;\n"
-        "    unsigned int const hotspot_x;\n"
-        "    unsigned int const hotspot_y;\n"
-        "    unsigned char const* const pixel_data;\n"
-        "};\n"
-        "auto const cursor_data = {\n";
-
-    auto const buffer_size = 4*mir::input::default_cursor_size.height.as_int()*mir::input::default_cursor_size.height.as_int();
-
-    auto const xcursor_loader = std::make_shared<XCursorLoader>(theme);
-
-    for (auto cursor : cursor_names)
-    {
-        if (auto const image = xcursor_loader->image(cursor, mir::input::default_cursor_size))
-        {
-            printf("Have image for %s:%s\n", theme, cursor);
-
-            auto const hotspot = image->hotspot();
-            auto const argb_8888 = static_cast<uint8_t const*>(image->as_argb_8888());
-
-            output << "CursorData{\"" << cursor << "\", " << hotspot.dx.as_int() << ", " << hotspot.dy.as_int() << ",\n";
-
-            int chars = 0;
-
-            output << std::oct << "    \"";
-
-            for (auto pbyte = argb_8888; pbyte != argb_8888 + buffer_size; ++pbyte)
-            {
-                auto step = (*pbyte < 010) ? 2 : (*pbyte < 0100) ? 3 : 4;
-
-                if ((chars += step) > 80)
-                {
-                    output << "\"\n    \"";
-                    chars = step;
-                }
-
-                output << '\\' << static_cast<unsigned>(*pbyte);
-            }
-
-            output << "\"\n";
-
-            output << "},\n";
-        }
-        else
-        {
-            printf("** WARNING ** No image for %s:%s\n", theme, cursor);
-        }
-    }
-    output << "};\n";
-    output << "}\n";
-}
-catch (std::exception const& error)
-{
-    printf("** ERROR **: %s", error.what());
-}
\ No newline at end of file

=== modified file 'examples/cursors_demo_client.c'
--- examples/cursors_demo_client.c	2017-05-08 03:04:26 +0000
+++ examples/cursors_demo_client.c	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * 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
+ * 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,

=== modified file 'examples/demo_client_display_config.c'
--- examples/demo_client_display_config.c	2017-05-08 03:04:26 +0000
+++ examples/demo_client_display_config.c	2017-10-11 15:01:23 +0000
@@ -1,10 +1,10 @@
 /*
  * Client-side display configuration demo.
  *
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013, 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 3 as
+ * 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,
@@ -37,7 +37,11 @@
     configuration_mode_clone,
     configuration_mode_horizontal,
     configuration_mode_vertical,
-    configuration_mode_single
+    configuration_mode_single,
+    configuration_mode_left,
+    configuration_mode_right,
+    configuration_mode_up,
+    configuration_mode_down,
 } ConfigurationMode;
 
 struct ClientContext
@@ -49,9 +53,13 @@
     volatile sig_atomic_t reconfigure;
 };
 
-static void print_current_configuration(MirConnection *connection)
+static MirDisplayConfig *conf = NULL;
+
+static void print_current_configuration()
 {
-    MirDisplayConfig *conf = mir_connection_create_display_configuration(connection);
+    if (!conf)
+        return;
+
     size_t num_outputs = mir_display_config_get_num_outputs(conf);
 
     for (uint32_t i = 0; i < num_outputs; i++)
@@ -64,8 +72,8 @@
         bool connected = mir_output_get_connection_state(output) ==
             mir_output_connection_state_connected;
 
-        printf("Output id: %d connected: %d used: %d position_x: %d position_y: %d",
-               id, connected, used, position_x, position_y);
+        printf("Output id: %d connected: %d used: %d position_x: %d position_y: %d orientation: %d",
+               id, connected, used, position_x, position_y, mir_output_get_orientation(output));
 
         MirOutputMode const* current = mir_output_get_current_mode(output);
         if (current)
@@ -80,8 +88,6 @@
             printf("\n");
         }
     }
-
-    mir_display_config_release(conf);
 }
 
 static int apply_configuration(MirConnection *connection, MirDisplayConfig *conf)
@@ -208,31 +214,67 @@
     }
 }
 
+static void orient_display(MirDisplayConfig *conf, MirOrientation orientation)
+{
+    size_t num_outputs = mir_display_config_get_num_outputs(conf);
+
+    for (size_t i = 0; i < num_outputs; i++)
+    {
+        MirOutput *output = mir_display_config_get_mutable_output(conf, i);
+        mir_output_set_orientation(output, orientation);
+    }
+}
+
 static void configure_display(struct ClientContext *context, ConfigurationMode mode,
                               int mode_data)
 {
-    MirDisplayConfig *conf =
-        mir_connection_create_display_configuration(context->connection);
+    if (!conf)
+        conf = mir_connection_create_display_configuration(context->connection);
 
-    if (mode == configuration_mode_clone)
+    switch (mode)
     {
+    case configuration_mode_clone:
         configure_display_clone(conf);
         printf("Applying clone configuration: ");
-    }
-    else if (mode == configuration_mode_vertical)
-    {
+        break;
+
+    case configuration_mode_vertical:
         configure_display_vertical(conf);
         printf("Applying vertical configuration: ");
-    }
-    else if (mode == configuration_mode_horizontal)
-    {
+        break;
+
+    case configuration_mode_horizontal:
         configure_display_horizontal(conf);
         printf("Applying horizontal configuration: ");
-    }
-    else if (mode == configuration_mode_single)
-    {
+        break;
+
+    case configuration_mode_single:
         configure_display_single(conf, mode_data);
         printf("Applying single configuration for output %d: ", mode_data);
+        break;
+
+    case configuration_mode_left:
+        orient_display(conf, mir_orientation_left);
+        printf("Applying orientation left: ");
+        break;
+
+    case configuration_mode_right:
+        orient_display(conf, mir_orientation_right);
+        printf("Applying orientation right: ");
+        break;
+
+    case configuration_mode_up:
+        orient_display(conf, mir_orientation_inverted);
+        printf("Applying orientation up: ");
+        break;
+
+    case configuration_mode_down:
+        orient_display(conf, mir_orientation_normal);
+        printf("Applying orientation down: ");
+        break;
+
+    default:
+        break;
     }
 
     if (apply_configuration(context->connection, conf))
@@ -240,22 +282,33 @@
         context->mode = mode;
         context->mode_data = mode_data;
     }
-
-    mir_display_config_release(conf);
 }
 
 static void display_change_callback(MirConnection *connection, void *context)
 {
-    (void)context;
-
     printf("=== Display configuration changed === \n");
 
-    print_current_configuration(connection);
+    if (conf)
+        mir_display_config_release(conf);
+
+    conf = mir_connection_create_display_configuration(connection);
+
+    print_current_configuration();
 
     struct ClientContext *ctx = (struct ClientContext*) context;
     ctx->reconfigure = 1;
 }
 
+static void apply_to_base_configuration(MirConnection *connection)
+{
+    if (!conf)
+        return;
+
+    mir_connection_preview_base_display_configuration(connection, conf, 2);
+    puts("Applying to base configuration");
+    mir_connection_confirm_base_display_configuration(connection, conf);
+}
+
 static void handle_keyboard_event(struct ClientContext *ctx, MirKeyboardEvent const* event)
 {
     if (mir_keyboard_event_action(event) != mir_keyboard_action_up)
@@ -271,6 +324,9 @@
 
     switch (key_code)
     {
+    case XKB_KEY_a:
+        apply_to_base_configuration(ctx->connection);
+        break;
     case XKB_KEY_q:
         ctx->running = 0;
         break;
@@ -284,7 +340,21 @@
         configure_display(ctx, configuration_mode_vertical, 0);
         break;
     case XKB_KEY_p:
-        print_current_configuration(ctx->connection);
+        if (!conf)
+            conf = mir_connection_create_display_configuration(ctx->connection);
+        print_current_configuration();
+        break;
+    case XKB_KEY_Left:
+        configure_display(ctx, configuration_mode_right, 0);
+        break;
+    case XKB_KEY_Up:
+        configure_display(ctx, configuration_mode_up, 0);
+        break;
+    case XKB_KEY_Right:
+        configure_display(ctx, configuration_mode_left, 0);
+        break;
+    case XKB_KEY_Down:
+        configure_display(ctx, configuration_mode_down, 0);
         break;
     }
 }
@@ -292,15 +362,16 @@
 static void event_callback(
     MirWindow* surface, MirEvent const* event, void* context)
 {
-    (void) surface;
+    mir_eglapp_handle_event(surface, event, context);
+
     struct ClientContext *ctx = (struct ClientContext*) context;
-    
+
     if (mir_event_get_type(event) != mir_event_type_input)
         return;
     MirInputEvent const* input_event = mir_event_get_input_event(event);
     if (mir_input_event_get_type(input_event) != mir_input_event_type_key)
         return;
-    
+
     handle_keyboard_event(ctx, mir_input_event_get_keyboard_event(input_event));
 }
 
@@ -317,7 +388,9 @@
                " h: arrange outputs horizontally in the virtual space\n"
                " v: arrange outputs vertically in the virtual space\n"
                " 1-9: enable only the Nth connected output (in the order returned by the hardware)\n"
-               " p: print current display configuration\n");
+               " Arrows: orient display (sets \"down\" direction)\n"
+               " p: print current display configuration\n"
+               " a: apply current display configuration globally\n");
 
         return 1;
     }
@@ -351,6 +424,9 @@
         }
     }
 
+    if (conf)
+        mir_display_config_release(conf);
+
     mir_eglapp_cleanup();
 
     return 0;

=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2017-06-30 11:35:46 +0000
+++ examples/eglapp.c	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2013 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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,

=== modified file 'examples/eglapp.h'
--- examples/eglapp.h	2017-06-06 15:41:28 +0000
+++ examples/eglapp.h	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2013 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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,

=== modified file 'examples/eglcounter.cpp'
--- examples/eglcounter.cpp	2017-05-08 03:04:26 +0000
+++ examples/eglcounter.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * 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
+ * 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,

=== modified file 'examples/eglflash.c'
--- examples/eglflash.c	2017-05-08 03:04:26 +0000
+++ examples/eglflash.c	2017-10-11 15:01:23 +0000
@@ -4,7 +4,7 @@
  * Copyright © 2013 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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,

=== modified file 'examples/eglplasma.c'
--- examples/eglplasma.c	2017-05-08 03:04:26 +0000
+++ examples/eglplasma.c	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2013 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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,

=== modified file 'examples/eglsquare.cpp'
--- examples/eglsquare.cpp	2017-06-06 13:55:51 +0000
+++ examples/eglsquare.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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,
@@ -169,84 +169,89 @@
 
             pos = Pos{x, y};
             cv.notify_one();
+            break;
         }
 
+        case mir_event_type_close_window:
+            kill(getpid(), SIGTERM);
+            break;
+
         default:;
         }
-        }
-
-        SquareRenderingSurface(SquareRenderingSurface const&) = delete;
-        SquareRenderingSurface& operator=(SquareRenderingSurface const&) = delete;
-        private:
-        struct OutputDimensions
-        {
-            unsigned int const width;
-            unsigned int const height;
-        } const dimensions;
-
-        me::Context context;
-        me::NormalWindow window;
-        RenderProgram program;
-
-        OutputDimensions active_output_dimensions(MirConnection* connection)
-        {
-            unsigned int width{0};
-            unsigned int height{0};
-            auto display_config = mir_connection_create_display_configuration(connection);
-            auto num_outputs = mir_display_config_get_num_outputs(display_config);
-            for (auto i = 0; i < num_outputs; i++)
-            {
-                auto output = mir_display_config_get_output(display_config, i);
-                auto state = mir_output_get_connection_state(output);
-                if (state == mir_output_connection_state_connected && mir_output_is_enabled(output))
-                {
-                    auto mode = mir_output_get_current_mode(output);
-                    width  = mir_output_mode_get_width(mode);
-                    height = mir_output_mode_get_height(mode);
-                    break;
-                }
-            }
-            mir_display_config_release(display_config);
-            if (width == 0 || height == 0)
-                throw std::logic_error("could not determine display size");
-            return {width, height};
-        }
-
-        static void on_event(MirWindow*, const MirEvent *event, void *context)
-        {
-            auto surface = reinterpret_cast<SquareRenderingSurface*>(context);
-            if (surface) surface->on_event(event);
-        }
-
-        private:
-        void do_work()
-        {
-            std::unique_lock<decltype(mutex)> lock(mutex);
-
-            while (true)
-            {
-                cv.wait(lock);
-
-                if (!running) return;
-
-                Pos  pos = this->pos;
-
-                context.make_current();
-                program.draw(
-                    pos.x/static_cast<float>(dimensions.width)*2.0 - 1.0,
-                    pos.y/static_cast<float>(dimensions.height)*-2.0 + 1.0);
-                context.swapbuffers();
-            }
-        }
-
-        struct Pos { float x; float y; };
-        std::atomic<Pos> pos;
-
-        std::thread worker;
-        std::condition_variable cv;
-        std::mutex mutex;
-        bool running{true};
-    };
+    }
+
+    SquareRenderingSurface(SquareRenderingSurface const&) = delete;
+    SquareRenderingSurface& operator=(SquareRenderingSurface const&) = delete;
+private:
+    struct OutputDimensions
+    {
+        unsigned int const width;
+        unsigned int const height;
+    } const dimensions;
+
+    me::Context context;
+    me::NormalWindow window;
+    RenderProgram program;
+
+    OutputDimensions active_output_dimensions(MirConnection* connection)
+    {
+        unsigned int width{0};
+        unsigned int height{0};
+        auto display_config = mir_connection_create_display_configuration(connection);
+        auto num_outputs = mir_display_config_get_num_outputs(display_config);
+        for (auto i = 0; i < num_outputs; i++)
+        {
+            auto output = mir_display_config_get_output(display_config, i);
+            auto state = mir_output_get_connection_state(output);
+            if (state == mir_output_connection_state_connected && mir_output_is_enabled(output))
+            {
+                auto mode = mir_output_get_current_mode(output);
+                width  = mir_output_mode_get_width(mode);
+                height = mir_output_mode_get_height(mode);
+                break;
+            }
+        }
+        mir_display_config_release(display_config);
+        if (width == 0 || height == 0)
+            throw std::logic_error("could not determine display size");
+        return {width, height};
+    }
+
+    static void on_event(MirWindow*, const MirEvent *event, void *context)
+    {
+        auto surface = reinterpret_cast<SquareRenderingSurface*>(context);
+        if (surface) surface->on_event(event);
+    }
+
+private:
+    void do_work()
+    {
+        std::unique_lock<decltype(mutex)> lock(mutex);
+
+        while (true)
+        {
+            cv.wait(lock);
+
+            if (!running) return;
+
+            Pos  pos = this->pos;
+
+            context.make_current();
+            program.draw(
+                pos.x/static_cast<float>(dimensions.width)*2.0 - 1.0,
+                pos.y/static_cast<float>(dimensions.height)*-2.0 + 1.0);
+            context.swapbuffers();
+        }
+    }
+
+    struct Pos { float x; float y; };
+    std::atomic<Pos> pos;
+
+    std::thread worker;
+    std::condition_variable cv;
+    std::mutex mutex;
+    bool running{true};
+};
 }
 
 int main(int argc, char *argv[])

=== modified file 'examples/eglstateswitcher.c'
--- examples/eglstateswitcher.c	2017-05-08 03:04:26 +0000
+++ examples/eglstateswitcher.c	2017-10-11 15:01:23 +0000
@@ -4,7 +4,7 @@
  * 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
+ * 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,

=== modified file 'examples/egltriangle.c'
--- examples/egltriangle.c	2017-05-08 03:04:26 +0000
+++ examples/egltriangle.c	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2013 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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,

=== modified file 'examples/fingerpaint.c'
--- examples/fingerpaint.c	2017-05-19 13:49:04 +0000
+++ examples/fingerpaint.c	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2013 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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,

=== modified file 'examples/flicker.c'
--- examples/flicker.c	2017-06-06 09:02:33 +0000
+++ examples/flicker.c	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2012 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
+ * 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,

=== modified file 'examples/glog_logger.cpp'
--- examples/glog_logger.cpp	2015-02-22 07:46:25 +0000
+++ examples/glog_logger.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2013 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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,

=== modified file 'examples/glog_logger.h'
--- examples/glog_logger.h	2015-02-22 07:46:25 +0000
+++ examples/glog_logger.h	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2013 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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,

=== modified file 'examples/graphics.h'
--- examples/graphics.h	2013-04-24 05:22:20 +0000
+++ examples/graphics.h	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2012 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,
+ * 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,

=== modified file 'examples/graphics_utils.cpp'
--- examples/graphics_utils.cpp	2017-05-08 03:04:26 +0000
+++ examples/graphics_utils.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2012 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,
+ * 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,

=== modified file 'examples/image_renderer.cpp'
--- examples/image_renderer.cpp	2017-05-08 03:04:26 +0000
+++ examples/image_renderer.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2012 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
+ * 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,

=== modified file 'examples/image_renderer.h'
--- examples/image_renderer.h	2015-02-22 07:46:25 +0000
+++ examples/image_renderer.h	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2012 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
+ * 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,

=== modified file 'examples/input_shapes.cpp'
--- examples/input_shapes.cpp	2017-05-23 10:51:47 +0000
+++ examples/input_shapes.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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,

=== modified file 'examples/mir_demo_server_loader.cpp'
--- examples/mir_demo_server_loader.cpp	2017-05-08 03:04:26 +0000
+++ examples/mir_demo_server_loader.cpp	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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,

=== modified file 'examples/mir_image.h'
--- examples/mir_image.h	2013-04-24 05:22:20 +0000
+++ examples/mir_image.h	2017-10-11 15:01:23 +0000
@@ -2,7 +2,7 @@
  * Copyright © 2012 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,
+ * 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,

=== 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-10-11 15:01:23 +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-10-11 15:01:23 +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 <[e-mail]>
+ */
+
+#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-10-11 15:01:23 +0000
@@ -0,0 +1,164 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#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);
+    }
+}
+
+auto KioskWindowManagerPolicy::place_new_window(ApplicationInfo const& app_info, WindowSpecification const& request)
+-> WindowSpecification
+{
+    WindowSpecification specification = CanonicalWindowManagerPolicy::place_new_window(app_info, request);
+
+    if ((specification.type() == mir_window_type_normal || specification.type() == mir_window_type_freestyle) &&
+        (!specification.parent().is_set() || !specification.parent().value().lock()))
+    {
+        specification.state() = mir_window_state_maximized;
+        tools.place_and_size_for_state(specification, WindowInfo{});
+
+        if (!request.state().is_set() || request.state().value() != mir_window_state_restored)
+            specification.state() = request.state();
+    }
+
+    return specification;
+}
+
+void KioskWindowManagerPolicy::handle_modify_window(WindowInfo& window_info, WindowSpecification const& modifications)
+{
+    WindowSpecification specification = modifications;
+
+    if ((window_info.type() == mir_window_type_normal || window_info.type() == mir_window_type_freestyle) &&
+        !window_info.parent())
+    {
+        specification.state() = mir_window_state_maximized;
+        tools.place_and_size_for_state(specification, window_info);
+
+        if (!modifications.state().is_set() || modifications.state().value() != mir_window_state_restored)
+            specification.state() = modifications.state();
+    }
+
+    CanonicalWindowManagerPolicy::handle_modify_window(window_info, specification);
+}

=== 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-10-11 15:01:23 +0000
@@ -0,0 +1,54 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#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&);
+
+    auto place_new_window(miral::ApplicationInfo const& app_info, miral::WindowSpecification const& request)
+    -> miral::WindowSpecification override;
+
+    void advise_focus_gained(miral::WindowInfo const& 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;
+    void handle_modify_window(miral::WindowInfo& window_info, miral::WindowSpecification const& modifications) 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-10-11 15:01:23 +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 <[e-mail]>
+ */
+
+#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-10-11 15:01:23 +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 <[e-mail]>
+ */
+
+#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-10-11 15:01:23 +0000
@@ -0,0 +1,69 @@
+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
+)
+
+add_library(miral-shell-lib STATIC
+    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-lib PRIVATE ${FREETYPE_INCLUDE_DIRS})
+target_compile_definitions(miral-shell-lib PRIVATE -DTYPO_SUPPORTS_FREETYPE)
+target_link_libraries(miral-shell-lib miral-spinner miral ${FREETYPE_LIBRARIES})
+
+mir_add_wrapped_executable(miral-shell
+    shell_main.cpp
+)
+
+target_link_libraries(miral-shell
+    miral-shell-lib
+    miral
+)
+

=== 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-10-11 15:01:23 +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 <[e-mail]>
+ */
+
+#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([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});
+