Merge lp:mir/0.14 into lp:mir/ubuntu

[Andreas Pokorny]

Mir 0.14.0 release

Mir 0.14.0 release

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2698
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/52/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/492
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/6/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/6/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2699
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/498
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/7/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/7/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

I feel 0.14 isn't big enough to justify investing the time in a release just yet. There's a few branches on the horizon and still up for review that are arguably worth waiting for and getting into 0.14, for the sake of visible performance improvement and stability (yes I mean my branches).

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2700
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/54/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/525
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/8/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/8/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2701
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/532
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/9/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/9/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2702
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/56/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/12/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/555
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/10/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/10/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Consider getting this one in too:
https://code.launchpad.net/~vanvugt/mir/fix-1391976-0.14/+merge/263068

Because I think we need that fix to be present in two consecutive releases before we can manage its ABI properly.

review: Needs Information

[Daniel van Vugt (vanvugt)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2703
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/57/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/582
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/11/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/11/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2704
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/58/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/14/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/626
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/12/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/12/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2705
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/59/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/650/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/13/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/13/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2707
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/61/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/17/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/18/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/690
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/15/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/15/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

In the end it was r2718 that made it into the wily release...
https://launchpad.net/ubuntu/+source/mir

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputDevice.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputDevice.cpp	2014-03-06 06:05:17 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputDevice.cpp	2015-07-23 14:41:37 +0000
@@ -86,11 +86,32 @@
     return getInputDeviceConfigurationFilePathByName(deviceIdentifier.name, type);
 }
 
+String8 getConfigurationFilePathInDirectory(String8 const& directory, String8 const& name, InputDeviceConfigurationFileType type)
+{
+    String8 path = directory;
+    appendInputDeviceConfigurationFileRelativePath(path, name, type);
+#if DEBUG_PROBE
+    ALOGD("Probing for input device configuration file: path='%s'", path.c_str());
+#endif
+    if (!access(c_str(path), R_OK)) {
+#if DEBUG_PROBE
+        ALOGD("Found");
+#endif
+        return path;
+    }
+
+    return String8();
+}
+    
 String8 getInputDeviceConfigurationFilePathByName(
         const String8& name, InputDeviceConfigurationFileType type) {
     // Search system repository.
     String8 path;
-    // <mir modifications>
+    setTo(path, "/usr/share/");
+    auto result = getConfigurationFilePathInDirectory(path, name, type);
+    if (result.length())
+        return result;
+
     {
         const char *root_env = getenv("ANDROID_ROOT");
         if (root_env == NULL) root_env = "";
@@ -98,38 +119,22 @@
     }
     // </mir modifications>
     path.append("/usr/");
-    appendInputDeviceConfigurationFileRelativePath(path, name, type);
-#if DEBUG_PROBE
-    ALOGD("Probing for system provided input device configuration file: path='%s'", path.c_str());
-#endif
-    if (!access(c_str(path), R_OK)) {
-#if DEBUG_PROBE
-        ALOGD("Found");
-#endif
-        return path;
-    }
+    result = getConfigurationFilePathInDirectory(path, name, type);
+    if (result.length())
+        return result;
 
     // Search user repository.
-    // TODO Should only look here if not in safe mode.
-    // <mir modifications>
+    // TODO Should only look here if not in safe mode. ( ?? ~ racarr)
     {
         const char *data_env = getenv("ANDROID_DATA");
         if (data_env == NULL) data_env = "";
         setTo(path, data_env);
     }
 
-    // </mir modifications>
     path.append("/system/devices/");
-    appendInputDeviceConfigurationFileRelativePath(path, name, type);
-#if DEBUG_PROBE
-    ALOGD("Probing for system user input device configuration file: path='%s'", path.c_str());
-#endif
-    if (!access(c_str(path), R_OK)) {
-#if DEBUG_PROBE
-        ALOGD("Found");
-#endif
-        return path;
-    }
+    result = getConfigurationFilePathInDirectory(path, name, type);
+    if (result.length())
+        return result;
 
     // Not found.
 #if DEBUG_PROBE

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-10 02:23:59 +0000
+++ CMakeLists.txt	2015-07-23 14:41:37 +0000
@@ -27,8 +27,8 @@
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 0)
-set(MIR_VERSION_MINOR 13) # This should change at least with every MIRSERVER_ABI
-set(MIR_VERSION_PATCH 3)
+set(MIR_VERSION_MINOR 14) # This should change at least with every MIRSERVER_ABI
+set(MIR_VERSION_PATCH 0)
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
 add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})
@@ -143,20 +143,20 @@
 
 add_definitions(-DMESA_EGL_NO_X11_HEADERS)
 
-# Default to mesa backend, but build all of them
+# Default to KMS backend, but build all of them
 set(
   MIR_PLATFORM
-  mesa;android
+  mesa-kms;android
   CACHE
   STRING
-  "a list of graphics backends to build (options are 'mesa' or 'android')"
+  "a list of graphics backends to build (options are 'mesa-kms' or 'android')"
 )
 
 list(GET MIR_PLATFORM 0 MIR_TEST_PLATFORM)
 
 foreach(platform IN LISTS MIR_PLATFORM)
-  if (platform STREQUAL "mesa")
-    set(MIR_BUILD_PLATFORM_MESA TRUE)
+  if (platform STREQUAL "mesa-kms")
+    set(MIR_BUILD_PLATFORM_MESA_KMS TRUE)
   endif()
   if (platform STREQUAL "android")
      set(MIR_BUILD_PLATFORM_ANDROID TRUE)
@@ -173,6 +173,7 @@
 find_package(LTTngUST REQUIRED)
 pkg_check_modules(UDEV REQUIRED libudev)
 pkg_check_modules(GLIB REQUIRED glib-2.0)
+pkg_check_modules(UUID REQUIRED uuid)
 
 include_directories (${GLESv2_INCLUDE_DIRS})
 include_directories (${EGL_INCLUDE_DIRS})
@@ -183,7 +184,7 @@
   find_package(LibHardware REQUIRED)
 endif()
 
-if (MIR_BUILD_PLATFORM_MESA)
+if (MIR_BUILD_PLATFORM_MESA_KMS)
   find_package( PkgConfig )
   pkg_check_modules( GBM REQUIRED gbm>=9.0.0)
   pkg_check_modules( DRM REQUIRED libdrm )
@@ -215,6 +216,7 @@
 
 if (MIR_ENABLE_TESTS)
   find_package(GtestGmock REQUIRED)
+  pkg_check_modules(LIBEVDEV REQUIRED libevdev)
   include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
   add_subdirectory(tests/)
 

