Merge lp:mir/0.22 into lp:mir/ubuntu

[Alberto Aguirre]

Mir 0.22 release

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

PASSED: Continuous integration, rev:3474
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/21/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/913
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/952
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/943
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/943
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/923
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/923/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/923
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/923/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/923
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/923/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/923
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/923/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/923
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/923/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3474
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/162/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/6050
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4957/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/6006/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/50/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-i386-ci/50/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/6003
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/6003/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8369/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28115

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

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

PS Jenkins bot is alive?

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

PASSED: Continuous integration, rev:3475
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/22/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/915
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/954
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/945
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/945
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/925
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/925/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/925
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/925/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/925
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/925/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/925
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/925/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/925
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/925/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3475
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/163/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/6051
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4958
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/6007/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/51/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-i386-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-i386-ci/51/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/6004
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/6004/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8370/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28117

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

review: Needs Fixing (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

lgtm

review: Approve

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

FAILED: Continuous integration, rev:3476
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/23/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/917/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/956
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/947
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/947
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/927
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/927/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/927
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/927/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/927
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/927/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/927
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/927/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/927/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3476
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/164/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/6052
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4959
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/6008/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-i386-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-i386-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/6005
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/6005/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8371/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28119

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

The mir-ci-bot failure is bug 1556045, which we marked as fixed in 0.22.0. I guess it's not.

The PS Jenkins failure is weird. But isn't PS Jenkins retired?
ERROR: Dynamic exception type: St12system_error
std::exception::what: Enable multithreading to use std::thread: Operation not permitted

[Daniel van Vugt (vanvugt)]

I wonder if this could break some C++ ABI that passes a MirEvent pointer/ref as a parameter?

diff -r 0.21/include/client/mir_toolkit/events/event.h 0.22/include/client/mir_toolkit/events/event.h
63c63
< typedef union MirEvent MirEvent;
---
> typedef struct MirEvent MirEvent;

[Daniel van Vugt (vanvugt)]

^^^
Changing MirEvent to a struct may represent a platform ABI break too:

include/platform/mir/input/event_builder.h: virtual void add_touch(MirEvent& event, MirTouchId touch_id, MirTouchAction action, MirTouchTooltype tooltype,
include/platform/mir/input/input_sink.h: virtual void handle_input(MirEvent& event) = 0;

review: Needs Information

[Daniel van Vugt (vanvugt)]

Nope, apparently not an ABI break. The typedef apparently means users of MirEvent& are not sensitive to its actual type changing, which you can see here:

   _ZN3mir6events9add_touchER8MirEventi14MirTouchAction16MirTouchTooltypeffffff
   mir::events::add_touch(MirEvent&, int, MirTouchAction, MirTouchTooltype, float, float, float, float, float, float)

Both Mir 0.21 and 0.22 view MirEvent& as the same thing.

Incidentally, 'struct MirEvent' is still private. So referring to a reference of that type in libmirclient's ABI doesn't seem quite right. We maintain ABI safety only by:
   ptr = created_opaquely
   add_touch(*ptr, ...)
So it should not be a reference (in future when we do eventually break the ABI).

review: Approve

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

PASSED: Continuous integration, rev:3477
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/24/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/923
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/962
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/953
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/953
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/933
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/933/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/933
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/933/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/933
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/933/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/933
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/933/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/933
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/933/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3477
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/165/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/6053
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4960
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/6009/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-i386-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-i386-ci/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/6006
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/6006/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8372/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28120

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

review: Needs Fixing (continuous-integration)

=== modified file '3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h'
--- 3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h	2016-01-29 08:18:22 +0000
+++ 3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h	2016-04-27 09:08:17 +0000
@@ -141,12 +141,6 @@
 public:
     InputChannel(const String8& name, int fd);
 
-    /* Creates a pair of input channels.
-     *
-     * Returns OK on success.
-     */
-    static status_t openInputFdPair(int& server_fd, int& client_fd);
-
     inline String8 getName() const { return mName; }
     inline int getFd() const { return mFd; }
 

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp	2016-03-16 06:59:01 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp	2016-04-27 09:08:17 +0000
@@ -32,12 +32,6 @@
 
 namespace android {
 
-// Socket buffer size.  The default is typically about 128KB, which is much larger than
-// we really need.  So we make it smaller.  It just needs to be big enough to hold
-// a few dozen large multi-finger motion events in the case where an application gets
-// behind processing touches.
-static const size_t SOCKET_BUFFER_SIZE = 32 * 1024;
-
 // Nanoseconds per milliseconds.
 static constexpr const std::chrono::nanoseconds NANOS_PER_MS = std::chrono::nanoseconds(1000000);
 
@@ -117,29 +111,6 @@
 #endif
 }
 
-status_t InputChannel::openInputFdPair(int& server_fd, int& client_fd) {
-    int sockets[2];
-    if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, sockets)) {
-        status_t result = -errno;
-        ALOGE("InputChannel ~ Could not create socket pair.  errno=%d",
-            errno);
-        server_fd = client_fd = 0;
-
-        return result;
-    }
-
-    int bufferSize = SOCKET_BUFFER_SIZE;
-    setsockopt(sockets[0], SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize));
-    setsockopt(sockets[0], SOL_SOCKET, SO_RCVBUF, &bufferSize, sizeof(bufferSize));
-    setsockopt(sockets[1], SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize));
-    setsockopt(sockets[1], SOL_SOCKET, SO_RCVBUF, &bufferSize, sizeof(bufferSize));
-
-    server_fd = sockets[0];
-    client_fd = sockets[1];
-    
-    return OK;
-}
-
 status_t InputChannel::sendMessage(const InputMessage* msg) {
     size_t msgLength = msg->size();
     ssize_t nWrite;

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-03-25 15:08:27 +0000
+++ CMakeLists.txt	2016-04-27 09:08:17 +0000
@@ -28,7 +28,7 @@
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 0)
-set(MIR_VERSION_MINOR 21)
+set(MIR_VERSION_MINOR 22)
 set(MIR_VERSION_PATCH 0)
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})

=== modified file 'cmake/FindLibHardware.cmake'
--- cmake/FindLibHardware.cmake	2016-03-16 06:59:01 +0000
+++ cmake/FindLibHardware.cmake	2016-04-27 09:08:17 +0000
@@ -7,7 +7,7 @@
 INCLUDE(FindPackageHandleStandardArgs)
 
 find_package( PkgConfig )
