Merge lp:~mir-team/mir/PD-demo into lp:mir/ubuntu

[Cemil Azizoglu]

PD demo

PD demo.

The source branch lp:~mir-team/mir/PD-demo contains :

lp:mir @3126
lp:~mir-team/mir/ubuntu (to resolve conflicts)
lp:~alan-griffiths/mir/fix-1516670 @3118
lp:~kdub/mir/egl-sync-fences @3134

Carefully merge new revisions of the latter two branches, as necessary, as they are still going through reviews and may get updated.

[Cemil Azizoglu (cemil-azizoglu)]

DO NOT LAND.

Silo for PD demo.

review: Disapprove

[lp:~mir-team/mir/PD-demo]

3126. By Andreas Pokorny on 2015-11-25

Add automatic searching and probing for input platforms

With this specifying the input platform via --platform-input-lib is no longer necessary, unless the stub input platform that supports attaching fake devices is required. Fixes: https://bugs.launchpad.net/bugs/1517133.

Approved by PS Jenkins bot, Cemil Azizoglu, Chris Halse Rogers.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3127
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/93/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/49/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/466/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1138/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/51/console

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

review: Needs Fixing (continuous-integration)

[lp:~mir-team/mir/PD-demo]

3127. By Cemil Azizoglu on 2015-11-25

merge ubuntu back

3128. By Cemil Azizoglu on 2015-11-25

delete mir-client-platform-mes-dev.pc.in

3129. By Cemil Azizoglu on 2015-11-25

Merge lp:~alan-griffiths/mir/fix-1516670 @3118

3130. By Cemil Azizoglu on 2015-11-25

Merge lp:~kdub/mir/egl-sync-fences @3134

3131. By Cemil Azizoglu on 2015-12-01

Fix/disable failing tests.

3132. By Cemil Azizoglu on 2015-12-01

Add missing symbol

3133. By Cemil Azizoglu on 2015-12-01

Disable failing test

3134. By Cemil Azizoglu on 2015-12-03

Install mir-platform-input-evdev4 package with drivers

3135. By Cemil Azizoglu on 2015-12-03

Fix esoteric arch builds

3136. By Cemil Azizoglu on 2015-12-03

fix-1521795

Unmerged revisions

3136. By Cemil Azizoglu on 2015-12-03

fix-1521795

3135. By Cemil Azizoglu on 2015-12-03

Fix esoteric arch builds

3134. By Cemil Azizoglu on 2015-12-03

Install mir-platform-input-evdev4 package with drivers

3133. By Cemil Azizoglu on 2015-12-01

Disable failing test

3132. By Cemil Azizoglu on 2015-12-01

Add missing symbol

3131. By Cemil Azizoglu on 2015-12-01

Fix/disable failing tests.

3130. By Cemil Azizoglu on 2015-11-25

Merge lp:~kdub/mir/egl-sync-fences @3134

3129. By Cemil Azizoglu on 2015-11-25

Merge lp:~alan-griffiths/mir/fix-1516670 @3118

3128. By Cemil Azizoglu on 2015-11-25

delete mir-client-platform-mes-dev.pc.in

3127. By Cemil Azizoglu on 2015-11-25

merge ubuntu back

=== modified file '3rd_party/CMakeLists.txt'
--- 3rd_party/CMakeLists.txt	2015-06-17 05:20:42 +0000
+++ 3rd_party/CMakeLists.txt	2015-11-25 21:33:30 +0000
@@ -21,11 +21,3 @@
   MIR_ANDROID_INPUT_COMPILE_FLAGS
   ${MIR_ANDROID_INPUT_COMPILE_FLAGS}
   PARENT_SCOPE)
-
-add_subdirectory(xcursor)
-list(
-  APPEND MIR_XCURSOR_INCLUDE_DIRECTORIES
-  ${CMAKE_CURRENT_SOURCE_DIR}/xcursor/
-)
-
-set(MIR_XCURSOR_INCLUDE_DIRECTORIES ${MIR_XCURSOR_INCLUDE_DIRECTORIES} PARENT_SCOPE)

=== modified file '3rd_party/android-input/CMakeLists.txt'
--- 3rd_party/android-input/CMakeLists.txt	2015-02-22 07:46:25 +0000
+++ 3rd_party/android-input/CMakeLists.txt	2015-11-25 21:33:30 +0000
@@ -24,6 +24,6 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/android/hardware/libhardware_legacy/include
   ${CMAKE_CURRENT_SOURCE_DIR}/android/system/core/include
   ${CMAKE_CURRENT_SOURCE_DIR}/android/system/extras/ext4_utils
-  ${CMAKE_CURRENT_SOURCE_DIR}/android/external/kernel-headers/original
+  ${CMAKE_CURRENT_SOURCE_DIR}/android/external/kernel-headers
   )
 set(MIR_ANDROID_INCLUDE_DIRECTORIES ${MIR_ANDROID_INCLUDE_DIRECTORIES} PARENT_SCOPE)

=== modified file '3rd_party/android-input/android/CMakeLists.txt'
--- 3rd_party/android-input/android/CMakeLists.txt	2015-08-19 02:03:51 +0000
+++ 3rd_party/android-input/android/CMakeLists.txt	2015-11-25 21:33:30 +0000
@@ -1,5 +1,5 @@
 include_directories(
-  external/kernel-headers/original
+  external/kernel-headers
   frameworks/base/include
   frameworks/native/include
   hardware/libhardware_legacy/include

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/EventHub.h'
--- 3rd_party/android-input/android/frameworks/base/services/input/EventHub.h	2015-06-17 05:20:42 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/EventHub.h	2015-11-25 21:33:30 +0000
@@ -34,7 +34,7 @@
 
 #include "mir/fd.h"
 
-#include <linux/input.h>
+#include <original/linux/input.h>
 #include <sys/epoll.h>
 
 #include <memory>

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp	2015-08-17 18:33:38 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp	2015-11-25 21:33:30 +0000
@@ -43,11 +43,7 @@
 
 // Latency added during resampling.  A few milliseconds doesn't hurt much but
 // reduces the impact of mispredicted touch positions.
-//static constexpr const std::chrono::nanoseconds RESAMPLE_LATENCY = std::chrono::nanoseconds(5 * NANOS_PER_MS);
-
-// Mir modification: No artificial latency please. This seems to provide
-// visibly and measurably lower input latency, with no noticeable down side...
-static constexpr const std::chrono::nanoseconds RESAMPLE_LATENCY(0);
+static constexpr const std::chrono::nanoseconds RESAMPLE_LATENCY = std::chrono::nanoseconds(5 * NANOS_PER_MS);
 
 // Minimum time difference between consecutive samples before attempting to resample.
 static constexpr const std::chrono::nanoseconds RESAMPLE_MIN_DELTA = std::chrono::nanoseconds(2 * NANOS_PER_MS);

=== modified file '3rd_party/android-input/android/frameworks/native/libs/utils/Timers.cpp'
--- 3rd_party/android-input/android/frameworks/native/libs/utils/Timers.cpp	2015-08-18 01:35:15 +0000
+++ 3rd_party/android-input/android/frameworks/native/libs/utils/Timers.cpp	2015-11-25 21:33:30 +0000
@@ -20,38 +20,12 @@
 #include <utils/Timers.h>
 #include <std/Log.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <time.h>
-#include <errno.h>
 #include <limits.h>
-
-#ifdef HAVE_WIN32_THREADS
-#include <windows.h>
-#endif
-
-std::chrono::nanoseconds systemTime(int clock)
+#include <chrono>
+
+std::chrono::nanoseconds systemTime(int /*clock => always MONOTONIC*/)
 {
-#if defined(HAVE_POSIX_CLOCKS)
-    static const clockid_t clocks[] = {
-            CLOCK_REALTIME,
-            CLOCK_MONOTONIC,
-            CLOCK_PROCESS_CPUTIME_ID,
-            CLOCK_THREAD_CPUTIME_ID
-    };
-    struct timespec t;
-    t.tv_sec = t.tv_nsec = 0;
-    clock_gettime(clocks[clock], &t);
-    return std::chrono::nanoseconds(t.tv_sec)*1000000000LL + t.tv_nsec;
-#else
-    // we don't support the clocks here.
-    struct timeval t;
-    t.tv_sec = t.tv_usec = 0;
-    gettimeofday(&t, NULL);
-    return std::chrono::nanoseconds(t.tv_sec)*1000000000LL + std::chrono::nanoseconds(t.tv_usec)*1000LL;
-#endif
+    return {std::chrono::steady_clock::now().time_since_epoch()};
 }
 
 int toMillisecondTimeoutDelay(std::chrono::nanoseconds referenceTime, std::chrono::nanoseconds timeoutTime)

=== removed directory '3rd_party/xcursor'
=== removed file '3rd_party/xcursor/CMakeLists.txt'
--- 3rd_party/xcursor/CMakeLists.txt	2015-06-17 05:20:42 +0000
+++ 3rd_party/xcursor/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-set(
-  XCURSOR_SOURCES
-
-  xcursor.c
-)
-
-add_library(
-  xcursorloader-static STATIC
-
-  ${XCURSOR_SOURCES}
-)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-10-27 05:18:41 +0000
+++ CMakeLists.txt	2015-11-25 21:33:30 +0000
@@ -27,8 +27,8 @@
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 0)
-set(MIR_VERSION_MINOR 17)
-set(MIR_VERSION_PATCH 1)
+set(MIR_VERSION_MINOR 18)
+set(MIR_VERSION_PATCH 0)
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
 add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})
@@ -49,7 +49,6 @@
 endif()
 include (cmake/EnableCoverageReport.cmake)
 include (cmake/MirCommon.cmake)
-include (cmake/PrePush.cmake)
 include (GNUInstallDirs)
 
 set(build_types "None;Debug;Release;RelWithDebInfo;MinSizeRel;Coverage;AddressSanitizer;ThreadSanitizer")
@@ -122,6 +121,7 @@
 enable_testing()
 
 include_directories(include/common)
+include_directories(include/cookie)
 
 # Check for boost
 find_package(Boost 1.48.0 COMPONENTS date_time system program_options filesystem REQUIRED)
@@ -196,7 +196,6 @@
 
 set(MIR_ANDROID_INCLUDE_DIRECTORIES) # to be filled by android-input
 set(MIR_ANDROID_INPUT_COMPILE_FLAGS) # to be filled by android-input
-set(MIR_XCURSOR_INCLUDE_DIRECTORIES)
 set(MIR_3RD_PARTY_INCLUDE_DIRECTORIES)
 add_subdirectory(3rd_party/)
 
@@ -212,7 +211,6 @@
 option(MIR_ENABLE_TESTS "Build tests" ON)
 
 add_subdirectory(benchmarks/)
-add_subdirectory(tools/)
 add_subdirectory(examples/)
 add_subdirectory(playground/)
 add_subdirectory(guides/)

=== modified file 'benchmarks/frame-uniformity/touch_producing_server.cpp'
--- benchmarks/frame-uniformity/touch_producing_server.cpp	2015-10-05 02:18:18 +0000
+++ benchmarks/frame-uniformity/touch_producing_server.cpp	2015-11-25 21:33:30 +0000
@@ -26,7 +26,6 @@
 #include <functional>
 
 namespace mi = mir::input;
-namespace mia = mi::android;
 namespace mg = mir::graphics;
 namespace mis = mi::synthesis;
 namespace geom = mir::geometry;

=== modified file 'benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp'
--- benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp	2015-10-07 02:34:05 +0000
+++ benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp	2015-11-25 21:33:30 +0000
@@ -92,23 +92,23 @@
 }
 
 VsyncSimulatingPlatform::VsyncSimulatingPlatform(geom::Size const& output_size, int vsync_rate_in_hz)