=== modified file 'benchmarks/android-input/CMakeLists.txt'
--- benchmarks/android-input/CMakeLists.txt	2015-04-17 15:53:50 +0000
+++ benchmarks/android-input/CMakeLists.txt	2015-07-23 14:41:37 +0000
@@ -1,7 +1,7 @@
 project(android-input-perf)
 
 include_directories(
-  ${Mir_SOURCE_DIR}/tests/include
+  ${Mir_SOURCE_DIR}/include/test
   ${Mir_SOURCE_DIR}/include/platform
   ${MIR_ANDROID_INCLUDE_DIRECTORIES}
   ${MIR_3RD_PARTY_INCLUDE_DIRECTORIES}

=== modified file 'benchmarks/benchmark_multiplexing_dispatchable.cpp'
--- benchmarks/benchmark_multiplexing_dispatchable.cpp	2015-04-24 15:36:12 +0000
+++ benchmarks/benchmark_multiplexing_dispatchable.cpp	2015-07-23 14:41:37 +0000
@@ -17,12 +17,12 @@
  */
 
 #include "mir/dispatch/multiplexing_dispatchable.h"
-#include "mir/dispatch/simple_dispatch_thread.h"
 
 #include <iostream>
 #include <vector>
 #include <memory>
 #include <chrono>
+#include <thread>
 #include <poll.h>
 #include <unistd.h>
 

=== modified file 'benchmarks/frame-uniformity/CMakeLists.txt'
--- benchmarks/frame-uniformity/CMakeLists.txt	2015-04-17 16:26:59 +0000
+++ benchmarks/frame-uniformity/CMakeLists.txt	2015-07-23 14:41:37 +0000
@@ -3,12 +3,16 @@
   ${PROJECT_SOURCE_DIR}/include/platform
   ${PROJECT_SOURCE_DIR}/include/server
   ${PROJECT_SOURCE_DIR}/include/client
-  ${PROJECT_SOURCE_DIR}/tests/include/
+  ${PROJECT_SOURCE_DIR}/include/test
+
   ${PROJECT_SOURCE_DIR}/src/include/server
   ${PROJECT_SOURCE_DIR}/src/include/common
   ${PROJECT_SOURCE_DIR}
   ${MIR_ANDROID_INCLUDE_DIRECTORIES}
   ${MIR_3RD_PARTY_INCLUDE_DIRECTORIES}
+
+  # needed for fake_event_hub_server_configuration.h (which relies on private APIs)
+  ${PROJECT_SOURCE_DIR}/tests/include/
 )
 
 mir_add_wrapped_executable(frame_uniformity_test_client NOINSTALL

=== modified file 'cmake/ABICheck.cmake'
--- cmake/ABICheck.cmake	2015-04-23 17:48:44 +0000
+++ cmake/ABICheck.cmake	2015-07-23 14:41:37 +0000
@@ -71,7 +71,7 @@
 endfunction()
 
 #These headers are not part of the libmircommon ABI
-set(mircommon-exclude-headers "${CMAKE_SOURCE_DIR}/src/include/common/mir/graphics/android\n    ${CMAKE_SOURCE_DIR}/src/include/common/mir/input")
+set(mircommon-exclude-headers "${CMAKE_SOURCE_DIR}/src/include/common/mir/graphics/android\n    ${CMAKE_SOURCE_DIR}/src/include/common/mir/input\n    ${CMAKE_SOURCE_DIR}/src/include/common/mir/events")
 
 #These headers are not part of the libmirplatform ABI
 set(mirplatform-exclude-headers "${CMAKE_SOURCE_DIR}/include/platform/mir/input")
@@ -80,9 +80,9 @@
 make_lib_descriptor(server)
 make_lib_descriptor(common INCLUDE_PRIVATE EXCLUDE_HEADERS ${mircommon-exclude-headers})
 make_lib_descriptor(platform INCLUDE_PRIVATE EXCLUDE_HEADERS ${mirplatform-exclude-headers})
-if(MIR_BUILD_PLATFORM_MESA)
+if(MIR_BUILD_PLATFORM_MESA_KMS)
 make_lib_descriptor(clientplatformmesa LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
-make_lib_descriptor(platformgraphicsmesa LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
+make_lib_descriptor(platformgraphicsmesakms LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
 endif()
 if(MIR_BUILD_PLATFORM_ANDROID)
 make_lib_descriptor(clientplatformandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
@@ -125,8 +125,8 @@
 endmacro(_define_abi_check_for)
 
 set(the_libs mirserver mirclient mircommon mirplatform)
-if(MIR_BUILD_PLATFORM_MESA)
-  set(the_libs ${the_libs} mirclientplatformmesa mirplatformgraphicsmesa)
+if(MIR_BUILD_PLATFORM_MESA_KMS)
+  set(the_libs ${the_libs} mirclientplatformmesa mirplatformgraphicsmesakms)
 endif()
 if(MIR_BUILD_PLATFORM_ANDROID)
   set(the_libs ${the_libs} mirclientplatformandroid mirplatformgraphicsandroid)

=== modified file 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2015-04-30 11:36:36 +0000
+++ cmake/MirCommon.cmake	2015-07-23 14:41:37 +0000
@@ -5,13 +5,6 @@
 include(CMakeDependentOption)
 file(REMOVE ${CMAKE_BINARY_DIR}/discover_all_tests.sh)
 
-CMAKE_DEPENDENT_OPTION(
-  DISABLE_GTEST_TEST_DISCOVERY
-  "If set to ON, disables fancy test autodiscovery and switches back to classic add_test behavior"
-  OFF
-  "NOT CMAKE_CROSSCOMPILING"
-  ON)
-
 option(
   ENABLE_MEMCHECK_OPTION
   "If set to ON, enables automatic creation of memcheck targets"
@@ -30,145 +23,120 @@
     valgrind)
 
   if(VALGRIND_EXECUTABLE)
-    set(VALGRIND_ARGS "--error-exitcode=1" "--trace-children=yes" "--leak-check=full" "--show-leak-kinds=definite" "--errors-for-leak-kinds=definite")
-    set(VALGRIND_ARGS ${VALGRIND_ARGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_generic")
-    set(VALGRIND_ARGS ${VALGRIND_ARGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_glibc_2.21")
-    set(DISCOVER_FLAGS "--enable-memcheck")
-    set(DISCOVER_FLAGS ${DISCOVER_FLAGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_generic")
-    set(DISCOVER_FLAGS ${DISCOVER_FLAGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_glibc_2.21")
+    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} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_generic")
+    set(VALGRIND_CMD ${VALGRIND_CMD} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_glibc_2.21")
     if (TARGET_ARCH STREQUAL "arm-linux-gnueabihf")
-        set(VALGRIND_ARGS ${VALGRIND_ARGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_armhf")
-        set(DISCOVER_FLAGS ${DISCOVER_FLAGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_armhf")
+      set(VALGRIND_CMD ${VALGRIND_CMD} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_armhf")
     endif()
   else(VALGRIND_EXECUTABLE)
     message("Not enabling memcheck as valgrind is missing on your system")
   endif(VALGRIND_EXECUTABLE)
 endif(ENABLE_MEMCHECK_OPTION)
 
-function (mir_discover_tests EXECUTABLE)
-  if(DISABLE_GTEST_TEST_DISCOVERY)
-    execute_process(
-      COMMAND uname -r
-      OUTPUT_VARIABLE KERNEL_VERSION_FULL
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    string(REGEX MATCH "^[0-9]+[.][0-9]+" KERNEL_VERSION ${KERNEL_VERSION_FULL})
-    message(STATUS "Kernel version detected: " ${KERNEL_VERSION})
-    # Some tests expect kernel version 3.11 and up
-    if (${KERNEL_VERSION} VERSION_LESS "3.11")
-        add_test(${EXECUTABLE} ${VALGRIND_EXECUTABLE} ${VALGRIND_ARGS} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${EXECUTABLE}
-            "--gtest_filter=-*DeathTest.*:AnonymousShmFile.*:MesaBufferAllocatorTest.software_buffers_dont_bypass:MesaBufferAllocatorTest.creates_software_rendering_buffer")
-    else()
-        add_test(${EXECUTABLE} ${VALGRIND_EXECUTABLE} ${VALGRIND_ARGS} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${EXECUTABLE}
-            "--gtest_filter=-*DeathTest.*")
-    endif()
-
-    add_test(${EXECUTABLE}_death_tests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${EXECUTABLE} "--gtest_filter=*DeathTest.*")
-    if (${ARGC} GREATER 1)
-      set_property(TEST ${EXECUTABLE} PROPERTY ENVIRONMENT ${ARGN})
-      set_property(TEST ${EXECUTABLE}_death_tests PROPERTY ENVIRONMENT ${ARGN})
-    endif()
-  else()
-    set(CHECK_TEST_DISCOVERY_TARGET_NAME "check_discover_tests_in_${EXECUTABLE}")
-    set(TEST_DISCOVERY_TARGET_NAME "discover_tests_in_${EXECUTABLE}")
-    message(STATUS "Defining targets: ${CHECK_TEST_DISCOVERY_TARGET_NAME} and ${TEST_DISCOVERY_TARGET_NAME}")
-
-    # These targets are always considered out-of-date, and are always run (at least for normal builds, except for make test/install).
-    add_custom_target(
-      ${CHECK_TEST_DISCOVERY_TARGET_NAME} ALL
-      ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${EXECUTABLE} --gtest_list_tests > /dev/null
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Check that discovering Tests in ${EXECUTABLE} works")
-      
-    if (MIR_BUILD_PLATFORM_ANDROID)
-      add_dependencies(${CHECK_TEST_DISCOVERY_TARGET_NAME} mirplatformgraphicsandroid)
-    endif()
-    
-    if (MIR_BUILD_PLATFORM_MESA)
-      add_dependencies(${CHECK_TEST_DISCOVERY_TARGET_NAME} mirplatformgraphicsmesa)
-    endif()
-
-    if (${ARGC} GREATER 1)
-      foreach (env ${ARGN})
-        list(APPEND EXTRA_ENV_FLAGS "--add-environment" "${env}")
-      endforeach()
-    endif()
-    
-    if(cmake_build_type_lower MATCHES "threadsanitizer")
-        find_program(LLVM_SYMBOLIZER llvm-symbolizer-3.6)
-        if (LLVM_SYMBOLIZER)
-            set(TSAN_EXTRA_OPTIONS "external_symbolizer_path=${LLVM_SYMBOLIZER}")
-        endif()
-        list(APPEND EXTRA_ENV_FLAGS "--add-environment" "TSAN_OPTIONS=suppressions=${CMAKE_SOURCE_DIR}/tools/tsan-suppressions second_deadlock_stack=1 halt_on_error=1 history_size=7 ${TSAN_EXTRA_OPTIONS}")
-        # TSan does not support multi-threaded fork
-        # TSan may open fds so "surface_creation_does_not_leak_fds" will not work as written
-        # TSan deadlocks when running StreamTransportTest/0.SendsFullMessagesWhenInterrupted - disable it until understood
-        set(EXCLUDED_TESTS "UnresponsiveClient.does_not_hang_server:DemoInProcessServerWithStubClientPlatform.surface_creation_does_not_leak_fds:StreamTransportTest/0.SendsFullMessagesWhenInterrupted")
-    endif()
-
-    add_custom_target(
-      ${TEST_DISCOVERY_TARGET_NAME} ALL
-      ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${EXECUTABLE} --gtest_list_tests | ${CMAKE_BINARY_DIR}/mir_gtest/mir_discover_gtest_tests --executable=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${EXECUTABLE} --exclusions=${EXCLUDED_TESTS} ${DISCOVER_FLAGS}
-      ${EXTRA_ENV_FLAGS}
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Discovering Tests in ${EXECUTABLE}" VERBATIM)
-
-    add_dependencies(
-      ${CHECK_TEST_DISCOVERY_TARGET_NAME}
-      ${EXECUTABLE})
-
-    add_dependencies(
-      ${TEST_DISCOVERY_TARGET_NAME}
-
-      ${CHECK_TEST_DISCOVERY_TARGET_NAME}
-      ${EXECUTABLE}
-      mir_discover_gtest_tests)
-
-  endif()
-
-  foreach (env ${ARGN})
-    set(discover_envs "${discover_envs} --env ${env}")
+try_run(SYSYEM_SUPPORTS_O_TMPFILE SYSTEM_HEADERS_SUPPORT_O_TMPFILE
+  ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/src/mir/mir_test_tmpfile.cpp
+  )
+
+function (list_to_string LIST_VAR PREFIX STR_VAR)
+  foreach (value ${LIST_VAR})
+    set(tmp_str "${tmp_str} ${PREFIX} ${value}")
   endforeach()
+  set(${STR_VAR} "${tmp_str}" PARENT_SCOPE)
+endfunction()
+
+function (mir_discover_tests_internal EXECUTABLE DETECT_FD_LEAKS)
+  # Set vars
+  set(test_cmd_no_memcheck "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${EXECUTABLE}")
+  set(test_cmd "${test_cmd_no_memcheck}")
+  set(test_env ${ARGN})
+  set(test_name ${EXECUTABLE})
+  set(test_no_memcheck_filter)
+  set(test_exclusion_filter)
 
   if(ENABLE_MEMCHECK_OPTION)
-    set(discover_cmd_memcheck "${VALGRIND_EXECUTABLE}")
-    foreach (arg ${VALGRIND_ARGS})
-      set(discover_cmd_memcheck "${discover_cmd_memcheck} ${arg}")
-    endforeach()
-  endif()
+    set(test_cmd ${VALGRIND_CMD} ${test_cmd_no_memcheck})
+    set(test_no_memcheck_filter "*DeathTest.*")
+  endif()
+
+  if(cmake_build_type_lower MATCHES "threadsanitizer")
+    find_program(LLVM_SYMBOLIZER llvm-symbolizer-3.6)
+    if (LLVM_SYMBOLIZER)
+        set(TSAN_EXTRA_OPTIONS "external_symbolizer_path=${LLVM_SYMBOLIZER}")
+    endif()
+    # Space after ${TSAN_EXTRA_OPTIONS} works around bug in TSAN env. variable parsing 
+    list(APPEND test_env "TSAN_OPTIONS=\"suppressions=${CMAKE_SOURCE_DIR}/tools/tsan-suppressions second_deadlock_stack=1 halt_on_error=1 history_size=7 ${TSAN_EXTRA_OPTIONS} \"")
+    # TSan does not support multi-threaded fork
+    # TSan may open fds so "surface_creation_does_not_leak_fds" will not work as written
+    # TSan deadlocks when running StreamTransportTest/0.SendsFullMessagesWhenInterrupted - disable it until understood
+    set(test_exclusion_filter "UnresponsiveClient.does_not_hang_server:DemoInProcessServerWithStubClientPlatform.surface_creation_does_not_leak_fds:StreamTransportTest/0.SendsFullMessagesWhenInterrupted")
+  endif()
+
+  if(SYSYEM_SUPPORTS_O_TMPFILE EQUAL 1)
+      set(test_exclusion_filter "${test_exclusion_filter}:AnonymousShmFile.*:MesaBufferAllocatorTest.software_buffers_dont_bypass:MesaBufferAllocatorTest.creates_software_rendering_buffer")
+  endif()
+
+  # Final commands
+  set(test_cmd "${test_cmd}" "--gtest_filter=-${test_no_memcheck_filter}:${test_exclusion_filter}")
+  set(test_cmd_no_memcheck "${test_cmd_no_memcheck}" "--gtest_filter=${test_no_memcheck_filter}:-${test_exclusion_filter}")
+  if(DETECT_FD_LEAKS)
+    set(test_cmd ${CMAKE_SOURCE_DIR}/tools/detect_fd_leaks.sh ${test_cmd})
+  endif()
+
+  # Normal
+  add_test(${test_name} ${test_cmd})
+  set_property(TEST ${test_name} PROPERTY ENVIRONMENT ${test_env})
+  if (test_no_memcheck_filter)
+    add_test(${test_name}_no_memcheck ${test_cmd_no_memcheck})
+    set_property(TEST ${test_name}_no_memcheck PROPERTY ENVIRONMENT ${test_env})
+  endif()
+
+  # ptest
+  list_to_string("${test_env}" "--env" discover_env)
+  list_to_string("${test_cmd}" "" discover_cmd)
+  list_to_string("${test_cmd_no_memcheck}" "" discover_cmd_no_memcheck)
 
   file(APPEND ${CMAKE_BINARY_DIR}/discover_all_tests.sh
-      "sh ${CMAKE_SOURCE_DIR}/tools/discover_gtests.sh ${discover_envs} -- ${discover_cmd_memcheck} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${EXECUTABLE}\n")
+    "sh ${CMAKE_SOURCE_DIR}/tools/discover_gtests.sh ${discover_env} -- ${discover_cmd}\n")
+  if (test_no_memcheck_filter)
+    file(APPEND ${CMAKE_BINARY_DIR}/discover_all_tests.sh
+      "sh ${CMAKE_SOURCE_DIR}/tools/discover_gtests.sh ${discover_env} -- ${discover_cmd_no_memcheck}\n")
+  endif()
 endfunction ()
 
+function (mir_discover_tests EXECUTABLE)
+  mir_discover_tests_internal(${EXECUTABLE} FALSE ${ARGN})
+endfunction()
+
+function (mir_discover_tests_with_fd_leak_detection EXECUTABLE)
+  mir_discover_tests_internal(${EXECUTABLE} TRUE ${ARGN})
+endfunction()
+
 function (mir_add_memcheck_test)
   if (ENABLE_MEMCHECK_OPTION)
-      if(DISABLE_GTEST_TEST_DISCOVERY)
-	add_custom_target(
-	  memcheck_test ALL
-	)
+    add_custom_target(memcheck_test ALL)
     mir_add_test(NAME "memcheck-test"
-      COMMAND ${CMAKE_BINARY_DIR}/mir_gtest/fail_on_success.sh ${VALGRIND_EXECUTABLE} ${VALGRIND_ARGS} ${CMAKE_BINARY_DIR}/mir_gtest/mir_test_memory_error)
-	add_dependencies(
-	  memcheck_test
-
-	  mir_test_memory_error
-	)
-      else()
-        add_custom_target(
-          memcheck_test ALL
-          ${CMAKE_BINARY_DIR}/mir_gtest/mir_discover_gtest_tests --executable=${CMAKE_BINARY_DIR}/mir_gtest/mir_test_memory_error --memcheck-test ${DISCOVER_FLAGS}
-          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-          COMMENT "Adding memcheck test" VERBATIM)
-
-        add_dependencies(
-          memcheck_test
-
-          mir_discover_gtest_tests
-          mir_test_memory_error)
-      endif()
-  endif()
-endfunction()
+      COMMAND ${CMAKE_BINARY_DIR}/mir_gtest/fail_on_success.sh ${VALGRIND_CMD} ${CMAKE_BINARY_DIR}/mir_gtest/mir_test_memory_error)
+    add_dependencies(memcheck_test mir_test_memory_error)
+  endif()
+endfunction()
+
+function (mir_add_detect_fd_leaks_test)
+  if (ENABLE_MEMCHECK_OPTION)
+    add_custom_target(detect_fd_leaks_catches_fd_leak_test ALL)
+    mir_add_test(NAME "detect-fd-leaks-catches-fd-leak"
+      COMMAND ${CMAKE_BINARY_DIR}/mir_gtest/fail_on_success.sh ${CMAKE_SOURCE_DIR}/tools/detect_fd_leaks.sh ${VALGRIND_CMD} ${CMAKE_BINARY_DIR}/mir_gtest/mir_test_fd_leak)
+    add_dependencies(detect_fd_leaks_catches_fd_leak_test mir_test_fd_leak)
+
+    add_custom_target(detect_fd_leaks_propagates_test_failure_test ALL)
+    mir_add_test(NAME "detect-fd-leaks-propagates-test-failure"
+      COMMAND ${CMAKE_BINARY_DIR}/mir_gtest/fail_on_success.sh ${CMAKE_SOURCE_DIR}/tools/detect_fd_leaks.sh ${VALGRIND_CMD} ${CMAKE_BINARY_DIR}/mir_gtest/mir_test_memory_error)
+    add_dependencies(detect_fd_leaks_propagates_test_failure_test mir_test_memory_error)
+  endif()
+endfunction()
+
 
 function (mir_precompiled_header TARGET HEADER)
   if (MIR_USE_PRECOMPILED_HEADERS)

=== modified file 'cmake/src/mir/CMakeLists.txt'
--- cmake/src/mir/CMakeLists.txt	2015-01-21 07:34:50 +0000
+++ cmake/src/mir/CMakeLists.txt	2015-07-23 14:41:37 +0000
@@ -1,14 +1,4 @@
 add_executable(
-  mir_discover_gtest_tests
-  EXCLUDE_FROM_ALL
-  ${CMAKE_CURRENT_SOURCE_DIR}/mir_discover_gtest_tests.cpp)
-
-set_target_properties(
-  mir_discover_gtest_tests PROPERTIES
-  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/mir_gtest
-)
-
-add_executable(
   mir_test_memory_error
   EXCLUDE_FROM_ALL
   ${CMAKE_CURRENT_SOURCE_DIR}/mir_test_memory_error.cpp)
@@ -18,6 +8,16 @@
   RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/mir_gtest
 )
 
+add_executable(
+  mir_test_fd_leak
+  EXCLUDE_FROM_ALL
+  ${CMAKE_CURRENT_SOURCE_DIR}/mir_test_fd_leak.cpp)
+
+set_target_properties(
+  mir_test_fd_leak PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/mir_gtest
+)
+
 file(INSTALL ${CMAKE_CURRENT_SOURCE_DIR}/fail_on_success.sh
   DESTINATION ${CMAKE_BINARY_DIR}/mir_gtest
   USE_SOURCE_PERMISSIONS

=== removed file 'cmake/src/mir/mir_discover_gtest_tests.cpp'
--- cmake/src/mir/mir_discover_gtest_tests.cpp	2015-04-23 10:27:31 +0000
+++ cmake/src/mir/mir_discover_gtest_tests.cpp	1970-01-01 00:00:00 +0000
@@ -1,408 +0,0 @@
-#include <algorithm>
-#include <cassert>
-#include <cstring>
-#include <map>
-#include <set>
-#include <string>
-#include <istream>
-#include <ostream>
-#include <fstream>
-#include <sstream>
-#include <iterator>
-#include <iostream>
-#include <vector>
-#include <libgen.h>
-
-#include <getopt.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#ifndef _GNU_SOURCE
-// Needed for O_TMPFILE
-#define _GNU_SOURCE
-#endif
-#include <fcntl.h>
-
-using namespace std;
-
-namespace
-{
-enum DescriptorType
-{
-    test_case,
-    test_suite
-};
-
-DescriptorType check_line_for_test_case_or_suite(const string& line)
-{
-    if (line.find("  ") == 0)
-        return test_case;
-
-    return test_suite;
-}
-
-int get_output_width()
-{
-    const int fd_out{fileno(stdout)};
-    const int max_width{65535};
-
-    int width{max_width};
-
-    if (isatty(fd_out))
-    {
-        struct winsize w;
-        if (ioctl(fd_out, TIOCGWINSZ, &w) != -1)
-            width = w.ws_col;
-    }
-
-    // If width is zero we likely don't have a terminal
-    if (width == 0) width = 80;
-
-    return width;
-}
-
-string ordinary_cmd_line_pattern()
-{
-    static const char* pattern = "ADD_TEST(\"%s.%s\" \"%s\" \"--gtest_filter=%s:-%s\")\n";
-    return pattern;
-}
-
-vector<string> valgrind_cmd_patterns(vector<string> const& suppressions)
-{
-    vector<string> patterns{
-        "valgrind",
-        "--error-exitcode=1",
-        "--trace-children=yes"
-    };
-
-    for (auto const& sup : suppressions)
-        patterns.push_back(std::string("--suppressions=") + sup);
-
-    vector<string> gtest_patterns{
-        "%s",
-        "--gtest_death_test_use_fork",
-        "--gtest_filter=%s:-%s"
-    };
-
-    patterns.insert(patterns.end(), gtest_patterns.begin(), gtest_patterns.end());
-
-    return patterns;
-}
-
-string memcheck_cmd_line_pattern(vector<string> const& suppressions)
-{
-    stringstream ss;
-
-    ss << "ADD_TEST(\"memcheck(%s.%s)\"";
-    for (auto& s : valgrind_cmd_patterns(suppressions))
-        ss << " \"" << s << "\"";
-    ss << ")" << endl;
-
-    return ss.str();
-}
-
-std::string elide_string_left(const std::string& in, std::size_t max_size)
-{
-    assert(max_size >= 3);
-
-    if (in.size() <= max_size)
-        return in;
-
-    std::string result(in.begin() + (in.size() - max_size), in.end());
-
-    *(result.begin()) = '.';
-    *(result.begin()+1) = '.';
-    *(result.begin()+2) = '.';
-
-    return result;
-}
-
-struct Configuration
-{
-    Configuration() : executable(NULL),
-                      enable_memcheck(false),
-                      memcheck_test(false)
-    {
-    }
-
-    std::string exclusions_for(string const& test)
-    {
-        if (test.size() < 2)
-            return {};
-
-        // assuming test name is Foo.*
-        std::string test_name{test.substr(0, test.size() - 2)};
-        if (exclusions.find(test_name) != std::string::npos)
-            return exclusions;
-
-        return {};
-    }
-
-    const char* executable;
-    bool enable_memcheck;
-    bool memcheck_test;
-    std::vector<std::pair<std::string, std::string>> extra_environment;
-    std::vector<std::string> suppressions;
-    std::string exclusions;
-};
-
-bool parse_configuration_from_cmd_line(int argc, char** argv, Configuration& config)
-{
-    static struct option long_options[] = {
-        {"executable", required_argument, 0, 0},
-        {"enable-memcheck", no_argument, 0, 0},
-        {"memcheck-test", no_argument, 0, 0},
-        {"add-environment", required_argument, 0, 0},
-        {"suppressions", required_argument, 0, 0},
-        {"exclusions", required_argument, 0, 0},
-        {0, 0, 0, 0}
-    };
-
-    while(1)
-    {
-        int option_index = -1;
-        const char *optname = "";
-        int c = getopt_long(
-            argc,
-            argv,
-            "e:m",
-            long_options,
-            &option_index);
-
-        /* Detect the end of the options. */
-        if (c == -1)
-            break;
-
-        /* Detect an error in the passed options */
-        if (c == ':' || c == '?')
-            return false;
-
-        /* Check if we got a long option and get its name */
-        if (option_index != -1)
-            optname = long_options[option_index].name;
-
-        /* Handle options */
-        if (c == 'e' || !strcmp(optname, "executable"))
-            config.executable = optarg;
-        else if (c == 'm' || !strcmp(optname, "enable-memcheck"))
-            config.enable_memcheck = true;
-        else if (!strcmp(optname, "memcheck-test"))
-            config.memcheck_test = true;
-        else if (!strcmp(optname, "add-environment"))
-        {
-            char const* equal_pos = strchr(optarg, '=');
-            if (!equal_pos)
-                return false;
-            config.extra_environment.push_back(std::make_pair(std::string(optarg, equal_pos - optarg), std::string(equal_pos + 1)));
-        }
-        else if (!strcmp(optname, "suppressions"))
-        {
-            config.suppressions.push_back(std::string(optarg));
-        }
-        else if (!strcmp(optname, "exclusions"))
-        {
-            config.exclusions = optarg;
-        }
-
-    }
-
-    return true;
-}
-
-string prepareMemcheckTestLine(string const& exe, vector<string> const& suppressions, std::string const& exclusions)
-{
-    stringstream ss;
-
-    ss << "ADD_TEST(\"memcheck-test\" \"sh\" \"-c\" \"";
-    for (auto& s : valgrind_cmd_patterns(suppressions))
-        ss << s << " ";
-    ss << "; if [ $? != 0 ]; then exit 0; else exit 1; fi\")";
-
-    char cmd_line[1024] = "";
-    snprintf(cmd_line,
-             sizeof(cmd_line),
-             ss.str().c_str(),
-             exe.c_str(),
-             "*",
-             exclusions.c_str()
-             );
-
-    return cmd_line;
-}
-
-void emitMemcheckTest(string const& exe, vector<string> const& suppressions, std::string const& exclusions)
-{
-    ifstream CTestTestfile("CTestTestfile.cmake", ifstream::in);
-    bool need_memcheck_test = true;
-    string line;
-
-    string memcheckTestLine = prepareMemcheckTestLine(exe, suppressions, exclusions);
-
-    if (CTestTestfile.is_open())
-    {
-        while (CTestTestfile.good())
-        {
-            getline(CTestTestfile, line);
-
-            if (line == memcheckTestLine)
-                need_memcheck_test = false;
-        }
-
-        CTestTestfile.close();
-    }
-
-    if (need_memcheck_test)
-    {
-        ofstream CTestTestfileW ("CTestTestfile.cmake", ofstream::app | ofstream::out);
-
-        if (CTestTestfileW.is_open())
-        {
-            CTestTestfileW << memcheckTestLine << endl;
-            CTestTestfileW.close();
-        }
-    }
-}
-
-bool is_death_test(string const& test)
-{
-    // precondition: test will match Foo.*
-    // assumption: death tests will match FooDeathTest.*
-    bool death_test = false;
-    if (test.size() > strlen("DeathTest.*"))
-       death_test = test.substr(test.size() - strlen("DeathTest.*"),
-                                strlen("DeathTest")) == "DeathTest";
-
-    return death_test;
-}
-
-}
-
-int main (int argc, char **argv)
-{
-    int output_width = get_output_width();
-
-    cin >> noskipws;
-
-    Configuration config;
-    if (!parse_configuration_from_cmd_line(argc, argv, config) || config.executable == NULL)
-    {
-        cout << "Usage: PATH_TO_TEST_BINARY --gtest_list_tests | " << basename(argv[0])
-             << " --executable PATH_TO_TEST_BINARY [--enable-memcheck]" << std::endl
-             << " or " << std::endl << basename(argv[0])
-             << " --executable PATH_TO_MEMCHECK_BINARY --memcheck-test" << std::endl;
-        return 1;
-    }
-
-    if (config.memcheck_test)
-    {
-        emitMemcheckTest(config.executable, config.suppressions, config.exclusions);
-        return 0;
-    }
-
-    set<string> tests;
-    string line;
-    string current_test;
-
-    while (getline (cin, line))
-    {
-        switch(check_line_for_test_case_or_suite(line))
-        {
-            case test_case:
-                tests.insert(current_test + "*");
-                break;
-            case test_suite:
-                auto suite_end = line.find(' ');
-                if (suite_end != std::string::npos)
-                {
-                    line = line.substr(0, suite_end);
-                }
-                current_test = line;
-                break;
-        }
-    }
-
-    ofstream testfilecmake;
-    char* executable_copy = strdup(config.executable);
-    string test_suite(basename(executable_copy));
-    free(executable_copy);
-
-    testfilecmake.open(string(test_suite  + "_test.cmake").c_str(), ios::out | ios::trunc);
-    if (testfilecmake.is_open())
-    {
-        for (auto& env_pair : config.extra_environment)
-        {
-            testfilecmake << "SET( ENV{"<<env_pair.first<<"} \""<<env_pair.second<<"\" )"<<std::endl;
-        }
-
-        int ret = open("/dev/shm", O_TMPFILE | O_RDWR | O_EXCL, S_IRWXU);
-        bool kernel_supports_O_TMPFILE = (ret != -1);
-        if (kernel_supports_O_TMPFILE) close(ret);
-
-        for (auto test = tests.begin(); test != tests.end(); ++ test)
-        {
-            static char cmd_line[1024] = "";
-
-
-            if (!kernel_supports_O_TMPFILE)
-            {
-                // Don't run AnonymousShmFile.* tests on older kernels
-                if (*test == "AnonymousShmFile.*")
-                    continue;
-                if (*test == "MesaBufferAllocatorTest.*")
-                    config.exclusions.append("MesaBufferAllocatorTest.software_buffers_dont_bypass:MesaBufferAllocatorTest.creates_software_rendering_buffer");
-            }
-
-            snprintf(
-                cmd_line,
-                sizeof(cmd_line),
-                (config.enable_memcheck && !is_death_test(*test)) ?
-                    memcheck_cmd_line_pattern(config.suppressions).c_str() :
-                    ordinary_cmd_line_pattern().c_str(),
-                test_suite.c_str(),
-                elide_string_left(*test, output_width/2).c_str(),
-                config.executable,
-                test->c_str(),
-                config.exclusions_for(*test).c_str());
-
-            if (testfilecmake.good())
-            {
-                testfilecmake << cmd_line;
-            }
-        }
-
-        testfilecmake.close();
-    }
-
-    ifstream CTestTestfile("CTestTestfile.cmake", ifstream::in);
-    bool need_include = true;
-    line.clear();
-
-    string includeLine = string ("INCLUDE (") +
-                         test_suite  +
-                         string ("_test.cmake)");
-
-    if (CTestTestfile.is_open())
-    {
-        while (CTestTestfile.good())
-        {
-            getline(CTestTestfile, line);
-
-            if (line == includeLine)
-                need_include = false;
-        }
-
-        CTestTestfile.close();
-    }
-
-    if (need_include)
-    {
-        ofstream CTestTestfileW ("CTestTestfile.cmake", ofstream::app | ofstream::out);
-
-        if (CTestTestfileW.is_open())
-        {
-            CTestTestfileW << includeLine << endl;
-            CTestTestfileW.close();
-        }
-    }
-
-    return 0;
-}

=== added file 'cmake/src/mir/mir_test_fd_leak.cpp'
--- cmake/src/mir/mir_test_fd_leak.cpp	1970-01-01 00:00:00 +0000
+++ cmake/src/mir/mir_test_fd_leak.cpp	2015-07-23 14:41:37 +0000
@@ -0,0 +1,6 @@
+#include <fcntl.h>
+
+int main()
+{
+    open("/dev/zero", O_RDONLY);
+}

=== added file 'cmake/src/mir/mir_test_tmpfile.cpp'
--- cmake/src/mir/mir_test_tmpfile.cpp	1970-01-01 00:00:00 +0000
+++ cmake/src/mir/mir_test_tmpfile.cpp	2015-07-23 14:41:37 +0000
@@ -0,0 +1,14 @@
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+int main()
+{
+    int ret = open("/dev/shm", O_TMPFILE | O_RDWR | O_EXCL, S_IRWXU);
+
+    if (ret == -1)
+        return 1;
+    close(ret);
+    return 0;
+}

=== modified file 'cross-compile-chroot.sh'
--- cross-compile-chroot.sh	2015-01-21 07:34:50 +0000
+++ cross-compile-chroot.sh	2015-07-23 14:41:37 +0000
@@ -77,7 +77,7 @@
     echo "Using PKG_CONFIG_EXECUTABLE: $PKG_CONFIG_EXECUTABLE"
     cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/LinuxCrossCompile.cmake \
       -DBoost_COMPILER=-gcc \
-      -DMIR_PLATFORM=android\;mesa \
+      -DMIR_PLATFORM=android\;mesa-kms \
       .. 
 
     make -j${NUM_JOBS} $@

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-17 20:02:15 +0000
+++ debian/changelog	2015-07-23 14:41:37 +0000
@@ -1,3 +1,88 @@
+mir (0.14.0+15.10.20150715-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Fix missing ABI renaming in Mirplatform
+  * Bump Mirserver platform graphics to 3
+  * Fix mirprotobuf ABI break
+  * Fix g++-5.0 compilation (LP: #1475994)
+
+ -- Andreas Pokorny <[e-mail]>  Tue, 21 Jul 2015 10:14:21 +0200
+
+mir (0.14.0+15.10.20150715-0ubuntu1) wily; urgency=medium
+
+  [ Andreas Pokorny ]
+  * New upstream release 0.14.0 (https://launchpad.net/mir/+milestone/0.14.0)
+    - ABI summary: All clients and all servers need building;
+      . Mirclient ABI bumped to 9
+      . Mirserver ABI bumped to 32
+      . Mircommon ABI bumped to 5
+      . Mirplatform ABI bumped to 8
+    - Enhancements:
+      . mir_demo_server: tweaks, features and improvements 
+      . More MirEvent-2.0 related changes and unifications
+      . New SurfaceInputDispatcher to replace the android InputDispatcher
+      . New Threaded dispatcher for Dispatchable added
+      . Rework of the relationship of surfaces and buffer streams to allow
+        attaching multiple buffer streams to a surface.
+      . Preparation work for new buffer semantics
+      . fd leaks in tests eliminated and leak check activated for unit and
+        integration tests
+      . Further TSAN reported issues removed
+      . Preparation work for mir-on-x: splitting of mesa platform in common
+        and KMS parts
+      . Further rework of input stack focused on test infrastructure
+      . Persistent id request for surfaces added
+      . Integration-tests cleaning: switch tests to in-process server
+      . A first end-to-end input test added in privileged-tests
+      . "mesa" platform renamed to "mesa-kms" (LP: #1381330)
+      . [enhancement] Mir servers should allow client connections only after
+        server start-up has finished  (LP: #1451844)
+      . build-dependency on g++-4.9 dropped (LP: #1452320)
+    - Bug fixes:
+      . Crash because uncaught exception in mir::events::add_touch 
+        (LP: #1437357)
+      . [vegetahd] android buffer allocator does consider hwc alignment
+        constraints  (LP: #1461314)
+      . [regression] Touch input does not work at all any more  (LP: #1464174)
+      . Mir emits a mir_motion_action_hover_exit event before of a 
+        mir_motion_action_pointer_down  (LP: #1419048)
+      . [testsfail] NestedInput.nested_event_filter_receives_keyboard_from_host
+        failure in CI  (LP: #1462033)
+      . [testsfail] InputEvents.reach_nested_client in CI  (LP: #1463315)
+      . [regression] titlebar in "canonical" example WM + KeyRepeatDispatcher
+        causes deadlock  (LP: #1464690)
+      . CI failure in
+        TestClientInput.clients_receive_many_button_events_inside_window
+        (LP: #1465231)
+      . mir-client-platform-mesa-dev package dependency is incorrect
+        (LP: #1465642)
+      . Repeat input events keep being emitted even when user switches to
+        different VT  (LP: #1465669)
+      . libmirprotobuf's ABI can be broken when modifying protobuf message
+        definitions  (LP: #1465883)
+      . Spurious Failure in ClientLibrary.highly_threaded_client
+        (LP: #1466492)
+      . failure in CI in BufferStreamArrangement.arrangements_are_applied
+        (LP: #1466594)
+      . [arale] software buffers have flickering line artefacts  (LP: #1418035)
+      . can't load app purchase UI without a U1 account  (LP: #1450377)
+      . [arale] Software cursor appears slightly corrupt on arale (black
+        spots in place of white)  (LP: #1451309)
+      . [regression] Dragging windows by the titlebar is incredibly slow
+        and laggy  (LP: #1454128)
+      . [regression] Opacity controls (Alt+mousewheel) don't work any more
+        (LP: #1454518)
+      . [regression] No API for creating freestyle surfaces  (LP: #1457987)
+      . [vivid-overlay] input-stub.so fails to load on i386  (LP: #1458689)
+      . client API version has wrong version  (LP: #1461312)
+      . abi-dump-base make target is broken  (LP: #1461697)
+      . Stopping input in a nested server stops VT switching  (LP: #1465585)
+      . Pointer events are not mapped to correct output by nested Mir
+        (LP: #1465692)
+      . Loading libmirclient.so twice leads to a segfault in libmirprotobuf.so
+        (LP: #1391976)
+
+ -- CI Train Bot <[e-mail]>  Wed, 15 Jul 2015 12:05:19 +0000
+
 mir (0.13.3+15.10.20150617-0ubuntu1) wily; urgency=medium
 
   [ Alberto Aguirre ]

=== modified file 'debian/control'
--- debian/control	2015-06-17 18:28:22 +0000
+++ debian/control	2015-07-23 14:41:37 +0000
@@ -10,10 +10,6 @@
                doxygen,
                xsltproc,
                graphviz,
-# We rely on C++11 features, and to prevent from ABI breaks
-# in libstdc++ causing us issues, we explicitly select a G++
-# version.
-               g++-4.9,
                libboost-dev,
                libboost-date-time-dev,
                libboost-program-options-dev,
@@ -38,10 +34,13 @@
                libudev-dev,
                libgtest-dev,
                google-mock (>= 1.6.0+svn437),
-               valgrind [!arm64 !powerpc !ppc64el],
+# only enable valgrind once it's been tested to work on each architecture:
+               valgrind [amd64 i386 armhf],
                libglib2.0-dev,
                libfreetype6-dev,
+               libevdev-dev,
                abi-compliance-checker,
+               uuid-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,
@@ -50,7 +49,7 @@
 
 Package: libmirprotobuf0
 Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
@@ -64,9 +63,9 @@
 
 #TODO: Packaging infrastructure for better dependency generation,
 #      ala pkg-xorg's xviddriver:Provides and ABI detection.
-Package: libmirserver31
+Package: libmirserver32
 Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
@@ -77,9 +76,9 @@
  .
  Contains the shared library needed by server applications for Mir.
 
-Package: libmirplatform7
+Package: libmirplatform8
 Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
@@ -93,10 +92,10 @@
 
 Package: libmircommon-dev
 Section: libdevel
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmircommon4 (= ${binary:Version}), 
+Depends: libmircommon5 (= ${binary:Version}), 
          libprotobuf-dev (>= 2.4.1),
          libxkbcommon-dev,
          ${misc:Depends},
@@ -110,10 +109,10 @@
 
 Package: libmirplatform-dev
 Section: libdevel
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirplatform7 (= ${binary:Version}),
+Depends: libmirplatform8 (= ${binary:Version}),
          libmircommon-dev,
          libboost-program-options-dev,
          ${misc:Depends},
@@ -127,10 +126,10 @@
 
 Package: libmirserver-dev
 Section: libdevel
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver31 (= ${binary:Version}),
+Depends: libmirserver32 (= ${binary:Version}),
          libmirplatform-dev (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libglm-dev,
@@ -141,9 +140,9 @@
  .
  Contains header files required to build Mir servers.
 
-Package: libmirclient8
+Package: libmirclient9
 Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
@@ -156,10 +155,10 @@
 
 Package: libmirclient-dev
 Section: libdevel
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirclient8 (= ${binary:Version}),
+Depends: libmirclient9 (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libprotobuf-dev (>= 2.4.1),
          ${misc:Depends},
@@ -171,7 +170,7 @@
 
 Package: libmirclient-debug-extension1
 Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
@@ -192,7 +191,7 @@
 
 Package: libmirclient-debug-extension-dev
 Section: libdevel
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libmirclient-debug-extension1 (= ${binary:Version}),
@@ -216,7 +215,7 @@
  the debug extensions.
 
 Package: mir-demos
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Recommends: fonts-liberation
@@ -227,7 +226,7 @@
  Contains demo applications (with source) that use the Mir display server
 
 Package: mir-utils
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Description: Display server for Ubuntu - utility programs
@@ -244,7 +243,7 @@
  This package installs the mir API documentation.
 
 Package: mir-test-tools
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
@@ -256,9 +255,9 @@
  .
  Contains a tool for stress testing the Mir display server
 
-Package: libmircommon4
+Package: libmircommon5
 Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
@@ -270,21 +269,33 @@
  Contains the shared libraries required for the Mir server and client.
 
 # Longer-term these drivers should move out-of-tree
+Package: mir-platform-graphics-mesa-kms3
+Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Replaces: mir-platform-graphics-mesa2 (<< 0.14)
+Breaks: mir-platform-graphics-mesa2 (<< 0.14)
+Description: Display server for Ubuntu - platform library for KMS Mesa
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains the shared libraries required for the Mir server to interact with
+ the hardware platform using the Mesa drivers.
+
 Package: mir-platform-graphics-mesa2
-Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
+Section: oldlibs
+Architecture: linux-any
+Depends: mir-platform-graphics-mesa-kms3,
+         ${misc:Depends},
          ${shlibs:Depends},
-Description: Display server for Ubuntu - platform library for Mesa
- Mir is a display server running on linux systems, with a focus on efficiency,
- robust operation and a well-defined driver model.
- .
- Contains the shared libraries required for the Mir server to interact with
- the hardware platform using the Mesa drivers.
+Description: transitional dummy package
+ This is a transitional dummy package created due to package renaming.
+ It can safely be removed.
 
-Package: mir-platform-graphics-android2
+Package: mir-platform-graphics-android3
 Section: libs
 Architecture: i386 amd64 armhf
 Multi-Arch: same
@@ -300,7 +311,7 @@
 
 Package: mir-client-platform-mesa2
 Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
@@ -314,7 +325,7 @@
 
 Package: mir-client-platform-mesa-dev
 Section: libdevel
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libmirclient-dev,
@@ -342,11 +353,11 @@
 
 Package: mir-graphics-drivers-desktop
 Section: libs
-Architecture: i386 amd64 armhf arm64 powerpc ppc64el
+Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-mesa2,
+         mir-platform-graphics-mesa-kms3,
          mir-client-platform-mesa2,
 Description: Display server for Ubuntu - desktop driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
@@ -361,7 +372,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-android2,
+         mir-platform-graphics-android3,
          mir-client-platform-android2,
 Description: Display server for Ubuntu - android driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,

=== modified file 'debian/create_postinst_prerm_scripts.sh'
--- debian/create_postinst_prerm_scripts.sh	2015-06-05 17:48:17 +0000
+++ debian/create_postinst_prerm_scripts.sh	2015-07-23 14:41:37 +0000
@@ -8,11 +8,11 @@
 
 mir_platform_types="${PLATFORM_DRIVER}"
 case $deb_host_arch in
-    arm64|powerpc|ppc64el)
-        mir_platforms="mesa"
+    amd64|i386|armhf)
+        mir_platforms="android mesa-kms"
         ;;
     *)
-        mir_platforms="android mesa"
+        mir_platforms="mesa-kms"
         ;;
 esac
 

=== modified file 'debian/install_ld_so_conf.sh'
--- debian/install_ld_so_conf.sh	2015-06-05 17:48:17 +0000
+++ debian/install_ld_so_conf.sh	2015-07-23 14:41:37 +0000
@@ -7,12 +7,11 @@
 
 mir_platform_types="${PLATFORM_DRIVER} ${CLIENT_DRIVER}"
 case $DEB_HOST_ARCH in
-    arm64|powerpc|ppc64el)
-        mir_platforms="mesa"
+    amd64|i386|armhf)
+        mir_platforms="android mesa-kms"
         ;;
     *)
-        mir_platforms="android mesa"
-        ;;
+        mir_platforms="mesa-kms"
 esac
 
 for platform_type in $mir_platform_types;

=== renamed file 'debian/libmirclient8.install' => 'debian/libmirclient9.install'
--- debian/libmirclient8.install	2015-03-31 02:35:42 +0000
+++ debian/libmirclient9.install	2015-07-23 14:41:37 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirclient.so.8
+usr/lib/*/libmirclient.so.9

=== renamed file 'debian/libmircommon4.install' => 'debian/libmircommon5.install'
--- debian/libmircommon4.install	2015-03-31 02:35:42 +0000
+++ debian/libmircommon5.install	2015-07-23 14:41:37 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmircommon.so.4
+usr/lib/*/libmircommon.so.5

=== renamed file 'debian/libmirplatform7.install' => 'debian/libmirplatform8.install'
--- debian/libmirplatform7.install	2015-03-31 02:35:42 +0000
+++ debian/libmirplatform8.install	2015-07-23 14:41:37 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirplatform.so.7
+usr/lib/*/libmirplatform.so.8

=== renamed file 'debian/libmirserver31.install' => 'debian/libmirserver32.install'
--- debian/libmirserver31.install	2015-04-30 11:36:36 +0000
+++ debian/libmirserver32.install	2015-07-23 14:41:37 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.31
+usr/lib/*/libmirserver.so.32

=== modified file 'debian/mir-demos.install'
--- debian/mir-demos.install	2015-01-21 07:34:50 +0000
+++ debian/mir-demos.install	2015-07-23 14:41:37 +0000
@@ -1,2 +1,3 @@
 usr/bin/mir_demo_*
-usr/bin/mir_proving_*
\ No newline at end of file
+usr/bin/mir_proving_*
+usr/lib/*/libmir_demo_*

=== renamed file 'debian/mir-platform-graphics-android2.install' => 'debian/mir-platform-graphics-android3.install'
--- debian/mir-platform-graphics-android2.install	2015-04-30 11:36:36 +0000
+++ debian/mir-platform-graphics-android3.install	2015-07-23 14:41:37 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/graphics-android.so.2
+usr/lib/*/mir/server-platform/graphics-android.so.3

=== renamed file 'debian/mir-platform-graphics-mesa2.install' => 'debian/mir-platform-graphics-mesa-kms3.install'
--- debian/mir-platform-graphics-mesa2.install	2015-04-30 11:36:36 +0000
+++ debian/mir-platform-graphics-mesa-kms3.install	2015-07-23 14:41:37 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/graphics-mesa.so.2
+usr/lib/*/mir/server-platform/graphics-mesa-kms.so.3

=== modified file 'debian/mir-test-tools.install'
--- debian/mir-test-tools.install	2015-04-09 06:20:31 +0000
+++ debian/mir-test-tools.install	2015-07-23 14:41:37 +0000
@@ -3,6 +3,8 @@
 usr/bin/mir_acceptance_tests
 usr/bin/mir_integration_tests
 usr/bin/mir_performance_tests
+usr/bin/mir_privileged_tests
+usr/bin/mir_test_reload_protobuf
 usr/lib/*/mir/tools/libmirclientlttng.so
 usr/lib/*/mir/tools/libmirserverlttng.so
 usr/lib/*/mir/server-platform/graphics-dummy.so

=== modified file 'debian/mir-utils.install'
--- debian/mir-utils.install	2014-03-06 06:05:17 +0000
+++ debian/mir-utils.install	2015-07-23 14:41:37 +0000
@@ -1,3 +1,4 @@
 usr/bin/mirping
 usr/bin/mirout
 usr/bin/mirscreencast
+usr/bin/mirbacklight

=== modified file 'debian/rules'
--- debian/rules	2015-06-05 17:48:17 +0000
+++ debian/rules	2015-07-23 14:41:37 +0000
@@ -2,27 +2,21 @@
 
 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)
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
-include /usr/share/dpkg/default.mk
-
-# Explicitly selecting a G{CC,++}-version here to avoid accidental
-# ABI breaks introduced by toolchain updates.
-export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
-export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
-
 %:
 	dh $@ --parallel --fail-missing
 
 # Enable verbose debugging output from the testsuite
 export MIR_SERVER_LOGGING = on
 override_dh_auto_test:
-ifneq ($(DEB_HOST_ARCH),powerpc)
+ifeq ($(DEB_HOST_ARCH_ENDIAN),little)
 	GTEST_OUTPUT=xml:./ dh_auto_test --max-parallel=1 -- ARGS="-V"
 else
-	echo "Testsuite disabled on powerpc due to lack of big-endian support."
+	echo "Testsuite disabled on $(DEB_HOST_ARCH) due to lack of big-endian support."
 endif
 
 COMMON_CONFIGURE_OPTIONS = \
@@ -34,16 +28,16 @@
 	  $(COMMON_CONFIGURE_OPTIONS) \
 	  -DMIR_RUN_ACCEPTANCE_TESTS=OFF \
 	  -DMIR_RUN_INTEGRATION_TESTS=OFF \
-	  -DMIR_PLATFORM=android\;mesa
-else
-ifneq ($(filter arm64 powerpc ppc64el,$(DEB_HOST_ARCH)),)
-	dh_auto_configure -- \
-	  $(COMMON_CONFIGURE_OPTIONS) \
-	  -DMIR_PLATFORM=mesa
-else
-	dh_auto_configure -- \
-	  $(COMMON_CONFIGURE_OPTIONS) \
-	  -DMIR_PLATFORM=mesa\;android
+	  -DMIR_PLATFORM=android\;mesa-kms
+else
+ifneq ($(filter amd64 i386,$(DEB_HOST_ARCH)),)
+	dh_auto_configure -- \
+	  $(COMMON_CONFIGURE_OPTIONS) \
+	  -DMIR_PLATFORM=mesa-kms\;android
+else
+	dh_auto_configure -- \
+	  $(COMMON_CONFIGURE_OPTIONS) \
+	  -DMIR_PLATFORM=mesa-kms
 endif
 endif
 

=== modified file 'doc/building_source_for_arm.md'
--- doc/building_source_for_arm.md	2015-01-21 07:34:50 +0000
+++ doc/building_source_for_arm.md	2015-07-23 14:41:37 +0000
@@ -1,40 +1,55 @@
-Building the source for ARM {#building_source_for_arm}
+Building the Mir source for ARM {#building_source_for_arm}
 ===============================
 
-There are a few ways to compile for a target arm device. Only armhf and arm64 
-are supported at this time.
-
-Native Compile
---------------
-
-If you have a target device, you should be able to compile and install directly 
-on the ARM device. This will be probably be slow, given the relative 
-desktop/embedded CPU speeds these days. On the armhf or arm64 target device:
+There are a few ways to compile Mir for an ARM device. You should only need
+to choose one of these approaches...
+
+Building on the ARM device
+--------------------------
+
+If you have an ARM device you should be able to compile and install directly 
+on the device. Although this will usually be significantly slower than using a
+desktop. On the armhf or arm64 target device just follow these steps:
 
        $ mk-build-deps --install --tool "apt-get -y" --build-dep debian/control
        $ cmake .. -DMIR_PLATFORM=android
        $ make
        $ make install
 
-The build-time flags -DMIR_BUILD_UNIT_TESTS=no -DMIR_BUILD_INTEGRATION_TESTS=no 
--DMIR_BUILD_ACCEPTANCE_TESTS=no can be used to avoid building the mir test suite
-and save build-time.
-
-Packaging workflow
-------------------
-
-sbuild is recommended to compile mir packages with armhf. Information on setting
-sbuild up can be found here:
+The addional cmake option -DMIR_ENABLE_TESTS=off can be used to avoid building
+the test suite to save time.
+
+Building for ARM from a PC (cross compiling)
+--------------------------------------------
+
+Using a current Ubuntu (15.04 or later) installation it's very simple to build
+binaries for armhf devices. Just follow these steps:
+
+    $ sudo apt-get install g++-arm-linux-gnueabihf debootstrap
+    $ cd mir_source_dir
+    $ ./cross-compile-chroot.sh
+    $ ls -l build-android-arm/*  # binaries to copy to your device as you wish
+
+To speed up the process for future runs of cross-compile-chroot.sh, some files
+are saved in ~/.cache/. To flush the cache and download new armhf packages
+just add the -u option to cross-compile-chroot.sh.
+
+Building armhf deb packages
+---------------------------
+
+"sbuild" is recommended to compile Mir packages with armhf. Information on
+setting up sbuild can be found here:
 
  * <a href="https://wiki.debian.org/sbuild"> https://wiki.debian.org/sbuild</a>
  * <a href="https://wiki.ubuntu.com/SimpleSbuild">
 https://wiki.ubuntu.com/SimpleSbuild</a> 
 
-If you do not wish to run the mir test suite during package generation, set
- DEB_BUILD_OPTIONS=nocheck to your environment
+If you do not wish to run the Mir test suite during package generation, set
+DEB_BUILD_OPTIONS=nocheck to your environment
 
 Emulated sbuild package generation
 ----------------------------------
+
 This uses qemu to compile the package. Substitute <version_string> for the .dsc
 file name generated by the debuild command.
 
@@ -43,44 +58,17 @@
        $ cd .. 
        $ sbuild -d vivid --arch armhf mir_<version_string>.dsc
 
-Cross compile sbuild package generation
+Cross-compile sbuild package generation
 ---------------------------------------
+
 This uses a cross-compile toolchain to compile the package, and generally 
 should be faster than the emulated sbuild package generation.
 
 Substitute <version_string> for the .dsc file name generated by the debuild 
 command.
 
-(Nov 2014) We are currently plagued by  
-<a href="https://bugs.launchpad.net/mir/+bug/1353855">launchpad bug: 1353855</a>
-which requires the sed step below as a work-around. If that bug gets resolved,
-the sed step can be omitted.
-
        $ cd mir_source_dir
-       $ sed -i '/.*g++-4.9.*$/d' debian/control
        $ debuild -S -uc -us
        $ cd .. 
        $ sbuild -d vivid --host armhf --build amd64 mir_<version_string>.dsc
 
-Development workflow
---------------------
-
-We have a script that can aid in the development workflow if you do not want to 
-generate and install a package. The script will download a partial armhf chroot
-within the mir_source_dir directory.
-
-Make sure to have a suitable cross compile toolchain (e.g., the
-`g++-arm-linux-gnueabihf` ubuntu package).
-
-    $ sudo apt-get install g++-arm-linux-gnueabihf debootstrap
-    $ cd mir_source_dir
-    $ ./cross-compile-chroot.sh
-    $ ls -l build-android-arm/*  # binaries to copy to your device
-
-To speed up the process for future branches you may wish to cache the files
-downloaded by setting environment variable MIR_NDK_PATH to point to a directory
-that cross-compile-chroot.sh should reuse each time.
-
-Copying the produced binaries correctly to the device requires good familiarity
-with the Mir codebase. For that reason, installing using the debian packaging is
- recommended, and this compile method is mentioned for development purposes.

=== modified file 'doc/kernel_requirements.md'
--- doc/kernel_requirements.md	2015-04-13 15:57:33 +0000
+++ doc/kernel_requirements.md	2015-07-23 14:41:37 +0000
@@ -1,7 +1,7 @@
 Linux Kernel Requirements for Mir
 =================================
 
-To run Mir with the default `mesa` platform you need a linux kernel with at
+To run Mir with the default `mesa-kms` platform you need a linux kernel with at
 least:
 
 Modules: i915, radeon and nouveau, to support the broadest range of common

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2015-04-23 11:42:34 +0000
+++ examples/CMakeLists.txt	2015-07-23 14:41:37 +0000
@@ -13,6 +13,7 @@
 
 add_library(eglapp STATIC
   eglapp.c
+  client_helpers.cpp
 )
 
 add_library(exampleserverconfig STATIC
@@ -88,6 +89,13 @@
 )
 target_link_libraries(mir_demo_client_tooltip
   eglapp
+  )
+
+mir_add_wrapped_executable(mir_demo_client_touch_validator
+  client_touch_validator.cpp
+)
+target_link_libraries(mir_demo_client_touch_validator
+  eglapp
 )
 
 mir_add_wrapped_executable(mir_demo_client_basic
@@ -185,6 +193,32 @@
   ${Boost_LIBRARIES}
 )
 
+add_library(mir_demo_server_loadable MODULE
+  server_example.cpp
+  glog_logger.cpp
+  server_example_test_client.cpp
+)
+
+target_link_libraries(mir_demo_server_loadable
+  mirserver
+  exampleserverconfig
+  ${GLog_LIBRARY}
+  ${GFlags_LIBRARY}
+  ${Boost_LIBRARIES}
+)
+
+install(TARGETS mir_demo_server_loadable
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+
+mir_add_wrapped_executable(mir_demo_server_loader
+  mir_demo_server_loader.cpp
+)
+
+target_link_libraries(mir_demo_server_loader
+  dl
+)
+
 mir_add_wrapped_executable(mir_demo_server_minimal server_minimal.cpp)
 target_link_libraries(mir_demo_server_minimal mirserver)
 

=== modified file 'examples/basic.c'
--- examples/basic.c	2015-03-31 02:35:42 +0000
+++ examples/basic.c	2015-07-23 14:41:37 +0000
@@ -91,7 +91,7 @@
 
     ///\internal [connect_tag]
     // Call mir_connect and wait for callback to complete.
-    mir_wait_for(mir_connect(server, __PRETTY_FUNCTION__, connection_callback, &mcd));
+    mir_wait_for(mir_connect(server, __FILE__, connection_callback, &mcd));
     puts("Connected");
     ///\internal [connect_tag]
 
@@ -125,7 +125,7 @@
     MirSurfaceSpec *spec =
         mir_connection_create_spec_for_normal_surface(mcd.connection, 640, 480, pixel_format);
     assert(spec != NULL);
-    mir_surface_spec_set_name(spec, __PRETTY_FUNCTION__);
+    mir_surface_spec_set_name(spec, __FILE__);
 
     ///\internal [surface_create_tag]
     // ...we create a surface using that format and wait for callback to complete.

=== added file 'examples/client_helpers.cpp'
--- examples/client_helpers.cpp	1970-01-01 00:00:00 +0000
+++ examples/client_helpers.cpp	2015-07-23 14:41:37 +0000
@@ -0,0 +1,204 @@
+/*
+ * 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: Kevin DuBois <[e-mail]>
+ */
+
+#include "client_helpers.h"
+#include "mir_toolkit/mir_client_library.h"
+#include <thread>
+#include <chrono>
+#include <iostream>
+#include <cstring>
+#include <unistd.h>
+#include <signal.h>
+
+namespace me = mir::examples;
+
+me::Connection::Connection(char const* socket_file) :
+    connection(mir_connect_sync(socket_file, __PRETTY_FUNCTION__))
+{
+    if (!mir_connection_is_valid(connection))
+        throw std::runtime_error(std::string("could not connect to server: ") +
+                                 mir_connection_get_error_message(connection));
+}
+
+me::Connection::~Connection()
+{
+    mir_connection_release(connection);
+}
+
+me::Connection::operator MirConnection*()
+{
+    return connection;
+}
+
+me::NormalSurface::NormalSurface(me::Connection& connection, unsigned int width, unsigned int height) :
+    surface{create_surface(connection, width, height), surface_deleter}
+{
+}
+
+me::NormalSurface::operator MirSurface*() const
+{
+    return surface.get();
+}
+
+MirSurface* me::NormalSurface::create_surface(MirConnection* connection, unsigned int width, unsigned int height)
+{
+    MirPixelFormat selected_format;
+    unsigned int valid_formats{0};
+    MirPixelFormat pixel_formats[mir_pixel_formats];
+    mir_connection_get_available_surface_formats(connection, pixel_formats, mir_pixel_formats, &valid_formats);
+    if (valid_formats == 0)
+        throw std::runtime_error("no pixel formats for surface");
+    selected_format = pixel_formats[0]; 
+    //select an 8 bit opaque format if we can
+    for(auto i = 0u; i < valid_formats; i++)
+    {
+        if (pixel_formats[i] == mir_pixel_format_xbgr_8888 ||
+            pixel_formats[i] == mir_pixel_format_xrgb_8888)
+        {
+            selected_format = pixel_formats[i];
+            break;
+        }
+    }
+
+    auto deleter = [](MirSurfaceSpec *spec) { mir_surface_spec_release(spec); };
+    std::unique_ptr<MirSurfaceSpec, decltype(deleter)> spec{
+        mir_connection_create_spec_for_normal_surface(connection, width, height, selected_format),
+        deleter
+    };
+
+    mir_surface_spec_set_name(spec.get(), __PRETTY_FUNCTION__);
+    mir_surface_spec_set_buffer_usage(spec.get(), mir_buffer_usage_hardware);
+    auto surface = mir_surface_create_sync(spec.get());
+    return surface;
+}
+
+me::Context::Context(Connection& connection, MirSurface* surface, int swap_interval) :
+    native_display(reinterpret_cast<EGLNativeDisplayType>(
+        mir_connection_get_egl_native_display(connection))),
+    native_window(reinterpret_cast<EGLNativeWindowType>(
+        mir_buffer_stream_get_egl_native_window(mir_surface_get_buffer_stream(surface)))),
+    display(native_display),
+    config(chooseconfig(display.disp)),
+    surface(display.disp, config, native_window),
+    context(display.disp, config)
+{
+    make_current();
+    eglSwapInterval(display.disp, swap_interval);
+}
+
+void me::Context::make_current()
+{
+    if (eglMakeCurrent(display.disp, surface.surface, surface.surface, context.context) == EGL_FALSE)
+        throw(std::runtime_error("could not makecurrent"));
+}
+
+void me::Context::release_current()
+{
+    if (eglMakeCurrent(display.disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT) == EGL_FALSE)
+        throw(std::runtime_error("could not makecurrent"));
+}
+void me::Context::swapbuffers()
+{
+    if (eglSwapBuffers(display.disp, surface.surface) == EGL_FALSE)
+        throw(std::runtime_error("could not swapbuffers"));
+}
+
+EGLConfig me::Context::chooseconfig(EGLDisplay disp)
+{
+    int n{0};
+    EGLConfig egl_config;
+    EGLint attribs[] = {
+        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+        EGL_RED_SIZE, 8,
+        EGL_GREEN_SIZE, 8,
+        EGL_BLUE_SIZE, 8,
+        EGL_ALPHA_SIZE, 8,
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+        EGL_NONE };
+    if (eglChooseConfig(disp, attribs, &egl_config, 1, &n) != EGL_TRUE || n != 1)
+        throw std::runtime_error("could not find egl config");
+    return egl_config;
+}
+
+me::Context::Display::Display(EGLNativeDisplayType native) :
+    disp(eglGetDisplay(native))
+{
+    int major{0}, minor{0};
+    if (disp == EGL_NO_DISPLAY)
+        throw std::runtime_error("no egl display");
+    if (eglInitialize(disp, &major, &minor) != EGL_TRUE || major != 1 || minor != 4)
+        throw std::runtime_error("could not init egl");
+}
+
+me::Context::Display::~Display()
+{
+    eglTerminate(disp);
+}
+
+me::Context::Surface::Surface(EGLDisplay display, EGLConfig config, EGLNativeWindowType native_window) :
+    disp(display),
+    surface(eglCreateWindowSurface(disp, config, native_window, NULL))
+{
+    if (surface == EGL_NO_SURFACE)
+        throw std::runtime_error("could not create egl surface");
+}
+
+me::Context::Surface::~Surface()
+{
+    if (eglGetCurrentSurface(EGL_DRAW) == surface)
+        eglMakeCurrent(disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    eglDestroySurface(disp, surface);
+}
+
+me::Context::EglContext::EglContext(EGLDisplay disp, EGLConfig config) :
+    disp(disp),
+    context(eglCreateContext(disp, config, EGL_NO_CONTEXT, context_attribs))
+{
+    if (context == EGL_NO_CONTEXT)
+        throw std::runtime_error("could not create egl context");
+}
+
+me::Context::EglContext::~EglContext()
+{
+    eglDestroyContext(disp, context);
+}
+
+me::Shader::Shader(GLchar const* const* src, GLuint type) :
+    shader(glCreateShader(type))
+{
+    glShaderSource(shader, 1, src, 0);
+    glCompileShader(shader);
+}
+
+me::Shader::~Shader()
+{
+    glDeleteShader(shader);
+}
+
+me::Program::Program(Shader& vertex, Shader& fragment) :
+    program(glCreateProgram())
+{
+    glAttachShader(program, vertex.shader);
+    glAttachShader(program, fragment.shader);
+    glLinkProgram(program);
+}
+
+me::Program::~Program()
+{
+    glDeleteProgram(program);
+}

=== added file 'examples/client_helpers.h'
--- examples/client_helpers.h	1970-01-01 00:00:00 +0000
+++ examples/client_helpers.h	2015-07-23 14:41:37 +0000
@@ -0,0 +1,110 @@
+/*
+ * 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: Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_EXAMLPES_CLIENT_HELPERS_H_
+#define MIR_EXAMLPES_CLIENT_HELPERS_H_
+
+#include "mir_toolkit/mir_client_library.h"
+#include <EGL/egl.h>
+#include <GLES2/gl2.h>
+#include <memory>
+
+namespace mir
+{
+namespace examples 
+{
+class Connection
+{
+public:
+    Connection(char const* socket_file);
+    ~Connection();
+    operator MirConnection*();
+    Connection(Connection const&) = delete;
+    Connection& operator=(Connection const&) = delete;
+private:
+    MirConnection* connection;
+};
+
+class NormalSurface
+{
+public:
+    NormalSurface(Connection& connection, unsigned int width, unsigned int height);
+    operator MirSurface*() const;
+private:
+    MirSurface* create_surface(MirConnection* connection, unsigned int width, unsigned int height);
+    std::function<void(MirSurface*)> const surface_deleter{
+        [](MirSurface* surface) { mir_surface_release_sync(surface); }
+    };
+    std::unique_ptr<MirSurface, decltype(surface_deleter)> surface;
+    NormalSurface(NormalSurface const&) = delete;
+    NormalSurface& operator=(NormalSurface const&) = delete;
+};
+
+class Context
+{
+public:
+    Context(Connection& connection, MirSurface* surface, int swap_interval);
+    void make_current();
+    void release_current();
+    void swapbuffers();
+    Context(Context const&) = delete;
+    Context& operator=(Context const&) = delete;
+private:
+    EGLConfig chooseconfig(EGLDisplay disp);
+    EGLNativeDisplayType native_display;
+    EGLNativeWindowType native_window;
+    struct Display
+    {
+        Display(EGLNativeDisplayType native);
+        ~Display();
+        EGLDisplay disp;
+    } display;
+    EGLConfig config;
+    struct Surface
+    {
+        Surface(EGLDisplay display, EGLConfig config, EGLNativeWindowType native_window);
+        ~Surface();
+        EGLDisplay disp;
+        EGLSurface surface;
+    } surface;
+    struct EglContext
+    {
+        EglContext(EGLDisplay disp, EGLConfig config);
+        ~EglContext();
+        EGLint context_attribs[3] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
+        EGLDisplay disp;
+        EGLContext context;
+    } context;
+};
+
+struct Shader
+{
+    Shader(GLchar const* const* src, GLuint type);
+    ~Shader();
+    GLuint shader;
+};
+
+struct Program
+{
+    Program(Shader& vertex, Shader& fragment);
+    ~Program();
+    GLuint program;
+};
+}
+}
+#endif /* MIR_EXAMLPES_CLIENT_HELPERS_H_ */

=== added file 'examples/client_touch_validator.cpp'
--- examples/client_touch_validator.cpp	1970-01-01 00:00:00 +0000
+++ examples/client_touch_validator.cpp	2015-07-23 14:41:37 +0000
@@ -0,0 +1,200 @@
+/*
+ * Client which validates incoming touch events.
+ *
+ * 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/>.
+ *
+ * Author: Robert Carr <[e-mail]>
+ */
+
+#include "eglapp.h"
+
+#include <mir_toolkit/mir_client_library.h>
+
+#include <GLES2/gl2.h>
+
+#include <set>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+namespace
+{
+// Assumes all touch input comes from a single device.
+// Validates:
+//     1. All touches which were down stay down unless they were coming up
+//     2. All touches which were released do not appear
+//     3. Only one touch comes up or down at a time.
+
+bool validate_events(MirTouchEvent const* last_event, MirTouchEvent const* event)
+{
+    std::set<MirTouchId> must_be_present;
+    std::set<MirTouchId> may_not_be_present;
+
+    // Here, from the last event, we build a list of points which must be
+    // and which must not be present in the next event.
+    for (size_t i = 0; i < mir_touch_event_point_count(last_event); i++)
+    {
+        auto id = mir_touch_event_id(last_event, i);
+        auto action = mir_touch_event_action(last_event, i);
+        if (action == mir_touch_action_change)
+            must_be_present.insert(id);
+        else if (action == mir_touch_action_down)
+            must_be_present.insert(id);
+        else
+            may_not_be_present.insert(id);
+    }
+    if (may_not_be_present.size() > 1)
+    {
+        printf("More than one touch came up\n");
+        return false;
+    }
+
+    bool found_a_up_down = false;
+    for (size_t i = 0; i < mir_touch_event_point_count(event); i++)
+    {
+        auto id = mir_touch_event_id(event, i);
+        auto it = may_not_be_present.find(id);
+        // Here we validate condition 2, where released touches may not reappear
+        if (it != may_not_be_present.end())
+        {
+            printf("We repeated a touch which was already lifted (%d)\n", static_cast<int>(id));
+            return false;
+        }
+        it = must_be_present.find(id);
+        if (it != must_be_present.end())
+        {
+            must_be_present.erase(it);
+        }
+        // Here we validate condition 4
+        else if (mir_touch_event_action(event, i) == mir_touch_action_down) 
+        {
+            if (found_a_up_down)
+                printf("Found too many downs in one event\n");
+            found_a_up_down = true;
+        }
+        if (mir_touch_event_action(event, i) == mir_touch_action_up)
+        {
+            if (found_a_up_down)
+                printf("Found too many ups in one event\n");
+            found_a_up_down = true;
+        }
+    }
+
+    // Here we validate condition 1
+    if (must_be_present.size())
+    {
+        printf("We received a touch which did not contain all required IDs\n");
+        return false;
+    }
+    
+    return true;
+}
+    
+class TouchState
+{
+public:
+    TouchState() : last_event(nullptr) {}
+    ~TouchState() { if (last_event) mir_event_unref(last_event); }
+    
+    void record_event(MirTouchEvent const* event)
+    {
+        if (!last_event)
+        {
+            last_event = mir_event_ref(reinterpret_cast<MirEvent const*>(event));
+            return;
+        }
+        if (!validate_events(reinterpret_cast<MirTouchEvent const*>(last_event), event))
+            abort();
+        
+        mir_event_unref(last_event);
+        last_event = mir_event_ref(reinterpret_cast<MirEvent const*>(event));
+    }
+private:
+    MirEvent const* last_event;
+};
+
+void on_input_event(TouchState *state, MirInputEvent const *event)
+{
+    if (mir_input_event_get_type(event) != mir_input_event_type_touch)
+        return;
+    auto tev = mir_input_event_get_touch_event(event);
+    state->record_event(tev);
+}
+    
+void on_event(MirSurface * /*surface*/, const MirEvent *event, void *context)
+{
+    TouchState *state = (TouchState*)context;
+
+    switch (mir_event_get_type(event))
+    {
+    case mir_event_type_input:
+        on_input_event(state, mir_event_get_input_event(event));
+        break;
+    case mir_event_type_close_surface:
+        abort();
+        break;
+    default:
+        break;
+    }
+}
+}
+
+
+typedef struct Color
+{
+    GLfloat r, g, b, a;
+} Color;
+
+int main(int argc, char *argv[])
+{
+    unsigned int width = 0, height = 0;
+
+    if (!mir_eglapp_init(argc, argv, &width, &height))
+        return 1;
+
+    TouchState state;
+
+    MirSurface *surface = mir_eglapp_native_surface();
+    mir_surface_set_event_handler(surface, on_event, &state);
+
+    float const opacity = mir_eglapp_background_opacity;
+    Color red = {opacity, 0.0f, 0.0f, opacity};
+    Color green = {0.0f, opacity, 0.0f, opacity};
+    Color blue = {0.0f, 0.0f, opacity, opacity};
+
+    /* This is probably the simplest GL you can do */
+    while (mir_eglapp_running())
+    {
+        glClearColor(red.r, red.g, red.b, red.a);
+        glClear(GL_COLOR_BUFFER_BIT);
+        mir_eglapp_swap_buffers();
+        sleep(1);
+
+        glClearColor(green.r, green.g, green.b, green.a);
+        glClear(GL_COLOR_BUFFER_BIT);
+        mir_eglapp_swap_buffers();
+        sleep(1);
+
+        glClearColor(blue.r, blue.g, blue.b, blue.a);
+        glClear(GL_COLOR_BUFFER_BIT);
+        mir_eglapp_swap_buffers();
+        sleep(1);
+    }
+
+    mir_eglapp_shutdown();
+
+    return 0;
+}

=== modified file 'examples/eglsquare.cpp'
--- examples/eglsquare.cpp	2015-04-24 14:11:07 +0000
+++ examples/eglsquare.cpp	2015-07-23 14:41:37 +0000
@@ -27,139 +27,16 @@
 #include <unistd.h>
 #include <signal.h>
 
+#include "client_helpers.h"
+
+namespace me = mir::examples;
+
 namespace
 {
-class Connection
-{
-public:
-    Connection(char const* socket_file) :
-        connection(mir_connect_sync(socket_file, __PRETTY_FUNCTION__))
-    {
-        if (!mir_connection_is_valid(connection))
-            throw std::runtime_error(std::string("could not connect to server: ") +
-                                     mir_connection_get_error_message(connection));
-    }
-    ~Connection()
-    {
-        mir_connection_release(connection);
-    }
-    operator MirConnection*() { return connection; }
-    Connection(Connection const&) = delete;
-    Connection& operator=(Connection const&) = delete;
-private:
-    MirConnection* connection;
-};
-
-class Context
-{
-public:
-    Context(Connection& connection, MirSurface* surface, int swap_interval) :
-        native_display(reinterpret_cast<EGLNativeDisplayType>(
-            mir_connection_get_egl_native_display(connection))),
-        native_window(reinterpret_cast<EGLNativeWindowType>(
-            mir_buffer_stream_get_egl_native_window(mir_surface_get_buffer_stream(surface)))),
-        display(native_display),
-        config(chooseconfig(display.disp)),
-        surface(display.disp, config, native_window),
-        context(display.disp, config)
-    {
-        make_current();
-        eglSwapInterval(display.disp, swap_interval);
-    }
-    void make_current()
-    {
-        if (eglMakeCurrent(display.disp, surface.surface, surface.surface, context.context) == EGL_FALSE)
-            throw(std::runtime_error("could not makecurrent"));
-    }
-    void release_current()
-    {
-        if (eglMakeCurrent(display.disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT) == EGL_FALSE)
-            throw(std::runtime_error("could not makecurrent"));
-    }
-    void swapbuffers()
-    {
-        if (eglSwapBuffers(display.disp, surface.surface) == EGL_FALSE)
-            throw(std::runtime_error("could not swapbuffers"));
-    }
-    Context(Context const&) = delete;
-    Context& operator=(Context const&) = delete;
-private:
-    EGLConfig chooseconfig(EGLDisplay disp)
-    {
-        int n{0};
-        EGLConfig egl_config;
-        EGLint attribs[] = {
-            EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-            EGL_RED_SIZE, 8,
-            EGL_GREEN_SIZE, 8,
-            EGL_BLUE_SIZE, 8,
-            EGL_ALPHA_SIZE, 8,
-            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-            EGL_NONE };
-        if (eglChooseConfig(disp, attribs, &egl_config, 1, &n) != EGL_TRUE || n != 1)
-            throw std::runtime_error("could not find egl config");
-        return egl_config;
-    }
-    EGLNativeDisplayType native_display;
-    EGLNativeWindowType native_window;
-    struct Display
-    {
-        Display(EGLNativeDisplayType native) :
-            disp(eglGetDisplay(native))
-        {
-            int major{0}, minor{0};
-            if (disp == EGL_NO_DISPLAY)
-                throw std::runtime_error("no egl display");
-            if (eglInitialize(disp, &major, &minor) != EGL_TRUE || major != 1 || minor != 4)
-                throw std::runtime_error("could not init egl");
-        }
-        ~Display()
-        {
-            eglTerminate(disp);
-        }
-        EGLDisplay disp;
-    } display;
-    EGLConfig config;
-    struct Surface
-    {
-        Surface(EGLDisplay display, EGLConfig config, EGLNativeWindowType native_window) :
-            disp(display),
-            surface(eglCreateWindowSurface(disp, config, native_window, NULL))
-        {
-            if (surface == EGL_NO_SURFACE)
-                throw std::runtime_error("could not create egl surface");
-        }
-        ~Surface() {
-            if (eglGetCurrentSurface(EGL_DRAW) == surface)
-                eglMakeCurrent(disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-            eglDestroySurface(disp, surface);
-         }
-        EGLDisplay disp;
-        EGLSurface surface;
-    } surface;
-    struct EglContext
-    {
-        EglContext(EGLDisplay disp, EGLConfig config) :
-            disp(disp),
-            context(eglCreateContext(disp, config, EGL_NO_CONTEXT, context_attribs))
-        {
-            if (context == EGL_NO_CONTEXT)
-                throw std::runtime_error("could not create egl context");
-        }
-        ~EglContext()
-        {
-            eglDestroyContext(disp, context);
-        }
-        EGLint context_attribs[3] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
-        EGLDisplay disp;
-        EGLContext context;
-    } context;
-};
-
 class RenderProgram
 {
 public:
-    RenderProgram(Context& context, unsigned int width, unsigned int height) :
+    RenderProgram(me::Context& context, unsigned int width, unsigned int height) :
         vertex(&vtex_shader_src, GL_VERTEX_SHADER),
         fragment(&frag_shader_src, GL_FRAGMENT_SHADER),
         program(vertex, fragment)
@@ -209,35 +86,9 @@
         "   gl_Position = vec4(vPosition.xy * scale + pos, 0.0, 1.0);"
         "}"
     };
-    struct Shader
-    {
-        Shader(GLchar const* const* src, GLuint type) :
-            shader(glCreateShader(type))
-        {
-            glShaderSource(shader, 1, src, 0);
-            glCompileShader(shader);
-        }
-        ~Shader()
-        {
-            glDeleteShader(shader);
-        }
-        GLuint shader;
-    } vertex, fragment;
-    struct Program
-    {
-        Program(Shader& vertex, Shader& fragment) :
-            program(glCreateProgram())
-        {
-            glAttachShader(program, vertex.shader);
-            glAttachShader(program, fragment.shader);
-            glLinkProgram(program);
-        }
-        ~Program()
-        {
-            glDeleteProgram(program);
-        }
-        GLuint program;
-    } program;
+    me::Shader vertex;
+    me::Shader fragment;
+    me::Program program;
     GLfloat vertex_data[16]
     {
         -1.0, -1.0f, 0.0f, 1.0f,
@@ -249,15 +100,16 @@
     GLuint posUniform; 
 };
 
-class Surface
+class SquareRenderingSurface
 {
 public:
-    Surface(Connection& connection, int swap_interval) :
+    SquareRenderingSurface(me::Connection& connection, int swap_interval) :
         dimensions(active_output_dimensions(connection)),
-        surface{create_surface(connection, dimensions), surface_deleter},
-        context{connection, surface.get(), swap_interval},
+        surface{connection, dimensions.width, dimensions.height},
+        context{connection, surface, swap_interval},
         program{context, dimensions.width, dimensions.height}
     {
+        mir_surface_set_event_handler(surface, &on_event, this);
     }
 
     void on_event(MirEvent const* ev)
@@ -290,8 +142,8 @@
         context.swapbuffers();
     }
 
-    Surface(Surface const&) = delete;
-    Surface& operator=(Surface const&) = delete;
+    SquareRenderingSurface(SquareRenderingSurface const&) = delete;
+    SquareRenderingSurface& operator=(SquareRenderingSurface const&) = delete;
 private:
     struct OutputDimensions
     {
@@ -299,15 +151,8 @@
         unsigned int const height;
     } const dimensions;
 
-
-    std::function<void(MirSurface*)> const surface_deleter{
-        [](MirSurface* surface)
-        {
-            mir_surface_release_sync(surface);
-        }
-    };
-    std::unique_ptr<MirSurface, decltype(surface_deleter)> surface;
-    Context context;
+    me::NormalSurface surface;
+    me::Context context;
     RenderProgram program;
 
     OutputDimensions active_output_dimensions(MirConnection* connection)
@@ -334,45 +179,12 @@
         return {width, height};
     }
 
-    MirSurface* create_surface(MirConnection* connection, OutputDimensions const& dim)
-    {
-        MirPixelFormat selected_format;
-        unsigned int valid_formats{0};
-        MirPixelFormat pixel_formats[mir_pixel_formats];
-        mir_connection_get_available_surface_formats(connection, pixel_formats, mir_pixel_formats, &valid_formats);
-        if (valid_formats == 0)
-            throw std::runtime_error("no pixel formats for surface");
-        selected_format = pixel_formats[0]; 
-        //select an 8 bit opaque format if we can
-        for(auto i = 0u; i < valid_formats; i++)
-        {
-            if (pixel_formats[i] == mir_pixel_format_xbgr_8888 ||
-                pixel_formats[i] == mir_pixel_format_xrgb_8888)
-            {
-                selected_format = pixel_formats[i];
-                break;
-            }
-        }
-
-        auto deleter = [](MirSurfaceSpec *spec) { mir_surface_spec_release(spec); };
-        std::unique_ptr<MirSurfaceSpec, decltype(deleter)> spec{
-            mir_connection_create_spec_for_normal_surface(connection, dim.width, dim.height, selected_format),
-            deleter
-        };
-
-        mir_surface_spec_set_name(spec.get(), __PRETTY_FUNCTION__);
-        mir_surface_spec_set_buffer_usage(spec.get(), mir_buffer_usage_hardware);
-        auto surface = mir_surface_create_sync(spec.get());
-        mir_surface_set_event_handler(surface, &on_event, this);
-        return surface;
-    }
     static void on_event(MirSurface*, const MirEvent *event, void *context)
     {
-        auto surface = reinterpret_cast<Surface*>(context);
+        auto surface = reinterpret_cast<SquareRenderingSurface*>(context);
         if (surface) surface->on_event(event);
     }
 };
-
 }
 
 int main(int argc, char *argv[])
@@ -398,8 +210,8 @@
         }
     }
 
-    Connection connection(socket_file);
-    Surface surface(connection, swap_interval);
+    me::Connection connection(socket_file);
+    SquareRenderingSurface surface(connection, swap_interval);
 
     sigset_t sigset;
     siginfo_t siginfo;

=== modified file 'examples/flicker.c'
--- examples/flicker.c	2015-03-31 02:35:42 +0000
+++ examples/flicker.c	2015-07-23 14:41:37 +0000
@@ -129,7 +129,7 @@
 
     puts("Starting");
 
-    connection = mir_connect_sync(socket_file, __PRETTY_FUNCTION__);
+    connection = mir_connect_sync(socket_file, __FILE__);
     assert(connection != NULL);
     assert(mir_connection_is_valid(connection));
     assert(strcmp(mir_connection_get_error_message(connection), "") == 0);
@@ -144,7 +144,7 @@
     MirSurfaceSpec *spec =
         mir_connection_create_spec_for_normal_surface(connection, 640, 480, pixel_format);
     assert(spec != NULL);
-    mir_surface_spec_set_name(spec, __PRETTY_FUNCTION__);
+    mir_surface_spec_set_name(spec, __FILE__);
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
 
     surface = mir_surface_create_sync(spec);

=== added file 'examples/mir_demo_server_loader.cpp'
--- examples/mir_demo_server_loader.cpp	1970-01-01 00:00:00 +0000
+++ examples/mir_demo_server_loader.cpp	2015-07-23 14:41:37 +0000
@@ -0,0 +1,46 @@
+/*
+ * 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 <dlfcn.h>
+#include <stdexcept>
+#include <iostream>
+
+namespace
+{
+const char* const library = "libmir_demo_server_loadable.so";
+const char* const entry = "main";
+}
+
+int main(int argc, char const* argv[])
+try
+{
+    auto const so = dlopen(library, RTLD_NOW|RTLD_LOCAL);
+    if (!so) throw std::runtime_error(dlerror());
+
+    int (*loaded_main)(int, char const*[]){nullptr};
+
+    (void*&)loaded_main = dlsym(so, entry);
+    if (!loaded_main) throw std::runtime_error(dlerror());
+
+    return loaded_main(argc, argv);
+
+}
+catch(std::exception const& x)
+{
+    std::cerr << "Error:" << x.what() << std::endl;
+}

=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2015-04-27 18:42:54 +0000
+++ examples/render_surfaces.cpp	2015-07-23 14:41:37 +0000
@@ -30,6 +30,8 @@
 #include "mir/options/option.h"
 #include "mir/scene/surface.h"
 #include "mir/scene/surface_coordinator.h"
+#include "mir/scene/buffer_stream_factory.h"
+#include "mir/scene/surface_factory.h"
 #include "mir/server.h"
 #include "mir/report_exception.h"
 
@@ -331,6 +333,8 @@
         std::cout << "Rendering " << moveables.size() << " surfaces" << std::endl;
 
         auto const display = the_display();
+        auto const buffer_stream_factory = the_buffer_stream_factory();
+        auto const surface_factory = the_surface_factory();
         auto const surface_coordinator = the_surface_coordinator();
         auto const gl_context = the_display()->create_gl_context();
 
@@ -355,16 +359,19 @@
         int i = 0;
         for (auto& m : moveables)
         {
-            auto const s = surface_coordinator->add_surface(
-                    ms::a_surface().of_size(surface_size)
-                                   .of_pixel_format(surface_pf)
-                                   .of_buffer_usage(mg::BufferUsage::hardware),
-                    nullptr);
+            auto params = ms::a_surface()
+                .of_size(surface_size)
+                .of_pixel_format(surface_pf)
+                .of_buffer_usage(mg::BufferUsage::hardware);
+            mg::BufferProperties properties{params.size, params.pixel_format, params.buffer_usage};
+            auto const stream = buffer_stream_factory->create_buffer_stream(properties); 
+            auto const surface = surface_factory->create_surface(stream, params);
+            surface_coordinator->add_surface(surface, params.depth, params.input_mode, nullptr);
 
             {
                 mg::Buffer* buffer{nullptr};
                 auto const complete = [&](mg::Buffer* new_buf){ buffer = new_buf; };
-                s->swap_buffers(buffer, complete); // Fetch buffer for rendering
+                surface->primary_buffer_stream()->swap_buffers(buffer, complete); // Fetch buffer for rendering
                 {
                     gl_context->make_current();
 
@@ -377,7 +384,7 @@
 
                     gl_context->release_current();
                 }
-                s->swap_buffers(buffer, complete); // Post rendered buffer
+                surface->primary_buffer_stream()->swap_buffers(buffer, complete); // Post rendered buffer
             }
 
             /*
@@ -387,8 +394,8 @@
             uint32_t const x = w * (0.5 + 0.25 * cos(i * angular_step)) - surface_side / 2.0;
             uint32_t const y = h * (0.5 + 0.25 * sin(i * angular_step)) - surface_side / 2.0;
 
-            s->move_to({x, y});
-            m = Moveable(s, display_size,
+            surface->move_to({x, y});
+            m = Moveable(surface, display_size,
                     cos(0.1f + i * M_PI / 6.0f) * w / 3.0f,
                     sin(0.1f + i * M_PI / 6.0f) * h / 3.0f,
                     glm::vec3{(i % 3 == 0) * 1.0f, (i % 3 == 1) * 1.0f, (i % 3 == 2) * 1.0f},

=== modified file 'examples/server_example_basic_window_manager.h'
--- examples/server_example_basic_window_manager.h	2015-04-23 07:11:04 +0000
+++ examples/server_example_basic_window_manager.h	2015-07-23 14:41:37 +0000
@@ -81,6 +81,8 @@
 
     virtual auto active_display() -> geometry::Rectangle const = 0;
 
+    virtual void forget(std::weak_ptr<scene::Surface> const& surface) = 0;
+
     virtual ~BasicWindowManagerToolsCopy() = default;
     BasicWindowManagerToolsCopy() = default;
     BasicWindowManagerToolsCopy(BasicWindowManagerToolsCopy const&) = delete;
@@ -170,6 +172,11 @@
         surface_info.erase(surface);
     }
 
+    void forget(std::weak_ptr<scene::Surface> const& surface) override
+    {
+        surface_info.erase(surface);
+    }
+
     void add_display(geometry::Rectangle const& area) override
     {
         std::lock_guard<decltype(mutex)> lock(mutex);

=== modified file 'examples/server_example_canonical_window_manager.cpp'
--- examples/server_example_canonical_window_manager.cpp	2015-04-30 05:09:11 +0000
+++ examples/server_example_canonical_window_manager.cpp	2015-07-23 14:41:37 +0000
@@ -19,7 +19,7 @@
 #include "server_example_canonical_window_manager.h"
 
 #include "mir/scene/surface.h"
-#include "mir/scene/null_surface_observer.h"
+#include "mir/shell/surface_ready_observer.h"
 #include "mir/shell/display_layout.h"
 #include "mir/shell/surface_specification.h"
 #include "mir/geometry/displacement.h"
@@ -28,8 +28,6 @@
 
 #include <linux/input.h>
 #include <csignal>
-#include <mutex>
-#include <condition_variable>
 #include <algorithm>
 
 namespace me = mir::examples;
@@ -54,20 +52,37 @@
         window_position.y - DeltaY(title_bar_height)
     };
 }
+
+bool needs_titlebar(MirSurfaceType type)
+{
+    switch (type)
+    {
+    case mir_surface_type_freestyle:
+    case mir_surface_type_menu:
+    case mir_surface_type_inputmethod:
+    case mir_surface_type_gloss:
+    case mir_surface_type_tip:
+        // No decorations for these surface types
+        return false;
+    default:
+        return true;
+    }
+}
 }
 
 me::CanonicalSurfaceInfoCopy::CanonicalSurfaceInfoCopy(
     std::shared_ptr<scene::Session> const& session,
     std::shared_ptr<scene::Surface> const& surface,
     scene::SurfaceCreationParameters const& params) :
-    state{mir_surface_state_restored},
+    type{surface->type()},
+    state{surface->state()},
     restore_rect{surface->top_left(), surface->size()},
     session{session},
     parent{params.parent},
-    min_width{params.min_width},
-    min_height{params.min_height},
-    max_width{params.max_width},
-    max_height{params.max_height},
+    min_width{params.min_width.is_set() ? params.min_width.value()  : Width{}},
+    min_height{params.min_height.is_set() ? params.min_height.value() : Height{}},
+    max_width{params.max_width.is_set() ? params.max_width.value() : Width{std::numeric_limits<int>::max()}},
+    max_height{params.max_height.is_set() ? params.max_height.value() : Height{std::numeric_limits<int>::max()}},
     width_inc{params.width_inc},
     height_inc{params.height_inc},
     min_aspect{params.min_aspect},
@@ -75,6 +90,98 @@
 {
 }
 
+bool me::CanonicalSurfaceInfoCopy::can_be_active() const
+{
+    switch (type)
+    {
+    case mir_surface_type_normal:       /**< AKA "regular"                       */
+    case mir_surface_type_utility:      /**< AKA "floating"                      */
+    case mir_surface_type_dialog:
+    case mir_surface_type_satellite:    /**< AKA "toolbox"/"toolbar"             */
+    case mir_surface_type_freestyle:
+    case mir_surface_type_menu:
+    case mir_surface_type_inputmethod:  /**< AKA "OSK" or handwriting etc.       */
+        return true;
+
+    case mir_surface_type_gloss:
+    case mir_surface_type_tip:          /**< AKA "tooltip"                       */
+    default:
+        // Cannot have input focus
+        return false;
+    }
+}
+
+bool me::CanonicalSurfaceInfoCopy::must_have_parent() const
+{
+    switch (type)
+    {
+    case mir_surface_type_overlay:;
+    case mir_surface_type_inputmethod:
+    case mir_surface_type_satellite:
+    case mir_surface_type_tip:
+        return true;
+
+    default:
+        return false;
+    }
+}
+
+bool me::CanonicalSurfaceInfoCopy::can_morph_to(MirSurfaceType new_type) const
+{
+    switch (new_type)
+    {
+    case mir_surface_type_normal:
+    case mir_surface_type_utility:
+    case mir_surface_type_satellite:
+        switch (type)
+        {
+        case mir_surface_type_normal:
+        case mir_surface_type_utility:
+        case mir_surface_type_dialog:
+        case mir_surface_type_satellite:
+            return true;
+
+        default:
+            break;
+        }
+        break;
+
+    case mir_surface_type_dialog:
+        switch (type)
+        {
+        case mir_surface_type_normal:
+        case mir_surface_type_utility:
+        case mir_surface_type_dialog:
+        case mir_surface_type_popover:
+        case mir_surface_type_satellite:
+            return true;
+
+        default:
+            break;
+        }
+        break;
+
+    default:
+        break;
+    }
+
+    return false;
+}
+
+bool me::CanonicalSurfaceInfoCopy::must_not_have_parent() const
+{
+    switch (type)
+    {
+    case mir_surface_type_normal:
+    case mir_surface_type_utility:
+        return true;
+
+    default:
+        return false;
+    }
+}
+
+
 me::CanonicalWindowManagerPolicyCopy::CanonicalWindowManagerPolicyCopy(
     Tools* const tools,
     std::shared_ptr<shell::DisplayLayout> const& display_layout) :
@@ -113,7 +220,14 @@
 -> ms::SurfaceCreationParameters
 {
     auto parameters = request_parameters;
-    parameters.size.height = parameters.size.height + DeltaY{title_bar_height};
+    auto surf_type = parameters.type.is_set() ? parameters.type.value() : mir_surface_type_normal;
+    bool const needs_titlebar = ::needs_titlebar(surf_type);
+
+    if (needs_titlebar)
+        parameters.size.height = parameters.size.height + DeltaY{title_bar_height};
+
+    if (!parameters.state.is_set())
+        parameters.state = mir_surface_state_restored;
 
     auto const active_display = tools->active_display();
 
@@ -158,7 +272,7 @@
         auto const top_right= aux_rect.top_right()  -Point{} + parent_top_left;
         auto const bot_left = aux_rect.bottom_left()-Point{} + parent_top_left;
 
-        if (edge_attachment && mir_edge_attachment_vertical)
+        if (edge_attachment & mir_edge_attachment_vertical)
         {
             if (active_display.contains(top_right + Displacement{width, height}))
             {
@@ -172,7 +286,7 @@
             }
         }
 
-        if (edge_attachment && mir_edge_attachment_horizontal)
+        if (edge_attachment & mir_edge_attachment_horizontal)
         {
             if (active_display.contains(bot_left + Displacement{width, height}))
             {
@@ -186,28 +300,119 @@
             }
         }
     }
+    else if (parent)
+    {
+        //  o Otherwise, if the dialog is not the same as any previous dialog for the
+        //    same parent window, and/or it does not have user-customized position:
+        //      o It should be optically centered relative to its parent, unless this
+        //        would overlap or cover the title bar of the parent.
+        //      o Otherwise, it should be cascaded vertically (but not horizontally)
+        //        relative to its parent, unless, this would cause at least part of
+        //        it to extend into shell space.
+        auto const parent_top_left = parent->top_left();
+        auto const centred = parent_top_left
+             + 0.5*(as_displacement(parent->size()) - as_displacement(parameters.size))
+             - DeltaY{(parent->size().height.as_int()-height)/6};
+
+        parameters.top_left = centred;
+        positioned = true;
+    }
 
     if (!positioned)
     {
-        auto centred = active_display.top_left + 0.5*(
-            as_displacement(active_display.size) - as_displacement(parameters.size));
-
-        parameters.top_left = centred - DeltaY{(active_display.size.height.as_int()-height)/6};
+        auto const centred = active_display.top_left
+            + 0.5*(as_displacement(active_display.size) - as_displacement(parameters.size))
+            - DeltaY{(active_display.size.height.as_int()-height)/6};
+
+        switch (parameters.state.value())
+        {
+        case mir_surface_state_fullscreen:
+        case mir_surface_state_maximized:
+            parameters.top_left = active_display.top_left;
+            parameters.size = active_display.size;
+            break;
+
+        case mir_surface_state_vertmaximized:
+            parameters.top_left = centred;
+            parameters.top_left.y = active_display.top_left.y;
+            parameters.size.height = active_display.size.height;
+            break;
+
+        case mir_surface_state_horizmaximized:
+            parameters.top_left = centred;
+            parameters.top_left.x = active_display.top_left.x;
+            parameters.size.width = active_display.size.width;
+            break;
+
+        default:
+            parameters.top_left = centred;
+        }
 
         if (parameters.top_left.y < display_area.top_left.y)
             parameters.top_left.y = display_area.top_left.y;
     }
 
-    parameters.top_left.y = parameters.top_left.y + DeltaY{title_bar_height};
-    parameters.size.height = parameters.size.height - DeltaY{title_bar_height};
+    if (parameters.state != mir_surface_state_fullscreen && needs_titlebar)
+    {
+        parameters.top_left.y = parameters.top_left.y + DeltaY{title_bar_height};
+        parameters.size.height = parameters.size.height - DeltaY{title_bar_height};
+    }
+
     return parameters;
 }
 
+//TODO: provide an easier way for the server to write to a surface!
+//TODO: this is painful to use mg::Buffer::write()
+struct mir::examples::CanonicalSurfaceInfoCopy::PaintingImpl
+{
+    PaintingImpl(std::shared_ptr<frontend::BufferStream> const& buffer_stream) :
+        buffer_stream{buffer_stream}, buffer{nullptr}
+    {
+        swap_buffers();
+    }
+
+    void swap_buffers()
+    {
+        auto const callback = [this](mir::graphics::Buffer* new_buffer)
+            {
+                buffer.store(new_buffer);
+            };
+
+        buffer_stream->swap_buffers(buffer, callback);
+    }
+
+    std::shared_ptr<frontend::BufferStream> const buffer_stream;
+    std::atomic<graphics::Buffer*> buffer;
+};
+
+void mir::examples::CanonicalSurfaceInfoCopy::init_titlebar(std::shared_ptr<scene::Surface> const& surface)
+{
+    painting_impl = std::make_shared<PaintingImpl>(surface->primary_buffer_stream());
+}
+
+void mir::examples::CanonicalSurfaceInfoCopy::paint_titlebar(int intensity)
+{
+    if (auto const buf = painting_impl->buffer.load())
+    {
+        auto const format = painting_impl->buffer_stream->pixel_format();
+        auto const sz = buf->size().height.as_int() *
+            buf->size().width.as_int() * MIR_BYTES_PER_PIXEL(format);
+
+        std::vector<unsigned char> pixels(sz, intensity);
+        buf->write(pixels.data(), sz);
+
+        painting_impl->swap_buffers();
+    }
+}
+
 void me::CanonicalWindowManagerPolicyCopy::generate_decorations_for(
     std::shared_ptr<scene::Session> const& session,
     std::shared_ptr<scene::Surface> const& surface,
-    CanonicalSurfaceInfoMap& surface_info)
+    CanonicalSurfaceInfoMap& surface_map)
 {
+    if (!needs_titlebar(surface->type()))
+        return;
+
     auto format = mir_pixel_format_xrgb_8888;
     ms::SurfaceCreationParameters params;
     params.of_size(titlebar_size_for_window(surface->size()))
@@ -219,116 +424,85 @@
     auto id = session->create_surface(params);
     auto titlebar = session->surface(id);
     titlebar->set_alpha(0.9);
-    tools->info_for(surface).titlebar = titlebar;
-    tools->info_for(surface).children.push_back(titlebar);
-
-    //TODO: provide an easier way for the server to write to a surface!
-    std::mutex mut;
-    std::condition_variable cv;
-    mir::graphics::Buffer* written_buffer{nullptr};
-
-    titlebar->swap_buffers(
-        nullptr,
-        [&](mir::graphics::Buffer* buffer)
-        {
-            //TODO: this is painful to use mg::Buffer::write()
-            auto const sz = buffer->size().height.as_int() *
-                 buffer->size().width.as_int() * MIR_BYTES_PER_PIXEL(format);
-            std::vector<unsigned char> pixels(sz, 0xFF);
-            buffer->write(pixels.data(), sz);
-            std::unique_lock<decltype(mut)> lk(mut);
-            written_buffer = buffer;
-            cv.notify_all();
-        });
-    {
-        std::unique_lock<decltype(mut)> lk(mut);
-        cv.wait(lk, [&]{return written_buffer;});
-    }
-
-    titlebar->swap_buffers(written_buffer, [](mir::graphics::Buffer*){});
-
-    CanonicalSurfaceInfoCopy info{session, titlebar, ms::SurfaceCreationParameters{}};
-    info.is_titlebar = true;
-    info.parent = surface;
-
-    surface_info.emplace(titlebar, std::move(info));
-}
-
-namespace
-{
-class SurfaceReadyObserver : public ms::NullSurfaceObserver,
-    public std::enable_shared_from_this<SurfaceReadyObserver>
-{
-public:
-    SurfaceReadyObserver(
-        me::CanonicalWindowManagerPolicyCopy::Tools* const focus_controller,
-        std::shared_ptr<ms::Session> const& session,
-        std::shared_ptr<ms::Surface> const& surface) :
-        focus_controller{focus_controller},
-        session{session},
-        surface{surface}
-    {
-    }
-
-private:
-    void frame_posted(int) override
-    {
-        if (auto const s = surface.lock())
-        {
-            focus_controller->set_focus_to(session.lock(), s);
-            s->remove_observer(shared_from_this());
-        }
-    }
-
-    me::CanonicalWindowManagerPolicyCopy::Tools* const focus_controller;
-    std::weak_ptr<ms::Session> const session;
-    std::weak_ptr<ms::Surface> const surface;
-};
+
+    auto& surface_info = tools->info_for(surface);
+    surface_info.titlebar = titlebar;
+    surface_info.titlebar_id = id;
+    surface_info.children.push_back(titlebar);
+
+    CanonicalSurfaceInfoCopy& titlebar_info =
+            surface_map.emplace(titlebar, CanonicalSurfaceInfoCopy{session, titlebar, {}}).first->second;
+    titlebar_info.is_titlebar = true;
+    titlebar_info.parent = surface;
+    titlebar_info.init_titlebar(titlebar);
 }
 
 void me::CanonicalWindowManagerPolicyCopy::handle_new_surface(std::shared_ptr<ms::Session> const& session, std::shared_ptr<ms::Surface> const& surface)
 {
-    if (auto const parent = surface->parent())
+    auto& surface_info = tools->info_for(surface);
+    if (auto const parent = surface_info.parent.lock())
     {
         tools->info_for(parent).children.push_back(surface);
     }
 
     tools->info_for(session).surfaces++;
 
-    switch (surface->type())
+    if (surface_info.can_be_active())
     {
-    case mir_surface_type_normal:       /**< AKA "regular"                       */
-    case mir_surface_type_utility:      /**< AKA "floating"                      */
-    case mir_surface_type_dialog:
-    case mir_surface_type_satellite:    /**< AKA "toolbox"/"toolbar"             */
-    case mir_surface_type_freestyle:
-    case mir_surface_type_menu:
-    case mir_surface_type_inputmethod:  /**< AKA "OSK" or handwriting etc.       */
-        // TODO There's currently no way to insert surfaces into an active (or inactive)
-        // TODO window tree while keeping the order stable or consistent with spec.
-        // TODO Nor is there a way to update the "default surface" when appropriate!!
-        surface->add_observer(std::make_shared<SurfaceReadyObserver>(tools, session, surface));
-        active_surface_ = surface;
-        break;
-
-    case mir_surface_type_gloss:
-    case mir_surface_type_tip:          /**< AKA "tooltip"                       */
-    default:
-        // Cannot have input focus
-        break;
+        surface->add_observer(std::make_shared<shell::SurfaceReadyObserver>(
+            [this](std::shared_ptr<scene::Session> const& /*session*/,
+                   std::shared_ptr<scene::Surface> const& surface)
+                {
+                    select_active_surface(surface);
+                },
+            session,
+            surface));
     }
 }
 
 void me::CanonicalWindowManagerPolicyCopy::handle_modify_surface(
-    std::shared_ptr<scene::Session> const& /*session*/,
+    std::shared_ptr<scene::Session> const& session,
     std::shared_ptr<scene::Surface> const& surface,
     shell::SurfaceSpecification const& modifications)
 {
-    auto& surface_info = tools->info_for(surface);
+    auto& surface_info_old = tools->info_for(surface);
+
+    auto surface_info = surface_info_old;
+
+    if (modifications.parent.is_set())
+        surface_info.parent = modifications.parent.value();
+
+    if (modifications.type.is_set() &&
+        surface_info.type != modifications.type.value())
+    {
+        auto const new_type = modifications.type.value();
+
+        if (!surface_info.can_morph_to(new_type))
+        {
+            throw std::runtime_error("Unsupported surface type change");
+        }
+
+        surface_info.type = new_type;
+
+        if (surface_info.must_not_have_parent())
+        {
+            if (modifications.parent.is_set())
+                throw std::runtime_error("Target surface type does not support parent");
+
+            surface_info.parent.reset();
+        }
+        else if (surface_info.must_have_parent())
+        {
+            if (!surface_info.parent.lock())
+                throw std::runtime_error("Target surface type requires parent");
+        }
+
+        surface->configure(mir_surface_attrib_type, new_type);
+    }
 
     #define COPY_IF_SET(field)\
         if (modifications.field.is_set())\
-        surface_info.field = modifications.field
+            surface_info.field = modifications.field.value()
 
     COPY_IF_SET(min_width);
     COPY_IF_SET(min_height);
@@ -342,9 +516,18 @@
 
     #undef COPY_IF_SET
 
+    std::swap(surface_info, surface_info_old);
+
     if (modifications.name.is_set())
         surface->rename(modifications.name.value());
 
+    if (modifications.streams.is_set())
+    {
+        auto v = modifications.streams.value();
+        std::vector<shell::StreamSpecification> l (v.begin(), v.end());
+        session->configure_streams(*surface, l);
+    }
+
     if (modifications.width.is_set() || modifications.height.is_set())
     {
         auto new_size = surface->size();
@@ -355,19 +538,25 @@
         if (modifications.height.is_set())
             new_size.height = modifications.height.value();
 
-        constrained_resize(
+        auto top_left = surface->top_left();
+
+        surface_info.constrain_resize(
             surface,
-            surface->top_left(),
+            top_left,
             new_size,
             false,
             false,
             display_area);
+
+        apply_resize(surface, surface_info.titlebar, top_left, new_size);
     }
 }
 
 void me::CanonicalWindowManagerPolicyCopy::handle_delete_surface(std::shared_ptr<ms::Session> const& session, std::weak_ptr<ms::Surface> const& surface)
 {
-    if (auto const parent = tools->info_for(surface).parent.lock())
+    auto& info = tools->info_for(surface);
+
+    if (auto const parent = info.parent.lock())
     {
         auto& siblings = tools->info_for(parent).children;
 
@@ -381,8 +570,15 @@
         }
     }
 
+    if (info.titlebar)
+    {
+        tools->forget(info.titlebar);
+        session->destroy_surface(info.titlebar_id);
+    }
+
     if (!--tools->info_for(session).surfaces && session == tools->focused_session())
     {
+        active_surface_.reset();
         tools->focus_next_session();
         select_active_surface(tools->focused_surface());
     }
@@ -399,6 +595,8 @@
     case mir_surface_state_vertmaximized:
     case mir_surface_state_horizmaximized:
     case mir_surface_state_fullscreen:
+    case mir_surface_state_hidden:
+    case mir_surface_state_minimized:
         break;
 
     default:
@@ -423,27 +621,35 @@
     case mir_surface_state_restored:
         movement = info.restore_rect.top_left - old_pos;
         surface->resize(info.restore_rect.size);
-        info.titlebar->resize(titlebar_size_for_window(info.restore_rect.size));
-        info.titlebar->show();
+        if (info.titlebar)
+        {
+            info.titlebar->resize(titlebar_size_for_window(info.restore_rect.size));
+            info.titlebar->show();
+        }
         break;
 
     case mir_surface_state_maximized:
         movement = display_area.top_left - old_pos;
         surface->resize(display_area.size);
-        info.titlebar->hide();
+        if (info.titlebar)
+            info.titlebar->hide();
         break;
 
     case mir_surface_state_horizmaximized:
         movement = Point{display_area.top_left.x, info.restore_rect.top_left.y} - old_pos;
         surface->resize({display_area.size.width, info.restore_rect.size.height});
-        info.titlebar->resize(titlebar_size_for_window({display_area.size.width, info.restore_rect.size.height}));
-        info.titlebar->show();
+        if (info.titlebar)
+        {
+            info.titlebar->resize(titlebar_size_for_window({display_area.size.width, info.restore_rect.size.height}));
+            info.titlebar->show();
+        }
         break;
 
     case mir_surface_state_vertmaximized:
         movement = Point{info.restore_rect.top_left.x, display_area.top_left.y} - old_pos;
         surface->resize({info.restore_rect.size.width, display_area.size.height});
-        info.titlebar->hide();
+        if (info.titlebar)
+            info.titlebar->hide();
         break;
 
     case mir_surface_state_fullscreen:
@@ -452,8 +658,16 @@
         display_layout->size_to_output(rect);
         movement = rect.top_left - old_pos;
         surface->resize(rect.size);
+        break;
     }
 
+    case mir_surface_state_hidden:
+    case mir_surface_state_minimized:
+        if (info.titlebar)
+            info.titlebar->hide();
+        surface->hide();
+        return info.state = value;
+
     default:
         break;
     }
@@ -652,35 +866,50 @@
 
 void me::CanonicalWindowManagerPolicyCopy::select_active_surface(std::shared_ptr<ms::Surface> const& surface)
 {
+    if (surface == active_surface_.lock())
+        return;
+
     if (!surface)
     {
+        if (auto const active_surface = active_surface_.lock())
+        {
+            if (auto const titlebar = tools->info_for(active_surface).titlebar)
+            {
+                tools->info_for(titlebar).paint_titlebar(0x3F);
+            }
+        }
+
+        if (active_surface_.lock())
+            tools->set_focus_to({}, {});
+
         active_surface_.reset();
         return;
     }
 
     auto const& info_for = tools->info_for(surface);
 
-    switch (surface->type())
+    if (info_for.can_be_active())
     {
-    case mir_surface_type_normal:       /**< AKA "regular"                       */
-    case mir_surface_type_utility:      /**< AKA "floating"                      */
-    case mir_surface_type_dialog:
-    case mir_surface_type_satellite:    /**< AKA "toolbox"/"toolbar"             */
-    case mir_surface_type_freestyle:
-    case mir_surface_type_menu:
-    case mir_surface_type_inputmethod:  /**< AKA "OSK" or handwriting etc.       */
+        if (auto const active_surface = active_surface_.lock())
+        {
+            if (auto const titlebar = tools->info_for(active_surface).titlebar)
+            {
+                tools->info_for(titlebar).paint_titlebar(0x3F);
+            }
+        }
+        if (auto const titlebar = tools->info_for(surface).titlebar)
+        {
+            tools->info_for(titlebar).paint_titlebar(0xFF);
+        }
         tools->set_focus_to(info_for.session.lock(), surface);
         raise_tree(surface);
         active_surface_ = surface;
-        break;
-
-    case mir_surface_type_gloss:
-    case mir_surface_type_tip:          /**< AKA "tooltip"                       */
-    default:
+    }
+    else
+    {
         // Cannot have input focus - try the parent
         if (auto const parent = info_for.parent.lock())
             select_active_surface(parent);
-        break;
     }
 }
 
@@ -701,7 +930,7 @@
 
 bool me::CanonicalWindowManagerPolicyCopy::resize(std::shared_ptr<ms::Surface> const& surface, Point cursor, Point old_cursor, Rectangle bounds)
 {
-    if (!surface || !surface->input_area_contains(cursor))
+    if (!surface || !surface->input_area_contains(old_cursor))
         return false;
 
     auto const top_left = surface->top_left();
@@ -732,32 +961,30 @@
 
     Point new_pos = top_left + left_resize*delta.dx + top_resize*delta.dy;
 
-    return constrained_resize(surface, new_pos, new_size, left_resize, top_resize, bounds);
+
+    auto const& surface_info = tools->info_for(surface);
+
+    surface_info.constrain_resize(surface, new_pos, new_size, left_resize, top_resize, bounds);
+
+    apply_resize(surface, surface_info.titlebar, new_pos, new_size);
+
+    return true;
 }
 
-bool me::CanonicalWindowManagerPolicyCopy::constrained_resize(
+void me::CanonicalSurfaceInfoCopy::constrain_resize(
     std::shared_ptr<ms::Surface> const& surface,
-    Point const& requested_pos,
-    Size const& requested_size,
+    Point& requested_pos,
+    Size& requested_size,
     bool const left_resize,
     bool const top_resize,
-    Rectangle const& /*bounds*/)
+    Rectangle const& /*bounds*/) const
 {
-    auto const& surface_info = tools->info_for(surface);
-
-    auto const min_width  = surface_info.min_width.is_set()  ? surface_info.min_width.value()  : Width{};
-    auto const min_height = surface_info.min_height.is_set() ? surface_info.min_height.value() : Height{};
-    auto const max_width  = surface_info.max_width.is_set()  ?
-        surface_info.max_width.value()  : Width{std::numeric_limits<int>::max()};
-    auto const max_height = surface_info.max_height.is_set() ?
-        surface_info.max_height.value() : Height{std::numeric_limits<int>::max()};
-
     Point new_pos = requested_pos;
     Size new_size = requested_size;
 
-    if (surface_info.min_aspect.is_set())
+    if (min_aspect.is_set())
     {
-        auto const ar = surface_info.min_aspect.value();
+        auto const ar = min_aspect.value();
 
         auto const error = new_size.height.as_int()*long(ar.width) - new_size.width.as_int()*long(ar.height);
 
@@ -778,9 +1005,9 @@
         }
     }
 
-    if (surface_info.max_aspect.is_set())
+    if (max_aspect.is_set())
     {
-        auto const ar = surface_info.max_aspect.value();
+        auto const ar = max_aspect.value();
 
         auto const error = new_size.width.as_int()*long(ar.height) - new_size.height.as_int()*long(ar.width);
 
@@ -813,18 +1040,18 @@
     if (max_height < new_size.height)
         new_size.height = max_height;
 
-    if (surface_info.width_inc.is_set())
+    if (width_inc.is_set())
     {
         auto const width = new_size.width.as_int() - min_width.as_int();
-        auto inc = surface_info.width_inc.value().as_int();
+        auto inc = width_inc.value().as_int();
         if (width % inc)
             new_size.width = min_width + DeltaX{inc*(((2L*width + inc)/2)/inc)};
     }
 
-    if (surface_info.height_inc.is_set())
+    if (height_inc.is_set())
     {
         auto const height = new_size.height.as_int() - min_height.as_int();
-        auto inc = surface_info.height_inc.value().as_int();
+        auto inc = height_inc.value().as_int();
         if (height % inc)
             new_size.height = min_height + DeltaY{inc*(((2L*height + inc)/2)/inc)};
     }
@@ -837,7 +1064,7 @@
 
     // placeholder - constrain onscreen
 
-    switch (surface_info.state)
+    switch (state)
     {
     case mir_surface_state_restored:
         break;
@@ -861,18 +1088,29 @@
     // the left-edge of the surface is anchored to the right-edge of the launcher."
     case mir_surface_state_maximized:
     default:
-        return true;
+        new_pos.x = surface->top_left().x;
+        new_pos.y = surface->top_left().y;
+        new_size.width = surface->size().width;
+        new_size.height = surface->size().height;
+        break;
     }
 
-    surface_info.titlebar->resize({new_size.width, Height{title_bar_height}});
+    requested_pos = new_pos;
+    requested_size = new_size;
+}
+
+void me::CanonicalWindowManagerPolicyCopy::apply_resize(
+    std::shared_ptr<ms::Surface> const& surface,
+    std::shared_ptr<ms::Surface> const& titlebar,
+    Point const& new_pos,
+    Size const& new_size) const
+{
+    if (titlebar)
+        titlebar->resize({new_size.width, Height{title_bar_height}});
+
     surface->resize(new_size);
 
-    // TODO It is rather simplistic to move a tree WRT the top_left of the root
-    // TODO when resizing. But for more sophistication we would need to encode
-    // TODO some sensible layout rules.
     move_tree(surface, new_pos-surface->top_left());
-
-    return true;
 }
 
 bool me::CanonicalWindowManagerPolicyCopy::drag(std::shared_ptr<ms::Surface> surface, Point to, Point from, Rectangle /*bounds*/)
@@ -887,6 +1125,32 @@
 
     // placeholder - constrain onscreen
 
+    switch (tools->info_for(surface).state)
+    {
+    case mir_surface_state_restored:
+        break;
+
+    // "A vertically maximised surface is anchored to the top and bottom of
+    // the available workspace and can have any width."
+    case mir_surface_state_vertmaximized:
+        movement.dy = DeltaY(0);
+        break;
+
+    // "A horizontally maximised surface is anchored to the left and right of
+    // the available workspace and can have any height"
+    case mir_surface_state_horizmaximized:
+        movement.dx = DeltaX(0);
+        break;
+
+    // "A maximised surface is anchored to the top, bottom, left and right of the
+    // available workspace. For example, if the launcher is always-visible then
+    // the left-edge of the surface is anchored to the right-edge of the launcher."
+    case mir_surface_state_maximized:
+    case mir_surface_state_fullscreen:
+    default:
+        return true;
+    }
+
     move_tree(surface, movement);
 
     return true;

=== modified file 'examples/server_example_canonical_window_manager.h'
--- examples/server_example_canonical_window_manager.h	2015-04-27 11:53:37 +0000
+++ examples/server_example_canonical_window_manager.h	2015-07-23 14:41:37 +0000
@@ -23,6 +23,8 @@
 
 #include "mir/geometry/displacement.h"
 
+#include <atomic>
+
 ///\example server_example_canonical_window_manager.h
 // Based on "Mir and Unity: Surfaces, input, and displays (v0.3)"
 
@@ -43,21 +45,46 @@
         std::shared_ptr<scene::Surface> const& surface,
         scene::SurfaceCreationParameters const& params);
 
+    bool can_be_active() const;
+
+    bool can_morph_to(MirSurfaceType new_type) const;
+    bool must_have_parent() const;
+    bool must_not_have_parent() const;
+
+    void constrain_resize(
+        std::shared_ptr<scene::Surface> const& surface,
+        geometry::Point& requested_pos,
+        geometry::Size& requested_size,
+        const bool left_resize,
+        const bool top_resize,
+        geometry::Rectangle const& bounds) const;
+
+    MirSurfaceType type;
     MirSurfaceState state;
     geometry::Rectangle restore_rect;
     std::weak_ptr<scene::Session> session;
     std::weak_ptr<scene::Surface> parent;
     std::vector<std::weak_ptr<scene::Surface>> children;
     std::shared_ptr<scene::Surface> titlebar;
+    frontend::SurfaceId titlebar_id;
     bool is_titlebar = false;
-    optional_value<geometry::Width> min_width;
-    optional_value<geometry::Height> min_height;
-    optional_value<geometry::Width> max_width;
-    optional_value<geometry::Height> max_height;
+    geometry::Width min_width;
+    geometry::Height min_height;
+    geometry::Width max_width;
+    geometry::Height max_height;
     mir::optional_value<geometry::DeltaX> width_inc;
     mir::optional_value<geometry::DeltaY> height_inc;
     mir::optional_value<shell::SurfaceAspectRatio> min_aspect;
     mir::optional_value<shell::SurfaceAspectRatio> max_aspect;
+
+    void init_titlebar(std::shared_ptr<scene::Surface> const& surface);
+    void paint_titlebar(int intensity);
+
+private:
+
+    struct PaintingImpl;
+
+    std::shared_ptr<PaintingImpl> painting_impl;
 };
 
 // standard window management algorithm:
@@ -113,7 +140,7 @@
 
     void generate_decorations_for(
         std::shared_ptr<scene::Session> const& session, std::shared_ptr<scene::Surface> const& surface,
-        CanonicalSurfaceInfoMap& surface_info);
+        CanonicalSurfaceInfoMap& surface_map);
 
 private:
     static const int modifier_mask =
@@ -134,13 +161,11 @@
     bool drag(std::shared_ptr<scene::Surface> surface, geometry::Point to, geometry::Point from, geometry::Rectangle bounds);
     void move_tree(std::shared_ptr<scene::Surface> const& root, geometry::Displacement movement) const;
     void raise_tree(std::shared_ptr<scene::Surface> const& root) const;
-    bool constrained_resize(
-        std::shared_ptr<scene::Surface> const& surface,
-        geometry::Point const& requested_pos,
-        geometry::Size const& requested_size,
-        const bool left_resize,
-        const bool top_resize,
-        geometry::Rectangle const& bounds);
+    void apply_resize(
+        std::shared_ptr<mir::scene::Surface> const& surface,
+        std::shared_ptr<mir::scene::Surface> const& titlebar,
+        geometry::Point const& new_pos,
+        geometry::Size const& new_size) const;
 
     Tools* const tools;
     std::shared_ptr<shell::DisplayLayout> const display_layout;

=== modified file 'examples/server_example_tiling_window_manager.cpp'
--- examples/server_example_tiling_window_manager.cpp	2015-04-23 07:11:04 +0000
+++ examples/server_example_tiling_window_manager.cpp	2015-07-23 14:41:37 +0000
@@ -292,6 +292,32 @@
             }
         }
     }
+    else if (action == mir_keyboard_action_down &&
+            modifiers == mir_input_event_modifier_alt &&
+            scan_code == KEY_TAB)
+    {
+        tools->focus_next_session();
+        if (auto const surface = tools->focused_surface())
+            tools->raise({surface});
+
+        return true;
+    }
+    else if (action == mir_keyboard_action_down &&
+            modifiers == mir_input_event_modifier_alt &&
+            scan_code == KEY_GRAVE)
+    {
+        if (auto const prev = tools->focused_surface())
+        {
+            if (auto const app = tools->focused_session())
+                if (auto const surface = app->surface_after(prev))
+                {
+                    tools->set_focus_to(app, surface);
+                    tools->raise({surface});
+                }
+        }
+
+        return true;
+    }
 
     return false;
 }

=== modified file 'examples/server_example_window_management.cpp'
--- examples/server_example_window_management.cpp	2015-04-17 14:31:42 +0000
+++ examples/server_example_window_management.cpp	2015-07-23 14:41:37 +0000
@@ -27,6 +27,7 @@
 #include "mir/input/composite_event_filter.h"
 #include "mir/options/option.h"
 #include "mir/shell/display_layout.h"
+#include "mir/shell/system_compositor_window_manager.h"
 
 namespace me = mir::examples;
 namespace mf = mir::frontend;
@@ -42,11 +43,12 @@
 namespace
 {
 char const* const wm_option = "window-manager";
-char const* const wm_description = "window management strategy [{tiling|fullscreen|canonical}]";
+char const* const wm_description = "window management strategy [{tiling|fullscreen|canonical|system-compositor}]";
 
 char const* const wm_tiling = "tiling";
 char const* const wm_fullscreen = "fullscreen";
 char const* const wm_canonical = "canonical";
+char const* const wm_system_compositor = "system-compositor";
 
 struct NullSessionInfo
 {
@@ -149,6 +151,13 @@
             {
                 return std::make_shared<CanonicalWindowManager>(focus_controller, server.the_shell_display_layout());
             }
+            else if (selection == wm_system_compositor)
+            {
+                return std::make_shared<msh::SystemCompositorWindowManager>(
+                    focus_controller,
+                    server.the_shell_display_layout(),
+                    server.the_session_coordinator());
+            }
 
             throw mir::AbnormalExit("Unknown window manager: " + selection);
         });

=== modified file 'examples/target.c'
--- examples/target.c	2015-04-02 06:20:31 +0000
+++ examples/target.c	2015-07-23 14:41:37 +0000
@@ -29,7 +29,8 @@
 
 enum
 {
-    max_touches = 10
+    max_fingers = 10,
+    max_samples_per_frame = 1000
 };
 
 typedef struct
@@ -39,8 +40,14 @@
 
 typedef struct
 {
-    int points;
-    Vec2 point[max_touches];
+    int samples;
+    Vec2 sample[max_samples_per_frame];
+} Finger;
+
+typedef struct
+{
+    int fingers;
+    Finger finger[max_fingers];
 } TouchState;
 
 typedef struct
@@ -124,13 +131,18 @@
 {
     if (mir_input_event_get_type(ievent) == mir_input_event_type_pointer)
     {
-        touch->points = 0;
         const MirPointerEvent *pevent =
             mir_input_event_get_pointer_event(ievent);
-        if (mir_pointer_event_action(pevent) != mir_pointer_action_leave)
-        {
-            touch->points = 1;
-            touch->point[0] = (Vec2)
+        if (mir_pointer_event_action(pevent) == mir_pointer_action_leave)
+        {
+            touch->fingers = 0;
+        }
+        else if (touch->finger[0].samples < max_samples_per_frame)
+        {
+            if (!touch->fingers)
+                touch->finger[0].samples = 0;
+            touch->fingers = 1;
+            touch->finger[0].sample[touch->finger[0].samples++] = (Vec2)
             {
                 mir_pointer_event_axis_value(pevent, mir_pointer_axis_x),
                 mir_pointer_event_axis_value(pevent, mir_pointer_axis_y)
@@ -141,20 +153,29 @@
     {
         const MirTouchEvent *tevent = mir_input_event_get_touch_event(ievent);
         int n = mir_touch_event_point_count(tevent);
-        if (n > max_touches)
-            n = max_touches;
-        bool all_up = true;
-        for (int p = 0; p < n; ++p)
+        if (n > max_fingers)
+            n = max_fingers;
+        for (int f = 0; f < n; ++f)
         {
-            if (mir_touch_event_action(tevent, p) != mir_touch_action_up)
-                all_up = false;
-            touch->point[p] = (Vec2)
-            {
-                mir_touch_event_axis_value(tevent, p, mir_touch_axis_x),
-                mir_touch_event_axis_value(tevent, p, mir_touch_axis_y)
+            Finger *finger = touch->finger + f;
+            if (f >= touch->fingers)
+            {
+                finger->samples = 0;
+                touch->fingers = f + 1;
+            }
+            if (mir_touch_event_action(tevent, f) == mir_touch_action_up)
+            {
+                finger->samples = 0;
+                continue;
+            }
+            if (finger->samples >= max_samples_per_frame)
+                continue;
+            finger->sample[finger->samples++] = (Vec2)
+            {
+                mir_touch_event_axis_value(tevent, f, mir_touch_axis_x),
+                mir_touch_event_axis_value(tevent, f, mir_touch_axis_y)
             };
         }
-        touch->points = all_up ? 0 : n;
     }
 }
 
@@ -211,10 +232,13 @@
         "precision mediump float;\n"
         "varying vec2 v_texcoord;\n"
         "uniform sampler2D texture;\n"
+        "uniform float opacity;\n"
         "\n"
         "void main()\n"
         "{\n"
-        "    gl_FragColor = texture2D(texture, v_texcoord);\n"
+        "    vec4 f = texture2D(texture, v_texcoord);\n"
+        "    f.a *= opacity;\n"
+        "    gl_FragColor = f;\n"
         "}\n";
 
     // Disable Mir's input resampling. We do our own here, in a way that
@@ -268,6 +292,9 @@
     GLint scale = glGetUniformLocation(prog, "scale");
     glUniform1f(scale, 128.0f);
 
+    GLint opacity = glGetUniformLocation(prog, "opacity");
+    glUniform1f(opacity, 1.0f);
+
     GLint translate = glGetUniformLocation(prog, "translate");
     glUniform2f(translate, 0.0f, 0.0f);
 
@@ -280,7 +307,7 @@
     glViewport(0, 0, width, height);
 
     glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE); // Behave like an accumulation buffer
 
     State state =
     {
@@ -288,7 +315,7 @@
         PTHREAD_COND_INITIALIZER,
         true,
         true,
-        {0, {{0,0}}}
+        {0, {{0, {{0.0f, 0.0f}}}}}
     };
     MirSurface *surface = mir_eglapp_native_surface();
     mir_surface_set_event_handler(surface, on_event, &state);
@@ -320,12 +347,31 @@
 
         glClear(GL_COLOR_BUFFER_BIT);
 
-        for (int p = 0; p < state.touch.points; ++p)
-        {
-            // Note the 0.5f to convert from pixel middle to corner (GL)
-            glUniform2f(translate, state.touch.point[p].x + 0.5f,
-                                   state.touch.point[p].y + 0.5f);
-            glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+        for (int f = 0; f < state.touch.fingers; ++f)
+        {
+            const Finger *finger = state.touch.finger + f;
+
+            if (!finger->samples)
+                continue;
+
+            glUniform1f(opacity, 1.0f / finger->samples);
+
+            for (int s = 0; s < finger->samples; ++s)
+            {
+                // Note the 0.5f to convert from pixel middle to corner (GL)
+                glUniform2f(translate, finger->sample[s].x + 0.5f,
+                                       finger->sample[s].y + 0.5f);
+                glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+            }
+        }
+
+        // Just keep the latest sample for the zeroth finger (mouse pointer)
+        if (state.touch.fingers)
+        {
+            state.touch.finger[0].sample[0] =
+                state.touch.finger[0].sample[state.touch.finger[0].samples-1];
+            state.touch.finger[0].samples = 1;
+            state.touch.fingers = 1;
         }
 
         // Put the event loop back to sleep:

=== modified file 'guides/cppguide.xml'
--- guides/cppguide.xml	2014-03-06 06:05:17 +0000
+++ guides/cppguide.xml	2015-07-23 14:41:37 +0000
@@ -3589,7 +3589,7 @@
     </SUMMARY>
     <BODY>
       <p>
-        There are two acceptable formats for initializer lists:
+        There are three acceptable formats for initializer lists:
       </p>
       <CODE_SNIPPET>
         // When it all fits on one line:
@@ -3610,6 +3610,21 @@
             ...
         }
       </CODE_SNIPPET>
+      <p>
+        or
+      </p>
+      <CODE_SNIPPET>
+        // When it requires multiple lines, indent 4 spaces, putting the colon on
+        // the first initializer line and commas at the end of the line.
+        MyClass::MyClass(int var)
+            : some_var_(var),            // 4 space indent
+              some_other_var_(var + 1)
+        {
+            ...
+            do_something();
+            ...
+        }
+      </CODE_SNIPPET>
     </BODY>
   </STYLEPOINT>
 

=== modified file 'include/client/mir/events/event_builders.h'
--- include/client/mir/events/event_builders.h	2015-04-01 19:39:19 +0000
+++ include/client/mir/events/event_builders.h	2015-07-23 14:41:37 +0000
@@ -25,8 +25,8 @@
 #include "mir/frontend/surface_id.h"
 
 #include <memory>
-#include <vector>
 #include <functional>
+#include <chrono>
 
 namespace mir
 {
@@ -48,23 +48,27 @@
 EventUPtr make_event(frontend::SurfaceId const& surface_id, xkb_rule_names const& names);
 
 // Key event
-EventUPtr make_event(MirInputDeviceId device_id, int64_t timestamp,
+EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
     MirKeyboardAction action, xkb_keysym_t key_code,
     int scan_code, MirInputEventModifiers modifiers);
 
 // Touch event
-EventUPtr make_event(MirInputDeviceId device_id, int64_t timestamp,
+EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
     MirInputEventModifiers modifiers);
 void add_touch(MirEvent &event, MirTouchId touch_id, MirTouchAction action,
     MirTouchTooltype tooltype, float x_axis_value, float y_axis_value,
     float pressure_value, float touch_major_value, float touch_minor_value, float size_value);
 
 // Pointer event
-EventUPtr make_event(MirInputDeviceId device_id, int64_t timestamp,
+EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
     MirInputEventModifiers modifiers, MirPointerAction action,
-    std::vector<MirPointerButton> const& buttons_pressed,
+    MirPointerButtons buttons_pressed,
     float x_axis_value, float y_axis_value,
     float hscroll_value, float vscroll_value);
+
+// Input configuration event
+EventUPtr make_event(MirInputConfigurationAction action,
+    MirInputDeviceId id, std::chrono::nanoseconds time);
 }
 }
 

=== modified file 'include/client/mir_toolkit/client_types.h'
--- include/client/mir_toolkit/client_types.h	2015-03-31 02:35:42 +0000
+++ include/client/mir_toolkit/client_types.h	2015-07-23 14:41:37 +0000
@@ -43,6 +43,7 @@
 typedef struct MirScreencast MirScreencast;
 typedef struct MirPromptSession MirPromptSession;
 typedef struct MirBufferStream MirBufferStream;
+typedef struct MirPersistentId MirPersistentId;
 
 /**
  * Returned by asynchronous functions. Must not be free'd by
@@ -75,11 +76,11 @@
 /**
  * Callback to be passed when calling:
  *  - mir_buffer_stream_* functions requiring a callback.
- *   \param [in] surface             the buffer stream being updated
+ *   \param [in] stream              the buffer stream being updated
  *   \param [in,out] client_context  context provided by client in calling
  *                                   mir_connect
  */
-typedef void (*mir_buffer_stream_callback)(MirBufferStream *surface, void *client_context);
+typedef void (*mir_buffer_stream_callback)(MirBufferStream *stream, void *client_context);
 
 /**
  * Callback for handling of surface events.
@@ -123,6 +124,10 @@
 typedef void (*mir_client_fd_callback)(
     MirPromptSession *prompt_session, size_t count, int const* fds, void* context);
 
+
+typedef void (*mir_surface_id_callback)(
+    MirSurface* surface, MirPersistentId* id, void* context);
+
 /**
  * MirBufferUsage specifies how a surface can and will be used. A "hardware"
  * surface can be used for OpenGL accelerated rendering. A "software" surface
@@ -278,6 +283,16 @@
     MirDisplayCard *cards;
 } MirDisplayConfiguration;
 
+/**
+ * The displacement from the top-left corner of the surface.
+ */
+typedef struct MirBufferStreamInfo
+{
+    MirBufferStream* stream;
+    int displacement_x;
+    int displacement_y;
+} MirBufferStreamInfo;
+
 typedef struct MirRectangle
 {
     int left;

=== modified file 'include/client/mir_toolkit/events/event.h'
--- include/client/mir_toolkit/events/event.h	2015-04-01 19:39:19 +0000
+++ include/client/mir_toolkit/events/event.h	2015-07-23 14:41:37 +0000
@@ -43,7 +43,8 @@
     /* Type for new style input event will be returned from mir_event_get_type
        when old style event type was mir_event_type_key or mir_event_type_motion */
     mir_event_type_input,
-    mir_event_type_keymap
+    mir_event_type_keymap,
+    mir_event_type_input_configuration,
 } MirEventType;
 
 typedef struct MirSurfaceEvent MirSurfaceEvent;
@@ -53,6 +54,7 @@
 typedef struct MirCloseSurfaceEvent MirCloseSurfaceEvent;
 typedef struct MirInputEvent MirInputEvent;
 typedef struct MirKeymapEvent MirKeymapEvent;
+typedef struct MirInputConfigurationEvent MirInputConfigurationEvent;
 
 typedef union MirEvent MirEvent;
 
@@ -67,6 +69,7 @@
 #include "mir_toolkit/events/orientation_event.h"
 #include "mir_toolkit/events/prompt_session_event.h"
 #include "mir_toolkit/events/keymap_event.h"
+#include "mir_toolkit/events/input_configuration_event.h"
 
 #ifdef __cplusplus
 /**
@@ -157,6 +160,16 @@
 MirKeymapEvent const* mir_event_get_keymap_event(MirEvent const* ev);
 
 /*
+ * Retrieve the MirInputConfiguration associated with a MirEvent of
+ * type mir_event_type_input_configuration. The event signifies that the
+ * input device configuration has changed.
+ *
+ * \param [in] event The event
+ * \return           The associated MirInputConfigurationEvent
+ */
+MirInputConfigurationEvent const* mir_event_get_input_configuration_event(MirEvent const* ev);
+
+/*
  * 
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * _________________________

=== modified file 'include/client/mir_toolkit/events/input/pointer_event.h'
--- include/client/mir_toolkit/events/input/pointer_event.h	2015-03-31 02:35:42 +0000
+++ include/client/mir_toolkit/events/input/pointer_event.h	2015-07-23 14:41:37 +0000
@@ -68,12 +68,13 @@
  * Identifiers for pointer buttons
  */
 typedef enum {
-    mir_pointer_button_primary   = 1,
-    mir_pointer_button_secondary = 2,
-    mir_pointer_button_tertiary  = 3,
-    mir_pointer_button_back      = 4,
-    mir_pointer_button_forward   = 5
+    mir_pointer_button_primary   = 1 << 0,
+    mir_pointer_button_secondary = 1 << 1,
+    mir_pointer_button_tertiary  = 1 << 2,
+    mir_pointer_button_back      = 1 << 3,
+    mir_pointer_button_forward   = 1 << 4
 } MirPointerButton;
+typedef unsigned int MirPointerButtons;
 
 /**
  * Retrieve the modifier keys pressed when the pointer action occured.
@@ -103,6 +104,15 @@
     MirPointerButton button);
 
 /**
+ * Retreive the pointer button state as a masked set of values.
+ *
+ * \param [in] event         The pointer event
+ *
+ * \return                   The button state
+ */
+MirPointerButtons mir_pointer_event_buttons(MirPointerEvent const* event);
+
+/**
  * Retrieve the axis value reported by a given pointer event.
  *
  *  \param [in] event       The pointer event

=== added file 'include/client/mir_toolkit/events/input_configuration_event.h'
--- include/client/mir_toolkit/events/input_configuration_event.h	1970-01-01 00:00:00 +0000
+++ include/client/mir_toolkit/events/input_configuration_event.h	2015-07-23 14:41:37 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+#ifndef MIR_TOOLKIT_EVENTS_INPUT_CONFIGURATION_EVENT_H_
+#define MIR_TOOLKIT_EVENTS_INPUT_CONFIGURATION_EVENT_H_
+
+#include <mir_toolkit/events/event.h>
+
+#ifdef __cplusplus
+/**
+ * \addtogroup mir_toolkit
+ * @{
+ */
+extern "C" {
+#endif
+
+/// MirInputConfigurationEvent indicates a configuration change in the input device subsystem. Eventually
+/// it's usage will be required to properly interpret MirInputEvent, for example:
+///    If we receive a button down, and then a device reset, we should not expect
+///    to receive the button up.
+///
+///    Another example, the maximum/minimum axis values for a device may have been reconfigured and
+///    need to be required.
+///
+/// Of course as things stand there is no client input-device introspection API so these events
+/// are difficult to use.
+    
+typedef enum
+{
+    mir_input_configuration_action_configuration_changed,
+    mir_input_configuration_action_device_reset
+} MirInputConfigurationAction;
+
+/*
+ * Retrieve the input configuration action which occurred.
+ *
+ * \param[in] ev The input configuration event
+ * \return       The action
+ */
+MirInputConfigurationAction mir_input_configuration_event_get_action(MirInputConfigurationEvent const* ev);
+
+/*
+ * Retreive the time associated with a MirInputConfiguration event
+
+ * \param[in] ev The input configuration event
+ * \return       The time in nanoseconds since epoch
+ */
+int64_t mir_input_configuration_event_get_time(MirInputConfigurationEvent const* ev);
+
+/*
+ * Retreive the device id associated with a MirInputConfiguration event
+
+ * \param[in] ev The input configuration event
+ * \return       The device id or -1 if not applicable to events of this action
+ */
+MirInputDeviceId mir_input_configuration_event_get_device_id(MirInputConfigurationEvent const* ev);
+
+#ifdef __cplusplus
+}
+/**@}*/
+#endif
+
+#endif /* MIR_TOOLKIT_INPUT_CONFIGURATION_EVENT_H_ */

=== removed file 'include/client/mir_toolkit/mir_client_library_drm.h'
--- include/client/mir_toolkit/mir_client_library_drm.h	2015-04-30 12:37:50 +0000
+++ include/client/mir_toolkit/mir_client_library_drm.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * 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.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MIR_CLIENT_LIBRARY_DRM_H_
-#define MIR_CLIENT_LIBRARY_DRM_H_
-
-#include "mir_toolkit/mir_client_library.h"
-
-#ifdef __cplusplus
-/**
- * \addtogroup mir_toolkit
- * @{
- */
-extern "C" {
-#endif
-
-struct gbm_device;
-
-typedef void (*mir_drm_auth_magic_callback)(int status, void *context);
-
-/* Authenticates a DRM magic cookie */
-MirWaitHandle *mir_connection_drm_auth_magic(MirConnection *connection,
-                                             unsigned int magic,
-                                             mir_drm_auth_magic_callback callback,
-                                             void *context)
-    __attribute__((__deprecated__("Use mir_connection_platform_operation() with operations from mir_toolkit/mesa/platform_operation.h")));
-
-/**
- * Set the gbm_device to be used by the EGL implementation.
- * This is required if the application needs to create EGLImages from
- * gbm buffers objects created on that gbm device.
- * \param [in] connection  The connection
- * \param [in] dev         The gbm_device to set
- * \return                 A non-zero value if the operation was successful,
- *                         0 otherwise
- */
-int mir_connection_drm_set_gbm_device(MirConnection* connection,
-                                      struct gbm_device* dev)
-    __attribute__((__deprecated__("Use mir_connection_platform_operation() with operations from mir_toolkit/mesa/platform_operation.h")));
-
-#ifdef __cplusplus
-}
-/**@}*/
-#endif
-
-#endif /* MIR_CLIENT_LIBRARY_DRM_H_ */

=== modified file 'include/client/mir_toolkit/mir_connection.h'
--- include/client/mir_toolkit/mir_connection.h	2015-03-31 02:35:42 +0000
+++ include/client/mir_toolkit/mir_connection.h	2015-07-23 14:41:37 +0000
@@ -104,12 +104,6 @@
     mir_lifecycle_event_callback callback, void* context);
 
 /**
- * \deprecated Use mir_connection_create_display_config
- */
-__attribute__((__deprecated__("Use mir_connection_create_display_config()")))
-void mir_connection_get_display_info(MirConnection *connection, MirDisplayInfo *display_info);
-
-/**
  * Query the display
  *   \warning return value must be destroyed via mir_display_config_destroy()
  *   \warning may return null if connection is invalid

=== modified file 'include/client/mir_toolkit/mir_screencast.h'
--- include/client/mir_toolkit/mir_screencast.h	2015-03-31 02:35:42 +0000
+++ include/client/mir_toolkit/mir_screencast.h	2015-07-23 14:41:37 +0000
@@ -56,13 +56,6 @@
  */
 MirBufferStream* mir_screencast_get_buffer_stream(MirScreencast *screencast);
 
-/**
- * Get a window type that can be used by EGL.
- *   \param [in] screencast  The screencast
- *   \return                 An EGLNativeWindowType that the client can use
- */
-MirEGLNativeWindowType mir_screencast_egl_native_window(MirScreencast *screencast) __attribute__((__deprecated__("Use mir_screencast_get_buffer_stream and the corresponding mir_buffer_stream* function")));
-
 #ifdef __cplusplus
 }
 /**@}*/

=== modified file 'include/client/mir_toolkit/mir_surface.h'
--- include/client/mir_toolkit/mir_surface.h	2015-04-30 12:37:50 +0000
+++ include/client/mir_toolkit/mir_surface.h	2015-07-23 14:41:37 +0000
@@ -168,6 +168,20 @@
                                       MirPixelFormat format);
 
 /**
+ * Create a surface specification.
+ * This can be used with mir_surface_create() to create a surface or with
+ * mir_surface_apply_spec() to change an existing surface.
+ * \remark For use with mir_surface_create() at least the type, width, height,
+ * format and buffer_usage must be set. (And for types requiring a parent that
+ * too must be set.)
+ *
+ * \param [in] connection   a valid mir connection
+ * \return                  A handle that can ultimately be passed to
+ *                          mir_surface_create() or mir_surface_apply_spec()
+ */
+MirSurfaceSpec* mir_create_surface_spec(MirConnection* connection);
+
+/**
  * Create a surface specification for updating a surface.
  *
  * This can be applied to one or more target surfaces using
@@ -203,6 +217,33 @@
 MirSurface* mir_surface_create_sync(MirSurfaceSpec* requested_specification);
 
 /**
+ * Set the requested parent.
+ *
+ * \param [in] spec    Specification to mutate
+ * \param [in] parent  A valid parent surface.
+ */
+void mir_surface_spec_set_parent(MirSurfaceSpec* spec, MirSurface* parent);
+
+/**
+ * Update a surface specification with a surface type.
+ * This can be used with mir_surface_create() to create a surface or with
+ * mir_surface_apply_spec() to change an existing surface.
+ * \remark For use with mir_surface_apply_spec() the shell need not support
+ * arbitrary changes of type and some target types may require the setting of
+ * properties such as "parent" that are not already present on the surface.
+ * The type transformations the server is required to support are:\n
+ * regular => utility, dialog or satellite\n
+ * utility => regular, dialog or satellite\n
+ * dialog => regular, utility or satellite\n
+ * satellite => regular, utility or dialog\n
+ * popup => satellite
+ *
+ * \param [in] spec         Specification to mutate
+ * \param [in] type         the target type of the surface
+ */
+void mir_surface_spec_set_type(MirSurfaceSpec* spec, MirSurfaceType type);
+
+/**
  * Set the requested name.
  *
  * The surface name helps the user to distinguish between multiple surfaces
@@ -212,31 +253,30 @@
  * \param [in] spec     Specification to mutate
  * \param [in] name     Requested name. This must be valid UTF-8.
  *                      Copied into spec; clients can free the buffer passed after this call.
- * \return              False if name is not a valid attribute of this surface type.
  */
-bool mir_surface_spec_set_name(MirSurfaceSpec* spec, char const* name);
+void mir_surface_spec_set_name(MirSurfaceSpec* spec, char const* name);
 
 /**
  * Set the requested width, in pixels
  *
  * \param [in] spec     Specification to mutate
  * \param [in] width    Requested width.
- * \return              False if width is invalid for a surface of this type
+ *
  * \note    The requested dimensions are a hint only. The server is not guaranteed to create a
  *          surface of any specific width or height.
  */
-bool mir_surface_spec_set_width(MirSurfaceSpec* spec, unsigned width);
+void mir_surface_spec_set_width(MirSurfaceSpec* spec, unsigned width);
 
 /**
  * Set the requested height, in pixels
  *
  * \param [in] spec     Specification to mutate
  * \param [in] height   Requested height.
- * \return              False if height is invalid for a surface of this type
+ *
  * \note    The requested dimensions are a hint only. The server is not guaranteed to create a
  *          surface of any specific width or height.
  */
-bool mir_surface_spec_set_height(MirSurfaceSpec* spec, unsigned height);
+void mir_surface_spec_set_height(MirSurfaceSpec* spec, unsigned height);
 
 /**
  * Set the requested width increment, in pixels.
@@ -245,11 +285,11 @@
  *
  * \param [in] spec       Specification to mutate
  * \param [in] width_inc  Requested width increment.
- * \return                False if width increment is invalid for a surface of this type
+ *
  * \note    The requested dimensions are a hint only. The server is not guaranteed to
  *          create a surface of any specific width or height.
  */
-bool mir_surface_spec_set_width_increment(MirSurfaceSpec *spec, unsigned width_inc);
+void mir_surface_spec_set_width_increment(MirSurfaceSpec* spec, unsigned width_inc);
 
 /**
  * Set the requested height increment, in pixels
@@ -258,54 +298,54 @@
  *
  * \param [in] spec       Specification to mutate
  * \param [in] height_inc Requested height increment.
- * \return                False if height increment is invalid for a surface of this type
+ *
  * \note    The requested dimensions are a hint only. The server is not guaranteed to
  *          create a surface of any specific width or height.
  */
-bool mir_surface_spec_set_height_increment(MirSurfaceSpec *spec, unsigned height_inc);
+void mir_surface_spec_set_height_increment(MirSurfaceSpec* spec, unsigned height_inc);
 
 /**
  * Set the minimum width, in pixels
  *
  * \param [in] spec     Specification to mutate
  * \param [in] width    Minimum width.
- * \return              False if minimum width is invalid for a surface of this type
+ *
  * \note    The requested dimensions are a hint only. The server is not guaranteed to create a
  *          surface of any specific width or height.
  */
-bool mir_surface_spec_set_min_width(MirSurfaceSpec* spec, unsigned min_width);
+void mir_surface_spec_set_min_width(MirSurfaceSpec* spec, unsigned min_width);
 
 /**
  * Set the minimum height, in pixels
  *
  * \param [in] spec     Specification to mutate
  * \param [in] height   Minimum height.
- * \return              False if minimum height is invalid for a surface of this type
+ *
  * \note    The requested dimensions are a hint only. The server is not guaranteed to create a
  *          surface of any specific width or height.
  */
-bool mir_surface_spec_set_min_height(MirSurfaceSpec* spec, unsigned min_height);
+void mir_surface_spec_set_min_height(MirSurfaceSpec* spec, unsigned min_height);
 /**
  * Set the maximum width, in pixels
  *
  * \param [in] spec     Specification to mutate
  * \param [in] width    Maximum width.
- * \return              False if maximum width is invalid for a surface of this type
+ *
  * \note    The requested dimensions are a hint only. The server is not guaranteed to create a
  *          surface of any specific width or height.
  */
-bool mir_surface_spec_set_max_width(MirSurfaceSpec* spec, unsigned max_width);
+void mir_surface_spec_set_max_width(MirSurfaceSpec* spec, unsigned max_width);
 
 /**
  * Set the maximum height, in pixels
  *
  * \param [in] spec     Specification to mutate
  * \param [in] height   Maximum height.
- * \return              False if maximum height is invalid for a surface of this type
+ *
  * \note    The requested dimensions are a hint only. The server is not guaranteed to create a
  *          surface of any specific width or height.
  */
-bool mir_surface_spec_set_max_height(MirSurfaceSpec* spec, unsigned max_height);
+void mir_surface_spec_set_max_height(MirSurfaceSpec* spec, unsigned max_height);
 
 /**
  * Set the minimum aspect ratio. This is the minimum ratio of surface width to height.
@@ -314,11 +354,11 @@
  * \param [in] spec     Specification to mutate
  * \param [in] width    numerator
  * \param [in] height   denominator
- * \return              False if minimum aspect is invalid for a surface of this type
+ *
  * \note    The requested aspect ratio is a hint only. The server is not guaranteed
  *          to create a surface of any specific aspect.
  */
-bool mir_surface_spec_set_min_aspect_ratio(MirSurfaceSpec* spec, unsigned width, unsigned height);
+void mir_surface_spec_set_min_aspect_ratio(MirSurfaceSpec* spec, unsigned width, unsigned height);
 
 /**
  * Set the maximum aspect ratio. This is the maximum ratio of surface width to height.
@@ -327,53 +367,63 @@
  * \param [in] spec     Specification to mutate
  * \param [in] width    numerator
  * \param [in] height   denominator
- * \return              False if maximum aspect is invalid for a surface of this type
+ *
  * \note    The requested aspect ratio is a hint only. The server is not guaranteed
  *          to create a surface of any specific aspect.
  */
-bool mir_surface_spec_set_max_aspect_ratio(MirSurfaceSpec* spec, unsigned width, unsigned height);
+void mir_surface_spec_set_max_aspect_ratio(MirSurfaceSpec* spec, unsigned width, unsigned height);
 
 /**
  * Set the requested pixel format.
  * \param [in] spec     Specification to mutate
  * \param [in] format   Requested pixel format
- * \return              False if format is not a valid pixel format for this surface type.
+ *
  * \note    If this call returns %true then the server is guaranteed to honour this request.
  *          If the server is unable to create a surface with this pixel format at
  *          the point mir_surface_create() is called it will instead return an invalid surface.
  */
-bool mir_surface_spec_set_pixel_format(MirSurfaceSpec* spec, MirPixelFormat format);
+void mir_surface_spec_set_pixel_format(MirSurfaceSpec* spec, MirPixelFormat format);
 
 /**
  * Set the requested buffer usage.
  * \param [in] spec     Specification to mutate
  * \param [in] usage    Requested buffer usage
- * \return              False if the requested buffer usage is invalid for this surface.
+ *
  * \note    If this call returns %true then the server is guaranteed to honour this request.
  *          If the server is unable to create a surface with this buffer usage at
  *          the point mir_surface_create() is called it will instead return an invalid surface.
  */
-bool mir_surface_spec_set_buffer_usage(MirSurfaceSpec* spec, MirBufferUsage usage);
+void mir_surface_spec_set_buffer_usage(MirSurfaceSpec* spec, MirBufferUsage usage);
 
 /**
  * \param [in] spec         Specification to mutate
  * \param [in] output_id    ID of output to place surface on. From MirDisplayOutput.output_id
- * \return                  False if setting surface fullscreen is invalid for this surface.
+ *
  * \note    If this call returns %true then a valid surface returned from mir_surface_create() is
  *          guaranteed to be fullscreen on the specified output. An invalid surface is returned
  *          if the server unable to, or policy prevents it from, honouring this request.
  */
-bool mir_surface_spec_set_fullscreen_on_output(MirSurfaceSpec* spec, uint32_t output_id);
+void mir_surface_spec_set_fullscreen_on_output(MirSurfaceSpec* spec, uint32_t output_id);
 
 /**
  * Set the requested preferred orientation mode.
  * \param [in] spec    Specification to mutate
  * \param [in] mode    Requested preferred orientation
- * \return             False if the mode is not valid for this surface type.
+ *
  * \note    If the server is unable to create a surface with the preferred orientation at
  *          the point mir_surface_create() is called it will instead return an invalid surface.
  */
-bool mir_surface_spec_set_preferred_orientation(MirSurfaceSpec* spec, MirOrientationMode mode);
+void mir_surface_spec_set_preferred_orientation(MirSurfaceSpec* spec, MirOrientationMode mode);
+
+/**
+ * Set the requested state.
+ * \param [in] spec    Specification to mutate
+ * \param [in] mode    Requested state
+ *
+ * \note    If the server is unable to create a surface with the requested state at
+ *          the point mir_surface_create() is called it will instead return an invalid surface.
+ */
+void mir_surface_spec_set_state(MirSurfaceSpec* spec, MirSurfaceState state);
 
 /**
  * Release the resources held by a MirSurfaceSpec.
@@ -383,40 +433,26 @@
 void mir_surface_spec_release(MirSurfaceSpec* spec);
 
 /**
- * Request a new Mir surface on the supplied connection with the supplied
- * parameters. The returned handle remains valid until the surface has been
- * released.
- *   \warning callback could be called from another thread. You must do any
- *            locking appropriate to protect your data accessed in the
- *            callback.
- *   \note    This will soon be deprecated. Use the *_spec_for_* / mir_surface_create()
- *            two-stage process instead.
- *   \param [in] connection          The connection
- *   \param [in] surface_parameters  Request surface parameters
- *   \param [in] callback            Callback function to be invoked when
- *                                   request completes
- *   \param [in,out] context         User data passed to the callback function
- *   \return                         A handle that can be passed to
- *                                   mir_wait_for
- */
-MirWaitHandle *mir_connection_create_surface(
-    MirConnection *connection,
-    MirSurfaceParameters const *surface_parameters,
-    mir_surface_callback callback,
-    void *context) __attribute__((__deprecated__("Use mir_surface_create()")));
-
-/**
- * Create a surface like in mir_connection_create_surface(), but also wait for
- * creation to complete and return the resulting surface.
- *   \note    This will soon be deprecated. Use the create_spec_for/mir_surface_create()
- *            two-stage process instead.
- *   \param [in] connection  The connection
- *   \param [in] params      Parameters describing the desired surface
- *   \return                 The resulting surface
- */
-MirSurface *mir_connection_create_surface_sync(
-    MirConnection *connection,
-    MirSurfaceParameters const *params) __attribute__((__deprecated__("Use mir_surface_create_sync()")));
+ * Set the streams associated with the spec.
+ * streams[0] is the bottom-most stream, and streams[size-1] is the topmost.
+ * On application of the spec, a stream that is present in the surface,
+ * but is not in the list will be disassociated from the surface.
+ * On application of the spec, a stream that is not present in the surface,
+ * but is in the list will be associated with the surface.
+ * Streams set a displacement from the top-left corner of the surface.
+ * 
+ * \warning disassociating streams from the surface will not release() them.
+ * \warning It is wiser to arrange the streams within the bounds of the
+ *          surface the spec is applied to. Shells can define their own
+ *          behavior as to what happens to an out-of-bound stream.
+ * 
+ * \param [in] spec        The spec to accumulate the request in.
+ * \param [in] streams     The an array of non-null streams info.
+ * \param [in] num_streams The number of elements in the streams array.
+ */
+void mir_surface_spec_set_streams(MirSurfaceSpec* spec,
+                                  MirBufferStreamInfo* streams,
+                                  unsigned int num_streams);
 
 /**
  * Set the event handler to be called when events arrive for a surface.
@@ -442,13 +478,6 @@
 MirBufferStream* mir_surface_get_buffer_stream(MirSurface *surface);
 
 /**
- * Get a window type that can be used for OpenGL ES 2.0 acceleration.
- *   \param [in] surface  The surface
- *   \return              An EGLNativeWindowType that the client can use
- */
-MirEGLNativeWindowType mir_surface_get_egl_native_window(MirSurface *surface) __attribute__((__deprecated__("Use mir_surface_get_buffer_stream and the corresponding mir_buffer_stream* function")));
-
-/**
  * Test for a valid surface
  *   \param [in] surface  The surface
  *   \return              True if the supplied surface is valid, or
@@ -476,58 +505,6 @@
 void mir_surface_get_parameters(MirSurface *surface, MirSurfaceParameters *parameters);
 
 /**
- * Get the underlying platform type so the buffer obtained in "raw" representation
- * in mir_surface_get_current_buffer() can be understood
- *   \pre                     The surface is valid
- *   \param [in] surface      The surface
- *   \return                  One of mir_platform_type_android or mir_platform_type_gbm
- */
-MirPlatformType mir_surface_get_platform_type(MirSurface *surface) __attribute__((__deprecated__("Use mir_surface_get_buffer_stream and the corresponding mir_buffer_stream* function")));
-
-/**
- * Get a surface's buffer in "raw" representation.
- *   \pre                         The surface is valid
- *   \param [in] surface          The surface
- *   \param [out] buffer_package  Structure to be populated
- */
-void mir_surface_get_current_buffer(MirSurface *surface, MirNativeBuffer **buffer_package) __attribute__((__deprecated__("Use mir_surface_get_buffer_stream and the corresponding mir_buffer_stream* function")));
-
-/**
- * Get a surface's graphics_region, i.e., map the graphics buffer to main
- * memory.
- *   \pre                          The surface is valid
- *   \param [in] surface           The surface
- *   \param [out] graphics_region  Structure to be populated
- */
-void mir_surface_get_graphics_region(
-    MirSurface *surface,
-    MirGraphicsRegion *graphics_region) __attribute__((__deprecated__("Use mir_surface_get_buffer_stream and the corresponding mir_buffer_stream* function")));
-                                                                          /**
- * Advance a surface's buffer. The returned handle remains valid until the next
- * call to mir_surface_swap_buffers, until the surface has been released or the
- * connection to the server has been released.
- *   \warning callback could be called from another thread. You must do any
- *            locking appropriate to protect your data accessed in the
- *            callback.
- *   \param [in] surface      The surface
- *   \param [in] callback     Callback function to be invoked when the request
- *                            completes
- *   \param [in,out] context  User data passed to the callback function
- *   \return                  A handle that can be passed to mir_wait_for
- */
-MirWaitHandle *mir_surface_swap_buffers(
-    MirSurface *surface,
-    mir_surface_callback callback,
-    void *context) __attribute__((__deprecated__("Use mir_surface_get_buffer_stream and the corresponding mir_buffer_stream* function")));
-
-/**
- * Advance a surface's buffer as in mir_surface_swap_buffers(), but also wait
- * for the operation to complete.
- *   \param [in] surface  The surface whose buffer to advance
- */
-void mir_surface_swap_buffers_sync(MirSurface *surface) __attribute__((__deprecated__("Use mir_surface_get_buffer_stream and the corresponding mir_buffer_stream* function")));
-
-/**
  * Release the supplied surface and any associated buffer. The returned wait
  * handle remains valid until the connection to the server is released.
  *   \warning callback could be called from another thread. You must do any
@@ -552,18 +529,6 @@
 void mir_surface_release_sync(MirSurface *surface);
 
 /**
- * \deprecated Use mir_debug_surface_id()
- */
-__attribute__((__deprecated__("Use mir_debug_surface_id()")))
-int mir_surface_get_id(MirSurface *surface);
-
-/**
- * \deprecated Use the mir_connection_create_spec_for_xxx family of APIs
- */
-__attribute__((__deprecated__("Use mir_connection_create_spec_for_xxx()")))
-MirWaitHandle* mir_surface_set_type(MirSurface *surface, MirSurfaceType type);
-
-/**
  * Get the type (purpose) of a surface.
  *   \param [in] surface  The surface to query
  *   \return              The type of the surface
@@ -689,6 +654,46 @@
  */
 void mir_surface_apply_spec(MirSurface* surface, MirSurfaceSpec* spec);
 
+/**
+ * \brief Request an ID for the surface that can be shared cross-process and
+ *        across restarts.
+ *
+ * This call acquires a MirPersistentId for this MirSurface. This MirPersistentId
+ * can be serialized to a string, stored or sent to another process, and then
+ * later deserialized to refer to the same surface.
+ *
+ * \param [in]     surface   The surface to acquire a persistent reference to.
+ * \param [in]     callback  Callback to invoke when the request completes.
+ * \param [in,out] context   User data passed to completion callback.
+ * \return A MirWaitHandle that can be used in mir_wait_for to await completion.
+ */
+MirWaitHandle* mir_surface_request_persistent_id(MirSurface* surface, mir_surface_id_callback callback, void* context);
+
+/**
+ * \brief Request a persistent ID for a surface and wait for the result
+ * \param [in] surface  The surface to acquire a persistent ID for.
+ * \return A MirPersistentId. This MirPersistentId is owned by the calling code, and must
+ *         be freed with a call to mir_persistent_id_release()
+ */
+MirPersistentId* mir_surface_request_persistent_id_sync(MirSurface *surface);
+
+/**
+ * \brief Check the validity of a MirPersistentId
+ * \param [in] id  The MirPersistentId
+ * \return True iff the MirPersistentId contains a valid ID value.
+ *
+ * \note This does not guarantee that the ID refers to a currently valid object.
+ */
+bool mir_persistent_id_is_valid(MirPersistentId* id);
+
+/**
+ * \brief Free a MirPersistentId
+ * \param [in] id  The MirPersistentId to free
+ * \note This frees only the client-side representation; it has no effect on the
+ *       object referred to by \arg id.
+ */
+void mir_persistent_id_release(MirPersistentId* id);
+
 #ifdef __cplusplus
 }
 /**@}*/

=== modified file 'include/client/mir_toolkit/version.h'
--- include/client/mir_toolkit/version.h	2015-06-02 23:12:34 +0000
+++ include/client/mir_toolkit/version.h	2015-07-23 14:41:37 +0000
@@ -33,7 +33,7 @@
  *
  * See also: http://semver.org/
  */
-#define MIR_CLIENT_MAJOR_VERSION (2)
+#define MIR_CLIENT_MAJOR_VERSION (3)
 
 /**
  * MIR_CLIENT_MINOR_VERSION

=== modified file 'include/common/mir/dispatch/action_queue.h'
--- include/common/mir/dispatch/action_queue.h	2015-03-11 07:43:13 +0000
+++ include/common/mir/dispatch/action_queue.h	2015-07-23 14:41:37 +0000
@@ -41,7 +41,7 @@
     bool dispatch(FdEvents events) override;
     FdEvents relevant_events() const override;
 private:
-    void consume();
+    bool consume();
     void wake();
     mir::Fd event_fd;
     std::mutex list_lock;

=== renamed file 'include/common/mir/dispatch/simple_dispatch_thread.h' => 'include/common/mir/dispatch/threaded_dispatcher.h'
--- include/common/mir/dispatch/simple_dispatch_thread.h	2015-04-23 18:29:35 +0000
+++ include/common/mir/dispatch/threaded_dispatcher.h	2015-07-23 14:41:37 +0000
@@ -19,8 +19,14 @@
 #ifndef MIR_DISPATCH_SIMPLE_DISPATCH_THREAD_H_
 #define MIR_DISPATCH_SIMPLE_DISPATCH_THREAD_H_
 
+#include <string>
 #include <memory>
 #include <thread>
+#include <vector>
+#include <mutex>
+#include <condition_variable>
+
+#include "mir/dispatch/multiplexing_dispatchable.h"
 #include "mir/fd.h"
 
 namespace mir
@@ -29,18 +35,30 @@
 {
 class Dispatchable;
 
-
-class SimpleDispatchThread
+class ThreadedDispatcher
 {
 public:
-    SimpleDispatchThread(std::shared_ptr<Dispatchable> const& dispatchee);
-    SimpleDispatchThread(std::shared_ptr<Dispatchable> const& dispatchee,
-                         std::function<void()> const& exception_handler);
-    ~SimpleDispatchThread() noexcept;
-
+    ThreadedDispatcher(std::string const& name, std::shared_ptr<Dispatchable> const& dispatchee);
+    ThreadedDispatcher(std::string const& name,
+                       std::shared_ptr<Dispatchable> const& dispatchee,
+                       std::function<void()> const& exception_handler);
+    ~ThreadedDispatcher() noexcept;
+
+    void add_thread();
+    void remove_thread();
+
+    class ThreadShutdownRequestHandler;
 private:
-    Fd shutdown_fd;
-    std::thread eventloop;
+
+    std::string const name_base;
+
+    std::shared_ptr<ThreadShutdownRequestHandler> thread_exiter;
+    std::shared_ptr<MultiplexingDispatchable> dispatcher;
+
+    std::mutex thread_pool_mutex;
+    std::vector<std::thread> threadpool;
+
+    std::function<void()> const exception_handler;
 };
 
 }

=== renamed file 'include/platform/mir/fatal.h' => 'include/common/mir/fatal.h'
=== modified file 'include/common/mir/optional_value.h'
--- include/common/mir/optional_value.h	2015-04-13 14:07:18 +0000
+++ include/common/mir/optional_value.h	2015-07-23 14:41:37 +0000
@@ -19,6 +19,8 @@
 #ifndef MIR_OPTIONAL_VALUE_H_
 #define MIR_OPTIONAL_VALUE_H_
 
+#include "mir/fatal.h"
+
 namespace mir
 {
 template<typename T>
@@ -36,7 +38,14 @@
     }
 
     bool is_set() const { return is_set_; }
-    T value() const { return value_; }
+    T value() const
+    {
+        if (!is_set())
+        {
+            (*fatal_error)("Accessing value of unset optional");
+        }
+        return value_;
+    }
 
 private:
     T value_;

=== modified file 'include/platform/mir/graphics/display_buffer.h'
--- include/platform/mir/graphics/display_buffer.h	2015-03-31 02:35:42 +0000
+++ include/platform/mir/graphics/display_buffer.h	2015-07-23 14:41:37 +0000
@@ -81,12 +81,6 @@
      */
     virtual MirOrientation orientation() const = 0;
 
-    /** Returns true if the display buffer has an alpha channel and the alpha 
-     *  channel will be read from at some point - in which case the renderer
-     *  must produce valid alpha channel content
-     */
-    virtual bool uses_alpha() const = 0;
-
 protected:
     DisplayBuffer() = default;
     DisplayBuffer(DisplayBuffer const& c) = delete;

=== modified file 'include/platform/mir/graphics/platform.h'
--- include/platform/mir/graphics/platform.h	2015-04-09 06:20:31 +0000
+++ include/platform/mir/graphics/platform.h	2015-07-23 14:41:37 +0000
@@ -146,7 +146,7 @@
     std::shared_ptr<NestedContext> const& nested_context);
 
 /**
- * Function prototype used to add platform specific options to the platform-independant server options.
+ * Function prototype used to add platform specific options to the platform-independent server options.
  *
  * \param [in] config a boost::program_options that can be appended with new options
  *
@@ -177,7 +177,7 @@
 extern "C" void add_graphics_platform_options(
     boost::program_options::options_description& config);
 
-extern "C" mir::graphics::PlatformPriority probe_graphcis_platform();
+extern "C" mir::graphics::PlatformPriority probe_graphics_platform();
 extern "C" mir::ModuleProperties const* describe_graphics_module();
 
 #endif // MIR_GRAPHICS_PLATFORM_H_

=== modified file 'include/platform/mir/input/device_capability.h'
--- include/platform/mir/input/device_capability.h	2015-04-09 06:20:31 +0000
+++ include/platform/mir/input/device_capability.h	2015-07-23 14:41:37 +0000
@@ -42,6 +42,7 @@
     alpha_numeric = 1<<9 // enough keys for text entry
 };
 
+DeviceCapability mir_enable_enum_bit_operators(DeviceCapability);
 using DeviceCapabilities = mir::Flags<DeviceCapability>;
 
 }

=== modified file 'include/platform/mir/input/input_sink.h'
--- include/platform/mir/input/input_sink.h	2015-04-09 06:20:31 +0000
+++ include/platform/mir/input/input_sink.h	2015-07-23 14:41:37 +0000
@@ -21,6 +21,8 @@
 #define MIR_INPUT_INPUT_SINK_H_
 
 #include "mir_toolkit/event.h"
+#include "mir/geometry/rectangle.h"
+#include "mir/geometry/displacement.h"
 
 namespace mir