-pkg_search_module(ANDROID_HEADERS REQUIRED android-headers)
+pkg_search_module(ANDROID_HEADERS REQUIRED android-headers-23)
 set(LIBHARDWARE_INCLUDE_DIRS ${ANDROID_HEADERS_INCLUDE_DIRS})
 
 find_library(LIBHARDWARE_LIBRARY

=== modified file 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2016-03-16 06:59:01 +0000
+++ cmake/MirCommon.cmake	2016-04-27 09:08:17 +0000
@@ -28,7 +28,7 @@
     set(VALGRIND_CMD ${VALGRIND_CMD} "--track-fds=yes")
     set(VALGRIND_CMD ${VALGRIND_CMD} "--num-callers=128")
     set(VALGRIND_CMD ${VALGRIND_CMD} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_generic")
-    set(VALGRIND_CMD ${VALGRIND_CMD} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_glibc_2.21")
+    set(VALGRIND_CMD ${VALGRIND_CMD} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_glibc_2.23")
     if (TARGET_ARCH STREQUAL "arm-linux-gnueabihf")
       set(VALGRIND_CMD ${VALGRIND_CMD} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_armhf")
     endif()

=== modified file 'cross-compile-chroot.sh'
--- cross-compile-chroot.sh	2016-03-16 06:59:01 +0000
+++ cross-compile-chroot.sh	2016-04-27 09:08:17 +0000
@@ -26,10 +26,10 @@
 dist=vivid
 clean=0
 update_build_dir=0
-
+enable_tests=yes
 target_arch=armhf
 
-while getopts "a:cd:hu" OPTNAME
+while getopts "a:cd:hut:" OPTNAME
 do
     case $OPTNAME in
       a )
@@ -55,6 +55,9 @@
         usage
         exit 1;
         ;;
+      t )
+        enable_tests=${OPTARG}
+        ;;
       * )
         echo "invalid option specified"
         usage
@@ -162,7 +165,7 @@
     echo "Using PKG_CONFIG_PATH: $PKG_CONFIG_PATH"
     echo "Using PKG_CONFIG_EXECUTABLE: $PKG_CONFIG_EXECUTABLE"
     cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/LinuxCrossCompile.cmake \
-      -DMIR_PLATFORM=${mir_platform} \
+      -DMIR_PLATFORM=${mir_platform} -DMIR_ENABLE_TESTS=${enable_tests}\
       .. 
 
     make -j${NUM_JOBS} $@

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-30 00:23:20 +0000
+++ debian/changelog	2016-04-27 09:08:17 +0000
@@ -1,3 +1,64 @@
+mir (0.22.0) UNRELEASED; urgency=medium
+
+  * New upstream release 0.22.0 (https://launchpad.net/mir/+milestone/0.22.0)
+    - ABI summary: Only servers need rebuilding
+      . mirclient ABI unchanged at 9
+      . mirserver ABI bumped to 39
+      . mircommon ABI unchanged at 5
+      . mirplatform ABI unchanged at 11
+      . mirprotobuf ABI unchanged at 3
+      . mirplatformgraphics ABI bumped to 9
+      . mirclientplatform ABI unchanged at 5
+      . mirinputplatform ABI unchanged at 5
+    - Enhancements:
+      . New screencast creation API which allows a client to specify
+        number of capture buffers and mirroring mode
+      . HWC 1.5 support for android based platforms
+    - Bug fixes:
+      . [regression] Black screen: Mir hangs and then crashes on startup/login
+        due to reading from /dev/random (LP: #1536662)
+      . CI test failures on xenial amd64 due to valgrind errors following system
+        upgrade to ld-2.23 (LP: #1560415)
+      . [regression] failure in CI on ThreadedDispatcherSignalTest.keeps_
+        dispatching_after_signal_interruption under Valgrind (LP: #1499229)
+      . [regression] Cursor mostly does not move at all in response to slow 
+        mouse movement, but then sometimes jumps (LP: #1528109)
+      . Sometimes devices don't suspend - display turns back on immediately
+        (LP: #1549701)
+      . CI failure in NestedServer.display_orientation_changes_are_forwarded_to_
+        host (LP: #1555074)
+      . NBS fullscreen overlay benchmark performance is much lower than 
+        BufferQueue (LP: #1557962)
+      . server crashes when shutting down in smoke tests (LP: #1560900)
+      . [regression] [OTA-10] Spread animation stutters badly with only a few
+        apps opened (LP: #1563287)
+      . nested mir_demo_server crashes on startup (LP: #1570362)
+      . mir_acceptance_tests & mir_unit_tests dump core files (even when 
+        everything passes) (LP: #1342092)
+      . [regression] Tests fail with: std::exception::what: Failed to read from
+        device: /dev/random after: 30 seconds (LP: #1541188)
+      . [testsfail] ClientLatency.throttled_input_rate_yields_lower_latency
+        (LP: #1554572)
+      . NBS causes sudden loss of performance after un-fullscreening a swap 
+        interval zero client (LP: #1557442)
+      . surface creation with non-default buffer streams is ignored by server
+        (LP: #1563278)
+      . [regression] mir_integration_tests take significantly longer (27x
+        longer) when running with ctest (LP: #1568966)
+      . CI failure in TestClientInput.receives_one_touch_event_per_frame 
+        (LP: #1570698)
+      . Racy shutdown in mir_demo_client_scroll causes SEGFAULT (LP: #1560943)
+      . mir_demo_client_target does not quit after SIGTERM/SIGINT (LP: #1562340)
+      . ClientLogging.reports_performance fails under moderate load, is badly
+        named (LP: #1563148)
+      . nested mir_demo_server crashes on mouse move when --print-input-events
+        active (LP: #1570357)
+      . Virtual output is not removed when screencast client disappears
+        (LP: #1573572)
+      . Virtual display output configuration is set to LVDS (LP: #1573782)
+
+ -- Alberto Aguirre <[e-mail]>  Thu, 21 Apr 2016 00:54:23 -0500
+
 mir (0.21.0+16.04.20160330-0ubuntu1) xenial; urgency=medium
 
   [ Alberto Aguirre ]

=== modified file 'debian/control'
--- debian/control	2016-03-18 19:40:56 +0000
+++ debian/control	2016-04-27 09:08:17 +0000
@@ -23,7 +23,7 @@
                libglm-dev,
                libprotobuf-dev,
                pkg-config,
-               android-headers (>=4.4.2) [i386 amd64 armhf],
+               android-headers-23,
                libhardware-dev [i386 amd64 armhf],
                libandroid-properties-dev [i386 amd64 armhf],
                libgoogle-glog-dev,
@@ -67,7 +67,7 @@
 
 #TODO: Packaging infrastructure for better dependency generation,
 #      ala pkg-xorg's xviddriver:Provides and ABI detection.
-Package: libmirserver38
+Package: libmirserver39
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -133,7 +133,7 @@
 Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver38 (= ${binary:Version}),
+Depends: libmirserver39 (= ${binary:Version}),
          libmirplatform-dev (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libglm-dev,
@@ -301,7 +301,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-x8
+Package: mir-platform-graphics-mesa-x9
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -315,7 +315,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-kms8
+Package: mir-platform-graphics-mesa-kms9
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -329,7 +329,7 @@
  Contains the shared libraries required for the Mir server to interact with
  the hardware platform using the Mesa drivers.
 
-Package: mir-platform-graphics-android8
+Package: mir-platform-graphics-android9
 Section: libs
 Architecture: i386 amd64 armhf
 Multi-Arch: same
@@ -405,8 +405,8 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-mesa-kms8,
-         mir-platform-graphics-mesa-x8,
+         mir-platform-graphics-mesa-kms9,
+         mir-platform-graphics-mesa-x9,
          mir-client-platform-mesa5,
          mir-platform-input-evdev5,
 Description: Display server for Ubuntu - desktop driver metapackage
@@ -422,7 +422,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-android8,
+         mir-platform-graphics-android9,
          mir-client-platform-android5,
          mir-platform-input-evdev5,
 Description: Display server for Ubuntu - android driver metapackage

=== renamed file 'debian/libmirserver38.install' => 'debian/libmirserver39.install'
--- debian/libmirserver38.install	2016-03-16 06:59:01 +0000
+++ debian/libmirserver39.install	2016-04-27 09:08:17 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.38
+usr/lib/*/libmirserver.so.39

=== renamed file 'debian/mir-platform-graphics-android8.install' => 'debian/mir-platform-graphics-android9.install'
--- debian/mir-platform-graphics-android8.install	2016-02-02 16:03:37 +0000
+++ debian/mir-platform-graphics-android9.install	2016-04-27 09:08:17 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/graphics-android.so.8
+usr/lib/*/mir/server-platform/graphics-android.so.9

=== renamed file 'debian/mir-platform-graphics-mesa-kms8.install' => 'debian/mir-platform-graphics-mesa-kms9.install'
--- debian/mir-platform-graphics-mesa-kms8.install	2016-02-02 16:03:37 +0000
+++ debian/mir-platform-graphics-mesa-kms9.install	2016-04-27 09:08:17 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/graphics-mesa-kms.so.8
+usr/lib/*/mir/server-platform/graphics-mesa-kms.so.9

=== renamed file 'debian/mir-platform-graphics-mesa-x8.install' => 'debian/mir-platform-graphics-mesa-x9.install'
--- debian/mir-platform-graphics-mesa-x8.install	2016-02-02 16:03:37 +0000
+++ debian/mir-platform-graphics-mesa-x9.install	2016-04-27 09:08:17 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/server-mesa-x11.so.8
+usr/lib/*/mir/server-platform/server-mesa-x11.so.9

=== modified file 'debian/mir-test-tools.install'
--- debian/mir-test-tools.install	2016-03-16 06:59:01 +0000
+++ debian/mir-test-tools.install	2016-04-27 09:08:17 +0000
@@ -7,6 +7,7 @@
 usr/bin/mir_performance_tests
 usr/bin/mir_privileged_tests
 usr/bin/mir_test_reload_protobuf
+usr/bin/mir_test_client_*
 usr/lib/*/mir/tools/libmirclientlttng.so
 usr/lib/*/mir/tools/libmirserverlttng.so
 usr/lib/*/mir/server-platform/graphics-dummy.so

=== modified file 'debian/mir-utils.install'
--- debian/mir-utils.install	2016-03-14 10:13:49 +0000
+++ debian/mir-utils.install	2016-04-27 09:08:17 +0000
@@ -3,3 +3,4 @@
 usr/bin/mirin
 usr/bin/mirscreencast
 usr/bin/mirbacklight
+usr/bin/mirrun

=== modified file 'doc/dso_versioning_guide.md'
--- doc/dso_versioning_guide.md	2016-01-29 08:18:22 +0000
+++ doc/dso_versioning_guide.md	2016-04-27 09:08:17 +0000
@@ -6,13 +6,11 @@
 
 There are more detailed descriptions below, but as a general rule:
 
- - If you add a new symbol, add it to the `*_unreleased` version stanza,
-   like `MIR_CLIENT_unreleased`, `MIR_PLATFORM_unreleased`, etc.
+ - If you add a new symbol, add it to a `*_NEXTSERIES` version stanza,
+   like `MIR_CLIENT_0.22`, `MIR_PLATFORM_0.22`, etc representing the
+   next future Mir series in which the new symbol will first be released.
  - If you change the behaviour or signature of a symbol _and_ wish to preserve
    backward compatibility, see "Change symbols without breaking ABI" below.
- - At release time, rename the current `*_unversioned` stanzas to have the
-   version of the current release, like `MIR_CLIENT_0.17`, `MIR_PLATFORM_0.17`,
-   etc.
 
 Can I have some details?
 ------------------------
@@ -95,7 +93,7 @@
             /* Other symbols go here */
     };
 
-    MIR_CLIENT_unreleased {
+    MIR_CLIENT_0.18 {
         global:
             mir_connect_new_symbol;
         local:
@@ -138,7 +136,7 @@
     /* The old implementation */
 
     /* The @@ specifies that this is the default version */
-    __asm__(".symver mir_connection_create_surface,mir_connection_create_surface@@@MIR_CLIENT_unreleased");
+    __asm__(".symver mir_connection_create_surface,mir_connection_create_surface@@@MIR_CLIENT_0.18");
     MirWaitHandle* mir_connection_create_surface(...)
     /* The new implementation */
 
@@ -151,7 +149,7 @@
             ...
     };
 
-    MIR_CLIENT_unreleased {
+    MIR_CLIENT_0.18 {
         global:
             ...
             mir_connection_create_surface;

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2016-03-16 06:59:01 +0000
+++ examples/CMakeLists.txt	2016-04-27 09:08:17 +0000
@@ -166,14 +166,8 @@
 )
 
 target_link_libraries(mir_demo_client_scroll
+  eglapp
   mirdraw
-  mirclient
-
-  ${Boost_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT}
-  ${EGL_LIBRARIES}
-  ${GLESv2_LIBRARIES}
-
 )
 
 mir_add_wrapped_executable(mir_demo_client_prompt_session prompt_session.c)

=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2016-03-16 06:59:01 +0000
+++ examples/render_surfaces.cpp	2016-04-27 09:08:17 +0000
@@ -333,6 +333,7 @@
 
     // New function to initialize moveables with surfaces
     void create_surfaces()
+    try
     {
         moveables.resize(get_options()->get<int>(surfaces_to_render));
         std::cout << "Rendering " << moveables.size() << " surfaces" << std::endl;
@@ -376,7 +377,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);
+            auto const surface = surface_factory->create_surface({ ms::StreamInfo{ stream, {0, 0}, {} } }, params);
             surface_stack->add_surface(surface, params.input_mode);
 
             {
@@ -416,6 +417,11 @@
 
         created = true;
     }
+    catch (...)
+    {
+        mir::report_exception();
+        exit(EXIT_FAILURE);
+    }
 
 private:
     std::vector<Moveable> moveables;

=== modified file 'examples/scroll.cpp'
--- examples/scroll.cpp	2016-03-15 08:14:23 +0000
+++ examples/scroll.cpp	2016-04-27 09:08:17 +0000
@@ -16,183 +16,34 @@
  * Authored by: Kevin DuBois   <[e-mail]>
  */
 
-#include "mir_toolkit/mir_client_library.h"
+#include "eglapp.h"
 #include "graphics.h"
 
-#ifdef NDEBUG
-// We have no error handling so rely on assert() always being present.
-#undef NDEBUG
-#endif
-#include <assert.h>
-#include <signal.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <EGL/egl.h>
-#include <GLES2/gl2.h>
-
-#include <thread>
-
-static char const *socket_file = NULL;
-static EGLDisplay disp;
-
-
-void create_and_run_scroll_surface(MirConnection *connection)
+#include <exception>
+#include <iostream>
+
+int main(int argc, char* argv[])
+try
 {
-    /* egl setup */
-    int major, minor, n, rc;
-    EGLContext context;
-    EGLSurface egl_surface;
-    EGLConfig egl_config;
-    EGLint attribs[] = {
-        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-        EGL_RED_SIZE, 8,
-        EGL_GREEN_SIZE, 8,
-        EGL_BLUE_SIZE, 8,
-        EGL_ALPHA_SIZE, 8,
-        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-        EGL_NONE };
-    EGLint context_attribs[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
-
-    rc = eglInitialize(disp, &major, &minor);
-    assert(rc == EGL_TRUE);
-    assert(major == 1);
-    assert(minor == 4);
-
-    rc = eglChooseConfig(disp, attribs, &egl_config, 1, &n);
-    assert(rc == EGL_TRUE);
-    assert(n == 1);
-
-    MirPixelFormat pixel_format =
-        mir_connection_get_egl_pixel_format(connection, disp, egl_config);
-
-    printf("Mir chose pixel format %d\n", pixel_format);
-
-    auto deleter = [](MirSurfaceSpec *spec) { mir_surface_spec_release(spec); };
-    std::unique_ptr<MirSurfaceSpec, decltype(deleter)> spec{
-        mir_connection_create_spec_for_normal_surface(connection, 640, 480,
-                                                      pixel_format),
-        deleter
-    };
-
-    assert(spec != nullptr);
-
-    mir_surface_spec_set_name(spec.get(), __PRETTY_FUNCTION__);
-    mir_surface_spec_set_buffer_usage(spec.get(), mir_buffer_usage_hardware);
-
-    MirSurface *surface = mir_surface_create_sync(spec.get());
-    spec.reset();
-
-    assert(surface != NULL);
-    assert(mir_surface_is_valid(surface));
-    assert(strcmp(mir_surface_get_error_message(surface), "") == 0);
-    puts("Surface created");
-
-    EGLNativeWindowType native_window =
-        (EGLNativeWindowType)mir_buffer_stream_get_egl_native_window(
-            mir_surface_get_buffer_stream(surface));
-    assert(native_window != (EGLNativeWindowType)NULL);
-
-    egl_surface = eglCreateWindowSurface(disp, egl_config, native_window, NULL);
-    assert(egl_surface != EGL_NO_SURFACE);
-
-    context = eglCreateContext(disp, egl_config, EGL_NO_CONTEXT, context_attribs);
-    assert(context != EGL_NO_CONTEXT);
-
-    rc = eglMakeCurrent(disp, egl_surface, egl_surface, context);
-    assert(rc == EGL_TRUE);
+    unsigned int width = 640, height = 480;
+    if (!mir_eglapp_init(argc, argv, &width, &height))
+        return 1;
 
     mir::draw::glAnimationBasic gl_animation;
     gl_animation.init_gl();
 
-    for(;;)
+    while (mir_eglapp_running())
     {
         gl_animation.render_gl();
-        rc = eglSwapBuffers(disp, egl_surface);
-        assert(rc == EGL_TRUE);
+        mir_eglapp_swap_buffers();
         gl_animation.step();
     }
 
-    eglDestroySurface(disp, egl_surface);
-    eglDestroyContext(disp, context);
-    
-    mir_surface_release_sync(surface);
-    puts("Surface released");
-}
-
-static void shutdown(int signum)
-{
-    // Exiting without closing surfaces and connection is impolite but should
-    // not kill the server. It actually did kill the server prior to -r 3385.
-    // Running this example in CI acts as a smoke test for that failure.
-    printf("Signal %d received. Good night.\n", signum);
-    exit(EXIT_SUCCESS);
-}
-
-int main(int argc, char* argv[])
-{
-    MirConnection *connection = 0;
-    unsigned num_windows = 1;
-    int arg;
-    opterr = 0;
-    while ((arg = getopt (argc, argv, "hm:w:")) != -1)
-    {
-        switch (arg)
-        {
-        case 'm':
-            socket_file = optarg;
-            break;
-        case 'w':
-            num_windows = atoi(optarg);
-            break;
-        case '?':
-        case 'h':
-        default:
-            puts(argv[0]);
-            puts("Usage:");
-            puts("    -m <Mir server socket>");
-            puts("    -w <Number of windows to create>:");
-            puts("    -h: this help text");
-            return -1;
-        }
-    }
-
-    puts("Starting");
-
-    signal(SIGINT, shutdown);
-    signal(SIGTERM, shutdown);
-    signal(SIGHUP, shutdown);
-
-    connection = mir_connect_sync(socket_file, __PRETTY_FUNCTION__);
-    assert(connection != NULL);
-    assert(mir_connection_is_valid(connection));
-    assert(strcmp(mir_connection_get_error_message(connection), "") == 0);
-    puts("Connected");
-
-    EGLNativeDisplayType native_display = (EGLNativeDisplayType) mir_connection_get_egl_native_display(connection);
-    disp = eglGetDisplay(native_display);
-    assert(disp != EGL_NO_DISPLAY);
-
-    if (num_windows == 1)
-    {
-        create_and_run_scroll_surface(connection);
-    }
-    else
-    {
-        for (unsigned i = 0; i < num_windows; i++) std::thread(create_and_run_scroll_surface, connection).detach();
-        for(;;) {}
-    }
-    
-
-    eglTerminate(disp);
-
-    mir_connection_release(connection);
-    puts("Connection released");
-
+    mir_eglapp_shutdown();
     return 0;
 }
-
-
-
+catch(std::exception& e)
+{
+    std::cerr << "error : " << e.what() << std::endl;
+    return 1;
+}

=== modified file 'examples/server_example.cpp'
--- examples/server_example.cpp	2016-03-16 06:59:01 +0000
+++ examples/server_example.cpp	2016-04-27 09:08:17 +0000
@@ -71,7 +71,12 @@
             {
                 auto const j = find(i, end(value), '&');
 
-                auto const cmd = "MIR_SOCKET=" + connection(server.open_client_socket()) + " " + std::string{i, j} + "&";
+                auto const cmd ="DISPLAY= "             // Discourage toolkits from using X11
+                    "GDK_BACKEND=mir "                  // configure GTK to use Mir
+                    "QT_QPA_PLATFORM=ubuntumirclient "  // configure Qt to use Mir
+                    "SDL_VIDEODRIVER=mir "              // configure SDL to use Mir
+                    "MIR_SOCKET=" + connection(server.open_client_socket()) + " " +
+                    std::string{i, j} + "&";
 
                 auto ignore = std::system(cmd.c_str());
                 (void)(ignore);

=== modified file 'examples/server_example_canonical_window_manager.cpp'
--- examples/server_example_canonical_window_manager.cpp	2016-01-29 08:18:22 +0000
+++ examples/server_example_canonical_window_manager.cpp	2016-04-27 09:08:17 +0000
@@ -251,13 +251,17 @@
         return;
 
     auto format = mir_pixel_format_xrgb_8888;
-    ms::SurfaceCreationParameters params;
-    params.of_size(titlebar_size_for_window(surface->size()))
+    mir::graphics::BufferProperties properties(titlebar_size_for_window(surface->size()),
+        format, mir::graphics::BufferUsage::software);
+    auto stream_id = session->create_buffer_stream(properties);
+    auto params = ms::a_surface()
+        .of_size(titlebar_size_for_window(surface->size()))
         .of_name("decoration")
         .of_pixel_format(format)
         .of_buffer_usage(mir::graphics::BufferUsage::software)
         .of_position(titlebar_position_for_window(surface->top_left()))
-        .of_type(mir_surface_type_gloss);
+        .of_type(mir_surface_type_gloss)
+        .with_buffer_stream(stream_id);
     auto id = build(session, params);
     auto titlebar = session->surface(id);
     titlebar->set_alpha(0.9);
@@ -265,6 +269,7 @@
     auto& surface_info = tools->info_for(surface);
     surface_info.titlebar = titlebar;
     surface_info.titlebar_id = id;
+    surface_info.titlebar_stream_id = stream_id;
     surface_info.children.push_back(titlebar);
 
     SurfaceInfo& titlebar_info =
@@ -369,11 +374,6 @@
         session->configure_streams(*surface, l);
     }
 
-    if (modifications.input_shape.is_set())
-    {
-        surface->set_input_region(modifications.input_shape.value());
-    }
-
     if (modifications.width.is_set() || modifications.height.is_set())
     {
         auto new_size = surface->size();
@@ -397,6 +397,20 @@
         apply_resize(surface, surface_info.titlebar, top_left, new_size);
     }
 
+    if (modifications.input_shape.is_set())
+    {
+        auto rectangles = modifications.input_shape.value();
+        auto displacement = surface->top_left() - Point{0, 0}; 
+        for(auto& rect : rectangles)
+        {
+            rect.top_left = rect.top_left + displacement;
+            rect = rect.intersection_with({surface->top_left(), surface->size()});
+            rect.top_left = rect.top_left - displacement;
+        }
+        surface->set_input_region(rectangles);
+    }
+
+
     if (modifications.state.is_set())
     {
         auto const state = handle_set_state(surface, modifications.state.value());
@@ -428,6 +442,7 @@
     if (info.titlebar)
     {
         session->destroy_surface(info.titlebar_id);
+        session->destroy_buffer_stream(info.titlebar_stream_id);
         tools->forget(info.titlebar);
     }
 

=== modified file 'examples/server_example_input_device_config.cpp'
--- examples/server_example_input_device_config.cpp	2016-01-29 08:18:22 +0000
+++ examples/server_example_input_device_config.cpp	2016-04-27 09:08:17 +0000
@@ -157,25 +157,37 @@
 {
     if (contains(device->capabilities(), mi::DeviceCapability::touchpad))
     {
-        mi::PointerConfiguration pointer_config( device->pointer_configuration().value() );
-        pointer_config.cursor_acceleration_bias = touchpad_cursor_acceleration_bias;
-        pointer_config.vertical_scroll_scale  = touchpad_scroll_speed_scale;
-        pointer_config.horizontal_scroll_scale = touchpad_scroll_speed_scale;
-        device->apply_pointer_configuration(pointer_config);
+	auto optional_pointer_config = device->pointer_configuration();
+        if (optional_pointer_config.is_set())
+        {
+            mi::PointerConfiguration pointer_config( optional_pointer_config.value() );
+            pointer_config.cursor_acceleration_bias = touchpad_cursor_acceleration_bias;
+            pointer_config.vertical_scroll_scale  = touchpad_scroll_speed_scale;
+            pointer_config.horizontal_scroll_scale = touchpad_scroll_speed_scale;
+            device->apply_pointer_configuration(pointer_config);
+        }
 
-        mi::TouchpadConfiguration touch_config( device->touchpad_configuration().value() );
-        touch_config.disable_while_typing = disable_while_typing;
-        touch_config.click_mode = click_mode;
-        touch_config.scroll_mode = scroll_mode;
-        device->apply_touchpad_configuration(touch_config);
+	auto optional_touchpad_config = device->touchpad_configuration();
+        if (optional_touchpad_config.is_set())
+        {
+            mi::TouchpadConfiguration touch_config( optional_touchpad_config.value() );
+            touch_config.disable_while_typing = disable_while_typing;
+            touch_config.click_mode = click_mode;
+            touch_config.scroll_mode = scroll_mode;
+            device->apply_touchpad_configuration(touch_config);
+        }
     }
     else if (contains(device->capabilities(), mi::DeviceCapability::pointer))
     {
-        mi::PointerConfiguration pointer_config( device->pointer_configuration().value() );
-        pointer_config.acceleration = mouse_profile;
-        pointer_config.cursor_acceleration_bias = mouse_cursor_acceleration_bias;
-        pointer_config.vertical_scroll_scale  = mouse_scroll_speed_scale;
-        pointer_config.horizontal_scroll_scale = mouse_scroll_speed_scale;
-        device->apply_pointer_configuration(pointer_config);
+	auto optional_pointer_config = device->pointer_configuration();
+        if (optional_pointer_config.is_set())
+        {
+            mi::PointerConfiguration pointer_config( optional_pointer_config.value() );
+            pointer_config.acceleration = mouse_profile;
+            pointer_config.cursor_acceleration_bias = mouse_cursor_acceleration_bias;
+            pointer_config.vertical_scroll_scale  = mouse_scroll_speed_scale;
+            pointer_config.horizontal_scroll_scale = mouse_scroll_speed_scale;
+            device->apply_pointer_configuration(pointer_config);
+        }
     }
 }

=== modified file 'examples/server_example_input_filter.cpp'
--- examples/server_example_input_filter.cpp	2015-06-17 05:20:42 +0000
+++ examples/server_example_input_filter.cpp	2016-04-27 09:08:17 +0000
@@ -56,7 +56,7 @@
     auto tev = mir_input_event_get_touch_event(ev);
     auto tc = mir_touch_event_point_count(tev);
 
-    std::cout << "Handline touch event time=" << event_time
+    std::cout << "Handling touch event time=" << event_time
               << " touch_count=" << tc << std::endl;
     for (unsigned i = 0; i < tc; i++)
     {
@@ -72,6 +72,38 @@
     std::cout << "----------------" << std::endl << std::endl;
 }
 
+void print_pointer_event(MirInputEvent const* ev)
+{
+    auto event_time = mir_input_event_get_event_time(ev);
+    auto pev = mir_input_event_get_pointer_event(ev);
+    auto action = mir_pointer_event_action(pev);
+
+    std::cout << "Handling pointer event time=" << event_time
+        << " action=";
+    switch(action)
+    {
+    case mir_pointer_action_motion:
+        std::cout << "motion";
+        break;
+    case mir_pointer_action_button_up:
+        std::cout << "up";
+        break;
+    case mir_pointer_action_button_down:
+        std::cout << "down";
+        break;
+    default:
+        break;
+    }
+
+    std::cout << "  "
+              << " pos=(" << mir_pointer_event_axis_value(pev, mir_pointer_axis_x) << ", "
+              << mir_pointer_event_axis_value(pev, mir_pointer_axis_y) << ")"
+              << " relative=(" << mir_pointer_event_axis_value(pev, mir_pointer_axis_relative_x) << ", "
+              << mir_pointer_event_axis_value(pev, mir_pointer_axis_relative_y) << ")" << std::endl;
+    std::cout << "----------------" << std::endl << std::endl;
+}
+
+
 struct PrintingEventFilter : public mi::EventFilter
 {
     bool handle(MirEvent const& ev) override
@@ -88,8 +120,12 @@
         case mir_input_event_type_touch:
             print_touch_event(input_event);
             break;
+        case mir_input_event_type_pointer:
+            print_pointer_event(input_event);
+            break;
         default:
-            abort();
+            std::cout << "unkown input event type: " << mir_input_event_get_type(input_event) << std::endl;
+            break;
         }
 
         return false;
@@ -220,4 +256,3 @@
 
     return screen_rotation_filter;
 }
-

=== modified file 'examples/server_example_test_client.cpp'
--- examples/server_example_test_client.cpp	2016-03-16 06:59:01 +0000
+++ examples/server_example_test_client.cpp	2016-04-27 09:08:17 +0000
@@ -46,6 +46,7 @@
     {
         ml::log(ml::Severity::informational, "Terminating client", component);
         kill(pid, SIGKILL);
+        return false;
     }
     else if (wait_rc != pid)
     {
@@ -55,7 +56,12 @@
     else if (WIFEXITED(status))
     {
         auto const exit_status = WEXITSTATUS(status);
-        if (exit_status != EXIT_SUCCESS)
+        if (exit_status == EXIT_SUCCESS)
+        {
+            ml::log(ml::Severity::informational, "Client exited successfully", component);
+            return true;
+        }
+        else
         {
             char const format[] = "Client has exited with status %d";
             char buffer[sizeof format + 10];
@@ -78,8 +84,6 @@
         ml::log(ml::Severity::informational, "Client died mysteriously", component);
         return false;
     }
-
-    return true;
 }
 }
 

=== modified file 'examples/server_example_window_management_info.h'
--- examples/server_example_window_management_info.h	2016-01-29 08:18:22 +0000
+++ examples/server_example_window_management_info.h	2016-04-27 09:08:17 +0000
@@ -65,6 +65,7 @@
     std::vector <std::weak_ptr<scene::Surface>> children;
     std::shared_ptr <scene::Surface> titlebar;
     frontend::SurfaceId titlebar_id;
+    frontend::BufferStreamId titlebar_stream_id;
     bool is_titlebar = false;
     geometry::Width min_width;
     geometry::Height min_height;

=== modified file 'examples/target.c'
--- examples/target.c	2015-06-10 07:48:27 +0000
+++ examples/target.c	2016-04-27 09:08:17 +0000
@@ -52,9 +52,11 @@
 
 typedef struct
 {
+    sigset_t sigs;
     pthread_mutex_t mutex;
-    pthread_cond_t change;
+    pthread_cond_t change_cv;
     bool changed;
+    bool running;
 
     bool resized;
     TouchState touch;
@@ -198,17 +200,32 @@
         state->resized = true;
         break;
     case mir_event_type_close_surface:
-        // TODO: eglapp.h needs a quit() function or different behaviour of
-        //       mir_eglapp_shutdown().
-        raise(SIGTERM);  // handled by eglapp
+        state->running = false;
         break;
     default:
         break;
     }
 
     state->changed = true;
-    pthread_cond_signal(&state->change);
-    pthread_mutex_unlock(&state->mutex);
+    pthread_cond_signal(&state->change_cv);
+    pthread_mutex_unlock(&state->mutex);
+}
+
+static void* shutdown_handler(void* context)
+{
+    State *state = (State*)context;
+
+    int signum;
+    sigwait(&state->sigs, &signum);
+    printf("Signal %d received. Good night.\n", signum);
+
+    pthread_mutex_lock(&state->mutex);
+    state->running = false;
+    state->changed = true;
+    pthread_cond_signal(&state->change_cv);
+    pthread_mutex_unlock(&state->mutex);
+
+    return NULL;
 }
 
 int main(int argc, char *argv[])
@@ -241,6 +258,13 @@
         "    gl_FragColor = f;\n"
         "}\n";
 
+    sigset_t sigs;
+    sigemptyset(&sigs);
+    sigaddset(&sigs, SIGINT);
+    sigaddset(&sigs, SIGTERM);
+    sigaddset(&sigs, SIGHUP);
+    pthread_sigmask(SIG_BLOCK, &sigs, NULL);
+
     // Disable Mir's input resampling. We do our own here, in a way that
     // has even lower latency than Mir's default algorithm.
     // TODO: Make a proper client API function for this:
@@ -311,22 +335,38 @@
 
     State state =
     {
-        PTHREAD_MUTEX_INITIALIZER,
-        PTHREAD_COND_INITIALIZER,
-        true,
-        true,
-        {0, {{0, {{0.0f, 0.0f}}}}}
+        .mutex = PTHREAD_MUTEX_INITIALIZER,
+        .change_cv = PTHREAD_COND_INITIALIZER,
+        .changed = true,
+        .running = true,
+        .resized = true,
+        .touch = {0, {{0, {{0.0f, 0.0f}}}}}
     };
+    state.sigs = sigs;
+
+    pthread_t shutdown_handler_thread;
+    if (pthread_create(&shutdown_handler_thread, NULL, &shutdown_handler, &state))
+    {
+        printf("Failed creating shutdown handling thread\n");
+        return 3;
+    }
+
     MirSurface *surface = mir_eglapp_native_surface();
     mir_surface_set_event_handler(surface, on_event, &state);
 
-    while (mir_eglapp_running())
+    while (true)
     {
         pthread_mutex_lock(&state.mutex);
 
-        while (mir_eglapp_running() && !state.changed)
-            pthread_cond_wait(&state.change, &state.mutex);
-        
+        while (state.running && !state.changed)
+            pthread_cond_wait(&state.change_cv, &state.mutex);
+
+        if (!state.running)
+        {
+            pthread_mutex_unlock(&state.mutex);
+            break;
+        }
+
         if (state.resized)
         {
             // mir_eglapp_swap_buffers updates the viewport for us...
@@ -384,5 +424,6 @@
     mir_surface_set_event_handler(surface, NULL, NULL);
     mir_eglapp_shutdown();
 
+    pthread_join(shutdown_handler_thread, NULL);
     return 0;
 }

=== modified file 'include/client/mir_toolkit/client_types.h'
--- include/client/mir_toolkit/client_types.h	2016-03-14 10:13:49 +0000
+++ include/client/mir_toolkit/client_types.h	2016-04-27 09:08:17 +0000
@@ -41,11 +41,14 @@
 typedef struct MirSurface MirSurface;
 typedef struct MirSurfaceSpec MirSurfaceSpec;
 typedef struct MirScreencast MirScreencast;
+typedef struct MirScreencastSpec MirScreencastSpec;
 typedef struct MirPromptSession MirPromptSession;
 typedef struct MirBufferStream MirBufferStream;
 typedef struct MirPersistentId MirPersistentId;
 typedef struct MirBlob MirBlob;
 typedef struct MirDisplayConfig MirDisplayConfig;
+typedef struct MirError MirError;
+
 
 /**
  * Descriptor for an output connection.
@@ -278,7 +281,8 @@
     mir_display_output_type_hdmia,
     mir_display_output_type_hdmib,
     mir_display_output_type_tv,
-    mir_display_output_type_edp
+    mir_display_output_type_edp,
+    mir_display_output_type_virtual
 } MirDisplayOutputType;
 
 typedef enum MirOutputType
@@ -297,7 +301,8 @@
     mir_output_type_hdmia,
     mir_output_type_hdmib,
     mir_output_type_tv,
-    mir_output_type_edp
+    mir_output_type_edp,
+    mir_output_type_virtual
 } MirOutputType;
 
 typedef enum MirOutputConnectionState
@@ -443,6 +448,36 @@
 typedef void (*mir_input_config_callback)(
     MirConnection* connection, void* context);
 
+/**
+ * Specifies the origin of an error.
+ *
+ * This is required to interpret the other aspects of a MirError.
+ */
+typedef enum MirErrorDomain
+{
+    /**
+     * Errors relating to display configuration.
+     *
+     * Associated error codes are found in \ref MirDisplayConfigurationError.
+     */
+    mir_error_domain_display_configuration,
+} MirErrorDomain;
+
+/**
+ * Errors from the \ref mir_error_domain_display_configuration \ref MirErrorDomain
+ */
+typedef enum MirDisplayConfigurationError {
+    /**
+     * Client is not permitted to change global display configuration
+     */
+    mir_display_configuration_error_unauthorized,
+} MirDisplayConfigurationError;
+
+typedef void (*mir_error_callback)(
+    MirConnection* connection,
+    MirError const* error,
+    void* context);
+
 #ifdef __cplusplus
 }
 /**@}*/

=== modified file 'include/client/mir_toolkit/events/event.h'
--- include/client/mir_toolkit/events/event.h	2016-03-14 10:13:49 +0000
+++ include/client/mir_toolkit/events/event.h	2016-04-27 09:08:17 +0000
@@ -60,7 +60,7 @@
 
 typedef struct MirCookie MirCookie;
 
-typedef union MirEvent MirEvent;
+typedef struct MirEvent MirEvent;
 
 #ifdef __cplusplus
 }

=== modified file 'include/client/mir_toolkit/mir_client_library.h'
--- include/client/mir_toolkit/mir_client_library.h	2016-03-14 10:13:49 +0000
+++ include/client/mir_toolkit/mir_client_library.h	2016-04-27 09:08:17 +0000
@@ -28,5 +28,6 @@
 #include <mir_toolkit/mir_cookie.h>
 #include <mir_toolkit/mir_display_configuration.h>
 #include <mir_toolkit/mir_input_device.h>
+#include <mir_toolkit/mir_error.h>
 
 #endif /* MIR_CLIENT_LIBRARY_H */

=== modified file 'include/client/mir_toolkit/mir_connection.h'
--- include/client/mir_toolkit/mir_connection.h	2016-03-14 10:13:49 +0000
+++ include/client/mir_toolkit/mir_connection.h	2016-04-27 09:08:17 +0000
@@ -226,6 +226,59 @@
     MirConnection* connection,
     MirDisplayConfiguration const* display_configuration);
 
+
+/**
+ * Preview a new base display configuration
+ *
+ * The base display configuration is the configuration the server applies when
+ * there is no active per-connection configuration.
+ *
+ * The display configuration will automatically revert to the previous
+ * settings after timeout_seconds unless confirmed by a call to
+ * mir_connection_confirm_base_display_configuration().
+ *
+ * If this request succeeds a configuration change event is sent to the
+ * client. Clients should register a callback with
+ * mir_connection_set_display_config_change_callback() in order to determine
+ * when this call succeeds.
+ *
+ * If the configuration is not confirmed before timeout_seconds have elapsed
+ * a second configuration change event is sent, with the old config.
+ *
+ * \param [in] connection       The connection
+ * \param [in] configuration    The MirDisplayConfig to set as base
+ * \param [in] timeout_seconds  The time the server should wait, in seconds,
+ *                                  for the change to be confirmed before
+ *                                  reverting to the previous configuration.
+ */
+void mir_connection_preview_base_display_configuration(
+    MirConnection* connection,
+    MirDisplayConfig const* configuration,
+    int timeout_seconds);
+
+/**
+ * Confirm a base configuration change initiated by mir_connection_preview_base_display_configuration()
+ *
+ * The base display configuration is the configuration the server applies when
+ * there is no active per-connection configuration.
+ *
+ * If this request succeeds a second configuration change event is sent to the
+ * client, identical to the one sent after
+ * mir_connection_preview_base_display_configuration(). Clients should
+ * register a callback with mir_connection_set_display_config_change_callback()
+ * in order to determine when this call succeeds.
+ *
+ * The MirDisplayConfig must be the same as the one passed to
+ * mir_connection_preview_base_display_configuration().
+ *
+ * \param [in] connection       The connection
+ * \param [in] configuration    The MirDisplayConfig to confirm as base
+ *                                  configuration.
+ */
+void mir_connection_confirm_base_display_configuration(
+    MirConnection* connection,
+    MirDisplayConfig const* configuration);
+
 /**
  * Get a display type that can be used for OpenGL ES 2.0 acceleration.
  *   \param [in] connection  The connection
@@ -311,6 +364,17 @@
     MirConnection* connection,
     mir_input_config_callback callback, void* context);
 
+/**
+ * Register a callback to be called on non-fatal errors
+ *
+ * \param [in] connection   The connection
+ * \param [in] callback     The function to be called when an error occurs
+ * \param [in,out] context  User data passed to the callback function
+ */
+void mir_connection_set_error_callback(
+    MirConnection* connection,
+    mir_error_callback callback,
+    void* context);
 
 #ifdef __cplusplus
 }

=== modified file 'include/client/mir_toolkit/mir_display_configuration.h'
--- include/client/mir_toolkit/mir_display_configuration.h	2016-03-14 10:13:49 +0000
+++ include/client/mir_toolkit/mir_display_configuration.h	2016-04-27 09:08:17 +0000
@@ -93,6 +93,19 @@
     size_t index);
 
 /**
+ * Get a modifyable handle to the index 'th output of this configuration
+ *
+ * \note The MirOutput handle is only valid while config is valid.
+ * \pre 0 <= index < mir_display_config_get_num_outputs(config)
+ * \param [in]  config  The configuration to query
+ * \param [in]  index   The index of the output to get
+ * \returns     A handle to a MirOutput within config which is valid
+ *              until mir_display_config_release(config) is called.
+ */
+MirOutput* mir_display_config_get_mutable_output(MirDisplayConfig* config,
+    size_t index);
+
+/**
  * Get the number of modes in the supported mode list of this output.
  *
  * The list of supported modes is retrieved from the hardware, possibly modified
@@ -153,6 +166,14 @@
 MirOutputMode const* mir_output_get_current_mode(MirOutput const* output);
 
 /**
+ * Set the current mode of an output.
+ *
+ * \param [in]  output  The MirOutput to mutate
+ * \param [in]  mode    The MirOutputMode to set as the current mode.
+ */
+void mir_output_set_current_mode(MirOutput* output, MirOutputMode const* mode);
+
+/**
  * Get the number of pixel formats supported by this output
  *
  * \param [in]  output  The MirOutput to query
@@ -245,6 +266,24 @@
 int mir_output_get_position_y(MirOutput const* output);
 
 /**
+ * Set the coordinates of the top-left point of the output in the virtual
+ * display space.
+ *
+ * Outputs can be thought of as viewports into a virtual display space. They may
+ * freely overlap, coincide, or be disjoint as desired.
+ *
+ * Output orientation changes the orientation of the output rectangle in virtual
+ * display space, but does not change its top-left corner.
+ *
+ * \param [in]  output  The MirOutput to mutate
+ * \param [in]  x       The new x coordinate of the top-left point of the
+ *                      output in virtual display space.
+ * \param [in]  y       The new y coordinate of the top-left point of the
+ *                      output in virtual display space.
+ */
+void mir_output_set_position(MirOutput* output, int x, int y);
+
+/**
  * Get whether there is a display physically connected to the output.
  *
  * This gives a best-effort determination of whether or not enabling this output
@@ -277,6 +316,20 @@
 bool mir_output_is_enabled(MirOutput const* output);
 
 /**
+ * Enable this output
+ *
+ * \param [in]  output  the MirOutput to enable
+ */
+void mir_output_enable(MirOutput* output);
+
+/**
+ * Disable this output
+ *
+ * \param [in]  output  the MirOutput to disable
+ */
+void mir_output_disable(MirOutput* output);
+
+/**
  * Get the physical width of the connected display, in millimetres.
  *
  * A best-effort report of the physical width of the display connected to this
@@ -318,6 +371,16 @@
 MirPowerMode mir_output_get_power_mode(MirOutput const* output);
 
 /**
+ * Set the power state of a connected display.
+ *
+ * It is undefined what power state is set if the output is not connected.
+ *
+ * \param [in]  output  The MirOutput to mutate
+ * \param [in]  mode    The new MirPowerMode for output
+ */
+void mir_output_set_power_mode(MirOutput* output, MirPowerMode mode);
+
+/**
  * Get the orientation of a display.
  *
  * \param [in]  output  The MirOutput to query
@@ -326,6 +389,14 @@
 MirOrientation mir_output_get_orientation(MirOutput const* output);
 
 /**
+ * Set the orientation of a display.
+ *
+ * \param [in]  output          The MirOutput to mutate
+ * \param [in]  orientation     The new MirOrientation for output
+ */
+void mir_output_set_orientation(MirOutput* output, MirOrientation orientation);
+
+/**
  * Get the scale-factor of a display
  *
  * The scale-factor specifies the conversion between logical pixels and physical pixels on this output.

=== added file 'include/client/mir_toolkit/mir_error.h'
--- include/client/mir_toolkit/mir_error.h	1970-01-01 00:00:00 +0000
+++ include/client/mir_toolkit/mir_error.h	2016-04-27 09:08:17 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2016 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: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_TOOLKIT_MIR_ERROR_H_
+#define MIR_TOOLKIT_MIR_ERROR_H_
+
+#ifdef __cplusplus
+/**
+ * \addtogroup mir_toolkit
+ * @{
+ */
+extern "C" {
+#endif
+
+#include "client_types.h"
+
+/**
+ * Get the domain of a MirError.
+ *
+ * The error domain is required to interpret the rest of the error details.
+ *
+ * \param [in] error    The MirError to query
+ * \returns     The MirErrorDomain that this error belongs to.
+ */
+MirErrorDomain mir_error_get_domain(MirError const* error);
+
+/**
+ * Get the domain-specific error code of a MirError.
+ *
+ * \param [in] error    The MirError to query
+ * \returns     The domain-specific error code
+ */
+uint32_t mir_error_get_code(MirError const* error);
+
+#ifdef __cplusplus
+}
+/**@}*/
+#endif
+
+#endif // MIR_TOOLKIT_MIR_ERROR_H_

=== modified file 'include/client/mir_toolkit/mir_screencast.h'
--- include/client/mir_toolkit/mir_screencast.h	2015-06-17 05:20:42 +0000
+++ include/client/mir_toolkit/mir_screencast.h	2016-04-27 09:08:17 +0000
@@ -28,6 +28,109 @@
 #endif
 
 /**
+ * Create a screencast specification.
+ *
+ * \remark For use with mir_screencast_create() at the width, height,
+ * pixel format and capture region must be set.
+ *
+ * \param [in] connection   a valid mir connection
+ * \return                  A handle that can ultimately be passed to
+ *                          mir_surface_create() or mir_surface_apply_spec()
+ */
+MirScreencastSpec* mir_create_screencast_spec(MirConnection* connection);
+
+/**
+ * Set the requested width, in pixels
+ *
+ * \param [in] spec     Specification to mutate
+ * \param [in] width    Requested width.
+ *
+ */
+void mir_screencast_spec_set_width(MirScreencastSpec* spec, unsigned int width);
+
+/**
+ * Set the requested height, in pixels
+ *
+ * \param [in] spec     Specification to mutate
+ * \param [in] height   Requested height.
+ *
+ */
+void mir_screencast_spec_set_height(MirScreencastSpec* spec, unsigned int height);
+
+/**
+ * Set the requested pixel format.
+ *
+ * \param [in] spec     Specification to mutate
+ * \param [in] format   Requested pixel format
+ *
+ */
+void mir_screencast_spec_set_pixel_format(MirScreencastSpec* spec, MirPixelFormat format);
+
+
+/**
+ * Set the rectangular region to capture.
+ *
+ * \param [in] spec     Specification to mutate
+ * \param [in] region   The rectangular region of the screen to capture
+ *                      specified in virtual screen space coordinates
+ *
+ */
+void mir_screencast_spec_set_capture_region(MirScreencastSpec* spec, MirRectangle const* region);
+
+/**
+ * Set the requested mirror mode.
+ *
+ * \param [in] spec     Specification to mutate
+ * \param [in] mode     The mirroring mode to apply when screencasting
+ *
+ */
+void mir_screencast_spec_set_mirror_mode(MirScreencastSpec* spec, MirMirrorMode mode);
+
+/**
+ * Set the requested number of buffers to use.
+ *
+ * \param [in] spec     Specification to mutate
+ * \param [in] nbuffers The number of buffers to allocate for screencasting
+ *
+ */
+void mir_screencast_spec_set_number_of_buffers(MirScreencastSpec* spec, unsigned int nbuffers);
+
+/**
+ * Release the resources held by a MirScreencastSpec.
+ *
+ * \param [in] spec     Specification to release
+ */
+void mir_screencast_spec_release(MirScreencastSpec* spec);
+
+/**
+ * Create a screencast from a given specification
+ *
+ * \param [in] spec  Specification of the screencast attributes
+ * \return           The resulting screencast
+ */
+MirScreencast* mir_screencast_create_sync(MirScreencastSpec* spec);
+
+/**
+ * Test for a valid screencast
+ *
+ * \param [in] screencast  The screencast to verify
+ * \return                 True if the supplied screencast is valid, false otherwise.
+ */
+bool mir_screencast_is_valid(MirScreencast *screencast);
+
+/**
+ * Retrieve a text description of the error. The returned string is owned by
+ * the library and remains valid until the screencast or the associated
+ * connection has been released.
+ *
+ * \param [in] screencast  The screencast
+ * \return                 A text description of any error resulting in an
+ *                         invalid screencast, or the empty string "" if the
+ *                         screencast is valid.
+ */
+char const *mir_screencast_get_error_message(MirScreencast *screencast);
+
+/**
  * Create a screencast on the supplied connection.
  *
  * A screencast allows clients to read the contents of the screen.
@@ -37,16 +140,16 @@
  *   \param [in] parameters  The screencast parameters
  *   \return                 The resulting screencast
  */
-MirScreencast *mir_connection_create_screencast_sync(
-    MirConnection *connection,
-    MirScreencastParameters *parameters);
+MirScreencast* mir_connection_create_screencast_sync(
+    MirConnection* connection,
+    MirScreencastParameters* parameters);
 
 /**
  * Release the specified screencast.
  *   \param [in] screencast  The screencast to be released
  */
 void mir_screencast_release_sync(
-    MirScreencast *screencast);
+    MirScreencast* screencast);
 
 /**
  * Retrieve the MirBufferStream associated with a screencast 
@@ -54,7 +157,7 @@
  * 
  *   \param[in] screencast The screencast
  */
-MirBufferStream* mir_screencast_get_buffer_stream(MirScreencast *screencast);
+MirBufferStream* mir_screencast_get_buffer_stream(MirScreencast* screencast);
 
 #ifdef __cplusplus
 }

=== modified file 'include/common/mir/optional_value.h'
--- include/common/mir/optional_value.h	2016-01-29 08:18:22 +0000
+++ include/common/mir/optional_value.h	2016-04-27 09:08:17 +0000
@@ -29,7 +29,7 @@
 {
 public:
     optional_value() = default;
-    optional_value(T const& value) : value_{value}, is_set_{true} {}
+    optional_value(T const& value) : value_(value), is_set_{true} {}
 
     optional_value& operator=(T const& value)
     {

=== modified file 'include/common/mir_toolkit/common.h'
--- include/common/mir_toolkit/common.h	2016-01-29 08:18:22 +0000
+++ include/common/mir_toolkit/common.h	2016-04-27 09:08:17 +0000
@@ -169,6 +169,14 @@
     mir_orientation_right = 270
 } MirOrientation;
 
+/** Mirroring axis relative to the "natural" orientation of the display */
+typedef enum MirMirrorMode
+{
+    mir_mirror_mode_none,
+    mir_mirror_mode_vertical,
+    mir_mirror_mode_horizontal
+} MirMirrorMode;
+
 typedef enum MirOrientationMode
 {
     mir_orientation_mode_portrait = 1 << 0,

=== modified file 'include/platform/mir/graphics/display_buffer.h'
--- include/platform/mir/graphics/display_buffer.h	2016-01-29 08:18:22 +0000
+++ include/platform/mir/graphics/display_buffer.h	2016-04-27 09:08:17 +0000
@@ -79,6 +79,17 @@
      */
     virtual MirOrientation orientation() const = 0;
 
+    /** Returns the mirror mode of the display buffer relative to orientation
+     *
+     *  If your DisplayBuffer can do the mirroring itself then this will
+     *  always return mir_mirror_mode_none. If the DisplayBuffer does not
+     *  implement the mirroring itself then this function will return the
+     *  mirror mode the renderer must do after rotation to make things
+     *  "look right".
+     *
+     */
+    virtual MirMirrorMode mirror_mode() const = 0;
+
     /** Returns a pointer to the native display buffer object backing this
      *  display buffer.
      *

=== modified file 'include/platform/mir/graphics/display_configuration.h'
--- include/platform/mir/graphics/display_configuration.h	2016-01-29 08:18:22 +0000
+++ include/platform/mir/graphics/display_configuration.h	2016-04-27 09:08:17 +0000
@@ -66,7 +66,8 @@
     hdmia,
     hdmib,
     tv,
-    edp
+    edp,
+    virt,
 };
 
 /**

=== modified file 'include/renderers/gl/mir/renderer/gl/render_target.h'
--- include/renderers/gl/mir/renderer/gl/render_target.h	2015-10-01 08:58:30 +0000
+++ include/renderers/gl/mir/renderer/gl/render_target.h	2016-04-27 09:08:17 +0000
@@ -31,7 +31,7 @@
 public:
     virtual ~RenderTarget() = default;
 
-    /** Makes the the current GL render target. */
+    /** Makes GL render target current to calling thread */
     virtual void make_current() = 0;
     /** Releases the current GL render target. */
     virtual void release_current() = 0;
@@ -41,6 +41,10 @@
      * free GL-related resources such as textures and buffers.
      */
     virtual void swap_buffers() = 0;
+    /** Binds any necessary resources (fbos, textures if any)
+     * in preparation for drawing.
+     */
+    virtual void bind() = 0;
 
 protected:
     RenderTarget() = default;

=== modified file 'include/server/mir/frontend/session.h'
--- include/server/mir/frontend/session.h	2016-01-29 08:18:22 +0000
+++ include/server/mir/frontend/session.h	2016-04-27 09:08:17 +0000
@@ -52,6 +52,8 @@
 
     virtual std::string name() const = 0;
 
+    virtual void send_display_config(graphics::DisplayConfiguration const&) = 0;
+
 protected:
     Session() = default;
     Session(Session const&) = delete;

=== modified file 'include/server/mir/frontend/session_mediator_report.h'
--- include/server/mir/frontend/session_mediator_report.h	2016-01-29 08:18:22 +0000
+++ include/server/mir/frontend/session_mediator_report.h	2016-04-27 09:08:17 +0000
@@ -38,8 +38,6 @@
 
     virtual void session_create_surface_called(std::string const& app_name) = 0;
 
-    virtual void session_next_buffer_called(std::string const& app_name) = 0;
-
     virtual void session_exchange_buffer_called(std::string const& app_name) = 0;
 
     virtual void session_submit_buffer_called(std::string const& app_name) = 0;
@@ -60,6 +58,10 @@
 
     virtual void session_set_base_display_configuration_called(std::string const& app_name) = 0;
 
+    virtual void session_preview_base_display_configuration_called(std::string const& app_name) = 0;
+
+    virtual void session_confirm_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/input_manager.h'
--- include/server/mir/input/input_manager.h	2016-03-14 10:13:49 +0000
+++ include/server/mir/input/input_manager.h	2016-04-27 09:08:17 +0000
@@ -21,20 +21,13 @@
 #ifndef MIR_INPUT_INPUT_MANAGER_H_
 #define MIR_INPUT_INPUT_MANAGER_H_
 
-#include <memory>
-
 namespace mir
 {
 namespace input
 {
-class Platform;
-
 class InputManager
 {
 public:
-    // TODO Remove add_platform() when we next break mirserver ABI
-    __attribute__ ((deprecated))
-    virtual void add_platform(std::shared_ptr<Platform> const& platform) = 0;
     virtual void start() = 0;
     virtual void stop() = 0;
 

=== modified file 'include/server/mir/scene/session.h'
--- include/server/mir/scene/session.h	2016-01-29 08:18:22 +0000
+++ include/server/mir/scene/session.h	2016-04-27 09:08:17 +0000
@@ -38,13 +38,12 @@
 class Session : public frontend::Session
 {
 public:
-    virtual void force_requests_to_complete() = 0;
+    virtual void drop_outstanding_requests() = 0;
     virtual pid_t process_id() const = 0;
 
     virtual void take_snapshot(SnapshotCallback const& snapshot_taken) = 0;
     virtual std::shared_ptr<Surface> default_surface() const = 0;
     virtual void set_lifecycle_state(MirLifecycleState state) = 0;
-    virtual void send_display_config(graphics::DisplayConfiguration const&) = 0;
 
     virtual void hide() = 0;
     virtual void show() = 0;

=== modified file 'include/server/mir/scene/surface.h'
--- include/server/mir/scene/surface.h	2016-03-18 15:26:47 +0000
+++ include/server/mir/scene/surface.h	2016-04-27 09:08:17 +0000
@@ -23,6 +23,7 @@
 #include "mir/input/surface.h"
 #include "mir/frontend/surface.h"
 #include "mir/compositor/compositor_id.h"
+#include "mir/optional_value.h"
 
 #include <vector>
 #include <list>
@@ -40,6 +41,7 @@
 {
     std::shared_ptr<compositor::BufferStream> stream;
     geometry::Displacement displacement;
+    optional_value<geometry::Size> size;
 };
 
 class SurfaceObserver;

=== modified file 'include/server/mir/scene/surface_creation_parameters.h'
--- include/server/mir/scene/surface_creation_parameters.h	2016-01-29 08:18:22 +0000
+++ include/server/mir/scene/surface_creation_parameters.h	2016-04-27 09:08:17 +0000
@@ -101,6 +101,7 @@
 
     mir::optional_value<std::vector<geometry::Rectangle>> input_shape;
     mir::optional_value<MirShellChrome> shell_chrome;
+    mir::optional_value<std::vector<shell::StreamSpecification>> streams;
 };
 
 bool operator==(const SurfaceCreationParameters& lhs, const SurfaceCreationParameters& rhs);

=== modified file 'include/server/mir/scene/surface_factory.h'
--- include/server/mir/scene/surface_factory.h	2015-06-17 05:20:42 +0000
+++ include/server/mir/scene/surface_factory.h	2016-04-27 09:08:17 +0000
@@ -21,6 +21,7 @@
 
 #include "mir/scene/surface_creation_parameters.h"
 #include <memory>
+#include <list>
 
 namespace mir
 {
@@ -28,6 +29,7 @@
 namespace scene
 {
 class Surface;
+class StreamInfo;
 
 class SurfaceFactory
 {
@@ -36,7 +38,7 @@
     virtual ~SurfaceFactory() = default;
 
     virtual std::shared_ptr<Surface> create_surface(
-        std::shared_ptr<compositor::BufferStream> const&,
+        std::list<scene::StreamInfo> const& streams,
         SurfaceCreationParameters const& params) = 0;
 
 private:

=== modified file 'include/server/mir/shell/surface_specification.h'
--- include/server/mir/shell/surface_specification.h	2016-03-18 15:26:47 +0000
+++ include/server/mir/shell/surface_specification.h	2016-04-27 09:08:17 +0000
@@ -43,6 +43,7 @@
 {
     frontend::BufferStreamId stream_id;
     geometry::Displacement displacement;
+    optional_value<geometry::Size> size;
 };
 
 /// Specification of surface properties requested by client

=== modified file 'include/server/mir/time/alarm_factory.h'
--- include/server/mir/time/alarm_factory.h	2015-06-17 05:20:42 +0000
+++ include/server/mir/time/alarm_factory.h	2016-04-27 09:08:17 +0000
@@ -62,7 +62,7 @@
      * \param callback Function to call when the Alarm signals
      * \return A handle to an Alarm that can later be scheduled
      */
-    virtual std::unique_ptr<Alarm> create_alarm(std::shared_ptr<LockableCallback> const& callback) = 0;
+    virtual std::unique_ptr<Alarm> create_alarm(std::unique_ptr<LockableCallback> callback) = 0;
 
 protected:
     AlarmFactory() = default;

=== modified file 'include/test/mir/test/display_config_matchers.h'
--- include/test/mir/test/display_config_matchers.h	2016-03-14 10:13:49 +0000
+++ include/test/mir/test/display_config_matchers.h	2016-04-27 09:08:17 +0000
@@ -23,6 +23,7 @@
 
 #include <gmock/gmock.h>
 
+
 //avoid a valgrind complaint by defining printer for this type
 static void PrintTo(MirDisplayConfiguration const&, ::std::ostream*) __attribute__ ((unused));
 void PrintTo(MirDisplayConfiguration const&, ::std::ostream*)

=== modified file 'include/test/mir/test/doubles/null_display_buffer.h'
--- include/test/mir/test/doubles/null_display_buffer.h	2016-01-29 08:18:22 +0000
+++ include/test/mir/test/doubles/null_display_buffer.h	2016-04-27 09:08:17 +0000
@@ -34,6 +34,7 @@
     geometry::Rectangle view_area() const override { return geometry::Rectangle(); }
     bool post_renderables_if_optimizable(graphics::RenderableList const&) override { return false; }
     MirOrientation orientation() const override { return mir_orientation_normal; }
+    MirMirrorMode mirror_mode() const override { return mir_mirror_mode_none; }
     NativeDisplayBuffer* native_display_buffer() override { return this; }
 };
 

=== modified file 'include/test/mir/test/doubles/stub_session.h'
--- include/test/mir/test/doubles/stub_session.h	2016-01-29 08:18:22 +0000
+++ include/test/mir/test/doubles/stub_session.h	2016-04-27 09:08:17 +0000
@@ -37,7 +37,7 @@
 
     std::string name() const override;
 
-    void force_requests_to_complete() override;
+    void drop_outstanding_requests() override;
 
     pid_t process_id() const override;
 

=== modified file 'include/test/mir/test/event_matchers.h'
--- include/test/mir/test/event_matchers.h	2016-03-16 06:59:01 +0000
+++ include/test/mir/test/event_matchers.h	2016-04-27 09:08:17 +0000
@@ -383,16 +383,21 @@
     return false;
 }
 
-MATCHER_P2(PointerEventWithDiff, dx, dy, "")
+MATCHER_P2(PointerEventWithDiff, expect_dx, expect_dy, "")
 {
     auto pev = maybe_pointer_event(to_address(arg));
     if (pev == nullptr)
         return false;
     if (mir_pointer_event_action(pev) != mir_pointer_action_motion)
         return false;
-    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_relative_x) != dx)
+    auto const error = 0.00001f;
+    auto const actual_dx = mir_pointer_event_axis_value(pev,
+                                                mir_pointer_axis_relative_x);
+    if (std::abs(expect_dx - actual_dx) > error)
         return false;
-    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_relative_y) != dy)
+    auto const actual_dy = mir_pointer_event_axis_value(pev,
+                                                mir_pointer_axis_relative_y);
+    if (std::abs(expect_dy - actual_dy) > error)
         return false;
     return true;
 }

=== modified file 'include/test/mir/test/signal.h'
--- include/test/mir/test/signal.h	2016-01-29 08:18:22 +0000
+++ include/test/mir/test/signal.h	2016-04-27 09:08:17 +0000
@@ -19,6 +19,8 @@
 #ifndef MIR_TEST_SIGNAL_H_
 #define MIR_TEST_SIGNAL_H_
 
+#include <gmock/gmock.h>
+
 #include <condition_variable>
 #include <chrono>
 #include <mutex>
@@ -57,6 +59,17 @@
     std::condition_variable cv;
     bool signalled{false};
 };
+
+ACTION_P(ReturnFalseAndWakeUp, signal)
+{
+    signal->raise();
+    return false;
+}
+ACTION_P(WakeUp, signal)
+{
+    signal->raise();
+}
+
 }
 }
 

=== removed file 'include/test/mir/test/wait_condition.h'
--- include/test/mir/test/wait_condition.h	2016-03-09 06:39:14 +0000
+++ include/test/mir/test/wait_condition.h	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU 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: Thomas Voß <[e-mail]>
- */
-
-#ifndef MIR_TEST_WAIT_CONDITION_H_
-#define MIR_TEST_WAIT_CONDITION_H_
-
-#include <gmock/gmock.h>
-
-#include <chrono>
-#include <mutex>
-#include <condition_variable>
-
-namespace mir
-{
-namespace test
-{
-struct WaitCondition
-{
-    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)
-    {
-        wait_for_at_most_seconds(std::chrono::seconds(seconds));
-    }
-
-    void wake_up_everyone()
-    {
-        std::unique_lock<std::mutex> ul(guard);
-        woken_ = true;
-        condition.notify_all();
-    }
-
-    bool woken()
-    {
-        std::unique_lock<std::mutex> ul(guard);
-        return woken_;
-    }
-
-    void reset()
-    {
-        std::lock_guard<std::mutex> ul(guard);
-        woken_ = false;
-    }
-
-    std::mutex guard;
-    std::condition_variable condition;
-    bool woken_;
-};
-
-ACTION_P(ReturnFalseAndWakeUp, wait_condition)
-{
-    wait_condition->wake_up_everyone();
-    return false;
-}
-ACTION_P(WakeUp, wait_condition)
-{
-    wait_condition->wake_up_everyone();
-}
-}
-}
-
-#endif // MIR_TEST_WAIT_CONDITION_H_

=== modified file 'include/test/mir_test_framework/interprocess_client_server_test.h'
--- include/test/mir_test_framework/interprocess_client_server_test.h	2016-01-29 08:18:22 +0000
+++ include/test/mir_test_framework/interprocess_client_server_test.h	2016-04-27 09:08:17 +0000
@@ -37,6 +37,8 @@
     void init_server(std::function<void()> const& init_code);
 
     void run_in_server(std::function<void()> const& exec_code);
+    void run_in_server_and_disable_core_dump(
+                       std::function<void()> const& exec_code);
 
     void run_in_client(std::function<void()> const& client_code);
 

=== modified file 'include/test/mir_test_framework/process.h'
--- include/test/mir_test_framework/process.h	2016-01-29 08:18:22 +0000
+++ include/test/mir_test_framework/process.h	2016-04-27 09:08:17 +0000
@@ -54,6 +54,9 @@
     // Was the process terminated by a signal?
     bool signalled() const;
 
+    // Was the process terminated normally?
+    bool exited_normally() const;
+
     TerminationReason reason;
     int exit_code;
     int signal;

=== modified file 'playground/demo-shell/demo_compositor.cpp'
--- playground/demo-shell/demo_compositor.cpp	2016-01-29 08:18:22 +0000
+++ playground/demo-shell/demo_compositor.cpp	2016-04-27 09:08:17 +0000
@@ -125,7 +125,7 @@
     }
     else
     {
-        renderer.set_rotation(display_buffer.orientation());
+        renderer.set_output_transform(display_buffer.orientation(), display_buffer.mirror_mode());
         renderer.set_viewport(viewport);
         renderer.begin(std::move(decorated));
         renderer.render(renderable_list);

=== modified file 'playground/mir_demo_client_prerendered_frames.c'
--- playground/mir_demo_client_prerendered_frames.c	2016-03-16 16:49:59 +0000
+++ playground/mir_demo_client_prerendered_frames.c	2016-04-27 09:08:17 +0000
@@ -159,14 +159,9 @@
     }
 
     MirSurfaceSpec* spec = mir_connection_create_spec_for_normal_surface(connection, width, height, format);
-    MirSurface* surface = mir_surface_create_sync(spec);
-    mir_surface_spec_release(spec);
-
-    //reassociate for advanced control
-    spec = mir_create_surface_spec(connection);
     mir_surface_spec_add_presentation_chain(
         spec, width, height, displacement_x, displacement_y, chain);
-    mir_surface_apply_spec(surface, spec);
+    MirSurface* surface = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
 
     int num_prerendered_frames = 20;

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2016-03-16 13:45:00 +0000
+++ src/client/CMakeLists.txt	2016-04-27 09:08:17 +0000
@@ -85,9 +85,13 @@
   display_configuration_api.cpp
   protobuf_to_native_buffer.cpp
   buffer_factory.cpp
+  mir_error.cpp
+  mir_error.h
+  mir_error_api.cpp
   ${MIR_CLIENT_SOURCES}
   ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/events/surface_output_event.h
   ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_display_configuration.h
+  ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_error.h
 )
 
 # Ensure protobuf C++ headers have been produced before

=== modified file 'src/client/buffer.cpp'
--- src/client/buffer.cpp	2016-03-16 13:45:00 +0000
+++ src/client/buffer.cpp	2016-04-27 09:08:17 +0000
@@ -32,11 +32,10 @@
     cb_context(context),
     buffer_id(buffer_id),
     buffer(buffer),
-    owned(true),
+    owned(false),
     chain(chain),
     usage(usage)
 {
-    cb(nullptr, reinterpret_cast<MirBuffer*>(this), cb_context);
 }
 
 int mcl::Buffer::rpc_id() const
@@ -49,19 +48,33 @@
     std::lock_guard<decltype(mutex)> lk(mutex);
     if (!owned)
         BOOST_THROW_EXCEPTION(std::logic_error("cannot submit unowned buffer"));
+    buffer->mark_as_submitted();
     mapped_region.reset();
     owned = false;
 }
 
+void mcl::Buffer::received()
+{
+    {
+        std::lock_guard<decltype(mutex)> lk(mutex);
+        if (!owned)
+            owned = true;
+    }
+    cb(nullptr, reinterpret_cast<MirBuffer*>(this), cb_context);
+
+}
+
 void mcl::Buffer::received(MirBufferPackage const& update_package)
 {
-    std::lock_guard<decltype(mutex)> lk(mutex);
-    if (!owned)
     {
-        owned = true;
-        buffer->update_from(update_package);
-        cb(nullptr, reinterpret_cast<MirBuffer*>(this), cb_context);
+        std::lock_guard<decltype(mutex)> lk(mutex);
+        if (!owned)
+        {
+            owned = true;
+            buffer->update_from(update_package);
+        }
     }
+    cb(nullptr, reinterpret_cast<MirBuffer*>(this), cb_context);
 }
     
 MirGraphicsRegion mcl::Buffer::map_region()
@@ -116,3 +129,12 @@
 {
     return buffer->size();
 }
+std::shared_ptr<mcl::ClientBuffer> mcl::Buffer::client_buffer() const
+{
+    return buffer;
+}
+
+void mcl::Buffer::increment_age()
+{
+    buffer->increment_age();
+}

=== modified file 'src/client/buffer.h'
--- src/client/buffer.h	2016-03-16 13:45:00 +0000
+++ src/client/buffer.h	2016-04-27 09:08:17 +0000
@@ -20,6 +20,7 @@
 #define MIR_CLIENT_BUFFER_H
 
 #include "mir_toolkit/mir_buffer.h"
+#include "mir/geometry/size.h"
 #include <memory>
 #include <chrono>
 #include <mutex>
@@ -43,9 +44,11 @@
     int rpc_id() const;
 
     void submitted();
+    void received();
     void received(MirBufferPackage const& update_message);
 
     MirNativeBuffer* as_mir_native_buffer() const;
+    std::shared_ptr<ClientBuffer> client_buffer() const;
     MirGraphicsRegion map_region();
 
     void set_fence(MirNativeFence*, MirBufferAccess);
@@ -57,6 +60,8 @@
     geometry::Size size() const;
 
     MirPresentationChain* allocating_chain() const;
+
+    void increment_age();
 private:
     mir_buffer_callback cb;
     void* cb_context;

=== modified file 'src/client/buffer_stream.cpp'
--- src/client/buffer_stream.cpp	2016-03-16 13:45:00 +0000
+++ src/client/buffer_stream.cpp	2016-04-27 09:08:17 +0000
@@ -19,6 +19,8 @@
 #define MIR_LOG_COMPONENT "MirBufferStream"
 
 #include "buffer_stream.h"
+#include "buffer.h"
+#include "buffer_factory.h"
 #include "make_protobuf_object.h"
 #include "mir_connection.h"
 #include "perf_report.h"
@@ -27,6 +29,7 @@
 #include "mir_protobuf.pb.h"
 #include "buffer_vault.h"
 #include "protobuf_to_native_buffer.h"
+#include "connection_surface_map.h"
 
 #include "mir/log.h"
 #include "mir/client_platform.h"
@@ -63,6 +66,7 @@
     virtual void lost_connection() = 0;
     virtual void set_size(geom::Size) = 0;
     virtual MirWaitHandle* set_scale(float, mf::BufferStreamId) = 0;
+    virtual void set_interval(int interval) = 0;
     virtual ~ServerBufferSemantics() = default;
     ServerBufferSemantics() = default;
     ServerBufferSemantics(ServerBufferSemantics const&) = delete;
@@ -196,6 +200,10 @@
         return &scale_wait_handle;
     }
 
+    void set_interval(int) override
+    {
+    }
+
     std::mutex mutex;
     mcl::ClientBufferDepository wrapped;
     mir::protobuf::DisplayServer& display_server;
@@ -245,11 +253,11 @@
             google::protobuf::NewCallback(Requests::ignore_response, protobuf_void));
     }
 
-    void submit_buffer(int id, mcl::ClientBuffer&) override
+    void submit_buffer(mcl::Buffer& buffer) override
     {
         mp::BufferRequest request;
         request.mutable_id()->set_value(stream_id);
-        request.mutable_buffer()->set_buffer_id(id);
+        request.mutable_buffer()->set_buffer_id(buffer.rpc_id());
 
         //note, NewCallback will trigger on exception, deleting this object there
         auto protobuf_void = new mp::Void;
@@ -272,10 +280,12 @@
 {
     NewBufferSemantics(
         std::shared_ptr<mcl::ClientBufferFactory> const& factory,
+        std::shared_ptr<mcl::AsyncBufferFactory> const& mirbuffer_factory,
         std::shared_ptr<mcl::ServerBufferRequests> const& requests,
+        std::weak_ptr<mcl::SurfaceMap> const& surface_map,
         geom::Size size, MirPixelFormat format, int usage,
         unsigned int initial_nbuffers) :
-        vault(factory, requests, size, format, usage, initial_nbuffers)
+        vault(factory, mirbuffer_factory, requests, surface_map, size, format, usage, initial_nbuffers)
     {
     }
 
@@ -295,30 +305,30 @@
     std::shared_ptr<mir::client::ClientBuffer> current_buffer() override
     {
         std::unique_lock<std::mutex> lk(mutex);
-        if (!current.buffer)
+        if (!current)
             advance_current_buffer(lk);
-        return current.buffer;
+        return current->client_buffer();
     }
 
     uint32_t current_buffer_id() override
     {
         std::unique_lock<std::mutex> lk(mutex);
-        if (!current.buffer)
+        if (!current)
             advance_current_buffer(lk);
-        return current.id;
+        return current->rpc_id();
     }
 
     MirWaitHandle* submit(std::function<void()> const& done, geom::Size, MirPixelFormat, int) override
     {
         std::unique_lock<std::mutex> lk(mutex);
-        if (!current.buffer)
+        if (!current)
             advance_current_buffer(lk);
         lk.unlock();
 
-        vault.deposit(current.buffer);
+        vault.deposit(current);
 
         next_buffer_wait_handle.expect_result();
-        vault.wire_transfer_outbound(current.buffer);
+        vault.wire_transfer_outbound(current);
         next_buffer_wait_handle.result_received();
 
         lk.lock();
@@ -349,11 +359,25 @@
         return &scale_wait_handle;
     }
 
+    void set_interval(int interval) override
+    {
+        std::unique_lock<decltype(mutex)> lk(mutex);
+        interval = std::max(0, std::min(1, interval));
+        if (current_swap_interval == interval)
+            return;
+        if (interval == 0)
+            vault.increase_buffer_count();
+        else
+            vault.decrease_buffer_count();
+        current_swap_interval = interval;
+    }
+
     mcl::BufferVault vault;
     std::mutex mutex;
-    mcl::BufferInfo current{nullptr, 0};
+    std::shared_ptr<mcl::Buffer> current{nullptr};
     MirWaitHandle next_buffer_wait_handle;
     MirWaitHandle scale_wait_handle;
+    int current_swap_interval = 1;
 };
 
 }
@@ -377,7 +401,8 @@
       protobuf_void{mcl::make_protobuf_object<mir::protobuf::Void>()},
       ideal_buffer_size(ideal_size),
       nbuffers(nbuffers),
-      creation_wait_handle(creation_wait_handle)
+      creation_wait_handle(creation_wait_handle),
+      surface_map(std::make_shared<mcl::ConnectionSurfaceMap>())
 {
     init_swap_interval();
     if (!protobuf_bs->has_id())
@@ -406,8 +431,8 @@
         {
             cached_buffer_size = ideal_buffer_size;
             buffer_depository = std::make_unique<NewBufferSemantics>(
-                client_platform->create_buffer_factory(),
-                std::make_shared<Requests>(display_server, protobuf_bs->id().value()),
+                client_platform->create_buffer_factory(), std::make_shared<mcl::BufferFactory>(),
+                std::make_shared<Requests>(display_server, protobuf_bs->id().value()), surface_map,
                 ideal_buffer_size, static_cast<MirPixelFormat>(protobuf_bs->pixel_format()), 
                 protobuf_bs->buffer_usage(), nbuffers);
         }
@@ -490,8 +515,8 @@
     else
     {
         buffer_depository = std::make_unique<NewBufferSemantics>(
-            client_platform->create_buffer_factory(),
-            std::make_shared<Requests>(display_server, protobuf_bs->id().value()),
+            client_platform->create_buffer_factory(), std::make_shared<mcl::BufferFactory>(),
+            std::make_shared<Requests>(display_server, protobuf_bs->id().value()), surface_map,
             ideal_buffer_size, static_cast<MirPixelFormat>(protobuf_bs->pixel_format()), 0, nbuffers);
     }
 }
@@ -638,6 +663,8 @@
     configuration.mutable_id()->set_value(protobuf_bs->id().value());
     configuration.set_swapinterval(interval);
 
+    buffer_depository->set_interval(interval);
+
     interval_wait_handle.expect_result();
     display_server.configure_buffer_stream(&configuration, protobuf_void.get(),
         google::protobuf::NewCallback(this, &mcl::BufferStream::on_swap_interval_set, interval));

=== modified file 'src/client/buffer_stream.h'
--- src/client/buffer_stream.h	2016-03-16 06:59:01 +0000
+++ src/client/buffer_stream.h	2016-04-27 09:08:17 +0000
@@ -64,7 +64,7 @@
 class ClientPlatform;
 class PerfReport;
 struct MemoryRegion;
-
+class SurfaceMap;
 class ServerBufferSemantics;
 class BufferStream : public EGLNativeSurface, public ClientBufferStream
 {
@@ -161,6 +161,7 @@
     size_t const nbuffers;
     std::string error_message;
     std::shared_ptr<MirWaitHandle> creation_wait_handle;
+    std::shared_ptr<SurfaceMap> const surface_map;
 };
 
 }

=== modified file 'src/client/buffer_vault.cpp'
--- src/client/buffer_vault.cpp	2016-03-16 13:45:00 +0000
+++ src/client/buffer_vault.cpp	2016-04-27 09:08:17 +0000
@@ -19,6 +19,9 @@
 #include "mir/client_buffer_factory.h"
 #include "mir/client_buffer.h"
 #include "buffer_vault.h"
+#include "buffer.h"
+#include "buffer_factory.h"
+#include "surface_map.h"
 #include "mir_protobuf.pb.h"
 #include "protobuf_to_native_buffer.h"
 #include <algorithm>
@@ -32,23 +35,38 @@
 enum class mcl::BufferVault::Owner
 {
     Server,
+    Self,
     ContentProducer,
-    Self
+    SelfWithContent
 };
 
+namespace
+{
+void ignore(MirPresentationChain*, MirBuffer*, void*)
+{
+}
+}
+
 mcl::BufferVault::BufferVault(
-    std::shared_ptr<ClientBufferFactory> const& client_buffer_factory,
+    std::shared_ptr<ClientBufferFactory> const& platform_factory,
+    std::shared_ptr<AsyncBufferFactory> const& buffer_factory,
     std::shared_ptr<ServerBufferRequests> const& server_requests,
+    std::weak_ptr<SurfaceMap> const& surface_map,
     geom::Size size, MirPixelFormat format, int usage, unsigned int initial_nbuffers) :
-    factory(client_buffer_factory),
+    platform_factory(platform_factory),
+    buffer_factory(buffer_factory),
     server_requests(server_requests),
+    surface_map(surface_map),
     format(format),
     usage(usage),
     size(size),
-    disconnected_(false)
+    disconnected_(false),
+    current_buffer_count(initial_nbuffers),
+    needed_buffer_count(initial_nbuffers),
+    initial_buffer_count(initial_nbuffers)
 {
-    for (auto i = 0u; i < initial_nbuffers; i++)
-        server_requests->allocate_buffer(size, format, usage);
+    for (auto i = 0u; i < initial_buffer_count; i++)
+        alloc_buffer(size, format, usage);
 }
 
 mcl::BufferVault::~BufferVault()
@@ -59,26 +77,57 @@
     for (auto& it : buffers)
     try
     {
-        server_requests->free_buffer(it.first);
+        free_buffer(it.first);
     }
     catch (...)
     {
     }
 }
 
-mcl::NoTLSFuture<mcl::BufferInfo> mcl::BufferVault::withdraw()
+void mcl::BufferVault::alloc_buffer(geom::Size size, MirPixelFormat format, int usage)
+{
+    buffer_factory->expect_buffer(platform_factory, nullptr, size, format, (MirBufferUsage)usage, ignore, nullptr);
+    server_requests->allocate_buffer(size, format, usage);
+}
+
+void mcl::BufferVault::free_buffer(int free_id)
+{
+    server_requests->free_buffer(free_id);
+}
+
+void mcl::BufferVault::realloc_buffer(int free_id, geom::Size size, MirPixelFormat format, int usage)
+{
+    free_buffer(free_id);
+    alloc_buffer(size, format, usage);
+}
+
+std::shared_ptr<mcl::Buffer> mcl::BufferVault::checked_buffer_from_map(int id)
+{
+    auto map = surface_map.lock();
+    if (!map)
+        BOOST_THROW_EXCEPTION(std::logic_error("connection resources lost; cannot access buffer"));
+    
+    if (auto buffer = map->buffer(id))
+        return buffer;
+    else
+        BOOST_THROW_EXCEPTION(std::logic_error("no buffer in map"));
+}
+
+mcl::NoTLSFuture<std::shared_ptr<mcl::Buffer>> mcl::BufferVault::withdraw()
 {
     std::lock_guard<std::mutex> lk(mutex);
-    mcl::NoTLSPromise<mcl::BufferInfo> promise;
+    mcl::NoTLSPromise<std::shared_ptr<mcl::Buffer>> promise;
     auto it = std::find_if(buffers.begin(), buffers.end(),
-        [this](std::pair<int, BufferEntry> const& entry) { 
-            return ((entry.second.owner == Owner::Self) && (size == entry.second.buffer->size())); });
+        [this](std::pair<int, Owner> const& entry) {
+            return ((entry.second == Owner::Self) &&
+                    (checked_buffer_from_map(entry.first)->size() == size));
+    });
 
     auto future = promise.get_future();
     if (it != buffers.end())
     {
-        it->second.owner = Owner::ContentProducer;
-        promise.set_value({it->second.buffer, it->first});
+        it->second = Owner::ContentProducer;
+        promise.set_value(checked_buffer_from_map(it->first));
     }
     else
     {
@@ -87,40 +136,34 @@
     return future;
 }
 
-void mcl::BufferVault::deposit(std::shared_ptr<mcl::ClientBuffer> const& buffer)
+void mcl::BufferVault::deposit(std::shared_ptr<mcl::Buffer> const& buffer)
 {
     std::lock_guard<std::mutex> lk(mutex);
-    auto it = std::find_if(buffers.begin(), buffers.end(),
-        [&buffer](std::pair<int, BufferEntry> const& entry) { return buffer == entry.second.buffer; });
-    if (it == buffers.end() || it->second.owner != Owner::ContentProducer)
+    auto it = buffers.find(buffer->rpc_id());
+    if (it == buffers.end() || it->second != Owner::ContentProducer)
         BOOST_THROW_EXCEPTION(std::logic_error("buffer cannot be deposited"));
 
-    it->second.owner = Owner::Self;
-    it->second.buffer->increment_age();
+    it->second = Owner::SelfWithContent;
+    checked_buffer_from_map(it->first)->increment_age();
 }
 
-void mcl::BufferVault::wire_transfer_outbound(std::shared_ptr<mcl::ClientBuffer> const& buffer)
+void mcl::BufferVault::wire_transfer_outbound(std::shared_ptr<mcl::Buffer> const& buffer)
 {
-    int id;
-    std::shared_ptr<mcl::ClientBuffer> submit_buffer;
     std::unique_lock<std::mutex> lk(mutex);
-    auto it = std::find_if(buffers.begin(), buffers.end(),
-        [&buffer](std::pair<int, BufferEntry> const& entry) { return buffer == entry.second.buffer; });
-    if (it == buffers.end() || it->second.owner != Owner::Self)
+    auto it = buffers.find(buffer->rpc_id());
+    if (it == buffers.end() || it->second != Owner::SelfWithContent)
         BOOST_THROW_EXCEPTION(std::logic_error("buffer cannot be transferred"));
-
-    it->second.owner = Owner::Server;
-    it->second.buffer->mark_as_submitted();
-    submit_buffer = it->second.buffer;
-    id = it->first;
+    it->second = Owner::Server;
     lk.unlock();
-    server_requests->submit_buffer(id, *submit_buffer);
+
+    buffer->submitted();
+    server_requests->submit_buffer(*buffer);
 }
 
 void mcl::BufferVault::wire_transfer_inbound(mp::Buffer const& protobuf_buffer)
 {
     std::shared_ptr<MirBufferPackage> package = mcl::protobuf_to_native_buffer(protobuf_buffer);
-
+    std::shared_ptr<mcl::Buffer> buffer;
     std::unique_lock<std::mutex> lk(mutex);
     auto it = buffers.find(protobuf_buffer.buffer_id());
     if (it == buffers.end())
@@ -129,39 +172,50 @@
         if (sz != size)
         {
             lk.unlock();
-            server_requests->free_buffer(protobuf_buffer.buffer_id());
             for (int i = 0; i != package->fd_items; ++i)
                 close(package->fd[i]);
 
-            server_requests->allocate_buffer(size, format, usage);
+            realloc_buffer(protobuf_buffer.buffer_id(), size, format, usage);
             return;
         }
 
-        buffers[protobuf_buffer.buffer_id()] = 
-            BufferEntry{ factory->create_buffer(package, sz, format), Owner::Self };
+        buffer = buffer_factory->generate_buffer(protobuf_buffer);
+        if (auto map = surface_map.lock())
+            map->insert(protobuf_buffer.buffer_id(), buffer);
+        else
+            BOOST_THROW_EXCEPTION(std::logic_error("connection resources lost; cannot access buffer"));
+         
+        buffers[protobuf_buffer.buffer_id()] = Owner::Self;
+        buffer->received();
     }
     else
     {
-        it->second.buffer->update_from(*package);
-        if (size == it->second.buffer->size())
-        { 
-            it->second.owner = Owner::Self;
-        }
-        else
+        buffer = checked_buffer_from_map(protobuf_buffer.buffer_id());
+        buffer->received(*package);
+        auto should_decrease_count = (current_buffer_count > needed_buffer_count);
+        if (size != buffer->size() || should_decrease_count)
         {
             int id = it->first;
             buffers.erase(it);
             lk.unlock();
-            server_requests->free_buffer(id);
-            server_requests->allocate_buffer(size, format, usage);
+
+            free_buffer(id);
+            if (should_decrease_count)
+                current_buffer_count--;
+            else
+                alloc_buffer(size, format, usage);
             return;
         }
+        else
+        {
+            it->second = Owner::Self;
+        }
     }
 
     if (!promises.empty())
     {
-        buffers[protobuf_buffer.buffer_id()].owner = Owner::ContentProducer;
-        promises.front().set_value({buffers[protobuf_buffer.buffer_id()].buffer, protobuf_buffer.buffer_id()});
+        buffers[protobuf_buffer.buffer_id()] = Owner::ContentProducer;
+        promises.front().set_value(buffer);
         promises.pop_front();
     }
 }
@@ -192,7 +246,8 @@
     size = new_size;
     for (auto it = buffers.begin(); it != buffers.end();)
     {
-        if ((it->second.owner == Owner::Self) && (it->second.buffer->size() != size)) 
+        auto buffer = checked_buffer_from_map(it->first);
+        if ((it->second == Owner::Self) && (buffer->size() != size)) 
         {
             free_ids.push_back(it->first);
             it = buffers.erase(it);
@@ -205,8 +260,34 @@
     lk.unlock();
 
     for(auto& id : free_ids)
+        realloc_buffer(id, new_size, format, usage);
+}
+
+void mcl::BufferVault::increase_buffer_count()
+{
+    std::unique_lock<std::mutex> lk(mutex);
+    current_buffer_count++;
+    needed_buffer_count++;
+    lk.unlock();
+    
+    alloc_buffer(size, format, usage);
+}
+
+void mcl::BufferVault::decrease_buffer_count()
+{
+    std::unique_lock<std::mutex> lk(mutex);
+    if (current_buffer_count == initial_buffer_count)
+        return;
+    needed_buffer_count--;
+
+    auto it = std::find_if(buffers.begin(), buffers.end(),
+        [](auto const& entry) { return entry.second == Owner::Self; });
+    if (it != buffers.end())
     {
-        server_requests->allocate_buffer(new_size, format, usage);
-        server_requests->free_buffer(id);
+        current_buffer_count--;
+        int free_id = it->first;
+        buffers.erase(it);
+        lk.unlock();
+        free_buffer(free_id);
     }
 }

=== modified file 'src/client/buffer_vault.h'
--- src/client/buffer_vault.h	2016-03-14 10:13:49 +0000
+++ src/client/buffer_vault.h	2016-04-27 09:08:17 +0000
@@ -33,12 +33,16 @@
 namespace client
 {
 class ClientBuffer;
+class Buffer;
+class AsyncBufferFactory;
+class SurfaceMap;
+
 class ServerBufferRequests
 {
 public:
     virtual void allocate_buffer(geometry::Size size, MirPixelFormat format, int usage) = 0;
     virtual void free_buffer(int buffer_id) = 0;
-    virtual void submit_buffer(int buffer_id, ClientBuffer&) = 0;
+    virtual void submit_buffer(Buffer&) = 0;
     virtual ~ServerBufferRequests() = default;
 protected:
     ServerBufferRequests() = default;
@@ -48,48 +52,50 @@
 
 class ClientBufferFactory;
 
-struct BufferInfo
-{
-    std::shared_ptr<ClientBuffer> buffer;
-    int id;
-};
-
 class BufferVault
 {
 public:
     BufferVault(
         std::shared_ptr<ClientBufferFactory> const&,
+        std::shared_ptr<AsyncBufferFactory> const&,
         std::shared_ptr<ServerBufferRequests> const&,
+        std::weak_ptr<SurfaceMap> const&,
         geometry::Size size, MirPixelFormat format, int usage,
         unsigned int initial_nbuffers);
     ~BufferVault();
 
-    NoTLSFuture<BufferInfo> withdraw();
-    void deposit(std::shared_ptr<ClientBuffer> const& buffer);
+    NoTLSFuture<std::shared_ptr<Buffer>> withdraw();
+    void deposit(std::shared_ptr<Buffer> const& buffer);
     void wire_transfer_inbound(protobuf::Buffer const&);
-    void wire_transfer_outbound(std::shared_ptr<ClientBuffer> const& buffer);
+    void wire_transfer_outbound(std::shared_ptr<Buffer> const& buffer);
     void set_size(geometry::Size);
     void disconnected();
     void set_scale(float scale);
+    void increase_buffer_count();
+    void decrease_buffer_count();
 
 private:
-    std::shared_ptr<ClientBufferFactory> const factory;
+    void alloc_buffer(geometry::Size size, MirPixelFormat format, int usage);
+    void free_buffer(int free_id);
+    void realloc_buffer(int free_id, geometry::Size size, MirPixelFormat format, int usage);
+    std::shared_ptr<Buffer> checked_buffer_from_map(int id);
+
+    std::shared_ptr<ClientBufferFactory> const platform_factory;
+    std::shared_ptr<AsyncBufferFactory> const buffer_factory;
     std::shared_ptr<ServerBufferRequests> const server_requests;
+    std::weak_ptr<SurfaceMap> const surface_map;
     MirPixelFormat const format;
     int const usage;
 
     enum class Owner;
-    struct BufferEntry
-    {
-        std::shared_ptr<ClientBuffer> buffer;
-        Owner owner;
-    };
-
     std::mutex mutex;
-    std::map<int, BufferEntry> buffers;
-    std::deque<NoTLSPromise<BufferInfo>> promises;
+    std::map<int, Owner> buffers;
+    std::deque<NoTLSPromise<std::shared_ptr<Buffer>>> promises;
     geometry::Size size;
     bool disconnected_;
+    size_t current_buffer_count;
+    size_t needed_buffer_count;
+    size_t const initial_buffer_count;
 };
 }
 }

=== modified file 'src/client/client_buffer_depository.cpp'
--- src/client/client_buffer_depository.cpp	2015-06-17 05:20:42 +0000
+++ src/client/client_buffer_depository.cpp	2016-04-27 09:08:17 +0000
@@ -36,6 +36,13 @@
     set_max_buffers(max_buffers);
 }
 
+mcl::ClientBufferDepository::ClientBufferDepository(
+    std::shared_ptr<ClientBufferFactory> const& factory) :
+    factory(factory),
+    max_buffers(0)
+{
+}
+
 void mcl::ClientBufferDepository::deposit_package(std::shared_ptr<MirBufferPackage> const& package, int id, geometry::Size size, MirPixelFormat pf)
 {
     auto existing_buffer_id_pair = buffers.end();
@@ -61,7 +68,7 @@
         buffers.erase(existing_buffer_id_pair);
     }
 
-    if (buffers.size() > max_buffers)
+    if (max_buffers != 0 && buffers.size() > max_buffers)
         buffers.pop_back();
 }
 

=== modified file 'src/client/client_buffer_depository.h'
--- src/client/client_buffer_depository.h	2015-06-17 05:20:42 +0000
+++ src/client/client_buffer_depository.h	2016-04-27 09:08:17 +0000
@@ -56,6 +56,9 @@
     /// passing. As such, this number needs to be shared between the server and client libraries.
     ClientBufferDepository(std::shared_ptr<ClientBufferFactory> const& factory, int max_buffers);
 
+    /// Creates a depository with no explicit limit
+    ClientBufferDepository(std::shared_ptr<ClientBufferFactory> const& factory);
+
     /// Construct a ClientBuffer from the IPC data, and use it as the current buffer.
 
     /// This also marks the previous current buffer (if any) as being submitted to the server.

=== modified file 'src/client/display_configuration_api.cpp'
--- src/client/display_configuration_api.cpp	2016-03-14 10:13:49 +0000
+++ src/client/display_configuration_api.cpp	2016-04-27 09:08:17 +0000
@@ -291,6 +291,14 @@
     return static_cast<MirOrientation>(output->orientation());
 }
 
+void mir_output_set_orientation(MirOutput* client_output, MirOrientation orientation)
+{
+    auto output = client_to_output(client_output);
+
+    output->set_orientation(orientation);
+}
+
+
 float mir_output_get_scale_factor(MirOutput const* client_output)
 {
     auto output = client_to_output(client_output);

=== modified file 'src/client/event.cpp'
--- src/client/event.cpp	2016-01-29 08:18:22 +0000
+++ src/client/event.cpp	2016-04-27 09:08:17 +0000
@@ -39,10 +39,10 @@
 template <typename EventType>
 void expect_event_type(EventType const* ev, MirEventType t)
 {
-    if (ev->type != t)
+    if (ev->type() != t)
     {
         mir::log_critical("Expected " + mir::event_type_to_string(t) + " but event is of type " +
-            mir::event_type_to_string(ev->type));
+            mir::event_type_to_string(ev->type()));
         abort();
     }
 }
@@ -76,82 +76,82 @@
 
 MirEventType mir_event_get_type(MirEvent const* ev)
 {
-    switch (ev->type)
+    switch (ev->type())
     {
     case mir_event_type_key:
     case mir_event_type_motion:
         return mir_event_type_input;
     default:
-        return ev->type;
+        return ev->type();
     }
 }
 
 MirInputEvent const* mir_event_get_input_event(MirEvent const* ev)
 {
-    if (ev->type != mir_event_type_key && ev->type != mir_event_type_motion)
+    if (ev->type() != mir_event_type_key && ev->type() != mir_event_type_motion)
     {
         mir::log_critical("Expected input event but event is of type " +
-            mir::event_type_to_string(ev->type));
+            mir::event_type_to_string(ev->type()));
         abort();
     }
 
-    return reinterpret_cast<MirInputEvent const*>(ev);
+    return ev->to_input();
 }
 
 MirSurfaceEvent const* mir_event_get_surface_event(MirEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_surface);
     
-    return &ev->surface;
+    return ev->to_surface();
 }
 
 MirResizeEvent const* mir_event_get_resize_event(MirEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_resize);
     
-    return &ev->resize;
+    return ev->to_resize();
 }
 
 MirPromptSessionEvent const* mir_event_get_prompt_session_event(MirEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_prompt_session_state_change);
     
-    return &ev->prompt_session;
+    return ev->to_prompt_session();
 }
 
 MirOrientationEvent const* mir_event_get_orientation_event(MirEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_orientation);
 
-    return &ev->orientation;
+    return ev->to_orientation();
 }
 
 MirCloseSurfaceEvent const* mir_event_get_close_surface_event(MirEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_close_surface);
 
-    return &ev->close_surface;
+    return ev->to_close_surface();
 }
 
 MirKeymapEvent const* mir_event_get_keymap_event(MirEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_keymap);
 
-    return &ev->keymap;
+    return ev->to_keymap();
 }
 
 MirInputConfigurationEvent const* mir_event_get_input_configuration_event(MirEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_input_configuration);
 
-    return &ev->input_configuration;
+    return ev->to_input_configuration();
 }
 
 MirSurfaceOutputEvent const* mir_event_get_surface_output_event(MirEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_surface_output);
 
-    return &ev->surface_output;
+    return ev->to_surface_output();
 }
 
 /* Surface event accessors */