-    : display(std::make_shared<StubDisplay>(output_size, vsync_rate_in_hz))
-{
-}
-
-std::shared_ptr<mg::GraphicBufferAllocator> VsyncSimulatingPlatform::create_buffer_allocator()
-{
-    return std::make_shared<mtd::StubBufferAllocator>();
-}
-
-std::shared_ptr<mg::Display> VsyncSimulatingPlatform::create_display(
+    : output_size(output_size), vsync_rate_in_hz(vsync_rate_in_hz)
+{
+}
+
+mir::UniqueModulePtr<mg::GraphicBufferAllocator> VsyncSimulatingPlatform::create_buffer_allocator()
+{
+    return mir::make_module_ptr<mtd::StubBufferAllocator>();
+}
+
+mir::UniqueModulePtr<mg::Display> VsyncSimulatingPlatform::create_display(
     std::shared_ptr<mg::DisplayConfigurationPolicy> const&,
      std::shared_ptr<mg::GLConfig> const&)
 {
-    return display;
+    return mir::make_module_ptr<StubDisplay>(output_size, vsync_rate_in_hz);
 }
-    
-std::shared_ptr<mg::PlatformIpcOperations> VsyncSimulatingPlatform::make_ipc_operations() const
+
+mir::UniqueModulePtr<mg::PlatformIpcOperations> VsyncSimulatingPlatform::make_ipc_operations() const
 {
-    return std::make_shared<mtd::NullPlatformIpcOperations>();
+    return mir::make_module_ptr<mtd::NullPlatformIpcOperations>();
 }

=== modified file 'benchmarks/frame-uniformity/vsync_simulating_graphics_platform.h'
--- benchmarks/frame-uniformity/vsync_simulating_graphics_platform.h	2015-10-07 02:34:05 +0000
+++ benchmarks/frame-uniformity/vsync_simulating_graphics_platform.h	2015-11-25 21:33:30 +0000
@@ -30,16 +30,17 @@
     VsyncSimulatingPlatform(mir::geometry::Size const& output_size, int vsync_rate_in_hz);
     ~VsyncSimulatingPlatform() = default;
     
-    std::shared_ptr<mir::graphics::GraphicBufferAllocator> create_buffer_allocator();
+    mir::UniqueModulePtr<mir::graphics::GraphicBufferAllocator> create_buffer_allocator();
     
-    std::shared_ptr<mir::graphics::Display> create_display(
+    mir::UniqueModulePtr<mir::graphics::Display> create_display(
         std::shared_ptr<mir::graphics::DisplayConfigurationPolicy> const& initial_conf_policy,
         std::shared_ptr<mir::graphics::GLConfig> const& gl_config);
     
-    std::shared_ptr<mir::graphics::PlatformIpcOperations> make_ipc_operations() const;
+    mir::UniqueModulePtr<mir::graphics::PlatformIpcOperations> make_ipc_operations() const;
 
 private:
-    std::shared_ptr<mir::graphics::Display> display;
+    mir::geometry::Size const output_size;
+    int const vsync_rate_in_hz;
 };
 
 #endif // VSYNC_SIMULATING_GRAPHICS_PLATFORM_H_

=== removed file 'cmake/PrePush.cmake'
--- cmake/PrePush.cmake	2015-02-22 07:46:25 +0000
+++ cmake/PrePush.cmake	1970-01-01 00:00:00 +0000
@@ -1,122 +0,0 @@
-#######################################################################
-# A convenience target that carries out the following steps:
-#   - Apply astyle to all source files of interest.
-#   - Build & test in a chroot, comparable setup to CI/Autolanding
-#     and ppa builders. Will fail if new files have not been added.
-#   - Build & test for android.
-#
-# NOTE: This target is very sensitive to the availability of all
-#       all required dependencies. For that, we prefer to fail the
-#       target if deps are missing to make the problem very visible.
-#
-# TODO:
-#   - Wire up the style-check target once we have reached a state
-#     where trunk actually passes the style check.
-#######################################################################
-add_custom_target(
-  pre-push
-
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}  
-)
-
-#######################################################################
-#      Add target for running astyle with the correct options         #
-#######################################################################
-find_program(ASTYLE_EXECUTABLE astyle)
-
-if(NOT ASTYLE_EXECUTABLE)
-  message(STATUS "Could NOT find astyle, pre-push is going to FAIL")
-endif()
-
-set(
-  ASTYLE_OPTIONS 
-  ${ASTYLE_OPTIONS} 
-  --indent-switches
-  --pad-header
-  --unpad-paren
-  --align-pointer=type
-)
-
-add_custom_target(
-  astyle
-
-  find ${CMAKE_SOURCE_DIR}/examples -name *.h | xargs ${ASTYLE_EXECUTABLE} ${ASTYLE_OPTIONS}
-  COMMAND find ${CMAKE_SOURCE_DIR}/include    -name *.h | xargs ${ASTYLE_EXECUTABLE} 
-  COMMAND find ${CMAKE_SOURCE_DIR}/src        -name *.h | xargs ${ASTYLE_EXECUTABLE} ${${ASTYLE_EXECUTABLE}_OPTIONS}
-  COMMAND find ${CMAKE_SOURCE_DIR}/tests      -name *.h | xargs ${ASTYLE_EXECUTABLE} ${${ASTYLE_EXECUTABLE}_OPTIONS} 
-  COMMAND find ${CMAKE_SOURCE_DIR}/tools      -name *.h | xargs ${ASTYLE_EXECUTABLE} ${${ASTYLE_EXECUTABLE}_OPTIONS} 
-
-  COMMAND find ${CMAKE_SOURCE_DIR}/examples   -name *.cpp | xargs ${ASTYLE_EXECUTABLE} ${${ASTYLE_EXECUTABLE}_OPTIONS} 
-  COMMAND find ${CMAKE_SOURCE_DIR}/include    -name *.cpp | xargs ${ASTYLE_EXECUTABLE} ${${ASTYLE_EXECUTABLE}_OPTIONS} 
-  COMMAND find ${CMAKE_SOURCE_DIR}/src        -name *.cpp | xargs ${ASTYLE_EXECUTABLE} ${${ASTYLE_EXECUTABLE}_OPTIONS} 
-  COMMAND find ${CMAKE_SOURCE_DIR}/tests      -name *.cpp | xargs ${ASTYLE_EXECUTABLE} ${${ASTYLE_EXECUTABLE}_OPTIONS} 
-  COMMAND find ${CMAKE_SOURCE_DIR}/tools      -name *.cpp | xargs ${ASTYLE_EXECUTABLE} ${${ASTYLE_EXECUTABLE}_OPTIONS} 
-
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM
-)
-
-#######################################################################
-#      Add target for creating a source tarball with bzr export       #
-#######################################################################
-add_custom_target(
-  pre-push-source-tarball
-
-  COMMAND rm -rf pre-push-build-area
-  COMMAND mkdir pre-push-build-area
-  COMMAND bzr export --root mir-pre-push pre-push-build-area/mir_${MIR_VERSION}.orig.tar.bz2 ${CMAKE_SOURCE_DIR}
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-  COMMENT "Preparing source tarball for pre-push build & test"
-)
-
-#######################################################################
-#      Add target for extracting source tarball for pdebuild          #
-#######################################################################
-add_custom_target(
-  extract-pre-push-tarball
-  COMMAND tar -xf mir_${MIR_VERSION}.orig.tar.bz2
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/pre-push-build-area VERBATIM
-)
-
-#######################################################################
-#  Builds & tests the last committed revision of the current branch   #
-#######################################################################
-find_program(PDEBUILD_EXECUTABLE pdebuild)
-if(NOT PDEBUILD_EXECUTABLE)
-  message(STATUS "pdebuild NOT found, pre-push is going to FAIL")
-endif()
-
-add_custom_target(
-  pdebuild
-  COMMAND ${PDEBUILD_EXECUTABLE}
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/pre-push-build-area/mir-pre-push 
-  COMMENT "Building & testing in chroot'd environment"
-  VERBATIM  
-)
-
-#######################################################################
-#  Builds & tests the last committed revision of the current branch   #
-#  for Android                                                        #
-#######################################################################
-if(NOT DEFINED ENV{MIR_ANDROID_NDK_DIR})
-    message(STATUS "Env. variable MIR_ANDROID_NDK_DIR not set, pre-push is going to FAIL")
-endif()
-if(NOT DEFINED ENV{MIR_ANDROID_SDK_DIR})
-    message(STATUS "Env. variable MIR_ANDROID_SDK_DIR not set, pre-push is going to FAIL")
-endif()
-
-add_custom_target(
-  android-build
-
-  COMMAND ./cross-compile.sh android-build
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  COMMENT "Building & testing for android"
-)
-
-#######################################################################
-# pdebuild: make tarball -> extract to build area -> pdebuild         #
-# android-build: invoke cross-compile script                          #
-#######################################################################
-add_dependencies(extract-pre-push-tarball pre-push-source-tarball)
-add_dependencies(pdebuild extract-pre-push-tarball)
-
-add_dependencies(pre-push pdebuild android-build)

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-05 21:54:17 +0000
+++ debian/changelog	2015-11-25 21:33:30 +0000
@@ -1,3 +1,9 @@
+mir (0.18.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release 0.18.0 (https://launchpad.net/mir/+milestone/0.18.0)
+
+ -- Alexandros Frantzis <[e-mail]>  Tue, 17 Nov 2015 13:14:36 +0200
+
 mir (0.17.1+16.04.20151105.1-0ubuntu1) xenial; urgency=medium
 
   [ Alberto Aguirre ]

=== modified file 'debian/control'
--- debian/control	2015-11-04 23:33:08 +0000
+++ debian/control	2015-11-25 21:33:30 +0000
@@ -67,7 +67,7 @@
 
 #TODO: Packaging infrastructure for better dependency generation,
 #      ala pkg-xorg's xviddriver:Provides and ABI detection.
-Package: libmirserver35
+Package: libmirserver36
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -133,7 +133,7 @@
 Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver35 (= ${binary:Version}),
+Depends: libmirserver36 (= ${binary:Version}),
          libmirplatform-dev (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libglm-dev,
@@ -180,6 +180,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libmirclient9 (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
+         libmircookie-dev (= ${binary:Version}),
          libprotobuf-dev (>= 2.4.1),
          ${misc:Depends},
 Description: Display server for Ubuntu - development headers
@@ -289,7 +290,7 @@
  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-x6
+Package: mir-platform-graphics-mesa-x7
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -303,7 +304,7 @@
  Contains the shared libraries required for the Mir server to interact with
  the X11 platform using the Mesa drivers.
 
-Package: mir-platform-graphics-mesa-kms6
+Package: mir-platform-graphics-mesa-kms7
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -317,7 +318,7 @@
  Contains the shared libraries required for the Mir server to interact with
  the hardware platform using the Mesa drivers.
 
-Package: mir-platform-graphics-android6
+Package: mir-platform-graphics-android7
 Section: libs
 Architecture: i386 amd64 armhf
 Multi-Arch: same
@@ -331,7 +332,7 @@
  Contains the shared libraries required for the Mir server to interact with
  the hardware platform using the Android drivers.
 
-Package: mir-platform-input-evdev3
+Package: mir-platform-input-evdev4
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -393,8 +394,8 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-mesa-kms6,
-         mir-platform-graphics-mesa-x6,
+         mir-platform-graphics-mesa-kms7,
+         mir-platform-graphics-mesa-x7,
          mir-client-platform-mesa3,
 Description: Display server for Ubuntu - desktop driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
@@ -409,7 +410,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-android6,
+         mir-platform-graphics-android7,
          mir-client-platform-android3,
 Description: Display server for Ubuntu - android driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
@@ -424,7 +425,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
 Description: Produce and verify spoof-resistant timestamps - runtime library
  libmircookie provides a simple mechanism for a group of cooperating processes
  to hand out and verify difficult-to-forge timestamps to untrusted 3rd parties.

=== renamed file 'debian/libmirserver35.install' => 'debian/libmirserver36.install'
--- debian/libmirserver35.install	2015-09-18 14:44:59 +0000
+++ debian/libmirserver36.install	2015-11-25 21:33:30 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.35
+usr/lib/*/libmirserver.so.36

=== modified file 'debian/mir-client-platform-mesa-dev.install'
--- debian/mir-client-platform-mesa-dev.install	2015-10-23 06:34:41 +0000
+++ debian/mir-client-platform-mesa-dev.install	2015-11-25 21:33:30 +0000
@@ -1,3 +1,2 @@
 usr/include/mirplatform/mir_toolkit/mesa
-usr/lib/*/pkgconfig/mir-client-platform-mesa-dev.pc
 usr/lib/*/pkgconfig/mir-client-platform-mesa.pc

=== renamed file 'debian/mir-platform-graphics-android6.install' => 'debian/mir-platform-graphics-android7.install'
--- debian/mir-platform-graphics-android6.install	2015-09-29 13:41:51 +0000
+++ debian/mir-platform-graphics-android7.install	2015-11-25 21:33:30 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/graphics-android.so.6
+usr/lib/*/mir/server-platform/graphics-android.so.7

=== renamed file 'debian/mir-platform-graphics-mesa-kms6.install' => 'debian/mir-platform-graphics-mesa-kms7.install'
--- debian/mir-platform-graphics-mesa-kms6.install	2015-09-29 13:41:51 +0000
+++ debian/mir-platform-graphics-mesa-kms7.install	2015-11-25 21:33:30 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/graphics-mesa-kms.so.6
+usr/lib/*/mir/server-platform/graphics-mesa-kms.so.7

=== renamed file 'debian/mir-platform-graphics-mesa-x6.install' => 'debian/mir-platform-graphics-mesa-x7.install'
--- debian/mir-platform-graphics-mesa-x6.install	2015-09-21 14:18:54 +0000
+++ debian/mir-platform-graphics-mesa-x7.install	2015-11-25 21:33:30 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/server-mesa-x11.so.6
+usr/lib/*/mir/server-platform/server-mesa-x11.so.7

=== renamed file 'debian/mir-platform-input-evdev3.install' => 'debian/mir-platform-input-evdev4.install'
--- debian/mir-platform-input-evdev3.install	2015-09-23 18:55:58 +0000
+++ debian/mir-platform-input-evdev4.install	2015-11-25 21:33:30 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/input-evdev.so.3
+usr/lib/*/mir/server-platform/input-evdev.so.4

=== modified file 'debian/mir-test-tools.install'
--- debian/mir-test-tools.install	2015-10-06 02:30:52 +0000
+++ debian/mir-test-tools.install	2015-11-25 21:33:30 +0000
@@ -1,5 +1,5 @@
 usr/bin/mir_stress
-usr/bin/mir_unit_tests
+usr/bin/mir_unit_tests*
 usr/bin/mir_acceptance_tests
 usr/bin/mir_umock_acceptance_tests
 usr/bin/mir_integration_tests*

=== modified file 'doc/building_source_for_arm.md'
--- doc/building_source_for_arm.md	2015-06-18 02:46:16 +0000
+++ doc/building_source_for_arm.md	2015-11-25 21:33:30 +0000
@@ -23,13 +23,31 @@
 --------------------------------------------
 
 Using a current Ubuntu (15.04 or later) installation it's very simple to build
-binaries for armhf devices. Just follow these steps:
+binaries for armhf (32-bit) devices. Just follow these steps:
 
-    $ sudo apt-get install g++-arm-linux-gnueabihf debootstrap
+    $ sudo apt-get install g++-arm-linux-gnueabihf multistrap
     $ cd mir_source_dir
     $ ./cross-compile-chroot.sh
     $ ls -l build-android-arm/*  # binaries to copy to your device as you wish
 
+If you wish to target arm64 (AArch64) then you can use:
+
+    $ sudo apt-get install g++-aarch64-linux-gnu multistrap
+    $ cd mir_source_dir
+    $ ./cross-compile-chroot.sh -a arm64
+    $ ls -l build-arm64-*/bin
+
+Note: If your target device is running an Ubuntu version other than vivid
+then you will also need to specify the target distribution for correct
+library linkage. For example:
+
+    $ ./cross-compile-chroot.sh -a arm64 -d wily
+
+More architectures like PowerPC are also supported. To see the full list of
+options, just run:
+
+    $ ./cross-compile-chroot.sh -h
+
 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.

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2015-09-15 17:13:45 +0000
+++ examples/CMakeLists.txt	2015-11-25 21:33:30 +0000
@@ -18,18 +18,29 @@
 )
 
 add_library(exampleserverconfig STATIC
+  server_example_basic_window_manager.h
   server_example_canonical_window_manager.cpp
   server_example_display_configuration_policy.cpp
   server_example_input_event_filter.cpp
   server_example_log_options.cpp
   server_example_input_filter.cpp
   server_example_host_lifecycle_event.cpp
+  server_example_canonical_surface_info.cpp
+  server_example_canonical_surface_info.h
   server_example_tiling_window_manager.cpp
   server_example_window_management.cpp
   server_example_custom_compositor.cpp
   server_example_adorning_compositor.cpp
+  server_example_cursor_images.cpp
+  server_example_cursor_images.h
+  xcursor_loader.cpp
+  xcursor_loader.h
+  xcursor.c
+  xcursor.h
 )
 
+SET_SOURCE_FILES_PROPERTIES(xcursor.c PROPERTIES COMPILE_FLAGS -D_GNU_SOURCE)
+
 target_link_libraries(eglapp
   mirclient
   ${EGL_LIBRARIES}
@@ -245,3 +256,22 @@
   )
 endif ()
 endif ()
+
+add_executable(mir_cursor_theme_dump
+  cursor-theme-dump.cpp
+)
+
+target_link_libraries(mir_cursor_theme_dump
+  exampleserverconfig
+  mirserver
+)
+
+mir_add_wrapped_executable(mir_demo_client_multistream
+  multi_stream.cpp
+)
+
+target_link_libraries(mir_demo_client_multistream
+  mirclient
+  eglapp
+  ${Boost_LIBRARIES}
+)

=== modified file 'examples/client_helpers.cpp'
--- examples/client_helpers.cpp	2015-07-23 02:39:20 +0000
+++ examples/client_helpers.cpp	2015-11-25 21:33:30 +0000
@@ -27,12 +27,18 @@
 
 namespace me = mir::examples;
 
+me::Connection::Connection(char const* socket_file, char const* name)
+    : connection{mir_connect_sync(socket_file, name)}
+{
+    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(char const* socket_file) :
-    connection(mir_connect_sync(socket_file, __PRETTY_FUNCTION__))
+    Connection(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()
@@ -45,8 +51,65 @@
     return connection;
 }
 
-me::NormalSurface::NormalSurface(me::Connection& connection, unsigned int width, unsigned int height, bool prefers_alpha) :
-    surface{create_surface(connection, width, height, prefers_alpha), surface_deleter}
+me::BufferStream::BufferStream(
+    Connection& connection,
+    unsigned int width,
+    unsigned int height,
+    bool prefer_alpha,
+    bool hardware)
+    : stream{create_stream(connection, width, height, prefer_alpha, hardware),
+             &mir_buffer_stream_release_sync}
+{
+    if (!mir_buffer_stream_is_valid(stream.get()))
+    {
+        // TODO: Huh. There's no mir_buffer_stream_get_error?
+        throw std::runtime_error("Could not create buffer stream.");
+    }
+}
+
+me::BufferStream::operator MirBufferStream*() const
+{
+    return stream.get();
+}
+
+MirBufferStream* me::BufferStream::create_stream(
+    MirConnection *connection,
+    unsigned int width,
+    unsigned int height,
+    bool prefer_alpha,
+    bool hardware)
+{
+    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 buffer stream");
+    selected_format = pixel_formats[0];
+    //select an 8 bit opaque format if we can
+    if (!prefer_alpha)
+    {
+        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;
+            }
+        }
+    }
+
+    return mir_connection_create_buffer_stream_sync(
+        connection,
+        width,
+        height,
+        selected_format,
+        hardware ? mir_buffer_usage_hardware : mir_buffer_usage_software);
+}
+
+me::NormalSurface::NormalSurface(me::Connection& connection, unsigned int width, unsigned int height, bool prefers_alpha, bool hardware) :
+    surface{create_surface(connection, width, height, prefers_alpha, hardware), surface_deleter}
 {
 }
 
@@ -55,7 +118,12 @@
     return surface.get();
 }
 
-MirSurface* me::NormalSurface::create_surface(MirConnection* connection, unsigned int width, unsigned int height, bool prefers_alpha)
+MirSurface* me::NormalSurface::create_surface(
+    MirConnection* connection,
+    unsigned int width,
+    unsigned int height,
+    bool prefers_alpha,
+    bool hardware)
 {
     MirPixelFormat selected_format;
     unsigned int valid_formats{0};
@@ -85,7 +153,7 @@
     };
 
     mir_surface_spec_set_name(spec.get(), __PRETTY_FUNCTION__);
-    mir_surface_spec_set_buffer_usage(spec.get(), mir_buffer_usage_hardware);
+    mir_surface_spec_set_buffer_usage(spec.get(), hardware ? mir_buffer_usage_hardware : mir_buffer_usage_software);
     auto surface = mir_surface_create_sync(spec.get());
     return surface;
 }

=== modified file 'examples/client_helpers.h'
--- examples/client_helpers.h	2015-07-23 02:39:20 +0000
+++ examples/client_helpers.h	2015-11-25 21:33:30 +0000
@@ -32,6 +32,7 @@
 {
 public:
     Connection(char const* socket_file);
+    Connection(char const* socket_file, const char* name);
     ~Connection();
     operator MirConnection*();
     Connection(Connection const&) = delete;
@@ -40,14 +41,39 @@
     MirConnection* connection;
 };
 