@@ -160,14 +160,14 @@
 {
     expect_event_type(ev, mir_event_type_surface);
 
-    return ev->attrib;
+    return ev->attrib();
 }
 
 int mir_surface_event_get_attribute_value(MirSurfaceEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_surface);
 
-    return ev->value;
+    return ev->value();
 }
 
 /* Resize event accessors */
@@ -175,13 +175,13 @@
 int mir_resize_event_get_width(MirResizeEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_resize);
-    return ev->width;
+    return ev->width();
 }
 
 int mir_resize_event_get_height(MirResizeEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_resize);
-    return ev->height;
+    return ev->height();
 }
 
 /* Prompt session event accessors */
@@ -189,7 +189,7 @@
 MirPromptSessionState mir_prompt_session_event_get_state(MirPromptSessionEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_prompt_session_state_change);
-    return ev->new_state;
+    return ev->new_state();
 }
 
 /* Orientation event accessors */
@@ -197,7 +197,7 @@
 MirOrientation mir_orientation_event_get_direction(MirOrientationEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_orientation);
-    return ev->direction;
+    return ev->direction();
 }
 
 /* Keymap event accessors */
@@ -206,15 +206,15 @@
 {
     expect_event_type(ev, mir_event_type_keymap);
 
-    *buffer = ev->buffer;
-    *length = ev->size;
+    *buffer = ev->buffer();
+    *length = ev->size();
 }
 
 MirInputDeviceId mir_keymap_event_get_device_id(MirKeymapEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_keymap);
 
-    return ev->device_id;
+    return ev->device_id();
 }
 
 /* Input configuration event accessors */
@@ -222,19 +222,19 @@
 MirInputConfigurationAction mir_input_configuration_event_get_action(MirInputConfigurationEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_input_configuration);
-    return ev->action;
+    return ev->action();
 }
 
 int64_t mir_input_configuration_event_get_time(MirInputConfigurationEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_input_configuration);
-    return ev->when.count();
+    return ev->when().count();
 }
 
 MirInputDeviceId mir_input_configuration_event_get_device_id(MirInputConfigurationEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_input_configuration);
-    return ev->id;
+    return ev->id();
 }
 
 /* Surface output event accessors */
@@ -242,45 +242,40 @@
 int mir_surface_output_event_get_dpi(MirSurfaceOutputEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_surface_output);
-    return ev->dpi;
+    return ev->dpi();
 }
 
 MirFormFactor mir_surface_output_event_get_form_factor(MirSurfaceOutputEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_surface_output);
-    return ev->form_factor;
+    return ev->form_factor();
 }
 
 float mir_surface_output_event_get_scale(MirSurfaceOutputEvent const* ev)
 {
     expect_event_type(ev, mir_event_type_surface_output);
-    return ev->scale;
+    return ev->scale();
 }
 
 uint32_t mir_surface_output_event_get_output_id(MirSurfaceOutputEvent const *ev)
 {
     expect_event_type(ev, mir_event_type_surface_output);
-    return ev->output_id;
+    return ev->output_id();
 }
 
 // TODO: Until we opaquify the MirEvent structure and add
 // a ref count ref is implemented as copy.
 MirEvent const* mir_event_ref(MirEvent const* ev)
 {
-    MirEvent *new_ev = new MirEvent;
-    memcpy(new_ev, ev, sizeof(MirEvent));
-
-    if (mir_event_get_type(new_ev) == mir_event_type_keymap)
-    {
-        // malloc to match xkbcommons allocation behavior
-        auto buffer  = static_cast<char*>(malloc(new_ev->keymap.size));
-        std::memcpy(buffer, ev->keymap.buffer, new_ev->keymap.size);
-        new_ev->keymap.buffer = buffer;
-    }
-    return new_ev;
+    return ev->clone();
 }
 
 void mir_event_unref(MirEvent const* ev)
 {
+    if (mir_event_get_type(ev) == mir_event_type_keymap)
+    {
+        const_cast<MirEvent*>(ev)->to_keymap()->free_buffer();
+    }
+
     delete const_cast<MirEvent*>(ev);
 }