+class BufferStream
+{
+public:
+    BufferStream(
+        Connection& connection,
+        unsigned int width,
+        unsigned int height,
+        bool prefer_alpha = false,
+        bool hardware = true);
+
+    operator MirBufferStream*() const;
+private:
+    MirBufferStream* create_stream(
+        MirConnection* connection,
+        unsigned int width,
+        unsigned int height,
+        bool prefer_alpha,
+        bool hardware);
+
+    std::unique_ptr<MirBufferStream, decltype(&mir_buffer_stream_release_sync)> const stream;
+
+    BufferStream(BufferStream const&) = delete;
+    BufferStream& operator=(BufferStream const&) = delete;
+};
+
 class NormalSurface
 {
 public:
-    NormalSurface(Connection& connection, unsigned int width, unsigned int height, bool prefers_alpha = false);
-    
+    NormalSurface(Connection& connection, unsigned int width, unsigned int height, bool prefers_alpha = false, bool hardware = true);
+
     operator MirSurface*() const;
 private:
-    MirSurface* create_surface(MirConnection* connection, unsigned int width, unsigned int height, bool prefers_alpha);
+    MirSurface* create_surface(MirConnection* connection, unsigned int width, unsigned int height, bool prefers_alpha, bool hardware);
     std::function<void(MirSurface*)> const surface_deleter{
         [](MirSurface* surface) { mir_surface_release_sync(surface); }
     };

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

=== modified file 'examples/fingerpaint.c'
--- examples/fingerpaint.c	2015-08-25 02:27:09 +0000
+++ examples/fingerpaint.c	2015-11-25 21:33:30 +0000
@@ -42,6 +42,7 @@
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t change = PTHREAD_COND_INITIALIZER;
 static bool changed = true;
+static int force_radius = 0;
 
 static void shutdown(int signum)
 {
@@ -263,11 +264,16 @@
                 {
                     x = mir_touch_event_axis_value(tev, p, mir_touch_axis_x);
                     y = mir_touch_event_axis_value(tev, p, mir_touch_axis_y);
-                    float size = mir_touch_event_axis_value(tev, p,
-                                                          mir_touch_axis_size);
+                    float m = mir_touch_event_axis_value(tev, p,
+                                                  mir_touch_axis_touch_major);
+                    float n = mir_touch_event_axis_value(tev, p,
+                                                  mir_touch_axis_touch_minor);
+                    radius = (m + n) / 4;  /* Half the average */
+                    // mir_touch_axis_touch_major can be 0
+                    if (radius < 5)
+                        radius = 5;
                     pressure = mir_touch_event_axis_value(tev, p,
                                                       mir_touch_axis_pressure);
-                    radius = size * 50.0f + 1.0f;
                 }
                 else if (pev != NULL)
                 {
@@ -277,6 +283,9 @@
                     radius = 5;
                 }
 
+                if (force_radius)
+                    radius = force_radius;
+
                 size_t c = (base_color + p) %
                            (sizeof(color)/sizeof(color[0]));
                 Color tone = color[c];
@@ -365,7 +374,18 @@
                 switch (arg[1])
                 {
                 case 'm':
-                    mir_socket = argv[++i];
+                    ++i;
+                    if (i < argc)
+                        mir_socket = argv[i];
+                    else
+                        help = 1;
+                    break;
+                case 'r':
+                    ++i;
+                    if (i < argc)
+                        force_radius = atoi(argv[i]);
+                    else
+                        help = 1;
                     break;
                 case 'w':
                     swap_interval = 1;
@@ -385,7 +405,8 @@
             {
                 printf("Usage: %s [<options>]\n"
                        "  -h               Show this help text\n"
-                       "  -m socket        Mir server socket\n"
+                       "  -m <socket path> Mir server socket\n"
+                       "  -r <radius>      Force paint brush radius\n"
                        "  -w               Wait for vblank (don't drop frames)\n"
                        "  --               Ignore further arguments\n"
                        , argv[0]);

=== added file 'examples/multi_stream.cpp'
--- examples/multi_stream.cpp	1970-01-01 00:00:00 +0000
+++ examples/multi_stream.cpp	2015-11-25 21:33:30 +0000
@@ -0,0 +1,283 @@
+/*
+ * 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: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include <boost/program_options.hpp>
+#include <iostream>
+#include <thread>
+#include <signal.h>
+#include <sys/signalfd.h>
+#include <poll.h>
+
+#include "mir_toolkit/mir_client_library.h"
+
+#include "client_helpers.h"
+
+namespace po = boost::program_options;
+
+namespace me = mir::examples;
+
+class Pixel
+{
+public:
+    Pixel(void* addr, MirPixelFormat format)
+        : addr{addr},
+          format{format}
+    {
+    }
+
+    void write(int r, int g, int b, int a)
+    {
+        switch (format)
+        {
+        case mir_pixel_format_abgr_8888:
+            *((uint32_t*) addr) =
+                (uint32_t) a << 24 |
+                (uint32_t) b << 16 |
+                (uint32_t) g << 8 |
+                (uint32_t) r;
+            break;
+        case mir_pixel_format_xbgr_8888:
+            *((uint32_t*) addr) =
+                /* Not filling in the X byte is correct but buggy (LP: #1423462) */
+                (uint32_t) b << 16 |
+                (uint32_t) g << 8 |
+                (uint32_t) r;
+            break;
+        case mir_pixel_format_argb_8888:
+            *((uint32_t*) addr) =
+                (uint32_t) a << 24 |
+                (uint32_t) r << 16 |
+                (uint32_t) g << 8 |
+                (uint32_t) b;
+            break;
+        case mir_pixel_format_xrgb_8888:
+            *((uint32_t*) addr) =
+                /* Not filling in the X byte is correct but buggy (LP: #1423462) */
+                (uint32_t) r << 16 |
+                (uint32_t) g << 8 |
+                (uint32_t) b;
+            break;
+        case mir_pixel_format_rgb_888:
+            *((uint8_t*) addr) = r;
+            *((uint8_t*) addr + 1) = g;
+            *((uint8_t*) addr + 2) = b;
+            break;
+        case mir_pixel_format_bgr_888:
+            *((uint8_t*) addr) = b;
+            *((uint8_t*) addr + 1) = g;
+            *((uint8_t*) addr + 2) = r;
+            break;
+        default:
+            throw std::runtime_error{"Pixel format unsupported by Pixel::write!"};
+        }
+    }
+
+public:
+    void* const addr;
+    MirPixelFormat const format;
+};
+
+class pixel_iterator : std::iterator<std::random_access_iterator_tag, Pixel>
+{
+public:
+    pixel_iterator(MirGraphicsRegion const& region, int x, int y)
+        : x{x},
+          y{y},
+          buffer(region)
+    {
+    }
+
+    pixel_iterator(MirGraphicsRegion const& region)
+       : pixel_iterator(region, 0, 0)
+    {
+    }
+
+
+    pixel_iterator& operator++()
+    {
+        x++;
+        if (x == buffer.width)
+        {
+            x = 0;
+            y++;
+        }
+        return *this;
+    }
+    pixel_iterator operator++(int)
+    {
+        auto old = *this;
+        ++(*this);
+        return old;
+    }
+
+    Pixel operator*() const
+    {
+        return Pixel{
+            buffer.vaddr + (x * MIR_BYTES_PER_PIXEL(buffer.pixel_format))  + (y * buffer.stride), buffer.pixel_format};
+    }
+
+    bool operator==(pixel_iterator const& rhs)
+    {
+        return rhs.buffer.vaddr == buffer.vaddr &&
+               rhs.x == x &&
+               rhs.y == y;
+    }
+
+    bool operator!=(pixel_iterator const& rhs)
+    {
+        return !(*this == rhs);
+    }
+
+private:
+    int x, y;
+    MirGraphicsRegion const buffer;
+};
+
+pixel_iterator begin(MirGraphicsRegion const& region)
+{
+    return pixel_iterator(region);
+}
+
+pixel_iterator end(MirGraphicsRegion const& region)
+{
+    return pixel_iterator{region, 0, region.height};
+}
+
+void fill_stream_with(MirBufferStream* stream, int r, int g, int b, int a)
+{
+    MirGraphicsRegion buffer;
+    mir_buffer_stream_get_graphics_region(stream, &buffer);
+
+    for (auto pixel : buffer)
+    {
+        pixel.write(r, g, b, a);
+    }
+}
+
+void bounce_position(int& position, int& delta, int min, int max)
+{
+    if (position <= min || position >= max)
+    {
+        delta = -delta;
+    }
+    position += delta;
+}
+
+int main(int argc, char* argv[])
+{
+    po::options_description desc("Mir multi-bufferstream example:");
+    desc.add_options()
+        ("help", "this help message")
+        ("socket", po::value<std::string>(), "Server socket to connect to");
+
+    po::variables_map options;
+    po::store(po::parse_command_line(argc, argv, desc), options);
+    po::notify(options);
+
+    if (options.count("help"))
+    {
+        std::cout << desc << std::endl;
+        return 0;
+    }
+
+    char const* socket = nullptr;
+    if (options.count("socket"))
+    {
+        socket = options["socket"].as<std::string>().c_str();
+    }
+
+    me::Connection connection{socket, "Multiple MirBufferStream example"};
+
+    me::NormalSurface surface{connection, 200, 200, true, false};
+    MirBufferStream* surface_stream = mir_surface_get_buffer_stream(surface);
+    me::BufferStream top{connection, 100, 100, true, false};
+    me::BufferStream bottom{connection, 50, 50, true, false};
+
+    fill_stream_with(surface_stream, 255, 0, 0, 128);
+    mir_buffer_stream_swap_buffers_sync(surface_stream);
+    fill_stream_with(top, 0, 255, 0, 128);
+    mir_buffer_stream_swap_buffers_sync(top);
+    fill_stream_with(bottom, 0, 0, 255, 128);
+    mir_buffer_stream_swap_buffers_sync(bottom);
+
+    std::array<MirBufferStreamInfo, 3> arrangement;
+
+    arrangement[0].displacement_x = 0;
+    arrangement[0].displacement_y = 0;
+    arrangement[0].stream = surface_stream;
+
+    arrangement[1].displacement_x = 50;
+    arrangement[1].displacement_y = 50;
+    arrangement[1].stream = bottom;
+
+    arrangement[2].displacement_x = -40;
+    arrangement[2].displacement_y = -10;
+    arrangement[2].stream = top;
+
+    int top_dx{1}, top_dy{2};
+    int bottom_dx{2}, bottom_dy{-1};
+
+    auto spec = mir_connection_create_spec_for_changes(connection);
+
+    int baseColour = 255, dbase = 1;
+    int topColour = 255, dtop = 1;
+    int bottomColour = 255, dbottom = 1;
+
+    sigset_t halt_signals;
+    sigemptyset(&halt_signals);
+    sigaddset(&halt_signals, SIGTERM);
+    sigaddset(&halt_signals, SIGQUIT);
+    sigaddset(&halt_signals, SIGINT);
+
+    sigprocmask(SIG_BLOCK, &halt_signals, nullptr);
+    int const signal_watch{signalfd(-1, &halt_signals, SFD_CLOEXEC)};
+
+    pollfd signal_poll{
+        signal_watch,
+        POLLIN | POLLERR,
+        0
+    };
+
+    while (poll(&signal_poll, 1, 0) <= 0)
+    {
+        bounce_position(arrangement[1].displacement_x, bottom_dx, -100, 300);
+        bounce_position(arrangement[1].displacement_y, bottom_dy, -100, 300);
+        bounce_position(arrangement[2].displacement_x, top_dx, -100, 300);
+        bounce_position(arrangement[2].displacement_y, top_dy, -100, 300);
+
+        mir_surface_spec_set_streams(spec, arrangement.data(), arrangement.size());
+        mir_surface_apply_spec(surface, spec);
+
+        bounce_position(baseColour, dbase, 128, 255);
+        bounce_position(topColour, dtop, 200, 255);
+        bounce_position(bottomColour, dbottom, 100, 255);
+
+        fill_stream_with(surface_stream, baseColour, 0, 0, 128);
+        fill_stream_with(bottom, 0, 0, bottomColour, 128);
+        fill_stream_with(top, 0, topColour, 0, 128);
+
+        mir_buffer_stream_swap_buffers_sync(surface_stream);
+        mir_buffer_stream_swap_buffers_sync(bottom);
+        mir_buffer_stream_swap_buffers_sync(top);
+    }
+    mir_surface_spec_release(spec);
+    close(signal_watch);
+
+    std::cout << "Quitting; have a nice day." << std::endl;
+    return 0;
+}

=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2015-07-22 02:54:31 +0000
+++ examples/render_surfaces.cpp	2015-11-25 21:33:30 +0000
@@ -373,7 +373,7 @@
             auto const stream = buffer_stream_factory->create_buffer_stream(
                 mf::BufferStreamId{}, std::make_shared<NullBufferSink>(), properties);
             auto const surface = surface_factory->create_surface(stream, params);
-            surface_coordinator->add_surface(surface, params.depth, params.input_mode, nullptr);
+            surface_coordinator->add_surface(surface, params.input_mode, nullptr);
 
             {
                 mg::Buffer* buffer{nullptr};

=== modified file 'examples/server_example.cpp'
--- examples/server_example.cpp	2015-08-12 06:37:54 +0000
+++ examples/server_example.cpp	2015-11-25 21:33:30 +0000
@@ -24,6 +24,7 @@
 #include "server_example_window_management.h"
 #include "server_example_custom_compositor.h"
 #include "server_example_test_client.h"
+#include "server_example_cursor_images.h"
 
 #include "mir/server.h"
 #include "mir/main_loop.h"
@@ -93,6 +94,7 @@
     me::add_custom_compositor_option_to(server);
     add_launcher_option_to(server);
     add_timeout_option_to(server);
+    me::add_x_cursor_images(server);
 
     me::ClientContext context;
     me::add_test_client_option_to(server, context);

=== modified file 'examples/server_example_basic_window_manager.h'
--- examples/server_example_basic_window_manager.h	2015-10-02 01:56:04 +0000
+++ examples/server_example_basic_window_manager.h	2015-11-25 21:33:30 +0000
@@ -194,18 +194,21 @@
     bool handle_keyboard_event(MirKeyboardEvent const* event) override
     {
         std::lock_guard<decltype(mutex)> lock(mutex);
+        update_event_timestamp(event);
         return policy.handle_keyboard_event(event);
     }
 
     bool handle_touch_event(MirTouchEvent const* event) override
     {
         std::lock_guard<decltype(mutex)> lock(mutex);
+        update_event_timestamp(event);
         return policy.handle_touch_event(event);
     }
 
     bool handle_pointer_event(MirPointerEvent const* event) override
     {
         std::lock_guard<decltype(mutex)> lock(mutex);
+        update_event_timestamp(event);
 
         cursor = {
             mir_pointer_event_axis_value(event, mir_pointer_axis_x),
@@ -214,6 +217,16 @@
         return policy.handle_pointer_event(event);
     }
 
+    void handle_raise_surface(
+        std::shared_ptr<scene::Session> const& session,
+        std::shared_ptr<scene::Surface> const& surface,
+        uint64_t timestamp) override
+    {
+        std::lock_guard<decltype(mutex)> lock(mutex);
+        if (timestamp >= last_input_event_timestamp)
+            policy.handle_raise_surface(session, surface);
+    }
+
     int set_surface_attribute(
         std::shared_ptr<scene::Session> const& /*session*/,
         std::shared_ptr<scene::Surface> const& surface,
@@ -344,6 +357,42 @@
     typename SurfaceTo<SurfaceInfo>::type surface_info;
     geometry::Rectangles displays;
     geometry::Point cursor;
+    uint64_t last_input_event_timestamp{0};
+
+private:
+    void update_event_timestamp(MirKeyboardEvent const* kev)
+    {
+        auto iev = mir_keyboard_event_input_event(kev);
+        last_input_event_timestamp = mir_input_event_get_event_time(iev);
+    }
+
+    void update_event_timestamp(MirPointerEvent const* pev)
+    {
+        auto iev = mir_pointer_event_input_event(pev);
+        auto pointer_action = mir_pointer_event_action(pev);
+
+        if (pointer_action == mir_pointer_action_button_up ||
+            pointer_action == mir_pointer_action_button_down)
+        {
+            last_input_event_timestamp = mir_input_event_get_event_time(iev);
+        }
+    }
+
+    void update_event_timestamp(MirTouchEvent const* tev)
+    {
+        auto iev = mir_touch_event_input_event(tev);
+        auto touch_count = mir_touch_event_point_count(tev);
+        for (unsigned i = 0; i < touch_count; i++)
+        {
+            auto touch_action = mir_touch_event_action(tev, i);
+            if (touch_action == mir_touch_action_up ||
+                   touch_action == mir_touch_action_down)
+            {
+                last_input_event_timestamp = mir_input_event_get_event_time(iev);
+                break;
+            }
+        }
+    }
 };
 }
 }

=== added file 'examples/server_example_canonical_surface_info.cpp'
--- examples/server_example_canonical_surface_info.cpp	1970-01-01 00:00:00 +0000
+++ examples/server_example_canonical_surface_info.cpp	2015-11-25 21:33:30 +0000
@@ -0,0 +1,404 @@
+/*
+ * 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 "server_example_canonical_surface_info.h"
+
+#include "mir/scene/surface.h"
+#include "mir/scene/surface_creation_parameters.h"
+
+#include "mir/graphics/buffer.h"
+
+#include <atomic>
+
+namespace me = mir::examples;
+namespace ms = mir::scene;
+namespace mg = mir::graphics;
+using namespace mir::geometry;
+
+me::CanonicalSurfaceInfoCopy::CanonicalSurfaceInfoCopy(
+    std::shared_ptr<scene::Session> const& session,
+    std::shared_ptr<scene::Surface> const& surface,
+    scene::SurfaceCreationParameters const& params) :
+    type{surface->type()},
+    state{surface->state()},
+    restore_rect{surface->top_left(), surface->size()},
+    session{session},
+    parent{params.parent},
+    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},
+    max_aspect{params.max_aspect}
+{
+}
+
+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;
+    }
+}
+
+bool me::CanonicalSurfaceInfoCopy::is_visible() const
+{
+    switch (state)
+    {
+    case mir_surface_state_hidden:
+    case mir_surface_state_minimized:
+        return false;
+    default:
+        break;
+    }
+    return true;
+}
+
+struct mir::examples::CanonicalSurfaceInfoCopy::StreamPainter
+{
+    virtual void paint(int) = 0;
+    virtual ~StreamPainter() = default;
+    StreamPainter() = default;
+    StreamPainter(StreamPainter const&) = delete;
+    StreamPainter& operator=(StreamPainter const&) = delete;
+};
+
+struct mir::examples::CanonicalSurfaceInfoCopy::SwappingPainter
+    : mir::examples::CanonicalSurfaceInfoCopy::StreamPainter
+{
+    SwappingPainter(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);
+    }
+
+    void paint(int intensity) override
+    {
+        if (auto const buf = buffer.load())
+        {
+            auto const format = 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);
+            swap_buffers();
+        }
+    }
+
+    std::shared_ptr<frontend::BufferStream> const buffer_stream;
+    std::atomic<graphics::Buffer*> buffer;
+};
+
+struct mir::examples::CanonicalSurfaceInfoCopy::AllocatingPainter
+    : mir::examples::CanonicalSurfaceInfoCopy::StreamPainter
+{
+    AllocatingPainter(std::shared_ptr<frontend::BufferStream> const& buffer_stream, Size size) :
+        buffer_stream(buffer_stream),
+        properties({
+            size,
+            buffer_stream->pixel_format(),
+            mg::BufferUsage::software
+        }),
+        front_buffer(buffer_stream->allocate_buffer(properties)),
+        back_buffer(buffer_stream->allocate_buffer(properties))
+    {
+    }
+
+    void paint(int intensity) override
+    {
+        buffer_stream->with_buffer(back_buffer,
+            [this, intensity](graphics::Buffer& buffer)
+            {
+                auto const format = buffer.pixel_format();
+                auto const sz = buffer.size().height.as_int() *
+                                buffer.size().width.as_int() * MIR_BYTES_PER_PIXEL(format);
+                std::vector<unsigned char> pixels(sz, intensity);
+                buffer.write(pixels.data(), sz);
+                buffer_stream->swap_buffers(&buffer, [](mg::Buffer*){});
+            });
+        std::swap(front_buffer, back_buffer);
+    }
+
+    ~AllocatingPainter()
+    {
+        buffer_stream->remove_buffer(front_buffer);
+        buffer_stream->remove_buffer(back_buffer);
+    }
+
+    std::shared_ptr<frontend::BufferStream> const buffer_stream;
+    mg::BufferProperties properties;
+    mg::BufferID front_buffer; 
+    mg::BufferID back_buffer; 
+};
+
+void mir::examples::CanonicalSurfaceInfoCopy::init_titlebar(std::shared_ptr<scene::Surface> const& surface)
+{
+    auto stream = surface->primary_buffer_stream();
+    try
+    {
+        stream_painter = std::make_shared<AllocatingPainter>(stream, surface->size());
+    }
+    catch (...)
+    {
+        stream_painter = std::make_shared<SwappingPainter>(stream);
+    }
+}
+
+void mir::examples::CanonicalSurfaceInfoCopy::paint_titlebar(int intensity)
+{
+    stream_painter->paint(intensity);
+}
+
+void me::CanonicalSurfaceInfoCopy::constrain_resize(
+    std::shared_ptr<ms::Surface> const& surface,
+    Point& requested_pos,
+    Size& requested_size,
+    bool const left_resize,
+    bool const top_resize,
+    Rectangle const& /*bounds*/) const
+{
+    Point new_pos = requested_pos;
+    Size new_size = requested_size;
+
+    if (min_aspect.is_set())
+    {
+        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);
+
+        if (error > 0)
+        {
+            // Add (denominator-1) to numerator to ensure rounding up
+            auto const width_correction  = (error+(ar.height-1))/ar.height;
+            auto const height_correction = (error+(ar.width-1))/ar.width;
+
+            if (width_correction < height_correction)
+            {
+                new_size.width = new_size.width + DeltaX(width_correction);
+            }
+            else
+            {
+                new_size.height = new_size.height - DeltaY(height_correction);
+            }
+        }
+    }
+
+    if (max_aspect.is_set())
+    {
+        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);
+
+        if (error > 0)
+        {
+            // Add (denominator-1) to numerator to ensure rounding up
+            auto const height_correction = (error+(ar.width-1))/ar.width;
+            auto const width_correction  = (error+(ar.height-1))/ar.height;
+
+            if (width_correction < height_correction)
+            {
+                new_size.width = new_size.width - DeltaX(width_correction);
+            }
+            else
+            {
+                new_size.height = new_size.height + DeltaY(height_correction);
+            }
+        }
+    }
+
+    if (min_width > new_size.width)
+        new_size.width = min_width;
+
+    if (min_height > new_size.height)
+        new_size.height = min_height;
+
+    if (max_width < new_size.width)
+        new_size.width = max_width;
+
+    if (max_height < new_size.height)
+        new_size.height = max_height;
+
+    if (width_inc.is_set())
+    {
+        auto const width = new_size.width.as_int() - min_width.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 (height_inc.is_set())
+    {
+        auto const height = new_size.height.as_int() - min_height.as_int();
+        auto inc = height_inc.value().as_int();
+        if (height % inc)
+            new_size.height = min_height + DeltaY{inc*(((2L*height + inc)/2)/inc)};
+    }
+
+    if (left_resize)
+        new_pos.x += new_size.width - requested_size.width;
+
+    if (top_resize)
+        new_pos.y += new_size.height - requested_size.height;
+
+    // placeholder - constrain onscreen
+
+    switch (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:
+        new_pos.y = surface->top_left().y;
+        new_size.height = surface->size().height;
+        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:
+        new_pos.x = surface->top_left().x;
+        new_size.width = surface->size().width;
+        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:
+    default:
+        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;
+    }
+
+    requested_pos = new_pos;
+    requested_size = new_size;
+}
+
+bool me::CanonicalSurfaceInfoCopy::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;
+    }
+}

=== added file 'examples/server_example_canonical_surface_info.h'
--- examples/server_example_canonical_surface_info.h	1970-01-01 00:00:00 +0000
+++ examples/server_example_canonical_surface_info.h	2015-11-25 21:33:30 +0000
@@ -0,0 +1,91 @@
+/*
+ * 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]>
+ */
+
+#ifndef MIR_SERVER_EXAMPLE_CANONICAL_SURFACE_INFO_H
+#define MIR_SERVER_EXAMPLE_CANONICAL_SURFACE_INFO_H
+
+#include "mir/geometry/rectangles.h"
+#include "mir/optional_value.h"
+#include "mir/shell/surface_specification.h"
+
+namespace mir
+{
+namespace scene { class Session; class Surface; class SurfaceCreationParameters; }
+namespace examples
+{
+struct CanonicalSurfaceInfoCopy
+{
+    CanonicalSurfaceInfoCopy(
+        std::shared_ptr <scene::Session> const& session,
+        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;
+
+    bool is_visible() const;
+
+    static bool needs_titlebar(MirSurfaceType type);
+
+    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;
+    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 StreamPainter;
+    struct AllocatingPainter;
+    struct SwappingPainter;
+
+    std::shared_ptr <StreamPainter> stream_painter;
+};
+}
+}
+
+#endif //MIR_SERVER_EXAMPLE_CANONICAL_SURFACE_INFO_H

=== modified file 'examples/server_example_canonical_window_manager.cpp'
--- examples/server_example_canonical_window_manager.cpp	2015-10-02 01:56:04 +0000
+++ examples/server_example_canonical_window_manager.cpp	2015-11-25 21:33:30 +0000
@@ -18,13 +18,8 @@
 
 #include "server_example_canonical_window_manager.h"
 
-#include "mir/scene/surface.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"
-
-#include "mir/graphics/buffer.h"
 
 #include <linux/input.h>
 #include <csignal>
@@ -52,148 +47,7 @@
         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) :