=== modified file 'src/client/events/CMakeLists.txt'
--- src/client/events/CMakeLists.txt	2016-01-22 16:40:15 +0000
+++ src/client/events/CMakeLists.txt	2016-04-27 09:08:17 +0000
@@ -17,7 +17,6 @@
 list(APPEND MIR_CLIENT_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/event_builders.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/serialization.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/make_empty_event.cpp
 )
 
 set(MIR_CLIENT_SOURCES ${MIR_CLIENT_SOURCES} PARENT_SCOPE)

=== modified file 'src/client/events/event_builders.cpp'
--- src/client/events/event_builders.cpp	2016-01-29 08:18:22 +0000
+++ src/client/events/event_builders.cpp	2016-04-27 09:08:17 +0000
@@ -20,8 +20,6 @@
 
 #include "mir/log.h"
 
-#include "make_empty_event.h"
-
 #include "mir/events/event_builders.h"
 #include "mir/events/event_private.h"
 #include "mir/cookie/blob.h"
@@ -56,56 +54,71 @@
 
         return blob;
     }
+
+template <class T>
+T* new_event()
+{
+    T* t = new T;
+
+    return t;
+}
+
+template <class T>
+mir::EventUPtr make_uptr_event(T* e)
+{
+    return mir::EventUPtr(e, ([](MirEvent* e) { delete reinterpret_cast<T*>(e); }));
+}
+
 }
 
 mir::EventUPtr mev::make_event(mf::SurfaceId const& surface_id, MirOrientation orientation)
 {
-    auto e = make_empty_event();
-
-    e->type = mir_event_type_orientation;
-    e->orientation.surface_id = surface_id.as_value();
-    e->orientation.direction = orientation;
-    return e;
+    auto e = new_event<MirOrientationEvent>();
+
+    e->set_surface_id(surface_id.as_value());
+    e->set_direction(orientation);
+
+    return make_uptr_event(e);
 }
 
 mir::EventUPtr mev::make_event(MirPromptSessionState state)
 {
-    auto e = make_empty_event();
-
-    e->type = mir_event_type_prompt_session_state_change;
-    e->prompt_session.new_state = state;
-    return e;
+    auto e = new_event<MirPromptSessionEvent>();
+
+    e->set_new_state(state);
+
+    return make_uptr_event(e);
 }
 
 mir::EventUPtr mev::make_event(mf::SurfaceId const& surface_id, geom::Size const& size)
 {
-    auto e = make_empty_event();
-
-    e->type = mir_event_type_resize;
-    e->resize.surface_id = surface_id.as_value();
-    e->resize.width = size.width.as_int();
-    e->resize.height = size.height.as_int();
-    return e;
+    auto e = new_event<MirResizeEvent>();
+
+    e->set_surface_id(surface_id.as_value());
+    e->set_width(size.width.as_int());
+    e->set_height(size.height.as_int());
+
+    return make_uptr_event(e);
 }
 
 mir::EventUPtr mev::make_event(mf::SurfaceId const& surface_id, MirSurfaceAttrib attribute, int value)
 {
-    auto e = make_empty_event();
-
-    e->type = mir_event_type_surface;
-    e->surface.id = surface_id.as_value();
-    e->surface.attrib = attribute;
-    e->surface.value = value;
-    return e;
+    auto e = new_event<MirSurfaceEvent>();
+
+    e->set_id(surface_id.as_value());
+    e->set_attrib(attribute);
+    e->set_value(value);
+
+    return make_uptr_event(e);
 }
 
 mir::EventUPtr mev::make_event(mf::SurfaceId const& surface_id)
 {
-    auto e = make_empty_event();
-
-    e->type = mir_event_type_close_surface;
-    e->close_surface.surface_id = surface_id.as_value();
-    return e;
+    auto e = new_event<MirCloseSurfaceEvent>();
+
+    e->set_surface_id(surface_id.as_value());
+
+    return make_uptr_event(e);
 }
 
 mir::EventUPtr mev::make_event(
@@ -115,16 +128,15 @@
     MirFormFactor form_factor,
     uint32_t output_id)
 {
-    auto e = make_empty_event();
-
-    e->type = mir_event_type_surface_output;
-    e->surface_output.surface_id = surface_id.as_value();
-    e->surface_output.dpi = dpi;
-    e->surface_output.scale = scale;
-    e->surface_output.form_factor = form_factor;
-    e->surface_output.output_id = output_id;
-
-    return e;
+    auto e = new_event<MirSurfaceOutputEvent>();
+
+    e->set_surface_id(surface_id.as_value());
+    e->set_dpi(dpi);
+    e->set_scale(scale);
+    e->set_form_factor(form_factor);
+    e->set_output_id(output_id);
+
+    return make_uptr_event(e);
 }
 
 namespace
@@ -162,36 +174,34 @@
     std::vector<uint8_t> const& cookie, MirKeyboardAction action, xkb_keysym_t key_code,
     int scan_code, MirInputEventModifiers modifiers)
 {
-    auto e = make_empty_event();
-
-    e->type = mir_event_type_key;
-    auto& kev = e->key;
-    kev.device_id = device_id;
-    kev.source_id = AINPUT_SOURCE_KEYBOARD;
-    kev.event_time = timestamp;
-    kev.cookie = vector_to_cookie_as_blob(cookie);
-    kev.action = action;
-    kev.key_code = key_code;
-    kev.scan_code = scan_code;
-    kev.modifiers = modifiers;
-
-    return e;
+    auto e = new_event<MirKeyboardEvent>();
+
+    e->set_device_id(device_id);
+    e->set_source_id(AINPUT_SOURCE_KEYBOARD);
+    e->set_event_time(timestamp);
+    e->set_cookie(vector_to_cookie_as_blob(cookie));
+    e->set_action(action);
+    e->set_key_code(key_code);
+    e->set_scan_code(scan_code);
+    e->set_modifiers(modifiers);
+
+    return make_uptr_event(e);
 }
 
 void mev::set_modifier(MirEvent& event, MirInputEventModifiers modifiers)
 {
-    switch(event.type)
+    switch(event.type())
     {
     case mir_event_type_key:
         {
-            auto& kev = event.key;
-            kev.modifiers = modifiers;
+            auto& kev = *event.to_input()->to_keyboard();
+            kev.set_modifiers(modifiers);
             break;
         }
     case mir_event_type_motion:
         {
-            auto& mev = event.motion;
-            mev.modifiers = modifiers;
+            auto& mev = *event.to_input()->to_motion();
+            mev.set_modifiers(modifiers);
             break;
         }
     default:
@@ -201,23 +211,23 @@
 
 void mev::set_cursor_position(MirEvent& event, mir::geometry::Point const& pos)
 {
-    if (event.type != mir_event_type_motion &&
-        event.motion.source_id != AINPUT_SOURCE_MOUSE &&
-        event.motion.pointer_count == 1)
+    if (event.type() != mir_event_type_motion &&
+        event.to_input()->to_motion()->source_id() != AINPUT_SOURCE_MOUSE &&
+        event.to_input()->to_motion()->pointer_count() == 1)
         BOOST_THROW_EXCEPTION(std::invalid_argument("Cursor position is only valid for pointer events."));
 
-    event.motion.pointer_coordinates[0].x = pos.x.as_float();
-    event.motion.pointer_coordinates[0].y = pos.y.as_float();
+    event.to_input()->to_motion()->set_x(0, pos.x.as_float());
+    event.to_input()->to_motion()->set_y(0, pos.y.as_float());
 }
 
 void mev::set_button_state(MirEvent& event, MirPointerButtons button_state)
 {
-    if (event.type != mir_event_type_motion &&
-        event.motion.source_id != AINPUT_SOURCE_MOUSE &&
-        event.motion.pointer_count == 1)
+    if (event.type() != mir_event_type_motion &&
+        event.to_input()->to_motion()->source_id() != AINPUT_SOURCE_MOUSE &&
+        event.to_input()->to_motion()->pointer_count() == 1)
         BOOST_THROW_EXCEPTION(std::invalid_argument("Cursor position is only valid for pointer events."));
 
-    event.motion.buttons = button_state;
+    event.to_input()->to_motion()->set_buttons(button_state);
 }
 
 // Deprecated version with uint64_t mac
@@ -239,17 +249,15 @@
 mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
     std::vector<uint8_t> const& cookie, MirInputEventModifiers modifiers)
 {
-    auto e = make_empty_event();
-
-    e->type = mir_event_type_motion;
-    auto& mev = e->motion;
-    mev.device_id = device_id;
-    mev.event_time = timestamp;
-    mev.cookie = vector_to_cookie_as_blob(cookie);
-    mev.modifiers = modifiers;
-    mev.source_id = AINPUT_SOURCE_TOUCHSCREEN;
-
-    return e;
+    auto e = new_event<MirMotionEvent>();
+
+    e->set_device_id(device_id);
+    e->set_event_time(timestamp);
+    e->set_cookie(vector_to_cookie_as_blob(cookie));
+    e->set_modifiers(modifiers);
+    e->set_source_id(AINPUT_SOURCE_TOUCHSCREEN);
+
+    return make_uptr_event(e);
 }
 
 // Deprecated version with uint64_t mac
@@ -270,17 +278,19 @@
     MirTouchTooltype tooltype, float x_axis_value, float y_axis_value,
     float pressure_value, float touch_major_value, float touch_minor_value, float size_value)
 {
-    auto& mev = event.motion;
-    auto& pc = mev.pointer_coordinates[mev.pointer_count++];
-    pc.id = touch_id;
-    pc.tool_type = tooltype;
-    pc.x = x_axis_value;
-    pc.y = y_axis_value;
-    pc.pressure = pressure_value;
-    pc.touch_major = touch_major_value;
-    pc.touch_minor = touch_minor_value;
-    pc.size = size_value;
-    pc.action = action;
+    auto mev = event.to_input()->to_motion();
+    auto current_index = mev->pointer_count();
+    mev->set_pointer_count(current_index + 1);
+
+    mev->set_id(current_index, touch_id);
+    mev->set_tool_type(current_index, tooltype);
+    mev->set_x(current_index, x_axis_value);
+    mev->set_y(current_index, y_axis_value);
+    mev->set_pressure(current_index, pressure_value);
+    mev->set_touch_major(current_index, touch_major_value);
+    mev->set_touch_minor(current_index, touch_minor_value);
+    mev->set_size(current_index, size_value);
+    mev->set_action(current_index, action);
 }
 
 mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
@@ -290,28 +300,26 @@
     float hscroll_value, float vscroll_value,
     float relative_x_value, float relative_y_value)
 {
-    auto e = make_empty_event();
-
-    e->type = mir_event_type_motion;
-    auto& mev = e->motion;
-    mev.device_id = device_id;
-    mev.event_time = timestamp;
-    mev.cookie = vector_to_cookie_as_blob(cookie);
-    mev.modifiers = modifiers;
-    mev.source_id = AINPUT_SOURCE_MOUSE;
-    mev.buttons = buttons_pressed;
-
-    mev.pointer_count = 1;
-    auto& pc = mev.pointer_coordinates[0];
-    mev.pointer_coordinates[0].action = action;
-    pc.x = x_axis_value;
-    pc.y = y_axis_value;
-    pc.dx = relative_x_value;
-    pc.dy = relative_y_value;
-    pc.hscroll = hscroll_value;
-    pc.vscroll = vscroll_value;
-
-    return e;
+    auto e = new_event<MirMotionEvent>();
+
+    auto& mev = *e->to_input()->to_motion();
+    mev.set_device_id(device_id);
+    mev.set_event_time(timestamp);
+    mev.set_cookie(vector_to_cookie_as_blob(cookie));
+    mev.set_modifiers(modifiers);
+    mev.set_source_id(AINPUT_SOURCE_MOUSE);
+    mev.set_buttons(buttons_pressed);
+
+    mev.set_pointer_count(1);
+    mev.set_action(0, action);
+    mev.set_x(0, x_axis_value);
+    mev.set_y(0, y_axis_value);
+    mev.set_dx(0, relative_x_value);
+    mev.set_dy(0, relative_y_value);
+    mev.set_hscroll(0, hscroll_value);
+    mev.set_vscroll(0, vscroll_value);
+
+    return make_uptr_event(e);
 }
 
 // Deprecated version with uint64_t mac
@@ -365,7 +373,16 @@
 mir::EventUPtr mev::make_event(mf::SurfaceId const& surface_id, MirInputDeviceId id, std::string const& model,
                                std::string const& layout, std::string const& variant, std::string const& options)
 {
-    auto e = make_empty_event();
+    auto e = new_event<MirKeymapEvent>();
+    auto ep = mir::EventUPtr(e, [](MirEvent* e) {
+        // xkbcommon creates the keymap through malloc
+        if (e && e->type() == mir_event_type_keymap)
+        {
+            e->to_keymap()->free_buffer();
+        }
+
+        delete e;
+    });
 
     auto ctx = mi::make_unique_context();
     auto map = mi::make_unique_keymap(ctx.get(), model, layout, variant, options);
@@ -373,24 +390,22 @@
     if (!map.get())
         BOOST_THROW_EXCEPTION(std::runtime_error("failed to assemble keymap from given parameters"));
 
-    e->type = mir_event_type_keymap;
-    e->keymap.surface_id = surface_id.as_value();
-    e->keymap.device_id = id;
+    e->set_surface_id(surface_id.as_value());
+    e->set_device_id(id);
     // TODO consider caching compiled keymaps
-    e->keymap.buffer = xkb_keymap_get_as_string(map.get(), XKB_KEYMAP_FORMAT_TEXT_V1);
-    e->keymap.size = strlen(e->keymap.buffer);
+    e->set_buffer(xkb_keymap_get_as_string(map.get(), XKB_KEYMAP_FORMAT_TEXT_V1));
+    e->set_size(strlen(e->to_keymap()->buffer()));
 
-    return e;
+    return ep;
 }
 
 mir::EventUPtr mev::make_event(MirInputConfigurationAction action, MirInputDeviceId id, std::chrono::nanoseconds time)
 {
-    auto e = make_empty_event();
-
-    e->type = mir_event_type_input_configuration;
-    e->input_configuration.action = action;
-    e->input_configuration.when = time;
-    e->input_configuration.id = id;
-
-    return e;
+    auto e = new_event<MirInputConfigurationEvent>();
+
+    e->set_action(action);
+    e->set_when(time);
+    e->set_id(id);
+
+    return make_uptr_event(e);
 }

=== removed file 'src/client/events/make_empty_event.cpp'
--- src/client/events/make_empty_event.cpp	2016-01-22 16:40:15 +0000
+++ src/client/events/make_empty_event.cpp	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright © 2016 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/>.
- *
- * Author: Andreas Pokorny <[e-mail]>
- */
-
-#include "make_empty_event.h"
-#include "mir/events/event_private.h"
-
-#include <cstring>
-#include <cstdlib>
-
-namespace mev = mir::events;
-namespace
-{
-    void delete_event(MirEvent *e)
-    {
-        // xkbcommon creates the keymap through malloc
-        if (e && e->type == mir_event_type_keymap)
-            std::free(const_cast<char*>(e->keymap.buffer));
-        delete e;
-    }
-}
-
-mir::EventUPtr mev::make_empty_event()
-{
-    auto e = new MirEvent;
-    std::memset(e, 0, sizeof (MirEvent));
-    return mir::EventUPtr(e, delete_event);
-}

=== removed file 'src/client/events/make_empty_event.h'
--- src/client/events/make_empty_event.h	2016-01-22 16:40:15 +0000
+++ src/client/events/make_empty_event.h	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/*
- * Copyright © 2016 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/>.
- *
- * Author: Andreas Pokorny <[e-mail]>
- */
-
-#ifndef MIR_EVENTS_MAKE_EMPTY_EVENTS_H_
-#define MIR_EVENTS_MAKE_EMPTY_EVENTS_H_
-
-#include "mir/events/event_builders.h"
-
-namespace mir
-{
-namespace events
-{
-mir::EventUPtr make_empty_event();
-}
-}
-
-#endif

=== modified file 'src/client/events/serialization.cpp'
--- src/client/events/serialization.cpp	2016-01-22 16:40:15 +0000
+++ src/client/events/serialization.cpp	2016-04-27 09:08:17 +0000
@@ -16,96 +16,17 @@
  * Authored by: Andreas Pokorny <[e-mail]>
  */
 
-#include "make_empty_event.h"
 #include "mir/events/serialization.h"
 #include "mir/events/event_private.h"
 
-#include <boost/throw_exception.hpp>
-#include <cstring>
-
 namespace mev = mir::events;
 
-namespace
-{
-template<typename Data>
-char const* consume(char const* pos, Data& data)
-{
-    std::memcpy(&data, pos, sizeof data);
-    return pos + sizeof data;
-}
-
-template<typename Data>
-void encode(std::string& encoded, Data const& data)
-{
-    encoded.append(reinterpret_cast<char const*>(&data), sizeof data);
-}
-}
-
 std::string mev::serialize_event(MirEvent const& event)
 {
-    auto type = mir_event_get_type(&event);
-
-    switch (type)
-    {
-    case mir_event_type_keymap:
-        {
-            std::string encoded;
-            auto const& keymap = event.keymap;
-            encoded.reserve(sizeof event.type +
-                            sizeof keymap.surface_id +
-                            sizeof keymap.device_id +
-                            sizeof keymap.size +
-                            keymap.size);
-            encode(encoded, event.type);
-            encode(encoded, keymap.surface_id);
-            encode(encoded, keymap.device_id);
-            encode(encoded, keymap.size);
-            encoded.append(keymap.buffer, keymap.size);
-            return encoded;
-        }
-    default:
-        return {reinterpret_cast<char const*>(&event), sizeof event};
-    }
+    return MirEvent::serialize(&event);
 }
 
 mir::EventUPtr mev::deserialize_event(std::string const& raw)
 {
-    auto ev = make_empty_event();
-    auto& event = *ev;
-    auto minimal_event_size = sizeof event.type;
-    auto const stream_size = raw.size();
-    if (stream_size < minimal_event_size)
-        BOOST_THROW_EXCEPTION(std::runtime_error("Failed to deserialize event"));
-
-    char const* pos = consume(raw.data(), event.type);
-
-    switch (event.type)
-    {
-    case mir_event_type_keymap:
-    {
-        auto& keymap = event.keymap;
-        minimal_event_size += sizeof keymap.surface_id + sizeof keymap.device_id + sizeof keymap.size;
-
-        if (stream_size < minimal_event_size)
-            BOOST_THROW_EXCEPTION(std::runtime_error("Failed to deserialize event"));
-        pos = consume(pos, keymap.surface_id);
-        pos = consume(pos, keymap.device_id);
-        pos = consume(pos, keymap.size);
-
-        minimal_event_size += keymap.size;
-
-        if (stream_size < minimal_event_size)
-            BOOST_THROW_EXCEPTION(std::runtime_error("Failed to deserialize event"));
-
-        auto buffer  = static_cast<char*>(malloc(keymap.size));
-        std::memcpy(buffer, pos, keymap.size);
-        keymap.buffer = buffer;
-        break;
-    }
-    default:
-        consume(raw.data(), event);
-        break;
-    }
-
-    return ev;
+    return MirEvent::deserialize(raw);
 }