-    type{surface->type()},
-    state{surface->state()},
-    restore_rect{surface->top_left(), surface->size()},
-    session{session},
-    parent{params.parent},
-    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},
-    max_aspect{params.max_aspect}
-{
-}
-
-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;
-    }
-}
-
-bool me::CanonicalSurfaceInfoCopy::is_visible() const
-{
-    switch (state)
-    {
-    case mir_surface_state_hidden:
-    case mir_surface_state_minimized:
-        return false;
-    default:
-        break;
-    }
-    return true;
-}
-
+}
 
 me::CanonicalWindowManagerPolicyCopy::CanonicalWindowManagerPolicyCopy(
     Tools* const tools,
@@ -234,7 +88,7 @@
 {
     auto parameters = request_parameters;
     auto surf_type = parameters.type.is_set() ? parameters.type.value() : mir_surface_type_normal;
-    bool const needs_titlebar = ::needs_titlebar(surf_type);
+    bool const needs_titlebar = CanonicalSurfaceInfoCopy::needs_titlebar(surf_type);
 
     if (needs_titlebar)
         parameters.size.height = parameters.size.height + DeltaY{title_bar_height};
@@ -374,57 +228,13 @@
     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_map,
     std::function<frontend::SurfaceId(std::shared_ptr<scene::Session> const& session, scene::SurfaceCreationParameters const& params)> const& build)
 {
-    if (!needs_titlebar(surface->type()))
+    if (!CanonicalSurfaceInfoCopy::needs_titlebar(surface->type()))
         return;
 
     auto format = mir_pixel_format_xrgb_8888;
@@ -595,10 +405,11 @@
         }
     }
 
+    session->destroy_surface(surface);
     if (info.titlebar)
     {
+        session->destroy_surface(info.titlebar_id);
         tools->forget(info.titlebar);
-        session->destroy_surface(info.titlebar_id);
     }
 
     if (!--tools->info_for(session).surfaces && session == tools->focused_session())
@@ -717,6 +528,13 @@
     old_cursor = cursor;
 }
 
+void me::CanonicalWindowManagerPolicyCopy::handle_raise_surface(
+    std::shared_ptr<ms::Session> const& /*session*/,
+    std::shared_ptr<ms::Surface> const& surface)
+{
+    select_active_surface(surface);
+}
+
 bool me::CanonicalWindowManagerPolicyCopy::handle_keyboard_event(MirKeyboardEvent const* event)
 {
     auto const action = mir_keyboard_event_action(event);
@@ -1001,134 +819,6 @@
     return true;
 }
 
-void me::CanonicalSurfaceInfoCopy::constrain_resize(
-    std::shared_ptr<ms::Surface> const& surface,
-    Point& requested_pos,
-    Size& requested_size,
-    bool const left_resize,
-    bool const top_resize,
-    Rectangle const& /*bounds*/) const
-{
-    Point new_pos = requested_pos;
-    Size new_size = requested_size;
-
-    if (min_aspect.is_set())
-    {
-        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);
-
-        if (error > 0)
-        {
-            // Add (denominator-1) to numerator to ensure rounding up
-            auto const width_correction  = (error+(ar.height-1))/ar.height;
-            auto const height_correction = (error+(ar.width-1))/ar.width;
-
-            if (width_correction < height_correction)
-            {
-                new_size.width = new_size.width + DeltaX(width_correction);
-            }
-            else
-            {
-                new_size.height = new_size.height - DeltaY(height_correction);
-            }
-        }
-    }
-
-    if (max_aspect.is_set())
-    {
-        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);
-
-        if (error > 0)
-        {
-            // Add (denominator-1) to numerator to ensure rounding up
-            auto const height_correction = (error+(ar.width-1))/ar.width;
-            auto const width_correction  = (error+(ar.height-1))/ar.height;
-
-            if (width_correction < height_correction)
-            {
-                new_size.width = new_size.width - DeltaX(width_correction);
-            }
-            else
-            {
-                new_size.height = new_size.height + DeltaY(height_correction);
-            }
-        }
-    }
-
-    if (min_width > new_size.width)
-        new_size.width = min_width;
-
-    if (min_height > new_size.height)
-        new_size.height = min_height;
-
-    if (max_width < new_size.width)
-        new_size.width = max_width;
-
-    if (max_height < new_size.height)
-        new_size.height = max_height;
-
-    if (width_inc.is_set())
-    {
-        auto const width = new_size.width.as_int() - min_width.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 (height_inc.is_set())
-    {
-        auto const height = new_size.height.as_int() - min_height.as_int();
-        auto inc = height_inc.value().as_int();
-        if (height % inc)
-            new_size.height = min_height + DeltaY{inc*(((2L*height + inc)/2)/inc)};
-    }
-
-    if (left_resize)
-        new_pos.x += new_size.width - requested_size.width;
-
-    if (top_resize)
-        new_pos.y += new_size.height - requested_size.height;
-
-    // placeholder - constrain onscreen
-
-    switch (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:
-        new_pos.y = surface->top_left().y;
-        new_size.height = surface->size().height;
-        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:
-        new_pos.x = surface->top_left().x;
-        new_size.width = surface->size().width;
-        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:
-    default:
-        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;
-    }
-
-    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,

=== modified file 'examples/server_example_canonical_window_manager.h'
--- examples/server_example_canonical_window_manager.h	2015-10-02 01:56:04 +0000
+++ examples/server_example_canonical_window_manager.h	2015-11-25 21:33:30 +0000
@@ -20,6 +20,7 @@
 #define MIR_EXAMPLE_CANONICAL_WINDOW_MANAGER_H_
 
 #include "server_example_basic_window_manager.h"
+#include "server_example_canonical_surface_info.h"
 
 #include "mir/geometry/displacement.h"
 
@@ -38,56 +39,6 @@
     int surfaces{0};
 };
 
-struct CanonicalSurfaceInfoCopy
-{
-    CanonicalSurfaceInfoCopy(
-        std::shared_ptr<scene::Session> const& session,
-        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;
-    bool is_visible() 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;
-    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:
 //  o Switch apps: tap or click on the corresponding tile
 //  o Move window: Alt-leftmousebutton drag
@@ -139,6 +90,10 @@
 
     bool handle_pointer_event(MirPointerEvent const* event);
 
+    void handle_raise_surface(
+        std::shared_ptr<scene::Session> const& session,
+        std::shared_ptr<scene::Surface> const& surface);
+
     void generate_decorations_for(
         std::shared_ptr<scene::Session> const& session,
         std::shared_ptr<scene::Surface> const& surface,

=== added file 'examples/server_example_cursor_images.cpp'
--- examples/server_example_cursor_images.cpp	1970-01-01 00:00:00 +0000
+++ examples/server_example_cursor_images.cpp	2015-11-25 21:33:30 +0000
@@ -0,0 +1,57 @@
+/*
+ * 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 "server_example_cursor_images.h"
+#include "xcursor_loader.h"
+
+#include "mir/server.h"
+#include "mir/options/option.h"
+
+#include <mir_toolkit/cursors.h>
+
+namespace mi = mir::input;
+
+namespace
+{
+char const* const xcursor_theme = "x-cursor-theme";
+char const* const xcursor_description = "X Cursor theme to load [default, DMZ-White, DMZ-Black, ...]";
+
+bool has_default_cursor(mi::CursorImages& images)
+{
+    if (images.image(mir_default_cursor_name, mi::default_cursor_size))
+        return true;
+    return false;
+}
+}
+
+void mir::examples::add_x_cursor_images(Server& server)
+{
+    server.add_configuration_option(xcursor_theme, xcursor_description, "default");
+
+    server.override_the_cursor_images([&]
+        {
+            auto const theme = server.get_options()->get<std::string>(xcursor_theme);
+
+            std::shared_ptr<mi::CursorImages> const xcursor_loader{std::make_shared<XCursorLoader>(theme)};
+
+            if (has_default_cursor(*xcursor_loader))
+                return xcursor_loader;
+            else
+                return std::shared_ptr<mi::CursorImages>{};
+        });
+}

=== added file 'examples/server_example_cursor_images.h'
--- examples/server_example_cursor_images.h	1970-01-01 00:00:00 +0000
+++ examples/server_example_cursor_images.h	2015-11-25 21:33:30 +0000
@@ -0,0 +1,33 @@
+/*
+ * 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]>
+ */
+
+#ifndef MIR_EXAMPLE_CURSOR_IMAGES_H
+#define MIR_EXAMPLE_CURSOR_IMAGES_H
+
+namespace mir
+{
+class Server;
+
+namespace examples
+{
+void add_x_cursor_images(Server& server);
+}
+} // namespace mir
+
+
+#endif //MIR_EXAMPLE_CURSOR_IMAGES_H

=== modified file 'examples/server_example_tiling_window_manager.cpp'
--- examples/server_example_tiling_window_manager.cpp	2015-10-02 01:56:04 +0000
+++ examples/server_example_tiling_window_manager.cpp	2015-11-25 21:33:30 +0000
@@ -34,16 +34,6 @@
 ///\example server_example_tiling_window_manager.cpp
 /// Demonstrate implementing a simple tiling algorithm
 
-me::TilingSurfaceInfo::TilingSurfaceInfo(
-    std::shared_ptr<scene::Session> const& session,
-    std::shared_ptr<scene::Surface> const& surface,
-    scene::SurfaceCreationParameters const& /*params*/) :
-    session{session},
-    state{mir_surface_state_restored},
-    restore_rect{surface->top_left(), surface->size()}
-{
-}
-
 me::TilingWindowManagerPolicy::TilingWindowManagerPolicy(Tools* const tools) :
     tools{tools}
 {
@@ -150,6 +140,8 @@
         }
     }
 
+    session->destroy_surface(surface);
+
     if (surfaces.empty() && session == tools->focused_session())
     {
         tools->focus_next_session();
@@ -246,6 +238,14 @@
     old_cursor = cursor;
 }
 
+void me::TilingWindowManagerPolicy::handle_raise_surface(
+    std::shared_ptr<ms::Session> const& session,
+    std::shared_ptr<ms::Surface> const& surface)
+{
+    tools->set_focus_to(session, surface);
+    tools->raise({surface});
+}
+
 bool me::TilingWindowManagerPolicy::handle_keyboard_event(MirKeyboardEvent const* event)
 {
     auto const action = mir_keyboard_event_action(event);

=== modified file 'examples/server_example_tiling_window_manager.h'
--- examples/server_example_tiling_window_manager.h	2015-10-02 01:56:04 +0000
+++ examples/server_example_tiling_window_manager.h	2015-11-25 21:33:30 +0000
@@ -20,6 +20,7 @@
 #define MIR_EXAMPLE_TILING_WINDOW_MANAGER_H_
 
 #include "server_example_basic_window_manager.h"
+#include "server_example_canonical_surface_info.h"
 
 ///\example server_example_tiling_window_manager.h
 /// Demonstrate implementing a simple tiling algorithm
@@ -34,18 +35,6 @@
     std::vector<std::weak_ptr<scene::Surface>> surfaces;
 };
 
-struct TilingSurfaceInfo
-{
-    TilingSurfaceInfo(
-        std::shared_ptr<scene::Session> const& session,
-        std::shared_ptr<scene::Surface> const& surface,
-        scene::SurfaceCreationParameters const& params);
-
-    std::weak_ptr<scene::Session> session;
-    MirSurfaceState state;
-    geometry::Rectangle restore_rect;
-};
-
 // simple tiling algorithm:
 //  o Switch apps: tap or click on the corresponding tile
 //  o Move window: Alt-leftmousebutton drag
@@ -57,9 +46,9 @@
 class TilingWindowManagerPolicy
 {
 public:
-    using Tools = BasicWindowManagerToolsCopy<TilingSessionInfo, TilingSurfaceInfo>;
+    using Tools = BasicWindowManagerToolsCopy<TilingSessionInfo, CanonicalSurfaceInfoCopy>;
     using TilingSessionInfoMap = typename SessionTo<TilingSessionInfo>::type;
-    using TilingSurfaceInfoMap = typename SurfaceTo<TilingSurfaceInfo>::type;
+    using TilingSurfaceInfoMap = typename SurfaceTo<CanonicalSurfaceInfoCopy>::type;
 
     explicit TilingWindowManagerPolicy(Tools* const tools);
 
@@ -95,6 +84,10 @@
 
     bool handle_pointer_event(MirPointerEvent const* event);
 
+    void handle_raise_surface(
+        std::shared_ptr<scene::Session> const& session,
+        std::shared_ptr<scene::Surface> const& surface);
+
     void generate_decorations_for(
         std::shared_ptr<scene::Session> const& session, std::shared_ptr<scene::Surface> const& surface,
         TilingSurfaceInfoMap& surface_info,
@@ -130,6 +123,8 @@
 
     geometry::Point old_cursor{};
 };
+
+using TilingWindowManager = BasicWindowManagerCopy<TilingWindowManagerPolicy, TilingSessionInfo, CanonicalSurfaceInfoCopy>;
 }
 }
 

=== modified file 'examples/server_example_window_management.cpp'
--- examples/server_example_window_management.cpp	2015-10-02 01:56:04 +0000
+++ examples/server_example_window_management.cpp	2015-11-25 21:33:30 +0000
@@ -20,7 +20,6 @@
 
 #include "server_example_tiling_window_manager.h"
 #include "server_example_canonical_window_manager.h"
-#include "server_example_basic_window_manager.h"
 
 #include "mir/abnormal_exit.h"
 #include "mir/server.h"
@@ -102,7 +101,8 @@
     {
     }
 
-    void handle_delete_surface(std::shared_ptr<ms::Session> const& /*session*/, std::weak_ptr<ms::Surface> const& /*surface*/) {}
+    void handle_delete_surface(std::shared_ptr<ms::Session> const& session, std::weak_ptr<ms::Surface> const& surface)
+        { session->destroy_surface(surface); }
 
     int handle_set_state(std::shared_ptr<ms::Surface> const& /*surface*/, MirSurfaceState value)
         { return value; }
@@ -113,6 +113,12 @@
 
     bool handle_pointer_event(MirPointerEvent const* /*event*/) { return false; }
 
+    void handle_raise_surface(
+        std::shared_ptr<ms::Session> const& /*session*/,
+        std::shared_ptr<ms::Surface> const& /*surface*/)
+    {
+    }
+
     void generate_decorations_for(
         std::shared_ptr<ms::Session> const&,
         std::shared_ptr<ms::Surface> const&,
@@ -126,7 +132,6 @@
 
 }
 
-using TilingWindowManager = me::BasicWindowManagerCopy<me::TilingWindowManagerPolicy, me::TilingSessionInfo, me::TilingSurfaceInfo>;
 using FullscreenWindowManager = me::BasicWindowManagerCopy<FullscreenWindowManagerPolicy, NullSessionInfo, NullSurfaceInfo>;
 using CanonicalWindowManager = me::BasicWindowManagerCopy<me::CanonicalWindowManagerPolicyCopy, me::CanonicalSessionInfoCopy, me::CanonicalSurfaceInfoCopy>;
 

=== renamed file '3rd_party/xcursor/xcursor.c' => 'examples/xcursor.c'
=== renamed file '3rd_party/xcursor/xcursor.h' => 'examples/xcursor.h'
=== renamed file 'src/server/input/xcursor_loader.cpp' => 'examples/xcursor_loader.cpp'
--- src/server/input/xcursor_loader.cpp	2015-07-27 21:23:24 +0000
+++ examples/xcursor_loader.cpp	2015-11-25 21:33:30 +0000
@@ -32,9 +32,10 @@
 //  we refer to them via their _ prefixed version, i.e. _XcursorImage
 extern "C"
 {
-#include <xcursor.h>
+#include "xcursor.h"
 }
 
+namespace me = mir::examples;
 namespace mg = mir::graphics;
 namespace mi = mir::input;
 namespace geom = mir::geometry;
@@ -148,13 +149,18 @@
 }
 }
 
-mi::XCursorLoader::XCursorLoader()
+me::XCursorLoader::XCursorLoader()
 {
     load_cursor_theme("default");
 }
 
+me::XCursorLoader::XCursorLoader(std::string const& theme)
+{
+    load_cursor_theme(theme);
+}
+
 // Each XcursorImages represents images for the different sizes of a given symbolic cursor.
-void mi::XCursorLoader::load_appropriately_sized_image(_XcursorImages *images)
+void me::XCursorLoader::load_appropriately_sized_image(_XcursorImages *images)
 {
     // We would rather take this lock in load_cursor_theme but the Xcursor lib style 
     // makes it difficult to use our standard 'pass the lg around to _locked members' pattern
@@ -184,7 +190,7 @@
     loaded_images[std::string(images->name)] = std::make_shared<XCursorImage>(image_of_correct_size, saved_xcursor_library_resource);
 }
 
-void mi::XCursorLoader::load_cursor_theme(std::string const& theme_name)
+void me::XCursorLoader::load_cursor_theme(std::string const& theme_name)
 {
     // Cursors are named by their square dimension...called the nominal size in XCursor terminology, so we just look up by width.
     // Later we verify the actual size.
@@ -192,12 +198,12 @@
         [](XcursorImages* images, void *this_ptr)  -> void
         {
             // Can't use lambda capture as this lambda is thunked to a C function ptr
-            auto p = static_cast<mi::XCursorLoader*>(this_ptr);
+            auto p = static_cast<me::XCursorLoader*>(this_ptr);
             p->load_appropriately_sized_image(images);
         }, this);
 }
 
-std::shared_ptr<mg::CursorImage> mi::XCursorLoader::image(
+std::shared_ptr<mg::CursorImage> me::XCursorLoader::image(
     std::string const& cursor_name,
     geom::Size const& size)
 {

=== renamed file 'src/server/input/xcursor_loader.h' => 'examples/xcursor_loader.h'
--- src/server/input/xcursor_loader.h	2014-06-19 23:40:22 +0000
+++ examples/xcursor_loader.h	2015-11-25 21:33:30 +0000
@@ -41,12 +41,15 @@
 class CursorImage;
 }
 
-namespace input
+namespace examples
 {
-class XCursorLoader : public CursorImages
+class XCursorLoader : public input::CursorImages
 {
 public:
     XCursorLoader();
+
+    explicit XCursorLoader(std::string const& theme);
+
     virtual ~XCursorLoader() = default;
 
     std::shared_ptr<graphics::CursorImage> image(std::string const& cursor_name,

=== modified file 'include/client/mir/events/event_builders.h'
--- include/client/mir/events/event_builders.h	2015-10-02 04:27:33 +0000
+++ include/client/mir/events/event_builders.h	2015-11-25 21:33:30 +0000
@@ -22,6 +22,7 @@
 #include "mir_toolkit/event.h"
 
 #include "mir/geometry/size.h"
+#include "mir/geometry/point.h"
 #include "mir/frontend/surface_id.h"
 
 #include <memory>
@@ -51,13 +52,17 @@
     frontend::SurfaceId const& surface_id,
     int dpi,
     float scale,
-    MirFormFactor form_factor);
+    MirFormFactor form_factor,
+    uint32_t id);
 
 // Key event
 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
     uint64_t mac, MirKeyboardAction action, xkb_keysym_t key_code,
     int scan_code, MirInputEventModifiers modifiers);
 
+void set_modifier(MirEvent& event, MirInputEventModifiers modifiers);
+void set_cursor_position(MirEvent& event, mir::geometry::Point const& pos);
+
 // Deprecated version without mac
 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
     MirKeyboardAction action, xkb_keysym_t key_code,

=== modified file 'include/client/mir_toolkit/events/input/keyboard_event.h'
--- include/client/mir_toolkit/events/input/keyboard_event.h	2015-06-25 11:26:34 +0000
+++ include/client/mir_toolkit/events/input/keyboard_event.h	2015-11-25 21:33:30 +0000
@@ -20,6 +20,7 @@
 #define MIR_TOOLKIT_KEYBOARD_EVENT_H_
 
 #include <xkbcommon/xkbcommon.h>
+#include <mir_toolkit/cookie.h>
 
 #ifdef __cplusplus
 /**
@@ -98,6 +99,14 @@
  */
 MirInputEvent const* mir_keyboard_event_input_event(MirKeyboardEvent const* event);
 
+/**
+ * Retrieves the timestamp cookie of a keyboard event.
+ *
+ * \param [in] event The keyboard event
+ * \return           A MirCookie
+ */
+MirCookie mir_keyboard_event_get_cookie(MirKeyboardEvent const* event);
+
 #ifdef __cplusplus
 }
 /**@}*/

=== modified file 'include/client/mir_toolkit/events/input/pointer_event.h'
--- include/client/mir_toolkit/events/input/pointer_event.h	2015-07-23 02:39:20 +0000
+++ include/client/mir_toolkit/events/input/pointer_event.h	2015-11-25 21:33:30 +0000
@@ -20,6 +20,7 @@
 #define MIR_TOOLKIT_POINTER_EVENT_H_
 
 #include <stdbool.h>
+#include <mir_toolkit/cookie.h>
 
 #ifdef __cplusplus
 /**
@@ -135,6 +136,14 @@
  */
 MirInputEvent const* mir_pointer_event_input_event(MirPointerEvent const* event);
 
+/**
+ * Retrieves the timestamp cookie of a pointer event.
+ *
+ * \param [in] event The pointer event
+ * \return           A MirCookie
+ */
+MirCookie mir_pointer_event_get_cookie(MirPointerEvent const* event);
+
 #ifdef __cplusplus
 }
 /**@}*/

=== modified file 'include/client/mir_toolkit/events/input/touch_event.h'
--- include/client/mir_toolkit/events/input/touch_event.h	2015-06-25 11:26:34 +0000
+++ include/client/mir_toolkit/events/input/touch_event.h	2015-11-25 21:33:30 +0000
@@ -19,6 +19,8 @@
 #ifndef MIR_TOOLKIT_TOUCH_EVENT_H_
 #define MIR_TOOLKIT_TOUCH_EVENT_H_
 
+#include <mir_toolkit/cookie.h>
+
 #ifdef __cplusplus
 /**
  * \addtogroup mir_toolkit
@@ -149,6 +151,14 @@
  */
 MirInputEvent const* mir_touch_event_input_event(MirTouchEvent const* event);
 
+/**
+ * Retrieves the timestamp cookie of a touch event.
+ *
+ * \param [in] event The touch event
+ * \return           A MirCookie
+ */
+MirCookie mir_touch_event_get_cookie(MirTouchEvent const* event);
+
 #ifdef __cplusplus
 }
 /**@}*/

=== modified file 'include/client/mir_toolkit/events/surface_output_event.h'
--- include/client/mir_toolkit/events/surface_output_event.h	2015-10-02 04:27:33 +0000
+++ include/client/mir_toolkit/events/surface_output_event.h	2015-11-25 21:33:30 +0000
@@ -53,6 +53,15 @@
  */
 float mir_surface_output_event_get_scale(MirSurfaceOutputEvent const* ev);
 
+/**
+ * Retrieve the ID of the output this surface is on from a MirSurfaceOutputEvent
+ *
+ * \param [in] ev   The event
+ * \return          The ID of the output the surface is currently considered to be on.
+ *                  (From MirDisplayOutput::output_id)
+ */
+uint32_t mir_surface_output_event_get_output_id(MirSurfaceOutputEvent const *ev);
+
 #ifdef __cplusplus
 }
 /**@}*/

=== modified file 'include/client/mir_toolkit/mir_buffer_stream.h'
--- include/client/mir_toolkit/mir_buffer_stream.h	2015-09-15 18:56:59 +0000
+++ include/client/mir_toolkit/mir_buffer_stream.h	2015-11-25 21:33:30 +0000
@@ -152,8 +152,10 @@
 void mir_buffer_stream_swap_buffers_sync(MirBufferStream *buffer_stream);
 
 /**
- * Retrieve a buffer stream's graphics region, e.g. map the graphics buffer to main
- * memory.
+ * Retrieve a buffer stream's graphics region
+ *   \warning Depending on platform, this can map the graphics buffer each
+ *            time its called. The region remains mapped until
+ *            mir_buffer_stream_swap_buffers().
  *   \pre                          The buffer stream is valid
  *   \param [in] buffer stream     The buffer stream
  *   \param [out] graphics_region  Structure to be populated

=== added file 'include/client/mir_toolkit/mir_input_device.h'
--- include/client/mir_toolkit/mir_input_device.h	1970-01-01 00:00:00 +0000
+++ include/client/mir_toolkit/mir_input_device.h	2015-11-25 21:33:30 +0000
@@ -0,0 +1,56 @@
+/*
+ * 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/>.
+ *
+ */
+
+#ifndef MIR_TOOLKIT_MIR_INPUT_DEVICE_H_
+#define MIR_TOOLKIT_MIR_INPUT_DEVICE_H_
+
+/**
+ * \addtogroup mir_toolkit
+ * @{
+ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum MirPointerHandedness
+{
+    mir_pointer_handedness_right = 0,
+    mir_pointer_handedness_left = 1
+} MirPointerHandedness;
+
+typedef enum MirTouchpadClickMode
+{
+    mir_touchpad_click_mode_none          = 0,
+    mir_touchpad_click_mode_area_to_click = 1 << 0,
+    mir_touchpad_click_mode_finger_count  = 1 << 1
+} MirTouchpadClickMode;
+typedef unsigned int MirTouchpadClickModes;
+
+typedef enum MirTouchpadScrollMode
+{
+    mir_touchpad_scroll_mode_none               = 0,
+    mir_touchpad_scroll_mode_two_finger_scroll  = 1 << 0,
+    mir_touchpad_scroll_mode_edge_scroll        = 1 << 1,
+    mir_touchpad_scroll_mode_button_down_scroll = 1 << 2
+} MirTouchpadScrollMode;
+typedef unsigned int MirTouchpadScrollModes;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

=== modified file 'include/client/mir_toolkit/mir_surface.h'
--- include/client/mir_toolkit/mir_surface.h	2015-09-09 03:13:35 +0000
+++ include/client/mir_toolkit/mir_surface.h	2015-11-25 21:33:30 +0000
@@ -21,6 +21,7 @@
 #include <mir_toolkit/mir_native_buffer.h>
 #include <mir_toolkit/client_types.h>
 #include <mir_toolkit/common.h>
+#include <mir_toolkit/cookie.h>
 #include <mir_toolkit/mir_cursor_configuration.h>
 
 #include <stdbool.h>
@@ -668,6 +669,13 @@
 MirWaitHandle* mir_surface_set_preferred_orientation(MirSurface *surface, MirOrientationMode orientation);
 
 /**
+ * Attempts to raise the surface based on a keyboard/touch/pointer cookie.
+ *   \param [in] surface The surface to operate on
+ *   \param [in] cookie  The MirCookie from the event that you want to raise the window from.
+ */
+void mir_surface_raise_with_cookie(MirSurface* surface, MirCookie const cookie);
+
+/**
  * Get the preferred orientation modes of a surface.
  *   \param [in] surface  The surface to query
  *   \return              The preferred orientation modes

=== added file 'include/common/mir/assert_module_entry_point.h'
--- include/common/mir/assert_module_entry_point.h	1970-01-01 00:00:00 +0000
+++ include/common/mir/assert_module_entry_point.h	2015-11-25 21:33:30 +0000
@@ -0,0 +1,34 @@
+/*
+ * 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: Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_ASSERT_MODULE_ENTRY_POINT_H_
+#define MIR_ASSERT_MODULE_ENTRY_POINT_H_
+
+#include <type_traits>
+
+namespace mir
+{
+template<typename ReferenceTypename, typename EntryPoint>
+void assert_entry_point_signature(EntryPoint)
+{
+    static_assert(std::is_same<EntryPoint, ReferenceTypename>::value,
+                  "Signature of platform entry point does not match.");
+}
+}
+
+#endif

=== modified file 'include/common/mir/optional_value.h'
--- include/common/mir/optional_value.h	2015-06-18 02:46:16 +0000
+++ include/common/mir/optional_value.h	2015-11-25 21:33:30 +0000
@@ -20,6 +20,7 @@
 #define MIR_OPTIONAL_VALUE_H_
 
 #include "mir/fatal.h"
+#include <utility>
 
 namespace mir
 {
@@ -40,14 +41,26 @@
     bool is_set() const { return is_set_; }
     T value() const
     {
+        die_if_unset();
+        return value_;
+    }
+
+    T&& consume()
+    {
+        die_if_unset();
+        is_set_ = false;
+        return std::move(value_);
+    }
+
+private:
+    void die_if_unset() const
+    {
         if (!is_set())
         {
             (*fatal_error)("Accessing value of unset optional");
         }
-        return value_;
     }
 
-private:
     T value_;
     bool is_set_{false};
 };

=== modified file 'include/cookie/mir/cookie_factory.h'
--- include/cookie/mir/cookie_factory.h	2015-09-23 02:56:56 +0000
+++ include/cookie/mir/cookie_factory.h	2015-11-25 21:33:30 +0000
@@ -21,8 +21,8 @@
 
 #include "mir_toolkit/cookie.h"
 
+#include <memory>
 #include <vector>
-#include <memory>
 
 namespace mir
 {

=== modified file 'include/platform/mir/graphics/display.h'
--- include/platform/mir/graphics/display.h	2015-06-24 08:48:36 +0000
+++ include/platform/mir/graphics/display.h	2015-11-25 21:33:30 +0000
@@ -152,7 +152,6 @@
      */
     virtual std::unique_ptr<GLContext> create_gl_context() = 0;
 
-protected:
     Display() = default;
     virtual ~Display() {/* TODO: make nothrow */}
 private:

=== modified file 'include/platform/mir/graphics/display_configuration.h'
--- include/platform/mir/graphics/display_configuration.h	2015-11-04 21:00:26 +0000
+++ include/platform/mir/graphics/display_configuration.h	2015-11-25 21:33:30 +0000
@@ -27,6 +27,7 @@
 
 #include <functional>
 #include <vector>
+#include <memory>
 
 namespace mir
 {
@@ -166,13 +167,16 @@
 class DisplayConfiguration
 {
 public:
-    virtual ~DisplayConfiguration() {}
+    virtual ~DisplayConfiguration() = default;
 
     /** Executes a function object for each card in the configuration. */
     virtual void for_each_card(std::function<void(DisplayConfigurationCard const&)> f) const = 0;
     /** Executes a function object for each output in the configuration. */
     virtual void for_each_output(std::function<void(DisplayConfigurationOutput const&)> f) const = 0;
     virtual void for_each_output(std::function<void(UserDisplayConfigurationOutput&)> f) = 0;
+
+    virtual std::unique_ptr<DisplayConfiguration> clone() const = 0;
+
     virtual bool valid() const;
 
 protected:

=== renamed file 'src/include/platform/mir/graphics/egl_extensions.h' => 'include/platform/mir/graphics/egl_extensions.h'
--- src/include/platform/mir/graphics/egl_extensions.h	2015-02-22 07:46:25 +0000
+++ include/platform/mir/graphics/egl_extensions.h	2015-11-25 21:33:30 +0000
@@ -37,6 +37,15 @@
     PFNEGLDESTROYIMAGEKHRPROC const eglDestroyImageKHR;
     PFNGLEGLIMAGETARGETTEXTURE2DOESPROC const glEGLImageTargetTexture2DOES;
 };
+
+struct EGLSyncExtensions
+{
+    EGLSyncExtensions();
+    PFNEGLCREATESYNCKHRPROC const eglCreateSyncKHR;
+    PFNEGLDESTROYIMAGEKHRPROC const eglDestroySyncKHR;
+    PFNEGLCLIENTWAITSYNCKHRPROC const eglClientWaitSyncKHR;
+};
+
 }
 }
 

=== added file 'include/platform/mir/graphics/egl_sync_fence.h'
--- include/platform/mir/graphics/egl_sync_fence.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/graphics/egl_sync_fence.h	2015-11-25 21:33:30 +0000
@@ -0,0 +1,82 @@
+/*
+ * 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: Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_EGL_SYNC_FENCE_H_
+#define MIR_GRAPHICS_EGL_SYNC_FENCE_H_
+
+#include "egl_extensions.h"
+#include <memory>
+#include <chrono>
+#include <mutex>
+
+namespace mir
+{
+namespace graphics
+{
+class CommandStreamSync
+{
+public:
+    //insert a sync object into the GL command stream of the current context.
+    // \warning the calling thread should have a current egl context and display
+    virtual void raise() = 0;
+    // remove fence without waiting.
+    virtual void reset() = 0;
+    //wait for fence.
+    // \ param [in] ns  The amount of time to wait for the fence to become signalled
+    // \ returns        true if the fence was signalled, false if timeout
+    virtual bool wait_for(std::chrono::nanoseconds ns) = 0;
+
+    virtual ~CommandStreamSync() = default;
+    CommandStreamSync() = default; 
+    CommandStreamSync(CommandStreamSync const&) = delete;
+    CommandStreamSync& operator=(CommandStreamSync const&) = delete;
+};
+
+class NullCommandSync : public CommandStreamSync
+{
+    void raise() override;
+    void reset() override;
+    bool wait_for(std::chrono::nanoseconds ns) override;
+};
+
+class EGLSyncFence : public CommandStreamSync
+{
+public:
+    EGLSyncFence(std::shared_ptr<EGLSyncExtensions> const&);
+    ~EGLSyncFence();
+
+    void raise() override;
+    void reset() override;
+    bool wait_for(std::chrono::nanoseconds ns) override;
+private:
+    void reset(std::unique_lock<std::mutex> const&);
+    bool wait_for(std::unique_lock<std::mutex> const&, std::chrono::nanoseconds ns);
+
+    std::shared_ptr<EGLSyncExtensions> const egl;
+    std::chrono::nanoseconds const default_timeout{
+        std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::milliseconds(1))};
+
+    std::mutex mutex;
+    EGLDisplay fence_display;
+    EGLSyncKHR sync_point;
+};
+
+}
+}
+
+#endif /* MIR_GRAPHICS_EGL_SYNC_FENCE_H_ */

=== modified file 'include/platform/mir/graphics/platform.h'
--- include/platform/mir/graphics/platform.h	2015-10-07 02:34:05 +0000
+++ include/platform/mir/graphics/platform.h	2015-11-25 21:33:30 +0000
@@ -22,9 +22,9 @@
 
 #include <boost/program_options/options_description.hpp>
 #include <EGL/egl.h>
-#include <memory>
 
 #include "mir/module_properties.h"
+#include "mir/module_deleter.h"
 
 namespace mir
 {
@@ -75,12 +75,12 @@
     /**
      * Creates the buffer allocator subsystem.
      */
-    virtual std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator() = 0;
-    
+    virtual UniqueModulePtr<GraphicBufferAllocator> create_buffer_allocator() = 0;
+
     /**
      * Creates the display subsystem.
      */
-    virtual std::shared_ptr<Display> create_display(
+    virtual UniqueModulePtr<Display> create_display(
         std::shared_ptr<DisplayConfigurationPolicy> const& initial_conf_policy,
         std::shared_ptr<GLConfig> const& gl_config) = 0;
 
@@ -88,7 +88,7 @@
      * Creates an object capable of doing platform specific processing of buffers
      * before they are sent or after they are recieved accross IPC
      */
-    virtual std::shared_ptr<PlatformIpcOperations> make_ipc_operations() const = 0;
+    virtual UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const = 0;
 
     virtual EGLNativeDisplayType egl_native_display() const = 0;
 };
@@ -114,12 +114,12 @@
                          */
 };
 
-typedef std::shared_ptr<mir::graphics::Platform>(*CreateHostPlatform)(
+typedef mir::UniqueModulePtr<mir::graphics::Platform>(*CreateHostPlatform)(
     std::shared_ptr<mir::options::Option> const& options,
     std::shared_ptr<mir::EmergencyCleanupRegistry> const& emergency_cleanup_registry,
     std::shared_ptr<mir::graphics::DisplayReport> const& report);
 
-typedef std::shared_ptr<mir::graphics::Platform>(*CreateGuestPlatform)(
+typedef mir::UniqueModulePtr<mir::graphics::Platform>(*CreateGuestPlatform)(
     std::shared_ptr<mir::graphics::DisplayReport> const& report,
     std::shared_ptr<mir::graphics::NestedContext> const& nested_context);
 
@@ -148,7 +148,7 @@
  *
  * \ingroup platform_enablement
  */
-std::shared_ptr<mir::graphics::Platform> create_host_platform(
+mir::UniqueModulePtr<mir::graphics::Platform> create_host_platform(
     std::shared_ptr<mir::options::Option> const& options,
     std::shared_ptr<mir::EmergencyCleanupRegistry> const& emergency_cleanup_registry,
     std::shared_ptr<mir::graphics::DisplayReport> const& report);
@@ -164,7 +164,7 @@
  *
  * \ingroup platform_enablement
  */
-std::shared_ptr<mir::graphics::Platform> create_guest_platform(
+mir::UniqueModulePtr<mir::graphics::Platform> create_guest_platform(
     std::shared_ptr<mir::graphics::DisplayReport> const& report,
     std::shared_ptr<mir::graphics::NestedContext> const& nested_context);
 

=== modified file 'include/platform/mir/input/event_builder.h'
--- include/platform/mir/input/event_builder.h	2015-08-24 23:25:00 +0000
+++ include/platform/mir/input/event_builder.h	2015-11-25 21:33:30 +0000
@@ -38,16 +38,14 @@
     virtual ~EventBuilder() = default;
     using Timestamp = std::chrono::nanoseconds;
 
-    virtual EventUPtr key_event(Timestamp timestamp, MirKeyboardAction action, xkb_keysym_t key_code, int scan_code,
-                                MirInputEventModifiers modifiers) = 0;
+    virtual EventUPtr key_event(Timestamp timestamp, MirKeyboardAction action, xkb_keysym_t key_code, int scan_code) = 0;
 
-    virtual EventUPtr touch_event(Timestamp timestamp, MirInputEventModifiers modifiers) = 0;
+    virtual EventUPtr touch_event(Timestamp timestamp) = 0;
     virtual 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) = 0;
 
-    virtual EventUPtr pointer_event(Timestamp timestamp, MirInputEventModifiers modifiers, MirPointerAction action,
-                                    MirPointerButtons buttons_pressed, float x_axis_value, float y_axis_value,
+    virtual EventUPtr pointer_event(Timestamp timestamp, MirPointerAction action, MirPointerButtons buttons_pressed,
                                     float hscroll_value, float vscroll_value, float relative_x_value,
                                     float relative_y_value) = 0;
 

=== modified file 'include/platform/mir/input/input_device.h'
--- include/platform/mir/input/input_device.h	2015-09-01 07:41:29 +0000
+++ include/platform/mir/input/input_device.h	2015-11-25 21:33:30 +0000
@@ -20,6 +20,9 @@
 #ifndef MIR_INPUT_INPUT_DEVICE_H_
 #define MIR_INPUT_INPUT_DEVICE_H_
 
+#include "mir/module_deleter.h"
+#include "mir/optional_value.h"
+
 #include <memory>
 
 namespace mir
@@ -34,6 +37,9 @@
 class InputDeviceInfo;
 class EventBuilder;
 
+class PointerSettings;
+class TouchpadSettings;
+
 /**
  * Represents an input device.
  */
@@ -54,6 +60,11 @@
 
     virtual InputDeviceInfo get_device_info() = 0;
 
+    virtual optional_value<PointerSettings> get_pointer_settings() const = 0;
+    virtual void apply_settings(PointerSettings const&) = 0;
+
+    virtual optional_value<TouchpadSettings> get_touchpad_settings() const = 0;
+    virtual void apply_settings(TouchpadSettings const&) = 0;
 protected:
     InputDevice(InputDevice const&) = delete;
     InputDevice& operator=(InputDevice const&) = delete;

=== modified file 'include/platform/mir/input/input_sink.h'
--- include/platform/mir/input/input_sink.h	2015-06-17 05:20:42 +0000
+++ include/platform/mir/input/input_sink.h	2015-11-25 21:33:30 +0000
@@ -34,11 +34,6 @@
     InputSink() = default;
     virtual ~InputSink() = default;
     virtual void handle_input(MirEvent& event) = 0;
-    /**
-     * Confine position of a pointer
-     */
-    virtual void confine_pointer(mir::geometry::Point& position) = 0;
-
     /**!
      * Obtain the bounding rectangle of the destination area for this input sink
      */

=== modified file 'include/platform/mir/input/platform.h'
--- include/platform/mir/input/platform.h	2015-07-23 02:39:20 +0000
+++ include/platform/mir/input/platform.h	2015-11-25 21:33:30 +0000
@@ -91,7 +91,7 @@
 };
 
 typedef mir::UniqueModulePtr<Platform>(*CreatePlatform)(
-    std::shared_ptr<options::Option> const& options,
+    options::Option const& options,
     std::shared_ptr<EmergencyCleanupRegistry> const& emergency_cleanup_registry,
     std::shared_ptr<InputDeviceRegistry> const& input_device_registry,
     std::shared_ptr<InputReport> const& report);
@@ -123,7 +123,7 @@
  * \ingroup platform_enablement
  */
 mir::UniqueModulePtr<mir::input::Platform> create_input_platform(
-    std::shared_ptr<mir::options::Option> const& options,
+    mir::options::Option const& options,
     std::shared_ptr<mir::EmergencyCleanupRegistry> const& emergency_cleanup_registry,
     std::shared_ptr<mir::input::InputDeviceRegistry> const& input_device_registry,
     std::shared_ptr<mir::input::InputReport> const& report);

=== added file 'include/platform/mir/input/pointer_settings.h'
--- include/platform/mir/input/pointer_settings.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/input/pointer_settings.h	2015-11-25 21:33:30 +0000
@@ -0,0 +1,58 @@
+/*
+ * 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:
+ *   Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_POINTER_SETTINGS_H_
+#define MIR_INPUT_POINTER_SETTINGS_H_
+
+#include "mir_toolkit/client_types.h"
+#include "mir_toolkit/mir_input_device.h"
+
+namespace mir
+{
+namespace input
+{
+
+struct PointerSettings
+{
+    PointerSettings() {}
+    /**
+     * Configure left and right handed mode by selecting a primary button
+     */
+    MirPointerHandedness handedness{mir_pointer_handedness_right};
+    /**
+     * Bias cursor acceleration.
+     *   - [-1, 0): reduced acceleration
+     *   - 0: default acceleration
+     *   - (0, 1]: increased acceleration
+     */
+    double cursor_acceleration_bias{0.0};
+    /**
+     * Scale horizontal scrolling linearly
+     */
+    double horizontal_scroll_scale{1.0};
+    /**
+     * Scale vertical scrolling linearly
+     */
+    double vertical_scroll_scale{1.0};
+};
+
+}
+}
+
+#endif

=== added file 'include/platform/mir/input/touchpad_settings.h'
--- include/platform/mir/input/touchpad_settings.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/input/touchpad_settings.h	2015-11-25 21:33:30 +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 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:
+ *   Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_TOUCH_PAD_SETTINGS_H_
+#define MIR_INPUT_TOUCH_PAD_SETTINGS_H_
+
+#include "mir_toolkit/mir_input_device.h"
+
+namespace mir
+{
+namespace input
+{
+int const no_scroll_button = 0;
+
+struct TouchpadSettings
+{
+    TouchpadSettings() {}
+    MirTouchpadClickModes click_mode{mir_touchpad_click_mode_finger_count};
+    MirTouchpadScrollModes scroll_mode{mir_touchpad_scroll_mode_two_finger_scroll};
+    int button_down_scroll_button{no_scroll_button};
+    bool tap_to_click{true};
+    bool disable_while_typing{false};
+    bool disable_with_mouse{false};
+    bool middle_mouse_button_emulation{true};
+};
+
+}
+}
+
+#endif

=== modified file 'include/renderers/gl/mir/renderer/gl/texture_source.h'
--- include/renderers/gl/mir/renderer/gl/texture_source.h	2015-09-15 17:13:45 +0000
+++ include/renderers/gl/mir/renderer/gl/texture_source.h	2015-11-25 21:33:30 +0000
@@ -32,6 +32,8 @@
     virtual ~TextureSource() = default;
 
     virtual void gl_bind_to_texture() = 0;
+    //must be called if using this buffer after initial texture upload
+    virtual void used_as_texture() = 0; 
 
 protected:
     TextureSource() = default;

=== modified file 'include/server/mir/frontend/session_mediator_report.h'
--- include/server/mir/frontend/session_mediator_report.h	2015-09-18 14:44:59 +0000
+++ include/server/mir/frontend/session_mediator_report.h	2015-11-25 21:33:30 +0000
@@ -58,6 +58,8 @@
 
     virtual void session_configure_display_called(std::string const& app_name) = 0;
 
+    virtual void session_set_base_display_configuration_called(std::string const& app_name) = 0;
+
     virtual void session_start_prompt_session_called(std::string const& app_name, pid_t application_process) = 0;
 
     virtual void session_stop_prompt_session_called(std::string const& app_name) = 0;

=== modified file 'include/server/mir/input/device.h'
--- include/server/mir/input/device.h	2015-10-01 09:52:28 +0000
+++ include/server/mir/input/device.h	2015-11-25 21:33:30 +0000
@@ -22,6 +22,7 @@
 
 #include "mir/input/device_capability.h"
 #include "mir_toolkit/event.h"
+#include "mir/optional_value.h"
 
 #include <memory>
 
@@ -30,8 +31,8 @@
 namespace input
 {
 
-class PointerSettings;
-class TouchPadSettings;
+class PointerConfiguration;
+class TouchpadConfiguration;
 
 class Device
 {
@@ -43,6 +44,12 @@
     virtual std::string name() const = 0;
     virtual std::string unique_id() const = 0;
 
+    virtual mir::optional_value<PointerConfiguration> pointer_configuration() const = 0;
+    virtual void apply_pointer_configuration(PointerConfiguration const&) = 0;
+
+    virtual mir::optional_value<TouchpadConfiguration> touchpad_configuration() const = 0;
+    virtual void apply_touchpad_configuration(TouchpadConfiguration const&) = 0;
+
 private:
     Device(Device const&) = delete;
     Device& operator=(Device const&) = delete;

=== added file 'include/server/mir/input/pointer_configuration.h'
--- include/server/mir/input/pointer_configuration.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/input/pointer_configuration.h	2015-11-25 21:33:30 +0000
@@ -0,0 +1,71 @@
+/*
+ * 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:
+ *   Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_POINTER_CONFIGURATION_H_
+#define MIR_INPUT_POINTER_CONFIGURATION_H_
+
+#include "mir_toolkit/common.h"
+#include "mir_toolkit/client_types.h"
+#include "mir_toolkit/mir_input_device.h"
+
+namespace mir
+{
+namespace input
+{
+
+struct PointerConfiguration
+{
+    PointerConfiguration() {}
+
+    PointerConfiguration(MirPointerHandedness handedness, double acceleration_bias, double horizontal_scroll_scale,
+                         double vertical_scroll_scale)
+        : handedness{handedness}, cursor_acceleration_bias{acceleration_bias},
+          horizontal_scroll_scale{horizontal_scroll_scale}, vertical_scroll_scale{vertical_scroll_scale}
+    {
+    }
+
+    /*!
+     * Configure which button shall be used as primary button. That way the input device is configured to be either
+     * right or left handed.
+     */
+    MirPointerHandedness handedness{mir_pointer_handedness_right};
+
+    /*!
+     * Configures the intensity of the cursor acceleration. Values within the range of [-1, 1] are allowed.
+     *   - 0: default acceleration
+     *   - [-1, 0): reduced acceleration
+     *   - (0, 1]: increased acceleration
+     */
+    double cursor_acceleration_bias{0.0};
+
+    /*!
+     * Configures a signed scale of the horizontal scrolling. Use negative values to configure 'natural scrolling'
+     */
+    double horizontal_scroll_scale{1.0};
+
+    /*!
+     * Configures a signed scale of the vertical scrolling. Use negative values to configure 'natural scrolling'
+     */
+    double vertical_scroll_scale{1.0};
+};
+
+}
+}
+
+#endif

=== added file 'include/server/mir/input/touchpad_configuration.h'
--- include/server/mir/input/touchpad_configuration.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/input/touchpad_configuration.h	2015-11-25 21:33:30 +0000
@@ -0,0 +1,82 @@
+/*
+ * 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:
+ *   Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_TOUCH_PAD_CONFIGURATION_H_
+#define MIR_INPUT_TOUCH_PAD_CONFIGURATION_H_
+
+#include "mir_toolkit/common.h"
+#include "mir_toolkit/mir_input_device.h"
+
+namespace mir
+{
+namespace input
+{
+
+struct TouchpadConfiguration
+{
+    TouchpadConfiguration() {}
+    TouchpadConfiguration(MirTouchpadClickModes click_mode,
+                          MirTouchpadScrollModes scroll_mode,
+                          int button_down_scroll_button,
+                          bool tap_to_click,
+                          bool disable_while_typing,
+                          bool disable_with_mouse,
+                          bool middle_mouse_button_emulation)
+        : click_mode{click_mode}, scroll_mode{scroll_mode}, button_down_scroll_button{button_down_scroll_button},
+          tap_to_click{tap_to_click}, middle_mouse_button_emulation{middle_mouse_button_emulation},
+          disable_with_mouse{disable_with_mouse}, disable_while_typing{disable_while_typing}
+    {
+    }
+
+    /*!
+     * The click mode defines when the touchpad generates software emulated button events.
+     */
+    MirTouchpadClickModes click_mode{mir_touchpad_click_mode_finger_count};
+/*!
+     * The scroll mode defines when the touchpad generates scroll events instead of pointer motion events.
+     */
+    MirTouchpadScrollModes scroll_mode{mir_touchpad_scroll_mode_two_finger_scroll};
+
+    /*!
+     * Configures the button used for the on-button-down scroll mode
+     */
+    int button_down_scroll_button{0};
+
+    /*!
+     * When tap to click is enabled the system will interpret short finger touch down/up sequences as button clicks.
+     */
+    bool tap_to_click{true};
+    /*!
+     * Emulates a middle mouse button press when the left and right buttons on a touchpad are pressed.
+     */
+    bool middle_mouse_button_emulation{true};
+    /*!
+     * When disable-with-mouse is enabled the touchpad will stop to emit user input events when another pointing device is plugged in.
+     */
+    bool disable_with_mouse{false};
+    /*!
+     * When disable-with-mouse is enabled the touchpad will stop to emit user input events when the user starts to use a keyboard and a short period after.
+     */
+    bool disable_while_typing{false};
+};
+
+}
+}
+
+#endif

=== removed file 'include/server/mir/scene/depth_id.h'
--- include/server/mir/scene/depth_id.h	2015-02-22 07:46:25 +0000
+++ include/server/mir/scene/depth_id.h	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
- * as 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: Robert Carr <[e-mail]>
- */
-
-#ifndef MIR_SCENE_DEPTH_ID_H_
-#define MIR_SCENE_DEPTH_ID_H_
-
-#include "mir/int_wrapper.h"
-
-namespace mir
-{
-namespace scene
-{
-namespace detail { struct DepthIdIdTag; }
-
-typedef IntWrapper<detail::DepthIdIdTag> DepthId;
-}
-} // namespace mir
-
-#endif // MIR_SCENE_DEPTH_ID_H_

=== modified file 'include/server/mir/scene/session.h'
--- include/server/mir/scene/session.h	2015-10-02 01:56:04 +0000
+++ include/server/mir/scene/session.h	2015-11-25 21:33:30 +0000
@@ -66,6 +66,7 @@
     virtual frontend::BufferStreamId create_buffer_stream(graphics::BufferProperties const& props) = 0;
     virtual void destroy_buffer_stream(frontend::BufferStreamId stream) = 0;
     virtual void configure_streams(Surface& surface, std::vector<shell::StreamSpecification> const& config) = 0;
+    virtual void destroy_surface(std::weak_ptr<Surface> const& surface) = 0;
 };
 }
 }

=== modified file 'include/server/mir/scene/surface_coordinator.h'
--- include/server/mir/scene/surface_coordinator.h	2015-06-17 05:20:42 +0000
+++ include/server/mir/scene/surface_coordinator.h	2015-11-25 21:33:30 +0000
@@ -20,7 +20,6 @@
 #ifndef MIR_SCENE_SURFACE_COORDINATOR_H_
 #define MIR_SCENE_SURFACE_COORDINATOR_H_
 
-#include "mir/scene/depth_id.h"
 #include <memory>
 #include <set>
 
@@ -42,7 +41,6 @@
 
     virtual void add_surface(
         std::shared_ptr<Surface> const&,
-        scene::DepthId depth,
         input::InputReceptionMode const& new_mode,
         Session* session) = 0;
 

=== modified file 'include/server/mir/scene/surface_creation_parameters.h'
--- include/server/mir/scene/surface_creation_parameters.h	2015-07-23 02:39:20 +0000
+++ include/server/mir/scene/surface_creation_parameters.h	2015-11-25 21:33:30 +0000
@@ -24,7 +24,6 @@
 #include "mir/geometry/size.h"
 #include "mir/graphics/buffer_properties.h"
 #include "mir/graphics/display_configuration.h"
-#include "mir/scene/depth_id.h"
 #include "mir/frontend/surface_id.h"
 #include "mir/input/input_reception_mode.h"
 #include "mir/optional_value.h"
@@ -55,8 +54,6 @@
 
     SurfaceCreationParameters& of_pixel_format(MirPixelFormat new_pixel_format);
 
-    SurfaceCreationParameters& of_depth(scene::DepthId const& new_depth);
-
     SurfaceCreationParameters& with_input_mode(input::InputReceptionMode const& new_mode);
 
     SurfaceCreationParameters& with_output_id(graphics::DisplayConfigurationOutputId const& output_id);
@@ -80,7 +77,6 @@
     geometry::Point top_left;
     graphics::BufferUsage buffer_usage;
     MirPixelFormat pixel_format;
-    scene::DepthId depth;
     input::InputReceptionMode input_mode;
     graphics::DisplayConfigurationOutputId output_id;
 

=== modified file 'include/server/mir/server.h'
--- include/server/mir/server.h	2015-10-07 15:32:10 +0000
+++ include/server/mir/server.h	2015-11-25 21:33:30 +0000
@@ -37,6 +37,7 @@
 namespace cookie
 {
 using Secret = std::vector<uint8_t>;
+class CookieFactory;
 }
 namespace shell
 {
@@ -84,12 +85,11 @@
     /// This must remain valid while apply_settings() and run() are called.
     void set_command_line(int argc, char const* argv[]);
 
-    /// creates the CookieFactory from the given secret
-    /// This secret is used to generate timestamps that can be attested to by
-    /// libmircookie. Any process this secret is shared with can verify Mir-generated
-    /// cookies, or produce their own.
-    /// \note If not explicitly set, a random secret will be chosen.
-    void override_the_cookie_factory(mir::cookie::Secret const& secret);
+    /// Sets an override functor for creating the cookie factory.
+    /// A secret can be saved and any process this secret is shared
+    /// with can verify Mir-generated cookies, or produce their own.
+    void override_the_cookie_factory(
+        std::function<std::shared_ptr<cookie::CookieFactory>()> const& cookie_factory_builder);
 
     /// Applies any configuration options, hooks, or custom implementations.
     /// Must be called before calling run() or accessing any mir subsystems.

=== modified file 'include/server/mir/shell/abstract_shell.h'
--- include/server/mir/shell/abstract_shell.h	2015-10-02 01:56:04 +0000
+++ include/server/mir/shell/abstract_shell.h	2015-11-25 21:33:30 +0000
@@ -28,6 +28,7 @@
 {
 namespace shell
 {
+class ShellReport;
 class WindowManager;
 
 /// Minimal Shell implementation with none of the necessary window management logic
@@ -39,6 +40,7 @@
         std::shared_ptr<scene::SurfaceCoordinator> const& surface_coordinator,
         std::shared_ptr<scene::SessionCoordinator> const& session_coordinator,
         std::shared_ptr<scene::PromptSessionManager> const& prompt_session_manager,
+        std::shared_ptr<ShellReport> const& report,
         WindowManagerBuilder const& wm_builder);
 
     ~AbstractShell() noexcept;
@@ -69,6 +71,11 @@
         std::shared_ptr<scene::Surface> const& surface,
         MirSurfaceAttrib attrib) override;
 
+    void raise_surface_with_timestamp(
+        std::shared_ptr<scene::Session> const& session,
+        std::shared_ptr<scene::Surface> const& surface,
+        uint64_t timestamp) override;
+
     std::shared_ptr<scene::PromptSession> start_prompt_session_for(
         std::shared_ptr<scene::Session> const& session,
         scene::PromptSessionCreationParameters const& params) override;
@@ -117,6 +124,8 @@
     std::shared_ptr<WindowManager> const window_manager;
 
 private:
+    std::shared_ptr<ShellReport> const report;
+
     std::mutex mutable focus_mutex;
     std::weak_ptr<scene::Surface> focus_surface;
     std::weak_ptr<scene::Session> focus_session;

=== modified file 'include/server/mir/shell/display_configuration_controller.h'
--- include/server/mir/shell/display_configuration_controller.h	2015-10-01 01:27:17 +0000
+++ include/server/mir/shell/display_configuration_controller.h	2015-11-25 21:33:30 +0000
@@ -50,7 +50,7 @@
      * \return              A std::future<> that becomes ready once the configuration
      *                      has been applied.
      */
-    virtual std::future<void> set_default_display_configuration(
+    virtual std::future<void> set_base_configuration(
         std::shared_ptr<graphics::DisplayConfiguration> const& conf) = 0;
 };
 }

=== modified file 'include/server/mir/shell/display_layout.h'
--- include/server/mir/shell/display_layout.h	2013-08-28 03:41:48 +0000
+++ include/server/mir/shell/display_layout.h	2015-11-25 21:33:30 +0000
@@ -53,12 +53,14 @@
     virtual void size_to_output(geometry::Rectangle& rect) = 0;
 
     /**
-     * Places a rectangle in an particular output.
+     * Places a rectangle in an particular output if the display is known,
+     * otherwise does nothing.
      *
      * @param [in]     id   the id of the output to place the rectangle in
      * @param [in,out] rect the rectangle to place
+     * @return true iff the display id is recognised
      */
-    virtual void place_in_output(graphics::DisplayConfigurationOutputId id,
+    virtual bool place_in_output(graphics::DisplayConfigurationOutputId id,
                                  geometry::Rectangle& rect) = 0;
 
 protected:

=== modified file 'include/server/mir/shell/shell.h'
--- include/server/mir/shell/shell.h	2015-10-02 01:56:04 +0000
+++ include/server/mir/shell/shell.h	2015-11-25 21:33:30 +0000
@@ -94,6 +94,12 @@
     virtual int get_surface_attribute(
         std::shared_ptr<scene::Surface> const& surface,
         MirSurfaceAttrib attrib) = 0;
+
+    virtual void raise_surface_with_timestamp(
+        std::shared_ptr<scene::Session> const& session,
+        std::shared_ptr<scene::Surface> const& surface,
+        uint64_t timestamp) = 0;
+
 /** @} */
 };
 }

=== added file 'include/server/mir/shell/shell_report.h'
--- include/server/mir/shell/shell_report.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/shell/shell_report.h	2015-11-25 21:33:30 +0000
@@ -0,0 +1,89 @@
+/*
+ * 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]>
+ */
+
+#ifndef MIR_SHELL_SHELL_REPORT_H
+#define MIR_SHELL_SHELL_REPORT_H
+
+#include "mir/frontend/surface_id.h"
+#include "mir_toolkit/common.h"
+
+#include <memory>
+#include <set>
+
+namespace mir
+{
+namespace geometry { struct Rectangle; }
+namespace scene { class PromptSession; class Session; class Surface; struct SurfaceCreationParameters; }
+
+namespace shell
+{
+struct SurfaceSpecification;
+using SurfaceSet = std::set<std::weak_ptr<scene::Surface>, std::owner_less<std::weak_ptr<scene::Surface>>>;
+
+class ShellReport
+{
+public:
+
+    virtual void opened_session(scene::Session const& session) = 0;
+
+    virtual void closing_session(scene::Session const& session) = 0;
+
+    virtual void created_surface(
+        scene::Session const& session, frontend::SurfaceId surface_id) = 0;
+
+    virtual void update_surface(
+        scene::Session const& session, scene::Surface const& surface,
+        SurfaceSpecification const& modifications) = 0;
+
+    virtual void update_surface(
+        scene::Session const& session, scene::Surface const& surface,
+        MirSurfaceAttrib attrib, int value) = 0;
+
+    virtual void destroying_surface(
+        scene::Session const& session, frontend::SurfaceId surface) = 0;
+
+    virtual void started_prompt_session(
+        scene::PromptSession const& prompt_session,
+        scene::Session const& session) = 0;
+
+    virtual void added_prompt_provider(
+        scene::PromptSession const& prompt_session,
+        scene::Session const& session) = 0;
+
+    virtual void stopping_prompt_session(
+        scene::PromptSession const& prompt_session) = 0;
+
+    virtual void adding_display(geometry::Rectangle const& area) = 0;
+
+    virtual void removing_display(geometry::Rectangle const& area) = 0;
+
+    virtual void input_focus_set_to(
+        scene::Session const* focus_session,
+        scene::Surface const* focus_surface) = 0;
+
+    virtual void surfaces_raised(SurfaceSet const& surfaces) = 0;
+
+    ShellReport() = default;
+    virtual ~ShellReport() = default;
+    ShellReport(ShellReport const&) = delete;
+    ShellReport& operator=(ShellReport const&) = delete;
+};
+}
+}
+
+#endif //MIR_SHELL_SHELL_REPORT_H

=== modified file 'include/server/mir/shell/shell_wrapper.h'
--- include/server/mir/shell/shell_wrapper.h	2015-10-02 01:56:04 +0000
+++ include/server/mir/shell/shell_wrapper.h	2015-11-25 21:33:30 +0000
@@ -80,6 +80,11 @@
         std::shared_ptr<scene::Surface> const& surface,
         MirSurfaceAttrib attrib) override;
 
+    void raise_surface_with_timestamp(
+        std::shared_ptr<scene::Session> const& session,
+        std::shared_ptr<scene::Surface> const& surface,
+        uint64_t timestamp) override;
+
     void add_display(geometry::Rectangle const& area) override;
     void remove_display(geometry::Rectangle const& area) override;
 

=== modified file 'include/server/mir/shell/surface_specification.h'
--- include/server/mir/shell/surface_specification.h	2015-07-23 02:39:20 +0000
+++ include/server/mir/shell/surface_specification.h	2015-11-25 21:33:30 +0000
@@ -27,7 +27,6 @@
 #include "mir/geometry/displacement.h"
 #include "mir/graphics/buffer_properties.h"
 #include "mir/graphics/display_configuration.h"
-#include "mir/scene/depth_id.h"
 
 #include <string>
 #include <memory>
@@ -49,6 +48,8 @@
 /// Specification of surface properties requested by client
 struct SurfaceSpecification
 {
+    bool is_empty() const;
+
     optional_value<geometry::Width> width;
     optional_value<geometry::Height> height;
     optional_value<MirPixelFormat> pixel_format;
@@ -76,7 +77,6 @@
     
     // TODO scene::SurfaceCreationParameters overlaps this content but has additional fields:
     //    geometry::Point top_left;
-    //    scene::DepthId depth;
     //    input::InputReceptionMode input_mode;
     //
     //    it also has size instead of width + height

=== modified file 'include/server/mir/shell/system_compositor_window_manager.h'
--- include/server/mir/shell/system_compositor_window_manager.h	2015-06-11 11:41:33 +0000
+++ include/server/mir/shell/system_compositor_window_manager.h	2015-11-25 21:33:30 +0000
@@ -20,10 +20,14 @@
 #define MIR_SHELL_SYSTEM_COMPOSITOR_WINDOW_MANAGER_H_
 
 #include "mir/shell/window_manager.h"
+#include "mir/graphics/display_configuration.h"
+
+#include <map>
+#include <mutex>
 
 namespace mir
 {
-namespace scene { class PlacementStrategy; class SessionCoordinator; }
+namespace scene { class SessionCoordinator; }
 namespace shell
 {
 class FocusController;
@@ -86,11 +90,21 @@
 
     bool handle_pointer_event(MirPointerEvent const* event) override;
 
+    void handle_raise_surface(
+        std::shared_ptr<scene::Session> const& session,
+        std::shared_ptr<scene::Surface> const& surface,
+        uint64_t timestamp) override;
+
     int set_surface_attribute(
         std::shared_ptr<scene::Session> const& session,
         std::shared_ptr<scene::Surface> const& surface,
         MirSurfaceAttrib attrib,
         int value) override;
+
+    using OutputMap = std::map<std::weak_ptr<scene::Surface>, graphics::DisplayConfigurationOutputId, std::owner_less<std::weak_ptr<scene::Surface>>>;
+
+    std::mutex mutable mutex;
+    OutputMap output_map;
 };
 }
 }

=== modified file 'include/server/mir/shell/window_manager.h'
--- include/server/mir/shell/window_manager.h	2015-10-02 01:56:04 +0000
+++ include/server/mir/shell/window_manager.h	2015-11-25 21:33:30 +0000
@@ -71,6 +71,11 @@
         MirSurfaceAttrib attrib,
         int value) = 0;
 
+    virtual void handle_raise_surface(
+        std::shared_ptr<scene::Session> const& session,
+        std::shared_ptr<scene::Surface> const& surface,
+        uint64_t timestamp) = 0;
+
     virtual ~WindowManager() = default;
     WindowManager() = default;
     WindowManager(WindowManager const&) = delete;

=== added file 'include/test/mir/test/doubles/mock_display_configuration.h'
--- include/test/mir/test/doubles/mock_display_configuration.h	1970-01-01 00:00:00 +0000
+++ include/test/mir/test/doubles/mock_display_configuration.h	2015-11-25 21:33:30 +0000
@@ -0,0 +1,57 @@
+/*
+ * 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: Alexandros Frantzis <[e-mail]>
+ */
+
+#ifndef MIR_TEST_DOUBLES_MOCK_DISPLAY_CONFIGURATION_H_
+#define MIR_TEST_DOUBLES_MOCK_DISPLAY_CONFIGURATION_H_
+
+#include "mir/graphics/display_configuration.h"
+
+namespace mir
+{
+namespace test
+{
+namespace doubles
+{
+
+struct MockDisplayConfiguration : public graphics::DisplayConfiguration
+{
+    MOCK_CONST_METHOD1(
+        for_each_card,
+        void(std::function<void(mg::DisplayConfigurationCard const&)>));
+
+    MOCK_CONST_METHOD1(
+        for_each_output,
+        void(std::function<void(mg::DisplayConfigurationOutput const&)>));
+
+    MOCK_METHOD1(
+        for_each_output,
+        void(std::function<void(mg::UserDisplayConfigurationOutput&)>));
+
+    MOCK_CONST_METHOD0(valid, bool());
+
+    std::unique_ptr<mg::DisplayConfiguration> clone() const
+    {
+        throw std::runtime_error("MockDisplayConfiguration::clone is not implemented");
+    }
+};
+
+}
+}
+}
+
+#endif

=== modified file 'include/test/mir/test/doubles/mock_egl.h'
--- include/test/mir/test/doubles/mock_egl.h	2015-06-22 03:04:56 +0000
+++ include/test/mir/test/doubles/mock_egl.h	2015-11-25 21:33:30 +0000
@@ -146,6 +146,10 @@
     MOCK_METHOD2(eglDestroyImageKHR,EGLBoolean(EGLDisplay, EGLImageKHR));
     MOCK_METHOD2(glEGLImageTargetTexture2DOES, void(GLenum, GLeglImageOES));
 
+    MOCK_METHOD3(eglCreateSyncKHR, EGLSyncKHR(EGLDisplay, EGLenum, EGLint const*));
+    MOCK_METHOD2(eglDestroySyncKHR, EGLBoolean(EGLDisplay, EGLSyncKHR));
+    MOCK_METHOD4(eglClientWaitSyncKHR, EGLint(EGLDisplay, EGLSyncKHR, EGLint, EGLTimeKHR));
+
     EGLDisplay fake_egl_display;
     EGLConfig* fake_configs;
     EGLint fake_configs_num;

=== modified file 'include/test/mir/test/doubles/mock_window_manager.h'
--- include/test/mir/test/doubles/mock_window_manager.h	2015-06-22 03:04:56 +0000
+++ include/test/mir/test/doubles/mock_window_manager.h	2015-11-25 21:33:30 +0000
@@ -57,6 +57,8 @@
     MOCK_METHOD1(handle_touch_event, bool(MirTouchEvent const*));
     MOCK_METHOD1(handle_pointer_event, bool(MirPointerEvent const*));
 
+    MOCK_METHOD3(handle_raise_surface, void(std::shared_ptr<scene::Session> const&, std::shared_ptr<scene::Surface> const&, uint64_t));
+
     MOCK_METHOD4(set_surface_attribute,
         int(std::shared_ptr<scene::Session> const& session,
             std::shared_ptr<scene::Surface> const& surface,

=== modified file 'include/test/mir/test/doubles/null_display_configuration.h'
--- include/test/mir/test/doubles/null_display_configuration.h	2015-06-22 03:04:56 +0000
+++ include/test/mir/test/doubles/null_display_configuration.h	2015-11-25 21:33:30 +0000
@@ -38,6 +38,10 @@
     void for_each_output(std::function<void(graphics::UserDisplayConfigurationOutput&)>) override
     {
     }
+    std::unique_ptr<graphics::DisplayConfiguration> clone() const override
+    {
+        return std::make_unique<NullDisplayConfiguration>();
+    }
 };
 }
 }

=== modified file 'include/test/mir/test/doubles/null_platform.h'
--- include/test/mir/test/doubles/null_platform.h	2015-10-07 02:34:05 +0000
+++ include/test/mir/test/doubles/null_platform.h	2015-11-25 21:33:30 +0000
@@ -21,6 +21,7 @@
 
 #include "mir/graphics/platform.h"
 #include "mir/graphics/platform_ipc_package.h"
+#include "mir/graphics/graphic_buffer_allocator.h"
 #include "mir/test/doubles/null_display.h"
 #include "mir/test/doubles/null_platform_ipc_operations.h"
 
@@ -33,16 +34,16 @@
 class NullPlatform : public graphics::Platform
 {
  public:
-    std::shared_ptr<graphics::GraphicBufferAllocator> create_buffer_allocator() override
+    mir::UniqueModulePtr<graphics::GraphicBufferAllocator> create_buffer_allocator() override
     {
         return nullptr;
     }
 
-    std::shared_ptr<graphics::Display> create_display(
+    mir::UniqueModulePtr<graphics::Display> create_display(
         std::shared_ptr<graphics::DisplayConfigurationPolicy> const&,
         std::shared_ptr<graphics::GLConfig> const&) override
     {
-        return std::make_shared<NullDisplay>();
+        return mir::make_module_ptr<NullDisplay>();
     }
 
     std::shared_ptr<graphics::PlatformIPCPackage> connection_ipc_package()
@@ -50,9 +51,9 @@
         return std::make_shared<graphics::PlatformIPCPackage>();
     }
 
-    std::shared_ptr<graphics::PlatformIpcOperations> make_ipc_operations() const override
+    mir::UniqueModulePtr<graphics::PlatformIpcOperations> make_ipc_operations() const override
     {
-        return std::make_shared<NullPlatformIpcOperations>();
+        return mir::make_module_ptr<NullPlatformIpcOperations>();
     }
 
     EGLNativeDisplayType egl_native_display() const override

=== modified file 'include/test/mir/test/doubles/stub_display_configuration.h'
--- include/test/mir/test/doubles/stub_display_configuration.h	2015-10-07 15:32:10 +0000
+++ include/test/mir/test/doubles/stub_display_configuration.h	2015-11-25 21:33:30 +0000
@@ -24,6 +24,7 @@
 #include "mir_toolkit/common.h"
 
 #include <vector>
+#include <limits>
 
 namespace mir
 {
@@ -36,7 +37,7 @@
 {
     StubDisplayConfigurationOutput(
         geometry::Size px_size, geometry::Size mm_size, MirPixelFormat format, double vrefresh, bool connected) :
-        StubDisplayConfigurationOutput(graphics::DisplayConfigurationOutputId{0}, px_size, mm_size, format, vrefresh, connected)
+        StubDisplayConfigurationOutput(graphics::DisplayConfigurationOutputId{1}, px_size, mm_size, format, vrefresh, connected)
     {
     }
 
@@ -108,7 +109,7 @@
             outputs[i].connected = connected_used[i].first;
             outputs[i].used = connected_used[i].second;
             outputs[i].current_format = mir_pixel_format_abgr_8888;
-            outputs[i].id = graphics::DisplayConfigurationOutputId{static_cast<int>(i)};
+            outputs[i].id = graphics::DisplayConfigurationOutputId{static_cast<int>(i+1)};
         }
     }
 
@@ -227,6 +228,14 @@
         }
     }
 
+    StubDisplayConfig(
+        std::vector<graphics::DisplayConfigurationCard> const& cards,
+        std::vector<graphics::DisplayConfigurationOutput> const& outputs)
+        : cards(cards),
+          outputs(outputs)
+    {
+    }
+
     void for_each_card(std::function<void(graphics::DisplayConfigurationCard const&)> f) const override
     {
         for (auto const& card : cards)
@@ -250,6 +259,11 @@
         }
     }
 
+    std::unique_ptr<graphics::DisplayConfiguration> clone() const override
+    {
+        return std::make_unique<StubDisplayConfig>(*this);
+    }
+
     std::vector<graphics::DisplayConfigurationCard> cards;
     std::vector<graphics::DisplayConfigurationOutput> outputs;
 };

=== added file 'include/test/mir/test/doubles/stub_session.h'
--- include/test/mir/test/doubles/stub_session.h	1970-01-01 00:00:00 +0000
+++ include/test/mir/test/doubles/stub_session.h	2015-11-25 21:33:30 +0000
@@ -0,0 +1,92 @@
+/*
+ * 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]>
+ */
+
+#ifndef MIR_TEST_DOUBLES_STUB_SESSION_H
+#define MIR_TEST_DOUBLES_STUB_SESSION_H
+
+#include <mir/scene/session.h>
+
+namespace mir
+{
+namespace test
+{
+namespace doubles
+{
+
+struct StubSession : scene::Session
+{
+    std::shared_ptr<frontend::Surface> get_surface(
+        frontend::SurfaceId surface) const override;
+
+    std::string name() const override;
+
+    void force_requests_to_complete() override;
+
+    pid_t process_id() const override;
+
+    void take_snapshot(scene::SnapshotCallback const& snapshot_taken) override;
+
+    std::shared_ptr<scene::Surface> default_surface() const override;
+
+    void set_lifecycle_state(MirLifecycleState state) override;
+
+    void send_display_config(graphics::DisplayConfiguration const&) override;
+
+    void hide() override;
+
+    void show() override;
+
+    void start_prompt_session() override;
+
+    void stop_prompt_session() override;
+
+    void suspend_prompt_session() override;
+
+    void resume_prompt_session() override;
+
+    frontend::SurfaceId create_surface(
+        scene::SurfaceCreationParameters const& params,
+        std::shared_ptr<frontend::EventSink> const& sink) override;
+
+    void destroy_surface(frontend::SurfaceId surface) override;
+
+    std::shared_ptr<scene::Surface> surface(
+        frontend::SurfaceId surface) const override;
+
+    std::shared_ptr<scene::Surface> surface_after(
+        std::shared_ptr<scene::Surface> const&) const override;
+
+    std::shared_ptr<frontend::BufferStream> get_buffer_stream(
+        frontend::BufferStreamId stream) const override;
+
+    frontend::BufferStreamId create_buffer_stream(
+        graphics::BufferProperties const& props) override;
+
+    void destroy_buffer_stream(frontend::BufferStreamId stream) override;
+
+    void configure_streams(
+        scene::Surface& surface,
+        std::vector<shell::StreamSpecification> const& config) override;
+
+    void destroy_surface(std::weak_ptr<scene::Surface> const& surface) override;
+};
+}
+}
+}
+
+#endif //MIR_TEST_DOUBLES_STUB_SESSION_H

=== added file 'include/test/mir/test/doubles/stub_surface.h'
--- include/test/mir/test/doubles/stub_surface.h	1970-01-01 00:00:00 +0000
+++ include/test/mir/test/doubles/stub_surface.h	2015-11-25 21:33:30 +0000
@@ -0,0 +1,77 @@
+/*
+ * 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]>
+ */
+
+#ifndef MIR_TEST_DOUBLES_STUB_SURFACE_H
+#define MIR_TEST_DOUBLES_STUB_SURFACE_H
+
+#include <mir/scene/surface.h>
+
+namespace mir
+{
+namespace test
+{
+namespace doubles
+{
+// scene::Surface is a horribly wide interface to expose from Mir
+struct StubSurface : scene::Surface
+{
+    std::string name() const override;
+    void move_to(geometry::Point const& top_left) override;
+    float alpha() const override;
+    geometry::Size size() const override;
+    geometry::Size client_size() const override;
+    std::shared_ptr<frontend::BufferStream> primary_buffer_stream() const override;
+    void set_streams(std::list<scene::StreamInfo> const& streams) override;
+    bool supports_input() const override;
+    int client_input_fd() const override;
+    std::shared_ptr<input::InputChannel> input_channel() const override;
+    input::InputReceptionMode reception_mode() const override;
+    void set_reception_mode(input::InputReceptionMode mode) override;
+    void set_input_region(std::vector<geometry::Rectangle> const& input_rectangles) override;
+    void resize(geometry::Size const& size) override;
+    geometry::Point top_left() const override;
+    geometry::Rectangle input_bounds() const override;
+    bool input_area_contains(geometry::Point const& point) const override;
+    void consume(MirEvent const& event) override;
+    void set_alpha(float alpha) override;
+    void set_orientation(MirOrientation orientation) override;
+    void set_transformation(glm::mat4 const&) override;
+    bool visible() const override;
+    graphics::RenderableList generate_renderables(compositor::CompositorID id) const override;
+    int buffers_ready_for_compositor(void const* compositor_id) const override;
+    MirSurfaceType type() const override;
+    MirSurfaceState state() const override;
+    int configure(MirSurfaceAttrib attrib, int value) override;
+    int query(MirSurfaceAttrib attrib) const override;
+    void hide() override;
+    void show() override;
+    void set_cursor_image(std::shared_ptr<graphics::CursorImage> const& image) override;
+    std::shared_ptr<graphics::CursorImage> cursor_image() const override;
+    void set_cursor_stream(std::shared_ptr<frontend::BufferStream> const& stream, geometry::Displacement const& hotspot) override;
+    void request_client_surface_close() override;
+    std::shared_ptr<Surface> parent() const override;
+    void add_observer(std::shared_ptr<scene::SurfaceObserver> const& observer) override;
+    void remove_observer(std::weak_ptr<scene::SurfaceObserver> const& observer) override;
+    void set_keymap(xkb_rule_names const& rules) override;
+    void rename(std::string const& title) override;
+};
+}
+}
+}
+
+#endif //MIR_TEST_DOUBLES_STUB_SURFACE_H

=== modified file 'include/test/mir/test/event_matchers.h'
--- include/test/mir/test/event_matchers.h	2015-09-18 08:31:26 +0000
+++ include/test/mir/test/event_matchers.h	2015-11-25 21:33:30 +0000
@@ -229,7 +229,7 @@
 }
 
 inline bool button_event_matches(MirPointerEvent const* pev, float x, float y, MirPointerAction action, MirPointerButtons button_state,
-                                 bool check_action = true, bool check_buttons = true)
+                                 bool check_action = true, bool check_buttons = true, bool check_axes = true)
 {
     if (pev == nullptr)
         return false;
@@ -237,9 +237,9 @@
         return false;
     if (check_buttons && mir_pointer_event_buttons(pev) != button_state)
         return false;
-    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_x) != x)
+    if (check_axes && mir_pointer_event_axis_value(pev, mir_pointer_axis_x) != x)
         return false;
-    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_y) != y)
+    if (check_axes && mir_pointer_event_axis_value(pev, mir_pointer_axis_y) != y)
         return false;
     return true;
 }
@@ -353,6 +353,14 @@
     return true;
 }
 
+MATCHER_P(PointerEventWithModifiers, modifiers, "")
+{
+    auto pev = maybe_pointer_event(to_address(arg));
+    if (pev && mir_pointer_event_modifiers(pev) == modifiers)
+        return true;
+    return false;
+}
+
 MATCHER_P2(PointerEventWithDiff, dx, dy, "")
 {
     auto pev = maybe_pointer_event(to_address(arg));

=== modified file 'include/test/mir/test/wait_condition.h'
--- include/test/mir/test/wait_condition.h	2015-06-22 03:04:56 +0000
+++ include/test/mir/test/wait_condition.h	2015-11-25 21:33:30 +0000
@@ -33,11 +33,16 @@
 {
     WaitCondition() : woken_(false) {}
 
+    void wait_for_at_most_seconds(std::chrono::seconds const& seconds)
+    {
+        std::unique_lock<std::mutex> ul(guard);
+        condition.wait_for(ul, seconds,
+                           [this] { return woken_; });
+    }
+
     void wait_for_at_most_seconds(int seconds)
     {
-        std::unique_lock<std::mutex> ul(guard);
-        condition.wait_for(ul, std::chrono::seconds(seconds),
-                           [this] { return woken_; });
+        wait_for_at_most_seconds(std::chrono::seconds(seconds));
     }
 
     void wake_up_everyone()

=== modified file 'include/test/mir_test_framework/async_server_runner.h'
--- include/test/mir_test_framework/async_server_runner.h	2015-07-27 07:24:50 +0000
+++ include/test/mir_test_framework/async_server_runner.h	2015-11-25 21:33:30 +0000
@@ -52,7 +52,7 @@
     auto new_connection() -> std::string;
 
     /// \return a connection string for a client to connect to the server
-    auto connection(mir::Fd fd) -> std::string;
+    auto connection(int fd) -> std::string;
 
     mir::Server server;
 
@@ -60,8 +60,6 @@
     std::list<TemporaryEnvironmentValue> env;
     mir::test::AutoJoinThread server_thread;
 
-    std::list<mir::Fd> connections;
-
     std::mutex mutex;
     std::condition_variable started;
     bool server_running{false};

=== modified file 'include/test/mir_test_framework/connected_client_with_a_surface.h'
--- include/test/mir_test_framework/connected_client_with_a_surface.h	2015-06-22 03:04:56 +0000
+++ include/test/mir_test_framework/connected_client_with_a_surface.h	2015-11-25 21:33:30 +0000
@@ -20,6 +20,7 @@
 #define MIR_TEST_FRAMEWORK_CONNECTED_CLIENT_WITH_A_SURFACE_H_
 
 #include "mir_test_framework/connected_client_headless_server.h"
+#include "mir/geometry/size.h"
 
 namespace mir_test_framework
 {
@@ -30,6 +31,8 @@
     void SetUp() override;
 
     void TearDown() override;
+
+    mir::geometry::Size const surface_size {640, 480};
 };
 }
 

=== modified file 'include/test/mir_test_framework/declarative_placement_window_manage_policy.h'
--- include/test/mir_test_framework/declarative_placement_window_manage_policy.h	2015-06-25 13:55:28 +0000
+++ include/test/mir_test_framework/declarative_placement_window_manage_policy.h	2015-11-25 21:33:30 +0000
@@ -21,7 +21,6 @@
 
 #include "mir/shell/canonical_window_manager.h"
 #include "mir/geometry/rectangle.h"
-#include "mir/scene/depth_id.h"
 
 #include <memory>
 #include <map>
@@ -30,7 +29,6 @@
 namespace mir_test_framework
 {
 typedef std::map<std::string, mir::geometry::Rectangle> SurfaceGeometries;
-typedef std::map<std::string, mir::scene::DepthId> SurfaceDepths;
 
 /// DeclarativePlacementWindowManagerPolicy is a test utility server component for specifying
 /// a static list of surface geometries and relative depths. Used, for example,
@@ -42,7 +40,6 @@
     DeclarativePlacementWindowManagerPolicy(
         Tools* const tools,
         SurfaceGeometries const& positions_by_name, 
-        SurfaceDepths const& depths_by_name,
         std::shared_ptr<mir::shell::DisplayLayout> const& display_layout);
 
     auto handle_place_new_surface(
@@ -52,7 +49,6 @@
 
 private:
     SurfaceGeometries const& surface_geometries_by_name;
-    SurfaceDepths const& surface_depths_by_name;
 };
 
 }

=== modified file 'include/test/mir_test_framework/executable_path.h'
--- include/test/mir_test_framework/executable_path.h	2015-10-06 02:30:52 +0000
+++ include/test/mir_test_framework/executable_path.h	2015-11-25 21:33:30 +0000
@@ -26,6 +26,7 @@
 std::string executable_path();
 
 std::string library_path();
+std::string server_platform_path();
 std::string udev_recordings_path();
 std::string server_platform(std::string const& name);
 std::string server_input_platform(std::string const& name);

=== modified file 'include/test/mir_test_framework/placement_applying_shell.h'
--- include/test/mir_test_framework/placement_applying_shell.h	2015-10-02 01:56:04 +0000
+++ include/test/mir_test_framework/placement_applying_shell.h	2015-11-25 21:33:30 +0000
@@ -21,7 +21,6 @@
 
 #include "mir/shell/shell_wrapper.h"
 #include "mir/geometry/rectangle.h"
-#include "mir/scene/depth_id.h"
 
 #include "mir/scene/session.h"
 #include "mir/scene/surface.h"
@@ -35,15 +34,13 @@
 {
 using ClientInputRegions = std::map<std::string, std::vector<mir::geometry::Rectangle>>;
 using ClientPositions = std::map<std::string, mir::geometry::Rectangle>;
-using ClientDepths = std::map<std::string, mir::scene::DepthId>;
 
 struct PlacementApplyingShell : mir::shell::ShellWrapper
 {
     PlacementApplyingShell(
         std::shared_ptr<mir::shell::Shell> wrapped_coordinator,
         ClientInputRegions const& client_input_regions,
-        ClientPositions const& client_positions,
-        ClientDepths const& client_depths);
+        ClientPositions const& client_positions);
 
     mir::frontend::SurfaceId create_surface(
         std::shared_ptr<mir::scene::Session> const& session,
@@ -52,7 +49,6 @@
 private:
     ClientInputRegions const& client_input_regions;
     ClientPositions const& client_positions;
-    ClientDepths const& client_depths;
 };
 
 }

=== modified file 'playground/demo-shell/default_window_manager.cpp'
--- playground/demo-shell/default_window_manager.cpp	2015-07-23 02:39:20 +0000
+++ playground/demo-shell/default_window_manager.cpp	2015-11-25 21:33:30 +0000
@@ -104,9 +104,10 @@
 }
 
 void me::DefaultWindowManager::remove_surface(
-    std::shared_ptr<scene::Session> const& /*session*/,
-    std::weak_ptr<scene::Surface> const& /*surface*/)
+    std::shared_ptr<scene::Session> const& session,
+    std::weak_ptr<scene::Surface> const& surface)
 {
+    session->destroy_surface(surface);
 }
 
 void me::DefaultWindowManager::add_display(geometry::Rectangle const& /*area*/)
@@ -117,6 +118,13 @@
 {
 }
 
+void me::DefaultWindowManager::handle_raise_surface(
+    std::shared_ptr<scene::Session> const& /*session*/,
+    std::shared_ptr<scene::Surface> const& /*surface*/,
+    uint64_t /*timestamp*/)
+{
+}
+
 bool me::DefaultWindowManager::handle_keyboard_event(MirKeyboardEvent const* /*event*/)
 {
     return false;

=== modified file 'playground/demo-shell/default_window_manager.h'
--- playground/demo-shell/default_window_manager.h	2015-06-24 03:00:56 +0000
+++ playground/demo-shell/default_window_manager.h	2015-11-25 21:33:30 +0000
@@ -64,6 +64,11 @@
 
     bool handle_pointer_event(MirPointerEvent const* event) override;
 
+    void handle_raise_surface(
+        std::shared_ptr<scene::Session> const& session,
+        std::shared_ptr<scene::Surface> const& surface,
+        uint64_t timestamp) override;
+
     int set_surface_attribute(
         std::shared_ptr<scene::Session> const& session,
         std::shared_ptr<scene::Surface> const& surface,

=== modified file 'playground/demo-shell/demo_renderer.cpp'
--- playground/demo-shell/demo_renderer.cpp	2015-10-06 02:30:52 +0000
+++ playground/demo-shell/demo_renderer.cpp	2015-11-25 21:33:30 +0000
@@ -311,10 +311,6 @@
     tl_shadow.vertices[1] = {{leftr, top,  0.0f}, {1.0f, 0.0f}};
     tl_shadow.vertices[2] = {{leftr, topr, 0.0f}, {1.0f, 1.0f}};
     tl_shadow.vertices[3] = {{left,  topr, 0.0f}, {0.0f, 1.0f}};
-
-    // Shadows always need blending...
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 }
 
 void DemoRenderer::tessellate_frame(std::vector<gl::Primitive>& primitives,

=== modified file 'playground/demo-shell/demo_shell.cpp'
--- playground/demo-shell/demo_shell.cpp	2015-06-24 03:00:56 +0000
+++ playground/demo-shell/demo_shell.cpp	2015-11-25 21:33:30 +0000
@@ -48,10 +48,6 @@
 {
 namespace examples
 {
-using CanonicalWindowManager = msh::BasicWindowManager<msh::CanonicalWindowManagerPolicy, msh::CanonicalSessionInfo, msh::CanonicalSurfaceInfo>;
-using TilingWindowManager = me::BasicWindowManagerCopy<me::TilingWindowManagerPolicy, me::TilingSessionInfo, me::TilingSurfaceInfo>;
-
-
 class DisplayBufferCompositorFactory : public mc::DisplayBufferCompositorFactory
 {
 public:
@@ -120,7 +116,7 @@
                 }
                 else if (selection == wm_canonical)
                 {
-                    return std::make_shared<CanonicalWindowManager>(
+                    return std::make_shared<msh::CanonicalWindowManager>(
                         focus_controller,
                         the_shell_display_layout());
                 }

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-10-06 02:30:52 +0000
+++ src/CMakeLists.txt	2015-11-25 21:33:30 +0000
@@ -50,6 +50,7 @@
 # We need the ABI versions in the tests
 set(MIR_SERVER_GRAPHICS_PLATFORM_ABI ${MIR_SERVER_GRAPHICS_PLATFORM_ABI} PARENT_SCOPE)
 set(MIR_SERVER_INPUT_PLATFORM_ABI ${MIR_SERVER_INPUT_PLATFORM_ABI} PARENT_SCOPE)
+set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION ${MIR_SERVER_GRAPHICS_PLATFORM_VERSION} PARENT_SCOPE)
 set(MIR_CLIENT_PLATFORM_ABI ${MIR_CLIENT_PLATFORM_ABI} PARENT_SCOPE)
 set(MIR_INPUT_PLATFORM_VERSION_SCRIPT ${MIR_INPUT_PLATFORM_VERSION_SCRIPT} PARENT_SCOPE)
 set(MIR_CLIENT_PLATFORM_VERSION ${MIR_CLIENT_PLATFORM_VERSION} PARENT_SCOPE)

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2015-10-02 04:27:35 +0000
+++ src/client/CMakeLists.txt	2015-11-25 21:33:30 +0000
@@ -18,6 +18,7 @@
 include_directories(
   ${PROTOBUF_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${PROJECT_SOURCE_DIR}/include/cookie
   ${PROJECT_SOURCE_DIR}/include/client
   ${PROJECT_SOURCE_DIR}/src/include/client
   ${DRM_INCLUDE_DIRS}

=== modified file 'src/client/buffer_stream.cpp'
--- src/client/buffer_stream.cpp	2015-09-24 15:42:21 +0000
+++ src/client/buffer_stream.cpp	2015-11-25 21:33:30 +0000
@@ -282,25 +282,39 @@
     void deposit(mp::Buffer const& buffer, geom::Size, MirPixelFormat) override
     {
         vault.wire_transfer_inbound(buffer);
+
+        std::lock_guard<std::mutex> lk(mutex);
         current_buffer_id_ = buffer.buffer_id();
     }
 
+    void advance_current_buffer(std::unique_lock<std::mutex>& lk)
+    {
+        lk.unlock();
+        auto buffer = vault.withdraw().get();
+        lk.lock();
+        current_buffer_ = buffer;
+    }
+
     std::shared_ptr<mir::client::ClientBuffer> current_buffer() override
     {
+        std::unique_lock<std::mutex> lk(mutex);
         if (!current_buffer_)
-            current_buffer_ = vault.withdraw().get();
+            advance_current_buffer(lk);
         return current_buffer_;
     }
 
     uint32_t current_buffer_id() override
     {
+        std::lock_guard<std::mutex> lk(mutex);
         return current_buffer_id_;
     }
 
     MirWaitHandle* submit(std::function<void()> const& done, geom::Size, MirPixelFormat, int) override
     {
+        std::unique_lock<std::mutex> lk(mutex);
         if (!current_buffer_)
-            current_buffer_ = vault.withdraw().get();
+            advance_current_buffer(lk);
+        lk.unlock();
 
         vault.deposit(current_buffer_);
 
@@ -308,7 +322,8 @@
         vault.wire_transfer_outbound(current_buffer_);
         next_buffer_wait_handle.result_received();
 
-        current_buffer_ = vault.withdraw().get();
+        lk.lock();
+        advance_current_buffer(lk);
         done();
         return &next_buffer_wait_handle;
     }
@@ -327,6 +342,7 @@
     }
 
     mcl::BufferVault vault;
+    std::mutex mutex;
     std::shared_ptr<mcl::ClientBuffer> current_buffer_;
     int current_buffer_id_;
     MirWaitHandle next_buffer_wait_handle;
@@ -341,7 +357,8 @@
     mp::BufferStream const& protobuf_bs,
     std::shared_ptr<mcl::PerfReport> const& perf_report,
     std::string const& surface_name,
-    geom::Size ideal_size)
+    geom::Size ideal_size,
+    size_t nbuffers)
     : connection(connection),
       display_server(server),
       mode(mode),
@@ -351,7 +368,8 @@
       scale_(1.0f),
       perf_report(perf_report),
       protobuf_void{mcl::make_protobuf_object<mir::protobuf::Void>()},
-      ideal_buffer_size(ideal_size)
+      ideal_buffer_size(ideal_size),
+      nbuffers(nbuffers)
 {
     created(nullptr, nullptr);
     perf_report->name_surface(surface_name.c_str());
@@ -363,6 +381,7 @@
     std::shared_ptr<mcl::ClientPlatform> const& client_platform,
     mp::BufferStreamParameters const& parameters,
     std::shared_ptr<mcl::PerfReport> const& perf_report,
+    size_t nbuffers,
     mir_buffer_stream_callback callback,
     void *context)
     : connection(connection),
@@ -373,7 +392,8 @@
       swap_interval_(1),
       perf_report(perf_report),
       protobuf_void{mcl::make_protobuf_object<mir::protobuf::Void>()},
-      ideal_buffer_size(parameters.width(), parameters.height())
+      ideal_buffer_size(parameters.width(), parameters.height()),
+      nbuffers(nbuffers)
 {
     perf_report->name_surface(std::to_string(reinterpret_cast<long int>(this)).c_str());
 
@@ -409,11 +429,10 @@
     }
     else
     {
-        int initial_nbuffers = 3u;
         buffer_depository = std::make_unique<NewBufferSemantics>(
             client_platform->create_buffer_factory(),
             std::make_shared<Requests>(display_server, protobuf_bs->id().value()),
-            ideal_buffer_size, mir_pixel_format_abgr_8888, 0, initial_nbuffers);
+            ideal_buffer_size, static_cast<MirPixelFormat>(protobuf_bs->pixel_format()), 0, nbuffers);
     }
 
 
@@ -437,7 +456,7 @@
     process_buffer(buffer, lock);
 }
 
-void mcl::BufferStream::process_buffer(protobuf::Buffer const& buffer, std::unique_lock<std::mutex> const&)
+void mcl::BufferStream::process_buffer(protobuf::Buffer const& buffer, std::unique_lock<std::mutex>& lk)
 {
     if (buffer.has_width() && buffer.has_height())
     {
@@ -452,7 +471,8 @@
     try
     {
         auto pixel_format = static_cast<MirPixelFormat>(protobuf_bs->pixel_format());
-        buffer_depository->deposit(buffer, cached_buffer_size, pixel_format);
+        lk.unlock();
+        buffer_depository->deposit(buffer, geom::Size{buffer.width(), buffer.height()}, pixel_format);
         perf_report->begin_frame(buffer.buffer_id());
     }
     catch (const std::runtime_error& err)
@@ -497,7 +517,6 @@
 
 std::shared_ptr<mcl::ClientBuffer> mcl::BufferStream::get_current_buffer()
 {
-    std::unique_lock<decltype(mutex)> lock(mutex);
     return buffer_depository->current_buffer();
 }
 
@@ -509,14 +528,17 @@
 
 void mcl::BufferStream::release_cpu_region()
 {
+    std::unique_lock<decltype(mutex)> lock(mutex);
     secured_region.reset();
 }
 
 std::shared_ptr<mcl::MemoryRegion> mcl::BufferStream::secure_for_cpu_write()
 {
+    auto buffer = buffer_depository->current_buffer();
     std::unique_lock<decltype(mutex)> lock(mutex);
 
-    secured_region = buffer_depository->current_buffer()->secure_for_cpu_write();