=== modified file 'src/client/input/android/event_conversion_helpers.cpp'
--- src/client/input/android/event_conversion_helpers.cpp	2016-03-17 22:23:47 +0000
+++ src/client/input/android/event_conversion_helpers.cpp	2016-04-27 09:08:17 +0000
@@ -201,11 +201,11 @@
 int32_t mia::extract_masked_android_action_from(MirEvent const& ev)
 {
     int index_with_action = -1;
-    auto const& mev = ev.motion;
+    auto const& mev = *ev.to_input()->to_motion();
 
-    for (unsigned i = 0; i < mev.pointer_count; i++)
+    for (unsigned i = 0; i < mev.pointer_count(); i++)
     {
-        if (mev.pointer_coordinates[i].action == mir_touch_action_change)
+        if (mev.action(i) == mir_touch_action_change)
             continue;
         index_with_action = i;
     }
@@ -213,16 +213,16 @@
         return AMOTION_EVENT_ACTION_MOVE;
     
     int masked_action = AMOTION_EVENT_ACTION_MASK;
-    switch (mev.pointer_coordinates[index_with_action].action)
+    switch (mev.action(index_with_action))
     {
     case mir_touch_action_up:
-        if (mev.pointer_count != 1)
+        if (mev.pointer_count() != 1)
             masked_action &= AMOTION_EVENT_ACTION_POINTER_UP;
         else
             masked_action &= AMOTION_EVENT_ACTION_UP;
         break;
     case mir_touch_action_down:
-        if (mev.pointer_count != 1)
+        if (mev.pointer_count() != 1)
             masked_action &= AMOTION_EVENT_ACTION_POINTER_DOWN;
         else
             masked_action &= AMOTION_EVENT_ACTION_DOWN;
@@ -275,10 +275,11 @@
 
 int32_t mia::extract_android_action_from(MirEvent const& event)
 {
-    if (mia::android_source_id_is_pointer_device(event.motion.source_id))
+    auto& mev = *event.to_input()->to_motion();
+    if (mia::android_source_id_is_pointer_device(mev.source_id()))
     {
         return mia::android_pointer_action_from_mir(
-            static_cast<MirPointerAction>(event.motion.pointer_coordinates[0].action), event.motion.buttons);
+            static_cast<MirPointerAction>(mev.action(0)), mev.buttons());
     }
     else
     {

=== modified file 'src/client/input/input_event.cpp'
--- src/client/input/input_event.cpp	2016-03-17 22:23:47 +0000
+++ src/client/input/input_event.cpp	2016-04-27 09:08:17 +0000
@@ -33,16 +33,6 @@
 
 namespace
 {
-void expect_old_event_type(MirEvent const* ev, MirEventType t)
-{
-    if (ev->type != t)
-    {
-        mir::log_critical("Expected " + mir::event_type_to_string(t) + " but event is of type " +
-            mir::event_type_to_string(ev->type));
-        abort();
-    }
-}
-
 std::string input_event_type_to_string(MirInputEventType input_event_type)
 {
     switch (input_event_type)
@@ -84,25 +74,6 @@
     AINPUT_SOURCE_ANY = 0xffffff00
 };
 
-MirEvent const* old_ev_from_new(MirInputEvent const* ev)
-{
-    return reinterpret_cast<MirEvent const*>(ev);
-}
-
-MirMotionEvent const& old_mev_from_new(MirTouchEvent const* ev)
-{
-    auto old_ev = reinterpret_cast<MirEvent const*>(ev);
-    expect_old_event_type(old_ev, mir_event_type_motion);
-    return old_ev->motion;
-}
-
-MirMotionEvent const& old_mev_from_new(MirPointerEvent const* ev)
-{
-    auto old_ev = reinterpret_cast<MirEvent const*>(ev);
-    expect_old_event_type(old_ev, mir_event_type_motion);
-    return old_ev->motion;
-}
-
 // Differentiate between MirTouchEvents and MirPointerEvents based on old device class
 MirInputEventType type_from_device_class(int32_t source_class)
 {
@@ -122,20 +93,18 @@
 
 MirInputEventType mir_input_event_get_type(MirInputEvent const* ev)
 {
-    auto old_ev = old_ev_from_new(ev);
-    
-    if (old_ev->type != mir_event_type_key && old_ev->type != mir_event_type_motion)
+    if (ev->type() != mir_event_type_key && ev->type() != mir_event_type_motion)
     {
-        mir::log_critical("expected input event but event was of type " + mir::event_type_to_string(old_ev->type));
+        mir::log_critical("expected input event but event was of type " + mir::event_type_to_string(ev->type()));
         abort();
     }
 
-    switch (old_ev->type)
+    switch (ev->type())
     {
     case mir_event_type_key:
         return mir_input_event_type_key;
     case mir_event_type_motion:
-        return type_from_device_class(old_ev->motion.source_id);
+        return type_from_device_class(ev->to_motion()->source_id());
     default:
         abort();
     }
@@ -143,20 +112,18 @@
 
 MirInputDeviceId mir_input_event_get_device_id(MirInputEvent const* ev)
 {
-    auto old_ev = old_ev_from_new(ev);
-
-    if(mir_event_get_type(old_ev) != mir_event_type_input)
+    if(mir_event_get_type(ev) != mir_event_type_input)
     {
-        mir::log_critical("expected input event but event was of type " + mir::event_type_to_string(old_ev->type));
+        mir::log_critical("expected input event but event was of type " + mir::event_type_to_string(ev->type()));
         abort();
     }
 
-    switch (old_ev->type)
+    switch (ev->type())
     {
     case mir_event_type_motion:
-        return old_ev->motion.device_id;
+        return ev->to_motion()->device_id();
     case mir_event_type_key:
-        return old_ev->key.device_id;
+        return ev->to_keyboard()->device_id();
     default:
         abort();
     }
@@ -164,19 +131,18 @@
 
 int64_t mir_input_event_get_event_time(MirInputEvent const* ev)
 {
-    auto old_ev = old_ev_from_new(ev);
-    if(mir_event_get_type(old_ev) != mir_event_type_input)
+    if(mir_event_get_type(ev) != mir_event_type_input)
     {
-        mir::log_critical("expected input event but event was of type " + mir::event_type_to_string(old_ev->type));
+        mir::log_critical("expected input event but event was of type " + mir::event_type_to_string(ev->type()));
         abort();
     }
 
-    switch (old_ev->type)
+    switch (ev->type())
     {
     case mir_event_type_motion:
-        return old_ev->motion.event_time.count();
+        return ev->to_motion()->event_time().count();
     case mir_event_type_key:
-        return old_ev->key.event_time.count();
+        return ev->to_keyboard()->event_time().count();
     default:
         abort();
     }
@@ -213,29 +179,28 @@
 
 MirKeyboardAction mir_keyboard_event_action(MirKeyboardEvent const* kev)
 {
-    return kev->action;
+    return kev->action();
 }
 
 xkb_keysym_t mir_keyboard_event_key_code(MirKeyboardEvent const* kev)
 {
-    return kev->key_code;
+    return kev->key_code();
 }
 
 int mir_keyboard_event_scan_code(MirKeyboardEvent const* kev)
 {
-    return kev->scan_code;
+    return kev->scan_code();
 }
 
 MirInputEventModifiers mir_keyboard_event_modifiers(MirKeyboardEvent const* kev)
 {    
-    return kev->modifiers;
+    return kev->modifiers();
 }
 /* Touch event accessors */
 
 MirInputEventModifiers mir_touch_event_modifiers(MirTouchEvent const* tev)
 {    
-    auto const& old_mev = old_mev_from_new(tev);
-    return old_mev.modifiers;
+    return tev->to_motion()->modifiers();
 }
 
 MirTouchEvent const* mir_input_event_get_touch_event(MirInputEvent const* ev)
@@ -252,76 +217,67 @@
 
 unsigned int mir_touch_event_point_count(MirTouchEvent const* event)
 {
-    auto const& old_mev = reinterpret_cast<MirEvent const*>(event)->motion;
-    return old_mev.pointer_count;
+    return event->to_motion()->pointer_count();
 }
 
 MirTouchId mir_touch_event_id(MirTouchEvent const* event, size_t touch_index)
 {
-    auto const& old_mev = old_mev_from_new(event);
-
-    if (touch_index >= old_mev.pointer_count)
+    if (touch_index >= event->to_motion()->pointer_count())
     {
         mir::log_critical("touch index is greater than pointer count");
         abort();
     }
 
-    return old_mev.pointer_coordinates[touch_index].id;
+    return event->to_motion()->id(touch_index);
 }
 
 MirTouchAction mir_touch_event_action(MirTouchEvent const* event, size_t touch_index)
 {
-    auto const& old_mev = old_mev_from_new(event);
-
-    if(touch_index > old_mev.pointer_count)
+    if(touch_index > event->to_motion()->pointer_count())
     {
         mir::log_critical("touch index is greater than pointer count");
         abort();
     }
     
-    return static_cast<MirTouchAction>(old_mev.pointer_coordinates[touch_index].action);
+    return static_cast<MirTouchAction>(event->to_motion()->action(touch_index));
 }
 
 MirTouchTooltype mir_touch_event_tooltype(MirTouchEvent const* event,
     size_t touch_index)
 {
-    auto const& old_mev = old_mev_from_new(event);
-
-    if(touch_index > old_mev.pointer_count)
+    if(touch_index > event->to_motion()->pointer_count())
     {
         mir::log_critical("touch index is greater than pointer count");
         abort();
     }
 
-    return old_mev.pointer_coordinates[touch_index].tool_type;
+    return event->to_motion()->tool_type(touch_index);
 }
 
 float mir_touch_event_axis_value(MirTouchEvent const* event,
     size_t touch_index, MirTouchAxis axis)
 {
-    auto const& old_mev = old_mev_from_new(event);
-
-    if(touch_index > old_mev.pointer_count)
+    if(touch_index > event->to_motion()->pointer_count())
     {
         mir::log_critical("touch index is greater than pointer count");
         abort();
     }
 
-    auto const& old_pc = old_mev.pointer_coordinates[touch_index];
+    auto mev = event->to_motion();
     switch (axis)
     {
     case mir_touch_axis_x:
-        return old_pc.x;
+        return mev->x(touch_index);
     case mir_touch_axis_y:
-        return old_pc.y;
+        return mev->y(touch_index);
     case mir_touch_axis_pressure:
-        return old_pc.pressure;
+        return mev->pressure(touch_index);
     case mir_touch_axis_touch_major:
-        return old_pc.touch_major;
+        return mev->touch_major(touch_index);
     case mir_touch_axis_touch_minor:
-        return old_pc.touch_minor;
+        return mev->touch_minor(touch_index);
     case mir_touch_axis_size:
-        return old_pc.size;
+        return mev->size(touch_index);
     default:
         return -1;
     }
@@ -343,46 +299,42 @@
 
 MirInputEventModifiers mir_pointer_event_modifiers(MirPointerEvent const* pev)
 {    
-    auto const& old_mev = old_mev_from_new(pev);
-    return old_mev.modifiers;
+    return pev->to_motion()->modifiers();
 }
 
 MirPointerAction mir_pointer_event_action(MirPointerEvent const* pev)
 {    
-    auto const& old_mev = old_mev_from_new(pev);
-    return static_cast<MirPointerAction>(old_mev.pointer_coordinates[0].action);
+    return static_cast<MirPointerAction>(pev->to_motion()->action(0));
 }
 
 bool mir_pointer_event_button_state(MirPointerEvent const* pev,
     MirPointerButton button)
 {
-   auto const& old_mev = old_mev_from_new(pev);
-   return old_mev.buttons & button;
+   return pev->to_motion()->buttons() & button;
 }
 
 MirPointerButtons mir_pointer_event_buttons(MirPointerEvent const* pev)
 {
-   auto const& old_mev = old_mev_from_new(pev);
-   return old_mev.buttons;
+   return pev->to_motion()->buttons();
 }
 
 float mir_pointer_event_axis_value(MirPointerEvent const* pev, MirPointerAxis axis)
 {
-   auto const& old_mev = old_mev_from_new(pev);
+   auto mev = pev->to_motion();
    switch (axis)
    {
    case mir_pointer_axis_x:
-       return old_mev.pointer_coordinates[0].x;
+       return mev->x(0);
    case mir_pointer_axis_y:
-       return old_mev.pointer_coordinates[0].y;
+       return mev->y(0);
    case mir_pointer_axis_relative_x:
-       return old_mev.pointer_coordinates[0].dx;
+       return mev->dx(0);
    case mir_pointer_axis_relative_y:
-       return old_mev.pointer_coordinates[0].dy;
+       return mev->dy(0);
    case mir_pointer_axis_vscroll:
-       return old_mev.pointer_coordinates[0].vscroll;
+       return mev->vscroll(0);
    case mir_pointer_axis_hscroll:
-       return old_mev.pointer_coordinates[0].hscroll;
+       return mev->hscroll(0);
    default:
        mir::log_critical("Invalid axis enumeration " + std::to_string(axis));
        abort();
@@ -432,17 +384,15 @@
 
 MirCookie const* mir_input_event_get_cookie(MirInputEvent const* iev) try
 {
-    auto const ev = old_ev_from_new(iev);
-
-    switch (ev->type)
+    switch (iev->type())
     {
     case mir_event_type_motion:
-        return new MirCookie(ev->motion.cookie);
+        return new MirCookie(iev->to_motion()->cookie());
     case mir_event_type_key:
-        return new MirCookie(ev->key.cookie);
+        return new MirCookie(iev->to_keyboard()->cookie());
     default:
     {
-        mir::log_critical("expected a key or motion events, type was: " + mir::event_type_to_string(ev->type));
+        mir::log_critical("expected a key or motion events, type was: " + mir::event_type_to_string(iev->type()));
         abort();
     }
     }

=== modified file 'src/client/input/xkb_mapper.cpp'
--- src/client/input/xkb_mapper.cpp	2016-01-29 08:18:22 +0000
+++ src/client/input/xkb_mapper.cpp	2016-04-27 09:08:17 +0000
@@ -103,23 +103,23 @@
 {
     std::lock_guard<std::mutex> lg(guard);
 
-    auto& key_ev = ev.key;
+    auto& key_ev = *ev.to_input()->to_keyboard();
 
     xkb_key_direction direction = XKB_KEY_DOWN;
 
     bool update_state = true;
-    if (key_ev.action == mir_keyboard_action_up)
+    if (key_ev.action() == mir_keyboard_action_up)
         direction = XKB_KEY_UP;
-    else if (key_ev.action == mir_keyboard_action_down)
+    else if (key_ev.action() == mir_keyboard_action_down)
         direction = XKB_KEY_DOWN;
-    else if (key_ev.action == mir_keyboard_action_repeat)
+    else if (key_ev.action() == mir_keyboard_action_repeat)
         update_state = false;
 
-    uint32_t xkb_scan_code = to_xkb_scan_code(key_ev.scan_code);
+    uint32_t xkb_scan_code = to_xkb_scan_code(key_ev.scan_code());
     if (update_state)
         xkb_state_update_key(state.get(), xkb_scan_code, direction);
 
-    key_ev.key_code = keysym_for_scan_code(state.get(), xkb_scan_code);
+    key_ev.set_key_code(keysym_for_scan_code(state.get(), xkb_scan_code));
 }
 
 // id should be used in the future to implement per device keymaps

=== modified file 'src/client/mir_connection.cpp'
--- src/client/mir_connection.cpp	2016-03-17 17:47:42 +0000
+++ src/client/mir_connection.cpp	2016-04-27 09:08:17 +0000
@@ -44,6 +44,7 @@
 
 #include "mir/events/event_builders.h"
 #include "mir/logging/logger.h"
+#include "mir_error.h"
 
 #include <algorithm>
 #include <cstddef>
@@ -172,6 +173,22 @@
         }
     }
 
+    if (spec.streams.is_set())
+    {
+        for(auto const& stream : spec.streams.value())
+        {
+            auto const new_stream = message.add_stream();
+            new_stream->set_displacement_x(stream.displacement.dx.as_int());
+            new_stream->set_displacement_y(stream.displacement.dy.as_int());
+            new_stream->mutable_id()->set_value(stream.stream_id);
+            if (stream.size.is_set())
+            {
+                new_stream->set_width(stream.size.value().width.as_int());
+                new_stream->set_height(stream.size.value().height.as_int());
+            }
+        }
+    }
+
     return message;
 }
 
@@ -400,7 +417,7 @@
             this, server, &debug, stream, input_platform, spec, *surface_proto, request->wh);
 
         surface_map->insert(mf::SurfaceId{surface_proto->id().value()}, surf);
-        surface_map->insert(mf::BufferStreamId{surface_proto->id().value()}, stream);
+        surface_map->insert(mf::BufferStreamId{surface_proto->buffer_stream().id().value()}, stream);
     }
 
     callback(surf.get(), context);
@@ -879,7 +896,7 @@
 }
 
 std::shared_ptr<mir::client::ClientBufferStream> MirConnection::make_consumer_stream(
-   mp::BufferStream const& protobuf_bs, mir::geometry::Size)
+   mp::BufferStream const& protobuf_bs)
 {
     return std::make_shared<mcl::ScreencastStream>(
         this, server, platform, protobuf_bs);
@@ -908,6 +925,11 @@
     ping_handler->set_callback(std::bind(callback, this, std::placeholders::_1, context));
 }
 
+void MirConnection::register_error_callback(mir_error_callback callback, void* context)
+{
+    error_handler.set_callback(std::bind(callback, this, std::placeholders::_1, context));
+}
+
 void MirConnection::pong(int32_t serial)
 {
     mp::PingEvent pong;
@@ -991,6 +1013,58 @@
     return &set_base_display_configuration_wait_handle;
 }
 
+namespace
+{
+struct HandleErrorVoid
+{
+    std::unique_ptr<mp::Void> result;
+    std::function<void(mp::Void const&)> on_error;
+};
+
+void handle_structured_error(HandleErrorVoid* handler)
+{
+    if (handler->result->has_structured_error())
+    {
+        handler->on_error(*handler->result);
+    }
+    delete handler;
+}
+}
+
+void MirConnection::preview_base_display_configuration(
+    mp::DisplayConfiguration const& configuration,
+    std::chrono::seconds timeout)
+{
+    mp::PreviewConfiguration request;
+
+    request.mutable_configuration()->CopyFrom(configuration);
+    request.set_timeout(timeout.count());
+
+    auto store_error_result = new HandleErrorVoid;
+    store_error_result->result = std::make_unique<mp::Void>();
+    store_error_result->on_error = [this](mp::Void const& message)
+    {
+        MirError const error{
+            static_cast<MirErrorDomain>(message.structured_error().domain()),
+            message.structured_error().code()};
+        error_handler(&error);
+    };
+
+    server.preview_base_display_configuration(
+        &request,
+        store_error_result->result.get(),
+        google::protobuf::NewCallback(&handle_structured_error, store_error_result));
+}
+
+void MirConnection::confirm_base_display_configuration(
+    mp::DisplayConfiguration const& configuration)
+{
+    server.confirm_base_display_configuration(
+        &configuration,
+        set_base_display_configuration_response.get(),
+        google::protobuf::NewCallback(google::protobuf::DoNothing));
+}
+
 void MirConnection::done_set_base_display_configuration()
 {
     std::lock_guard<decltype(mutex)> lock(mutex);

=== modified file 'src/client/mir_connection.h'
--- src/client/mir_connection.h	2016-03-17 17:47:42 +0000
+++ src/client/mir_connection.h	2016-04-27 09:08:17 +0000
@@ -135,6 +135,8 @@
 
     void register_display_change_callback(mir_display_config_callback callback, void* context);
 
+    void register_error_callback(mir_error_callback callback, void* context);
+
     void populate(MirPlatformPackage& platform_package);
     void populate_graphics_module(MirModuleProperties& properties);
     MirDisplayConfiguration* create_copy_of_display_config();
@@ -143,7 +145,7 @@
                                    unsigned int formats_size, unsigned int& valid_formats);
 
     std::shared_ptr<mir::client::ClientBufferStream> make_consumer_stream(
-       mir::protobuf::BufferStream const& protobuf_bs, mir::geometry::Size);
+       mir::protobuf::BufferStream const& protobuf_bs);
 
     MirWaitHandle* create_client_buffer_stream(
         int width, int height,
@@ -174,6 +176,11 @@
     void done_display_configure();
 
     MirWaitHandle* set_base_display_configuration(MirDisplayConfiguration const* configuration);
+    void preview_base_display_configuration(
+        mir::protobuf::DisplayConfiguration const& configuration,
+        std::chrono::seconds timeout);
+    void confirm_base_display_configuration(
+        mir::protobuf::DisplayConfiguration const& configuration);
     void done_set_base_display_configuration();
 
     std::shared_ptr<mir::client::rpc::MirBasicRpcChannel> rpc_channel() const
@@ -306,6 +313,8 @@
     
     std::shared_ptr<mir::client::ClientBufferStreamFactory> buffer_stream_factory;
 
+    mir::client::AtomicCallback<MirError const*> error_handler;
+
     struct SurfaceRelease;
     struct StreamRelease;
 

=== modified file 'src/client/mir_connection_api.cpp'
--- src/client/mir_connection_api.cpp	2016-03-14 10:13:49 +0000
+++ src/client/mir_connection_api.cpp	2016-04-27 09:08:17 +0000
@@ -314,10 +314,46 @@
 
 void mir_input_config_destroy(MirInputConfig const* config)
 {
-    auto device_vector = reinterpret_cast<std::vector<mir::input::DeviceData>const*>(config);
+    auto device_vector = reinterpret_cast<std::vector<mir::input::DeviceData> const*>(config);
     delete device_vector;
 }
 
+void mir_connection_preview_base_display_configuration(
+    MirConnection* connection,
+    MirDisplayConfig const* config,
+    int timeout_seconds)
+{
+    mir::require(mir_connection_is_valid(connection));
+
+    try
+    {
+        connection->preview_base_display_configuration(
+            *reinterpret_cast<mp::DisplayConfiguration const*>(config),
+            std::chrono::seconds{timeout_seconds});
+    }
+    catch (std::exception const& ex)
+    {
+        MIR_LOG_UNCAUGHT_EXCEPTION(ex);
+    }
+}
+
+void mir_connection_confirm_base_display_configuration(
+    MirConnection* connection,
+    MirDisplayConfig const* config)
+{
+    mir::require(mir_connection_is_valid(connection));
+
+    try
+    {
+        connection->confirm_base_display_configuration(
+            *reinterpret_cast<mp::DisplayConfiguration const*>(config));
+    }
+    catch (std::exception const& ex)
+    {
+        MIR_LOG_UNCAUGHT_EXCEPTION(ex);
+    }
+}
+
 MirEGLNativeDisplayType mir_connection_get_egl_native_display(
     MirConnection* connection)
 {
@@ -355,3 +391,21 @@
         return nullptr;
     }
 }
+
+void mir_connection_set_error_callback(
+    MirConnection* connection,
+    mir_error_callback callback,
+    void* context)
+{
+    mir::require(mir_connection_is_valid(connection));
+
+    try
+    {
+        connection->register_error_callback(callback, context);
+    }
+    catch (std::exception const& ex)
+    {
+        MIR_LOG_UNCAUGHT_EXCEPTION(ex);
+    }
+}
+

=== added file 'src/client/mir_error.cpp'
--- src/client/mir_error.cpp	1970-01-01 00:00:00 +0000
+++ src/client/mir_error.cpp	2016-04-27 09:08:17 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2016 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: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "mir_error.h"
+
+MirError::MirError(MirErrorDomain domain, uint32_t code)
+    : domain_{domain},
+      code_{code}
+{
+}
+
+MirErrorDomain MirError::domain() const noexcept
+{
+    return domain_;
+}
+
+uint32_t MirError::code() const noexcept
+{
+    return code_;
+}

=== added file 'src/client/mir_error.h'
--- src/client/mir_error.h	1970-01-01 00:00:00 +0000
+++ src/client/mir_error.h	2016-04-27 09:08:17 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2016 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: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_CLIENT_MIR_ERROR_H_
+#define MIR_CLIENT_MIR_ERROR_H_
+
+#include "mir_toolkit/client_types.h"
+
+struct MirError
+{
+public:
+    MirError(MirErrorDomain domain, uint32_t code);
+
+    MirErrorDomain domain() const noexcept;
+    uint32_t code() const noexcept;
+
+private:
+    MirErrorDomain const domain_;
+    uint32_t const code_;
+};
+
+#endif //MIR_CLIENT_MIR_ERROR_H_

=== added file 'src/client/mir_error_api.cpp'
--- src/client/mir_error_api.cpp	1970-01-01 00:00:00 +0000
+++ src/client/mir_error_api.cpp	2016-04-27 09:08:17 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2016 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: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "mir_toolkit/mir_error.h"
+#include "mir_error.h"
+
+MirErrorDomain mir_error_get_domain(MirError const* error)
+{
+    return error->domain();
+}
+
+uint32_t mir_error_get_code(MirError const* error)
+{
+    return error->code();
+}

=== modified file 'src/client/mir_screencast.cpp'
--- src/client/mir_screencast.cpp	2016-03-16 06:59:01 +0000
+++ src/client/mir_screencast.cpp	2016-04-27 09:08:17 +0000
@@ -30,42 +30,101 @@
 namespace mp = mir::protobuf;
 namespace geom = mir::geometry;
 
+namespace
+{
+mir::protobuf::ScreencastParameters serialize_spec(MirScreencastSpec const& spec)
+{
+    mp::ScreencastParameters message;
+
+#define SERIALIZE_OPTION_IF_SET(option) \
+    if (spec.option.is_set()) \
+        message.set_##option(spec.option.value());
+
+    SERIALIZE_OPTION_IF_SET(width);
+    SERIALIZE_OPTION_IF_SET(height);
+    SERIALIZE_OPTION_IF_SET(pixel_format);
+    SERIALIZE_OPTION_IF_SET(mirror_mode);
+    SERIALIZE_OPTION_IF_SET(num_buffers);
+
+    if (spec.capture_region.is_set())
+    {
+        auto const region = spec.capture_region.value();
+        message.mutable_region()->set_left(region.left);
+        message.mutable_region()->set_top(region.top);
+        message.mutable_region()->set_width(region.width);
+        message.mutable_region()->set_height(region.height);
+    }
+
+    return message;
+}
+
+//TODO: it should be up to the server to decide if the parameters are acceptable
+void throw_if_invalid(MirScreencastSpec const& spec)
+{
+#define THROW_IF_UNSET(option) \
+    if (!spec.option.is_set()) \
+        BOOST_THROW_EXCEPTION(std::runtime_error("Unset "#option));
+
+#define THROW_IF_EQ(option, val) \
+    THROW_IF_UNSET(option); \
+    if (spec.option.is_set() && spec.option.value() == val) \
+        BOOST_THROW_EXCEPTION(std::runtime_error("Invalid "#option));
+
+#define THROW_IF_ZERO(option) THROW_IF_EQ(option, 0)
+
+    THROW_IF_ZERO(width);
+    THROW_IF_ZERO(height);
+    THROW_IF_EQ(pixel_format, mir_pixel_format_invalid);
+    THROW_IF_UNSET(capture_region);
+
+    if (spec.capture_region.is_set())
+    {
+        auto const region = spec.capture_region.value();
+        if (region.width == 0)
+            BOOST_THROW_EXCEPTION(std::runtime_error("Invalid capture region width"));
+        if (region.height == 0)
+            BOOST_THROW_EXCEPTION(std::runtime_error("Invalid capture region height"));
+    }
+}
+}
+
+MirScreencastSpec::MirScreencastSpec() = default;
+
+MirScreencastSpec::MirScreencastSpec(MirConnection* connection)
+    : connection{connection}
+{
+}
+
+MirScreencastSpec::MirScreencastSpec(MirConnection* connection, MirScreencastParameters const& params)
+    : connection{connection},
+      width{params.width},
+      height{params.height},
+      pixel_format{params.pixel_format},
+      capture_region{params.region}
+{
+}
+
+MirScreencast::MirScreencast(std::string const& error)
+    : protobuf_screencast{mcl::make_protobuf_object<mir::protobuf::Screencast>()}
+{
+    protobuf_screencast->set_error(error);
+}
+
 MirScreencast::MirScreencast(
-    geom::Rectangle const& region,
-    geom::Size const& size,
-    MirPixelFormat pixel_format,
-    mir::client::rpc::DisplayServer& server,
-    MirConnection* connection,
+    MirScreencastSpec const& spec,
+    mir::client::rpc::DisplayServer& the_server,
     mir_screencast_callback callback, void* context)
-    : server(server),
-      connection{connection},
-      output_size{size},
+    : server{&the_server},
+      connection{spec.connection},
       protobuf_screencast{mcl::make_protobuf_object<mir::protobuf::Screencast>()},
       protobuf_void{mcl::make_protobuf_object<mir::protobuf::Void>()}
 {
-    if (output_size.width.as_int()  == 0 ||
-        output_size.height.as_int() == 0 ||
-        region.size.width.as_int()  == 0 ||
-        region.size.height.as_int() == 0 ||
-        pixel_format == mir_pixel_format_invalid)
-    {
-        BOOST_THROW_EXCEPTION(std::runtime_error("Invalid parameters"));
-    }
-    protobuf_screencast->set_error("Not initialized");
-
-    mp::ScreencastParameters parameters;
-
-    parameters.mutable_region()->set_left(region.top_left.x.as_int());
-    parameters.mutable_region()->set_top(region.top_left.y.as_int());
-    parameters.mutable_region()->set_width(region.size.width.as_uint32_t());
-    parameters.mutable_region()->set_height(region.size.height.as_uint32_t());
-    parameters.set_width(output_size.width.as_uint32_t());
-    parameters.set_height(output_size.height.as_uint32_t());
-    parameters.set_pixel_format(pixel_format);
+    throw_if_invalid(spec);
+    auto const message = serialize_spec(spec);
 
     create_screencast_wait_handle.expect_result();
-    server.create_screencast(
-        &parameters,
+    server->create_screencast(
+        &message,
         protobuf_screencast.get(),
         google::protobuf::NewCallback(
             this, &MirScreencast::screencast_created,
@@ -79,36 +138,53 @@
 
 bool MirScreencast::valid()
 {
+    std::lock_guard<decltype(mutex)> lock(mutex);
     return !protobuf_screencast->has_error();
 }
 
-MirWaitHandle* MirScreencast::release(
-        mir_screencast_callback callback, void* context)
-{
-    mp::ScreencastId screencast_id;
-    screencast_id.set_value(protobuf_screencast->screencast_id().value());
-    
+char const* MirScreencast::get_error_message()
+{
+    std::lock_guard<decltype(mutex)> lock(mutex);
+    if (protobuf_screencast->has_error())
+    {
+        return protobuf_screencast->error().c_str();
+    }
+    return empty_error_message.c_str();
+}
+
+MirWaitHandle* MirScreencast::release(mir_screencast_callback callback, void* context)
+{
     release_wait_handle.expect_result();
-    server.release_screencast(
-        &screencast_id,
-        protobuf_void.get(),
-        google::protobuf::NewCallback(
-            this, &MirScreencast::released, callback, context));
+    if (valid() && server)
+    {
+        mp::ScreencastId screencast_id;
+        {
+            std::lock_guard<decltype(mutex)> lock(mutex);
+            screencast_id.set_value(protobuf_screencast->screencast_id().value());
+        }
+        server->release_screencast(
+            &screencast_id,
+            protobuf_void.get(),
+            google::protobuf::NewCallback(
+                this, &MirScreencast::released, callback, context));
+    }
+    else
+    {
+        callback(this, context);
+        release_wait_handle.result_received();
+    }
 
     return &release_wait_handle;
 }
 
-void MirScreencast::request_and_wait_for_configure(MirSurfaceAttrib, int)
-{
-}
-
 void MirScreencast::screencast_created(
     mir_screencast_callback callback, void* context)
 {
     if (!protobuf_screencast->has_error() && connection)
     {
+        std::lock_guard<decltype(mutex)> lock(mutex);
         buffer_stream = connection->make_consumer_stream(
-            protobuf_screencast->buffer_stream(), output_size);
+            protobuf_screencast->buffer_stream());
     }
 
     callback(this, context);
@@ -119,14 +195,18 @@
     mir_screencast_callback callback, void* context)
 {
     callback(this, context);
-    if (connection)
-        connection->release_consumer_stream(buffer_stream.get());
-    buffer_stream.reset();
 
+    {
+        std::lock_guard<decltype(mutex)> lock(mutex);
+        if (connection)
+            connection->release_consumer_stream(buffer_stream.get());
+        buffer_stream.reset();
+    }
     release_wait_handle.result_received();
 }
 
 mir::client::ClientBufferStream* MirScreencast::get_buffer_stream()
 {
+    std::lock_guard<decltype(mutex)> lock(mutex);
     return buffer_stream.get();
 }

=== modified file 'src/client/mir_screencast.h'
--- src/client/mir_screencast.h	2016-01-29 08:18:22 +0000
+++ src/client/mir_screencast.h	2016-04-27 09:08:17 +0000
@@ -21,6 +21,7 @@
 
 #include "mir_wait_handle.h"
 #include "mir_toolkit/client_types.h"
+#include "mir/optional_value.h"
 #include "mir/geometry/size.h"
 #include "mir/geometry/rectangle.h"
 
@@ -46,27 +47,43 @@
 }
 }
 
+struct MirScreencastSpec
+{
+    MirScreencastSpec();
+    MirScreencastSpec(MirConnection* connection);
+    MirScreencastSpec(MirConnection* connection, MirScreencastParameters const& params);
+
+    // Required parameters
+    MirConnection* connection{nullptr};
+
+    // Optional parameters
+    mir::optional_value<unsigned int> width;
+    mir::optional_value<unsigned int> height;
+    mir::optional_value<MirPixelFormat> pixel_format;
+    mir::optional_value<MirRectangle> capture_region;
+
+    mir::optional_value<MirMirrorMode> mirror_mode;
+    mir::optional_value<unsigned int> num_buffers;
+};
+
 struct MirScreencast
 {
 public:
+    MirScreencast(std::string const& error);
     MirScreencast(
-        mir::geometry::Rectangle const& region,
-        mir::geometry::Size const& size,
-        MirPixelFormat pixel_format,
+        MirScreencastSpec const& spec,
         mir::client::rpc::DisplayServer& server,
-        MirConnection* connection,
         mir_screencast_callback callback, void* context);
 
     MirWaitHandle* creation_wait_handle();
     bool valid();
+    char const* get_error_message();
 
     MirWaitHandle* release(
         mir_screencast_callback callback, void* context);
 
     EGLNativeWindowType egl_native_window();
 
-    void request_and_wait_for_configure(MirSurfaceAttrib a, int value);
-
     mir::client::ClientBufferStream* get_buffer_stream();
 
 private:
@@ -75,16 +92,18 @@
     void released(
         mir_screencast_callback callback, void* context);
 
-    mir::client::rpc::DisplayServer& server;
-    MirConnection* connection;
-    mir::geometry::Size const output_size;
+    std::mutex mutable mutex;
+    mir::client::rpc::DisplayServer* const server{nullptr};
+    MirConnection* const connection{nullptr};
     std::shared_ptr<mir::client::ClientBufferStream> buffer_stream;
 
-    std::unique_ptr<mir::protobuf::Screencast> protobuf_screencast;
-    std::unique_ptr<mir::protobuf::Void> protobuf_void;
+    std::unique_ptr<mir::protobuf::Screencast> const protobuf_screencast;
+    std::unique_ptr<mir::protobuf::Void> const protobuf_void;
 
     MirWaitHandle create_screencast_wait_handle;
     MirWaitHandle release_wait_handle;
+
+    std::string const empty_error_message;
 };
 
 #endif /* MIR_CLIENT_MIR_SCREENCAST_H_ */

=== modified file 'src/client/mir_screencast_api.cpp'
--- src/client/mir_screencast_api.cpp	2015-06-18 02:46:16 +0000
+++ src/client/mir_screencast_api.cpp	2016-04-27 09:08:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 Canonical Ltd.
+ * Copyright © 2014,2016 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,
@@ -22,7 +22,7 @@
 #include "mir_screencast.h"
 #include "mir_connection.h"
 #include "mir/raii.h"
-
+#include "mir/require.h"
 #include "mir/uncaught.h"
 
 #include <stdexcept>
@@ -31,53 +31,88 @@
 namespace
 {
 void null_callback(MirScreencast*, void*) {}
-}
+MirScreencast* create_screencast(MirScreencastSpec* spec)
+{
+    auto& server = spec->connection->display_server();
+    auto screencast = std::make_unique<MirScreencast>(*spec, server, null_callback, nullptr);
+    screencast->creation_wait_handle()->wait_for_all();
+
+    auto raw_screencast = screencast.get();
+    screencast.release();
+    return raw_screencast;
+}
+}
+
+MirScreencastSpec* mir_create_screencast_spec(MirConnection* connection)
+{
+    mir::require(mir_connection_is_valid(connection));
+    return new MirScreencastSpec{connection};
+}
+
+void mir_screencast_spec_set_width(MirScreencastSpec* spec, unsigned int width)
+{
+    spec->width = width;
+}
+
+void mir_screencast_spec_set_height(MirScreencastSpec* spec, unsigned int height)
+{
+    spec->height = height;
+}
+
+void mir_screencast_spec_set_pixel_format(MirScreencastSpec* spec, MirPixelFormat format)
+{
+    spec->pixel_format = format;
+}
+
+void mir_screencast_spec_set_capture_region(MirScreencastSpec* spec, MirRectangle const* region)
+{
+    spec->capture_region = *region;
+}
+
+void mir_screencast_spec_set_mirror_mode(MirScreencastSpec* spec, MirMirrorMode mode)
+{
+    spec->mirror_mode = mode;
+}
+
+void mir_screencast_spec_set_number_of_buffers(MirScreencastSpec* spec, unsigned int nbuffers)
+{
+    spec->num_buffers = nbuffers;
+}
+
+void mir_screencast_spec_release(MirScreencastSpec* spec)
+{
+    delete spec;
+}
+
+MirScreencast* mir_screencast_create_sync(MirScreencastSpec* spec)
+try
+{
+    return create_screencast(spec);
+}
+catch (std::exception const& ex)
+{
+    MIR_LOG_UNCAUGHT_EXCEPTION(ex);
+    return new MirScreencast(ex.what());
+}
+
+bool mir_screencast_is_valid(MirScreencast *screencast)
+{
+    return screencast && screencast->valid();
+}
+
+char const *mir_screencast_get_error_message(MirScreencast *screencast)
+{
+    return screencast->get_error_message();
+}
+
 
 MirScreencast* mir_connection_create_screencast_sync(
     MirConnection* connection,
     MirScreencastParameters* parameters)
 {
-    if (!MirConnection::is_valid(connection))
-        return nullptr;
-
-    MirScreencast* screencast = nullptr;
-
-    try
-    {
-        auto const config = mir::raii::deleter_for(
-            mir_connection_create_display_config(connection),
-            &mir_display_config_destroy);
-
-        mir::geometry::Rectangle const region{
-            {parameters->region.left, parameters->region.top},
-            {parameters->region.width, parameters->region.height}
-        };
-        mir::geometry::Size const size{parameters->width, parameters->height};
-
-        std::unique_ptr<MirScreencast> screencast_uptr{
-            new MirScreencast{
-                region,
-                size,
-                parameters->pixel_format,
-                connection->display_server(),
-                connection,
-                null_callback, nullptr}};
-
-        screencast_uptr->creation_wait_handle()->wait_for_all();
-
-        if (screencast_uptr->valid())
-        {
-            screencast = screencast_uptr.get();
-            screencast_uptr.release();
-        }
-    }
-    catch (std::exception const& ex)
-    {
-        MIR_LOG_UNCAUGHT_EXCEPTION(ex);
-        return nullptr;
-    }
-
-    return screencast;
+    mir::require(mir_connection_is_valid(connection));
+    MirScreencastSpec spec{connection, *parameters};
+    return mir_screencast_create_sync(&spec);
 }
 
 void mir_screencast_release_sync(MirScreencast* screencast)

=== modified file 'src/client/presentation_chain.cpp'
--- src/client/presentation_chain.cpp	2016-03-16 13:45:00 +0000
+++ src/client/presentation_chain.cpp	2016-04-27 09:08:17 +0000
@@ -127,10 +127,12 @@
     if (buffer_it != buffers.end())
     {
         (*buffer_it)->received(*package);
-        return;
-    }
-
-    buffers.emplace_back(mir_buffer_factory->generate_buffer(buffer));
+    }
+    else
+    {
+        buffers.emplace_back(mir_buffer_factory->generate_buffer(buffer));
+        buffers.back()->received();
+    }
 }
 
 void mcl::PresentationChain::buffer_unavailable()

=== modified file 'src/client/rpc/mir_display_server.cpp'
--- src/client/rpc/mir_display_server.cpp	2016-01-29 08:18:22 +0000
+++ src/client/rpc/mir_display_server.cpp	2016-04-27 09:08:17 +0000
@@ -56,13 +56,6 @@
 {
     channel->call_method(std::string(__func__), request, response, done);
 }
-void mclr::DisplayServer::next_buffer(
-    mir::protobuf::SurfaceId const* request,
-    mir::protobuf::Buffer* response,
-    google::protobuf::Closure* done)
-{
-    channel->call_method(std::string(__func__), request, response, done);
-}
 void mclr::DisplayServer::release_surface(
     mir::protobuf::SurfaceId const* request,
     mir::protobuf::Void* response,
@@ -98,6 +91,20 @@
 {
     channel->call_method(std::string(__func__), request, response, done);
 }
+void mclr::DisplayServer::preview_base_display_configuration(
+    mir::protobuf::PreviewConfiguration const* request,
+    mir::protobuf::Void* response,
+    google::protobuf::Closure* done)
+{
+    channel->call_method(std::string(__func__), request, response, done);
+}
+void mclr::DisplayServer::confirm_base_display_configuration(
+    mir::protobuf::DisplayConfiguration const* request,
+    mir::protobuf::Void* response,
+    google::protobuf::Closure* done)
+{
+    channel->call_method(std::string(__func__), request, response, done);
+}
 void mclr::DisplayServer::create_screencast(
     mir::protobuf::ScreencastParameters const* request,
     mir::protobuf::Screencast* response,

=== modified file 'src/client/rpc/mir_display_server.h'
--- src/client/rpc/mir_display_server.h	2016-01-29 08:18:22 +0000
+++ src/client/rpc/mir_display_server.h	2016-04-27 09:08:17 +0000
@@ -51,10 +51,6 @@
         mir::protobuf::SurfaceModifications const* request,
         mir::protobuf::Void* response,
         google::protobuf::Closure* done) override;
-    void next_buffer(
-        mir::protobuf::SurfaceId const* request,
-        mir::protobuf::Buffer* response,
-        google::protobuf::Closure* done) override;
     void release_surface(
         mir::protobuf::SurfaceId const* request,
         mir::protobuf::Void* response,
@@ -75,6 +71,14 @@
         mir::protobuf::DisplayConfiguration const* request,
         mir::protobuf::Void* response,
         google::protobuf::Closure* done) override;
+    void preview_base_display_configuration(
+        mir::protobuf::PreviewConfiguration const* request,
+        mir::protobuf::Void* response,
+        google::protobuf::Closure* done) override;
+    void confirm_base_display_configuration(
+        mir::protobuf::DisplayConfiguration const* request,
+        mir::protobuf::Void* response,
+        google::protobuf::Closure* done) override;
     void create_screencast(
         mir::protobuf::ScreencastParameters const* request,
         mir::protobuf::Screencast* response,

=== modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp'
--- src/client/rpc/mir_protobuf_rpc_channel.cpp	2016-03-17 17:47:42 +0000
+++ src/client/rpc/mir_protobuf_rpc_channel.cpp	2016-04-27 09:08:17 +0000
@@ -342,34 +342,34 @@
                     auto const send_e = [&e](MirSurface* surface)
                         { surface->handle_event(*e); };
 
-                    switch (e->type)
+                    switch (e->type())
                     {
                     case mir_event_type_surface:
                         if (auto map = surface_map.lock())
-                            map->with_surface_do(mf::SurfaceId(e->surface.id), send_e);
+                            map->with_surface_do(mf::SurfaceId(e->to_surface()->id()), send_e);
                         break;
 
                     case mir_event_type_resize:
                         if (auto map = surface_map.lock())
-                            map->with_surface_do(mf::SurfaceId(e->resize.surface_id), send_e);
+                            map->with_surface_do(mf::SurfaceId(e->to_resize()->surface_id()), send_e);
                         break;
 
                     case mir_event_type_orientation: