Merge lp:~andreas-pokorny/mir/reworked-external-output-centering-integration-branch into lp:mir

[Andreas Pokorny]

just for silo-009

reworked centering

[lp:~andreas-pokorny/mir/reworked-external-output-centering-integration-branch]

2332. By Andreas Pokorny on 2015-03-01

merge changes to lp:mir but leaving out all abi affecting changes

2333. By Andreas Pokorny on 2015-03-01

tweaking cursor size

2334. By Andreas Pokorny on 2015-03-01

synchronizing changelog

2335. By Andreas Pokorny on 2015-03-02

offset touch position with the display position

2336. By Andreas Pokorny on 2015-03-02

make test cases run

2337. By Andreas Pokorny on 2015-03-02

some debug output for usc

2338. By Andreas Pokorny on 2015-03-02

merged lp:mir

2339. By Andreas Pokorny on 2015-03-02

use top_left to offset touch coordinates

2340. By Andreas Pokorny on 2015-03-02

update to current lp:mir

2341. By Andreas Pokorny on 2015-03-09

updated to current lp:mir without integrating the changes

2342. By Andreas Pokorny on 2015-04-23

* integrate changes of for 0.12.1

2343. By Andreas Pokorny on 2015-04-23

merge lp:mir by essentially omitting most of the changes

2344. By Andreas Pokorny on 2015-04-23

fix changelog

2345. By Andreas Pokorny on 2015-04-23

update to current lp:mir

2346. By Andreas Pokorny on 2015-04-23

platform version 7 is expected

2347. By Andreas Pokorny on 2015-04-23

revert back to older server platform abi version

2348. By Andreas Pokorny on 2015-04-23

fix test case

2349. By Andreas Pokorny on 2015-05-12

rebasing ontop of lp:mir

2350. By Andreas Pokorny on 2015-05-18

rebase on lp:mir

2351. By Andreas Pokorny on 2015-05-20

rebase lp:mir

Unmerged revisions

2351. By Andreas Pokorny on 2015-05-20

rebase lp:mir

2350. By Andreas Pokorny on 2015-05-18

rebase on lp:mir

2349. By Andreas Pokorny on 2015-05-12

rebasing ontop of lp:mir

2348. By Andreas Pokorny on 2015-04-23

fix test case

2347. By Andreas Pokorny on 2015-04-23

revert back to older server platform abi version

2346. By Andreas Pokorny on 2015-04-23

platform version 7 is expected

2345. By Andreas Pokorny on 2015-04-23

update to current lp:mir

2344. By Andreas Pokorny on 2015-04-23

fix changelog

2343. By Andreas Pokorny on 2015-04-23

merge lp:mir by essentially omitting most of the changes

2342. By Andreas Pokorny on 2015-04-23

* integrate changes of for 0.12.1

=== modified file '3rd_party/CMakeLists.txt'
--- 3rd_party/CMakeLists.txt	2015-05-07 09:06:20 +0000
+++ 3rd_party/CMakeLists.txt	2015-05-20 14:01:27 +0000
@@ -7,12 +7,17 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/android-deps
   )
 
+add_library(
+  3rd_party 
+
+  ${MIR_3RD_PARTY_SOURCES}
+)
+
 set(MIR_3RD_PARTY_INCLUDE_DIRECTORIES ${MIR_3RD_PARTY_INCLUDE_DIRECTORIES} PARENT_SCOPE)
 set(MIR_INPUT_ANDROID_COMPILE_FLAGS ${MIR_INPUT_ANDROID_COMPILE_FLAGS}
   PARENT_SCOPE)
 
 include_directories(${PROJECT_SOURCE_DIR}/src/include/common)
-include_directories(${PROJECT_SOURCE_DIR}/src/include/platform)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/android-deps)
 add_subdirectory(android-input)
 
@@ -29,3 +34,10 @@
 )
 
 set(MIR_XCURSOR_INCLUDE_DIRECTORIES ${MIR_XCURSOR_INCLUDE_DIRECTORIES} PARENT_SCOPE)
+  
+target_link_libraries(
+  3rd_party
+
+  android-input
+  xcursorloader
+)

=== modified file '3rd_party/android-deps/std/Thread.h'
--- 3rd_party/android-deps/std/Thread.h	2015-03-31 02:35:42 +0000
+++ 3rd_party/android-deps/std/Thread.h	2015-05-20 14:01:27 +0000
@@ -61,10 +61,7 @@
         status.store(NO_ERROR);
         exit_pending.store(false);
 
-        // Avoid data races by doing a move capture instead of copy capture,
-        // since libstdc++ is using a copy-on-write implementation of std::string
-        // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=21334#c45
-        thread = std::thread([name_str = std::move(name_str),this]
+        thread = std::thread([name_str,this]() -> void
             {
                 mir::set_thread_name(name_str);
                 try

=== modified file '3rd_party/android-input/android/CMakeLists.txt'
--- 3rd_party/android-input/android/CMakeLists.txt	2015-05-07 09:06:20 +0000
+++ 3rd_party/android-input/android/CMakeLists.txt	2015-05-20 14:01:27 +0000
@@ -26,7 +26,7 @@
 
 
 add_library(
-  android-input-static STATIC
+  android-input STATIC
   # The stuff that we want
   frameworks/base/services/input/EventHub.cpp
   frameworks/base/services/input/InputApplication.cpp
@@ -58,19 +58,19 @@
 #we don't have binder or skia available on hybris/linux platforms
 if(MIR_USE_BIONIC)
   target_link_libraries(
-    android-input-static
+    android-input
     binder
     skia)
 endif()
 
 target_link_libraries(
-  android-input-static
+  android-input
 
   ${Boost_LIBRARIES}
 )
 
 set_target_properties(
-  android-input-static
+  android-input
   PROPERTIES
   COMPILE_FLAGS ${ANDROID_INPUT_COMPILE_FLAGS}
 )

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp	2015-05-07 09:06:20 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp	2015-05-20 14:01:27 +0000
@@ -52,7 +52,6 @@
 #include <sys/inotify.h>
 #include <sys/epoll.h>
 #include <sys/ioctl.h>
-#include <sys/timerfd.h>
 // <mir changes>
 // Needed to build on android platform (PATH_MAX)
 #ifdef HAVE_ANDROID_OS
@@ -209,7 +208,6 @@
 
 const uint32_t EventHub::EPOLL_ID_UDEV;
 const uint32_t EventHub::EPOLL_ID_WAKE;
-const uint32_t EventHub::EPOLL_ID_TIMER;
 const int EventHub::EPOLL_SIZE_HINT;
 const int EventHub::EPOLL_MAX_EVENTS;
 
@@ -220,13 +218,11 @@
         mOpeningDevices(0), mClosingDevices(0),
         mNeedToSendFinishedDeviceScan(false),
         mNeedToReopenDevices(false), mNeedToScanDevices(true),
-        mEpollFd{epoll_create(EPOLL_SIZE_HINT)},
-        mTimerFd{timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK|TFD_CLOEXEC)},
         mPendingEventCount(0), mPendingEventIndex(0), mPendingUdevEvent(false) {
     acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_ID);
 
+    mEpollFd = epoll_create(EPOLL_SIZE_HINT);
     LOG_ALWAYS_FATAL_IF(mEpollFd < 0, "Could not create epoll instance.  errno=%d", errno);
-    LOG_ALWAYS_FATAL_IF(mTimerFd < 0, "Could not create timerfd.  errno=%d", errno);
 
     device_listener->filter_by_subsystem("input");
     device_listener->enable();
@@ -258,11 +254,6 @@
     result = epoll_ctl(mEpollFd, EPOLL_CTL_ADD, mWakeReadPipeFd, &eventItem);
     LOG_ALWAYS_FATAL_IF(result != 0, "Could not add wake read pipe to epoll instance.  errno=%d",
             errno);
-
-    eventItem.data.u32 = EPOLL_ID_TIMER;
-    result = epoll_ctl(mEpollFd, EPOLL_CTL_ADD, mTimerFd, &eventItem);
-    LOG_ALWAYS_FATAL_IF(result != 0, "Could not add timer fd to epoll instance.  errno=%d",
-                        errno);
 }
 
 EventHub::~EventHub(void) {
@@ -274,6 +265,7 @@
         delete device;
     }
 
+    ::close(mEpollFd);
     ::close(mWakeReadPipeFd);
     ::close(mWakeWritePipeFd);
 
@@ -662,7 +654,7 @@
     return NULL;
 }
 
-size_t EventHub::getEvents(RawEvent* buffer, size_t bufferSize) {
+size_t EventHub::getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSize) {
     ALOG_ASSERT(bufferSize >= 1);
 
     AutoMutex _l(mLock);
@@ -763,19 +755,6 @@
                 continue;
             }
 
-            if (eventItem.data.u32 == EPOLL_ID_TIMER) {
-                if (eventItem.events & EPOLLIN) {
-                    ALOGV("awoken after wakeIn()");
-                    awoken = true;
-                    uint64_t timeout_count;
-                    read(mTimerFd, &timeout_count, sizeof timeout_count);
-                } else {
-                    ALOGW("Received unexpected epoll event 0x%08x for wake read pipe.",
-                          eventItem.events);
-                }
-                continue;
-            }
-
             ssize_t deviceIndex = mDevices.indexOfKey(eventItem.data.u32);
             if (deviceIndex < 0) {
                 ALOGW("Received unexpected epoll event 0x%08x for unknown device id %d.",
@@ -884,13 +863,15 @@
         // when this happens, the EventHub holds onto its own user wake lock while the client
         // is processing events.  Thus the system can only sleep if there are no events
         // pending or currently being processed.
+        //
+        // The timeout is advisory only.  If the device is asleep, it will not wake just to
+        // service the timeout.
         mPendingEventIndex = 0;
 
         mLock.unlock(); // release lock before poll, must be before release_wake_lock
         release_wake_lock(WAKE_LOCK_ID);
 
-        // non blocking call to epoll_wait - blocking happens in dispatch threads
-        int pollResult = epoll_wait(mEpollFd, mPendingEventItems, EPOLL_MAX_EVENTS, 0);
+        int pollResult = epoll_wait(mEpollFd, mPendingEventItems, EPOLL_MAX_EVENTS, timeoutMillis);
 
         acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_ID);
         mLock.lock(); // reacquire lock after poll, must be after acquire_wake_lock
@@ -921,15 +902,6 @@
     return event - buffer;
 }
 
-void EventHub::wakeIn(int32_t timeoutMillis) {
-    itimerspec delay;
-    std::memset(&delay, 0, sizeof delay);
-
-    delay.it_value.tv_sec = timeoutMillis / 1000;
-    delay.it_value.tv_nsec = (timeoutMillis % 1000) * 1000000LL;
-    timerfd_settime(mTimerFd, 0, &delay, nullptr);
-}
-
 void EventHub::wake() {
     ALOGV("wake() called");
 
@@ -1365,7 +1337,7 @@
 }
 
 bool EventHub::hasKeycodeLocked(Device* device, int keycode) const {
-    if (!device->keyMap.haveKeyLayout()) {
+    if (!device->keyMap.haveKeyLayout() || !device->keyBitmask) {
         return false;
     }
     
@@ -1528,9 +1500,4 @@
     return false;
 }
 
-mir::Fd EventHub::fd()
-{
-    return mEpollFd;
-}
-
 }; // namespace android

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/EventHub.h'
--- 3rd_party/android-input/android/frameworks/base/services/input/EventHub.h	2015-05-07 09:06:20 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/EventHub.h	2015-05-20 14:01:27 +0000
@@ -32,8 +32,6 @@
 #include <std/Vector.h>
 #include <std/KeyedVector.h>
 
-#include "mir/fd.h"
-
 #include <linux/input.h>
 #include <sys/epoll.h>
 
@@ -196,15 +194,18 @@
     virtual void setExcludedDevices(const Vector<String8>& devices) = 0;
 
     /*
-     * Tests for available events and returns them.
+     * Wait for events to become available and returns them.
      * After returning, the EventHub holds onto a wake lock until the next call to getEvent.
      * This ensures that the device will not go to sleep while the event is being processed.
      * If the device needs to remain awake longer than that, then the caller is responsible
      * for taking care of it (say, by poking the power manager user activity timer).
      *
-     * Returns the number of events obtained.
+     * The timeout is advisory only.  If the device is asleep, it will not wake just to
+     * service the timeout.
+     *
+     * Returns the number of events obtained, or 0 if the timeout expired.
      */
-    virtual size_t getEvents(RawEvent* buffer, size_t bufferSize) = 0;
+    virtual size_t getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSize) = 0;
 
     /*
      * Query current input state.
@@ -241,9 +242,6 @@
     /* Wakes up getEvents() if it is blocked on a read. */
     virtual void wake() = 0;
 
-    /* Ensures that fd() readable after given timeout */
-    virtual void wakeIn(int32_t timeout) = 0;
-
     /* Dump EventHub state to a string. */
     virtual void dump(String8& dump) = 0;
 
@@ -252,9 +250,6 @@
 
     /* Flush all pending events not yet read from the input devices */
     virtual void flush() = 0;
-
-    /* Epoll fd used by EventHub */
-    virtual mir::Fd fd() = 0;
 };
 
 class EventHub : public EventHubInterface
@@ -291,7 +286,7 @@
     virtual bool markSupportedKeyCodes(int32_t deviceId, size_t numCodes,
             const int32_t* keyCodes, uint8_t* outFlags) const;
 
-    virtual size_t getEvents(RawEvent* buffer, size_t bufferSize);
+    virtual size_t getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSize);
 
     virtual bool hasScanCode(int32_t deviceId, int32_t scanCode) const;
     virtual bool hasLed(int32_t deviceId, int32_t led) const;
@@ -309,19 +304,13 @@
     virtual void requestReopenDevices();
 
     virtual void wake();
-    virtual void wakeIn(int32_t timeout);
 
     virtual void dump(String8& dump);
     virtual void monitor();
     virtual void flush();
-    virtual mir::Fd fd();
 
     virtual ~EventHub();
 
-    // Ids used for epoll notifications not associated with devices.
-    static const uint32_t EPOLL_ID_UDEV = 0x80000001;
-    static const uint32_t EPOLL_ID_WAKE = 0x80000002;
-    static const uint32_t EPOLL_ID_TIMER = 0x80000003;
 private:
     std::shared_ptr<mir::input::InputReport> const input_report;
 
@@ -416,12 +405,15 @@
     bool mNeedToScanDevices;
     Vector<String8> mExcludedDevices;
 
-    mir::Fd mEpollFd;
-    mir::Fd mTimerFd;
+    int mEpollFd;
     std::unique_ptr<mir::udev::Monitor> const device_listener;
     int mWakeReadPipeFd;
     int mWakeWritePipeFd;
 
+    // Ids used for epoll notifications not associated with devices.
+    static const uint32_t EPOLL_ID_UDEV = 0x80000001;
+    static const uint32_t EPOLL_ID_WAKE = 0x80000002;
+
     // Epoll FD list size hint.
     static const int EPOLL_SIZE_HINT = 8;
 

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp	2015-05-07 09:06:20 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp	2015-05-20 14:01:27 +0000
@@ -43,8 +43,6 @@
 // Log debug messages about hover events.
 #define DEBUG_HOVER 0
 
-#define ENABLE_APP_SWITCH_OPTIMIZATION 0
-
 #include "InputDispatcher.h"
 
 #include "mir/input/input_report.h"
@@ -375,7 +373,6 @@
 
     switch (entry->type) {
     case EventEntry::TYPE_KEY: {
-#if ENABLE_APP_SWITCH_OPTIMIZATION == 1
         // Optimize app switch latency.
         // If the application takes too long to catch up then we drop all events preceding
         // the app switch key.
@@ -394,7 +391,6 @@
                 }
             }
         }
-#endif
         break;
     }
 
@@ -667,7 +663,7 @@
                 && (entry->policyFlags & POLICY_FLAG_TRUSTED)
                 && (!(entry->policyFlags & POLICY_FLAG_DISABLE_KEY_REPEAT))) {
             if (mKeyRepeatState.lastKeyEntry
-                    && mKeyRepeatState.lastKeyEntry->is_same_key(entry)) {
+                    && mKeyRepeatState.lastKeyEntry->keyCode == entry->keyCode) {
                 // We have seen two identical key downs in a row which indicates that the device
                 // driver is automatically generating key repeats itself.  We take note of the
                 // repeat here, but we disable our own next key repeat timer since it is clear that
@@ -3743,12 +3739,6 @@
     interceptKeyWakeupTime = std::chrono::nanoseconds(0);
 }
 
-bool InputDispatcher::KeyEntry::is_same_key(KeyEntry* other) const {
-    if (keyCode != 0)
-        return keyCode == other->keyCode;
-    else
-        return scanCode == other->scanCode;
-}
 
 // --- InputDispatcher::MotionEntry ---
 

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h	2015-05-07 09:06:20 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h	2015-05-20 14:01:27 +0000
@@ -516,8 +516,6 @@
         virtual void appendDescription(String8& msg) const;
         void recycle();
 
-        bool is_same_key(KeyEntry* other) const;
-
     protected:
         virtual ~KeyEntry();
     };

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp	2015-05-07 09:06:20 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp	2015-05-20 14:01:27 +0000
@@ -269,23 +269,27 @@
 
 void InputReader::loopOnce() {
     int32_t oldGeneration;
+    int32_t timeoutMillis;
     bool inputDevicesChanged = false;
     Vector<InputDeviceInfo> inputDevices;
     { // acquire lock
         AutoMutex _l(mLock);
 
         oldGeneration = mGeneration;
+        timeoutMillis = -1;
 
         uint32_t changes = mConfigurationChangesToRefresh;
         if (changes) {
-            if (0 == (changes & InputReaderConfiguration::CHANGE_MUST_REOPEN))
-                mEventHub->wake();
             mConfigurationChangesToRefresh = 0;
+            timeoutMillis = 0;
             refreshConfigurationLocked(changes);
+        } else if (mNextTimeout != std::chrono::nanoseconds(LLONG_MAX)) {
+            std::chrono::nanoseconds now = systemTime(SYSTEM_TIME_MONOTONIC);
+            timeoutMillis = toMillisecondTimeoutDelay(now, mNextTimeout);
         }
     } // release lock
 
-    size_t count = mEventHub->getEvents(mEventBuffer, EVENT_BUFFER_SIZE);
+    size_t count = mEventHub->getEvents(timeoutMillis, mEventBuffer, EVENT_BUFFER_SIZE);
 
     { // acquire lock
         AutoMutex _l(mLock);
@@ -570,8 +574,7 @@
 void InputReader::requestTimeoutAtTimeLocked(std::chrono::nanoseconds when) {
     if (when < mNextTimeout) {
         mNextTimeout = when;
-        std::chrono::nanoseconds now = systemTime(SYSTEM_TIME_MONOTONIC);
-        mEventHub->wakeIn(toMillisecondTimeoutDelay(now, mNextTimeout));
+        mEventHub->wake();
     }
 }
 
@@ -3934,6 +3937,15 @@
 void TouchInputMapper::cookPointerData() {
     uint32_t currentPointerCount = mCurrentRawPointerData.pointerCount;
 
+    // hack
+    auto pointer = mPointerController;
+
+    float display_x = 0, display_y = 0;
+    if (pointer == nullptr)
+        pointer = getPolicy()->obtainPointerController(getDeviceId());
+
+    if (pointer != nullptr)
+        pointer->getDisplayPosition(display_x, display_y);
     mCurrentCookedPointerData.clear();
     mCurrentCookedPointerData.pointerCount = currentPointerCount;
     mCurrentCookedPointerData.hoveringIds = mCurrentRawPointerData.hoveringIds;
@@ -4079,8 +4091,8 @@
         }
 
         // X and Y
+        float x, y;
         // Adjust coords for surface orientation.
-        float x, y;
         switch (mSurfaceOrientation) {
         case DISPLAY_ORIENTATION_90:
             x = float(in.y - mRawPointerAxes.y.minValue) * mYScale;
@@ -4108,6 +4120,10 @@
             break;
         }
 
+        // offset to input region
+        x -= display_x;
+        y -= display_y;
+
         // Write output coords.
         PointerCoords& out = mCurrentCookedPointerData.pointerCoords[i];
         out.clear();

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/MirLog.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/MirLog.cpp	2015-03-31 02:35:42 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/MirLog.cpp	2015-05-20 14:01:27 +0000
@@ -42,8 +42,6 @@
 #include <cstdlib>
 #include <cstring>
 
-#include <atomic>
-
 #define kMaxTagLen  16      /* from the long-dead utils/Log.cpp */
 #define kTagSetSize 16      /* arbitrary */
 
@@ -51,14 +49,14 @@
 {
     struct LogState {
         /* global minimum priority */
-        std::atomic<int> globalMinPriority{ANDROID_LOG_UNKNOWN};
+        int     globalMinPriority;
 
         /* tags and priorities */
         struct {
             char    tag[kMaxTagLen];
-            std::atomic<int> minPriority;
+            int     minPriority;
         } tagSet[kTagSetSize];
-    } gLogState = {};
+    } gLogState = { .globalMinPriority = ANDROID_LOG_UNKNOWN };
 }
 
 /*

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/PointerController.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/PointerController.cpp	2014-03-06 06:05:17 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/PointerController.cpp	2015-05-20 14:01:27 +0000
@@ -273,4 +273,9 @@
   // TODO: Implement
 }
 
+void PointerController::getDisplayPosition(float &x, float &y) const {
+    x = 0;
+    y = 0;
+}
+
 } // namespace android

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/PointerController.h'
--- 3rd_party/android-input/android/frameworks/base/services/input/PointerController.h	2014-03-06 06:05:17 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/PointerController.h	2015-05-20 14:01:27 +0000
@@ -68,6 +68,9 @@
     /* Gets the absolute location of the pointer. */
     virtual void getPosition(float* outX, float* outY) const = 0;
 
+    // hack
+    virtual void getDisplayPosition(float &x,  float& y) const = 0;
+
     enum Transition {
         // Fade/unfade immediately.
         TRANSITION_IMMEDIATE,
@@ -142,6 +145,7 @@
 
     void setDisplaySize(int32_t width, int32_t height);
     void setDisplayOrientation(int32_t orientation);
+    void getDisplayPosition(float &x,  float& y) const override;
 
 private:
     mutable Mutex mLock;

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/VelocityControl.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/VelocityControl.cpp	2015-03-31 02:35:42 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/VelocityControl.cpp	2015-05-20 14:01:27 +0000
@@ -70,7 +70,7 @@
 
         float vx, vy;
         float scale = mParameters.scale;
-        if (mVelocityTracker.getVelocity(0, &vx, &vy)) {
+        if (mVelocityTracker.getVelocity(1, &vx, &vy)) {
             float speed = hypotf(vx, vy) * scale;
             if (speed >= mParameters.highThreshold) {
                 // Apply full acceleration above the high speed threshold.

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/VelocityTracker.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/VelocityTracker.cpp	2015-03-31 02:35:42 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/VelocityTracker.cpp	2015-05-20 14:01:27 +0000
@@ -65,36 +65,31 @@
 
 #if DEBUG_STRATEGY || DEBUG_VELOCITY
 static String8 vectorToString(const float* a, uint32_t m) {
-    String8 str;
-    str.append("[");
+    std::stringstream str;
+    str << '[';
     while (m--) {
-        str.appendFormat(" %f", *(a++));
-        if (m) {
-            str.append(",");
-        }
+        str << *a++;
+        if (m)
+            str << ',';
     }
-    str.append(" ]");
-    return str;
+    str << ']';
+    return str.str();
 }
 
 static String8 matrixToString(const float* a, uint32_t m, uint32_t n, bool rowMajor) {
-    String8 str;
-    str.append("[");
+    std::stringstream str;
+    str << '[';
     for (size_t i = 0; i < m; i++) {
-        if (i) {
-            str.append(",");
-        }
-        str.append(" [");
+        if (i) str << ',';
+        str << " [";
         for (size_t j = 0; j < n; j++) {
-            if (j) {
-                str.append(",");
-            }
-            str.appendFormat(" %f", a[rowMajor ? i * n + j : j * m + i]);
+            if (j) str << ',';
+            str << ' ' << a[rowMajor ? i * n + j : j * m + i];
         }
-        str.append(" ]");
+        str << " ]";
     }
-    str.append(" ]");
-    return str;
+    str << " ]";
+    return str.str();
 }
 #endif
 
@@ -249,11 +244,11 @@
                 "estimator (degree=%d, xCoeff=%s, yCoeff=%s, confidence=%f)",
                 id, positions[index].x, positions[index].y,
                 int(estimator.degree),
-                vectorToString(estimator.xCoeff, estimator.degree + 1).string(),
-                vectorToString(estimator.yCoeff, estimator.degree + 1).string(),
+                vectorToString(estimator.xCoeff, estimator.degree + 1).c_str(),
+                vectorToString(estimator.yCoeff, estimator.degree + 1).c_str(),
                 estimator.confidence);
         ++index;
-    }
+    });
 #endif
 }
 
@@ -436,8 +431,8 @@
         const float* w, uint32_t m, uint32_t n, float* outB, float* outDet) {
 #if DEBUG_STRATEGY
     ALOGD("solveLeastSquares: m=%d, n=%d, x=%s, y=%s, w=%s", int(m), int(n),
-            vectorToString(x, m).string(), vectorToString(y, m).string(),
-            vectorToString(w, m).string());
+            vectorToString(x, m).c_str(), vectorToString(y, m).c_str(),
+            vectorToString(w, m).c_str());
 #endif
 
     // Expand the X vector to a matrix A, pre-multiplied by the weights.
@@ -449,7 +444,7 @@
         }
     }
 #if DEBUG_STRATEGY
-    ALOGD("  - a=%s", matrixToString(&a[0][0], m, n, false /*rowMajor*/).string());
+    ALOGD("  - a=%s", matrixToString(&a[0][0], m, n, false /*rowMajor*/).c_str());
 #endif
 
     // Apply the Gram-Schmidt process to A to obtain its QR decomposition.
@@ -484,8 +479,8 @@
         }
     }
 #if DEBUG_STRATEGY
-    ALOGD("  - q=%s", matrixToString(&q[0][0], m, n, false /*rowMajor*/).string());
-    ALOGD("  - r=%s", matrixToString(&r[0][0], n, n, true /*rowMajor*/).string());
+    ALOGD("  - q=%s", matrixToString(&q[0][0], m, n, false /*rowMajor*/).c_str());
+    ALOGD("  - r=%s", matrixToString(&r[0][0], n, n, true /*rowMajor*/).c_str());
 
     // calculate QR, if we factored A correctly then QR should equal A
     float qr[n][m];
@@ -497,7 +492,7 @@
             }
         }
     }
-    ALOGD("  - qr=%s", matrixToString(&qr[0][0], m, n, false /*rowMajor*/).string());
+    ALOGD("  - qr=%s", matrixToString(&qr[0][0], m, n, false /*rowMajor*/).c_str());
 #endif
 
     // Solve R B = Qt W Y to find B.  This is easy because R is upper triangular.
@@ -514,7 +509,7 @@
         outB[i] /= r[i][i];
     }
 #if DEBUG_STRATEGY
-    ALOGD("  - b=%s", vectorToString(outB, n).string());
+    ALOGD("  - b=%s", vectorToString(outB, n).c_str());
 #endif
 
     // Calculate the coefficient of determination as 1 - (SSerr / SStot) where
@@ -598,10 +593,10 @@
             outEstimator->degree = degree;
             outEstimator->confidence = xdet * ydet;
 #if DEBUG_STRATEGY
-            ALOGD("estimate: degree=%d, xCoeff=%s, yCoeff=%s, confidence=%f",
+            ALOGD("estimate : degree=%d, xCoeff=%s, yCoeff=%s, confidence=%f",
                     int(outEstimator->degree),
-                    vectorToString(outEstimator->xCoeff, n).string(),
-                    vectorToString(outEstimator->yCoeff, n).string(),
+                    vectorToString(outEstimator->xCoeff, n).c_str(),
+                    vectorToString(outEstimator->yCoeff, n).c_str(),
                     outEstimator->confidence);
 #endif
             return true;

=== modified file '3rd_party/xcursor/CMakeLists.txt'
--- 3rd_party/xcursor/CMakeLists.txt	2015-05-07 09:06:20 +0000
+++ 3rd_party/xcursor/CMakeLists.txt	2015-05-20 14:01:27 +0000
@@ -5,7 +5,7 @@
 )
 
 add_library(
-  xcursorloader-static STATIC
+  xcursorloader STATIC
 
   ${XCURSOR_SOURCES}
 )

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-05-19 04:37:02 +0000
+++ CMakeLists.txt	2015-05-20 14:01:27 +0000
@@ -23,12 +23,12 @@
 
 cmake_policy(SET CMP0015 NEW)
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 0)
-set(MIR_VERSION_MINOR 14) # This should change at least with every MIRSERVER_ABI
-set(MIR_VERSION_PATCH 0)
+set(MIR_VERSION_MINOR 12) # This should change at least with every MIRSERVER_ABI
+set(MIR_VERSION_PATCH 1)
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
 add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})
@@ -215,20 +215,17 @@
 
 if (MIR_ENABLE_TESTS)
   find_package(GtestGmock REQUIRED)
-  pkg_check_modules(LIBEVDEV REQUIRED libevdev)
   include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
   add_subdirectory(tests/)
 
   # There's no nice way to format this. Thanks CMake.
-  mir_add_test(NAME LGPL-required
-    COMMAND /bin/sh -c "! grep -rl 'GNU General' ${PROJECT_SOURCE_DIR}/src/client ${PROJECT_SOURCE_DIR}/include/client ${PROJECT_SOURCE_DIR}/src/common ${PROJECT_SOURCE_DIR}/include/common ${PROJECT_SOURCE_DIR}/src/include/common ${PROJECT_SOURCE_DIR}/src/platform ${PROJECT_SOURCE_DIR}/include/platform ${PROJECT_SOURCE_DIR}/src/include/platform"
-  )
-  mir_add_test(NAME GPL-required
-    COMMAND /bin/sh -c "! grep -rl 'GNU Lesser' ${PROJECT_SOURCE_DIR}/src/server ${PROJECT_SOURCE_DIR}/include/server ${PROJECT_SOURCE_DIR}/src/include/server ${PROJECT_SOURCE_DIR}/tests ${PROJECT_SOURCE_DIR}/examples"
-  )
-
-  mir_add_test(NAME package-abis
-    COMMAND /bin/sh -c "cd ${PROJECT_SOURCE_DIR} && tools/update_package_abis.sh --check --verbose")
+  add_test(LGPL-required
+    /bin/sh -c "! grep -rl 'GNU General' ${PROJECT_SOURCE_DIR}/src/client ${PROJECT_SOURCE_DIR}/include/client ${PROJECT_SOURCE_DIR}/src/common ${PROJECT_SOURCE_DIR}/include/common ${PROJECT_SOURCE_DIR}/src/include/common ${PROJECT_SOURCE_DIR}/src/platform ${PROJECT_SOURCE_DIR}/include/platform ${PROJECT_SOURCE_DIR}/src/include/platform"
+  )
+  add_test(GPL-required
+    /bin/sh -c "! grep -rl 'GNU Lesser' ${PROJECT_SOURCE_DIR}/src/server ${PROJECT_SOURCE_DIR}/include/server ${PROJECT_SOURCE_DIR}/src/include/server ${PROJECT_SOURCE_DIR}/tests ${PROJECT_SOURCE_DIR}/examples"
+  )
+  
 endif ()
 
 enable_coverage_report(mirserver)
@@ -236,7 +233,3 @@
 include (cmake/ABICheck.cmake)
 
 add_subdirectory(snappy)
-
-add_custom_target(ptest
-    COMMAND "${CMAKE_SOURCE_DIR}/tools/run_ctests.sh" "--cost-file" "${CMAKE_BINARY_DIR}/ptest_ctest_cost_data.txt" "sh ${CMAKE_BINARY_DIR}/discover_all_tests.sh" "--" "$$ARGS"
-    )

=== modified file 'benchmarks/android-input/CMakeLists.txt'
--- benchmarks/android-input/CMakeLists.txt	2015-05-07 09:06:20 +0000
+++ benchmarks/android-input/CMakeLists.txt	2015-05-20 14:01:27 +0000
@@ -14,8 +14,8 @@
 target_link_libraries(
   input-reader-perf
 
-  android-input-static
-  mir-test-doubles-static
+  android-input
+  mir-test-doubles
   mirserver
  )
 

=== modified file 'benchmarks/benchmark_multiplexing_dispatchable.cpp'
--- benchmarks/benchmark_multiplexing_dispatchable.cpp	2015-05-07 09:06:20 +0000
+++ benchmarks/benchmark_multiplexing_dispatchable.cpp	2015-05-20 14:01:27 +0000
@@ -20,6 +20,7 @@
 #include "mir/dispatch/simple_dispatch_thread.h"
 
 #include <iostream>
+#include <atomic>
 #include <vector>
 #include <memory>
 #include <chrono>

=== modified file 'benchmarks/frame-uniformity/CMakeLists.txt'
--- benchmarks/frame-uniformity/CMakeLists.txt	2015-05-07 09:06:20 +0000
+++ benchmarks/frame-uniformity/CMakeLists.txt	2015-05-20 14:01:27 +0000
@@ -23,13 +23,17 @@
 target_link_libraries(frame_uniformity_test_client
   mirserver
   mirclient
+  
+  mir-test
+  mir-test-framework
+  mir-test-doubles
+  mir-test-doubles-platform
+
+  # Why does this have to come after mir-test-framework here but not in tests/acceptance-tests/
+  # /CMakeLists.txt? ~racarr
   mirplatform
-  
-  mir-test-static
-  mir-test-framework-static
-  mir-test-doubles-static
-  mir-test-doubles-platform-static
 
+  3rd_party
   ${PROTOBUF_LIBRARIES}
   ${Boost_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}

=== modified file 'benchmarks/frame-uniformity/main.cpp'
--- benchmarks/frame-uniformity/main.cpp	2015-03-31 02:35:42 +0000
+++ benchmarks/frame-uniformity/main.cpp	2015-05-20 14:01:27 +0000
@@ -18,7 +18,6 @@
 
 #include "frame_uniformity_test.h"
 #include "mir_test_framework/executable_path.h"
-#include "mir/geometry/displacement.h"
 
 #include <assert.h>
 #include <cmath>
@@ -47,7 +46,9 @@
 
     double alpha = elapsed_interval / total_interval;
     
-    return touch_start + alpha*(touch_end-touch_start);
+    auto ix = touch_start.x.as_int() + (touch_end.x.as_int()-touch_start.x.as_int())*alpha;
+    auto iy = touch_start.y.as_int() + (touch_end.y.as_int()-touch_start.y.as_int())*alpha;
+    return {ix, iy};
 }
 
 double pixel_lag_for_sample_at_time(geom::Point touch_start_point, geom::Point touch_end_point,
@@ -57,12 +58,10 @@
 {
     auto expected_point = interpolated_touch_at_time(touch_start_point, touch_end_point, touch_start_time,
         touch_end_time, sample.frame_time);
-
-    geom::Displacement const displacement{
-        sample.x - expected_point.x.as_int(),
-        sample.y - expected_point.y.as_int()};
-
-    return std::sqrt(displacement.length_squared());
+    auto dx = sample.x - expected_point.x.as_int();
+    auto dy = sample.y - expected_point.y.as_int();
+    auto distance = std::sqrt(dx*dx+dy*dy);
+    return distance;
 }
 
 double compute_average_frame_offset(std::vector<TouchSamples::Sample> const& results,

=== modified file 'benchmarks/frame-uniformity/touch_measuring_client.cpp'
--- benchmarks/frame-uniformity/touch_measuring_client.cpp	2015-05-07 09:06:20 +0000
+++ benchmarks/frame-uniformity/touch_measuring_client.cpp	2015-05-20 14:01:27 +0000
@@ -22,7 +22,12 @@
 
 #include "mir_toolkit/mir_client_library.h"
 
+#include <chrono>
+#include <memory>
+#include <vector>
+
 #include <iostream>
+#include <assert.h>
 
 namespace mt = mir::test;
 
@@ -34,15 +39,13 @@
     MirPixelFormat pixel_format;
     unsigned int valid_formats;
     mir_connection_get_available_surface_formats(connection, &pixel_format, 1, &valid_formats);
-
-    auto const spec = mir_connection_create_spec_for_normal_surface(
-        connection, 1024, 1024, pixel_format);
-    mir_surface_spec_set_name(spec, "frame-uniformity-test");
-    mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
-
-    auto surface = mir_surface_create_sync(spec);
-    mir_surface_spec_release(spec);
+    MirSurfaceParameters const surface_params = { "frame-uniformity-test",
+        1024, 1024, /* TODO: Ensure fullscreen? */
+        pixel_format,
+        mir_buffer_usage_hardware, 
+        mir_display_output_id_invalid};
     
+    auto surface = mir_connection_create_surface_sync(connection, &surface_params);
     if (!mir_surface_is_valid(surface))
     {
         std::cerr << "Surface creation failed: " << mir_surface_get_error_message(surface) << std::endl;
@@ -61,7 +64,8 @@
 
 void collect_input_and_frame_timing(MirSurface *surface, mt::Barrier& client_ready, std::chrono::high_resolution_clock::duration duration, std::shared_ptr<TouchSamples> const& results)
 {
-    mir_surface_set_event_handler(surface, input_callback, results.get());
+    MirEventDelegate event_handler = { input_callback, results.get() };
+    mir_surface_set_event_handler(surface, &event_handler);
     
     client_ready.ready();
 

=== modified file 'benchmarks/frame-uniformity/touch_measuring_client.h'
--- benchmarks/frame-uniformity/touch_measuring_client.h	2015-05-07 09:06:20 +0000
+++ benchmarks/frame-uniformity/touch_measuring_client.h	2015-05-20 14:01:27 +0000
@@ -23,8 +23,13 @@
 
 #include "mir_test/barrier.h"
 
+#include "mir_toolkit/mir_client_library.h"
+
 #include <chrono>
 #include <memory>
+#include <vector>
+#include <string>
+#include <mutex>
 
 class TouchMeasuringClient
 {

=== modified file 'benchmarks/frame-uniformity/touch_producing_server.cpp'
--- benchmarks/frame-uniformity/touch_producing_server.cpp	2015-03-31 02:35:42 +0000
+++ benchmarks/frame-uniformity/touch_producing_server.cpp	2015-05-20 14:01:27 +0000
@@ -21,7 +21,6 @@
 
 #include "mir_test/event_factory.h"
 #include "mir_test/fake_event_hub.h"
-#include "mir/geometry/displacement.h"
 
 #include <functional>
 
@@ -102,7 +101,8 @@
         touch_end_time = now;
         
         double alpha = (now.time_since_epoch().count()-start.time_since_epoch().count()) / static_cast<double>(end.time_since_epoch().count()-start.time_since_epoch().count());
-        auto point = touch_start + alpha*(touch_end-touch_start);
+        auto point = geom::Point{touch_start.x.as_int()+(touch_end.x.as_int()-touch_start.x.as_int())*alpha,
+            touch_start.y.as_int()+(touch_end.y.as_int()-touch_start.y.as_int())*alpha};
         synthesize_event_at(point);
     }
 }

=== modified file 'benchmarks/frame-uniformity/touch_samples.cpp'
--- benchmarks/frame-uniformity/touch_samples.cpp	2015-04-09 08:57:24 +0000
+++ benchmarks/frame-uniformity/touch_samples.cpp	2015-05-20 14:01:27 +0000
@@ -16,6 +16,8 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
+#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
+
 #include "touch_samples.h"
 
 void TouchSamples::record_frame_time(std::chrono::high_resolution_clock::time_point time)
@@ -34,26 +36,21 @@
 {
     std::unique_lock<std::mutex> lg(guard);
 
-    if (mir_event_get_type(&event) != mir_event_type_input)
-        return;
-    auto iev = mir_event_get_input_event(&event);
-    if (mir_input_event_get_type(iev) != mir_input_event_type_touch)
-        return;
-    auto tev = mir_input_event_get_touch_event(iev);
-
+    if (event.type != mir_event_type_motion)
+        return;
+    
+    auto const& mev = event.motion;
+    if (mev.action != mir_motion_action_down &&
+        mev.action != mir_motion_action_up &&
+        mev.action != mir_motion_action_move)
+    {
+        return;
+    }
     // We could support multitouch, etc...
-    size_t touch_index = 0;
-    auto action = mir_touch_event_action(tev, touch_index);
-    if (action != mir_touch_action_down &&
-        action != mir_touch_action_up &&
-        action != mir_touch_action_change)
-    {
-        return;
-    }
-    auto x = mir_touch_event_axis_value(tev, 0, mir_touch_axis_x);
-    auto y = mir_touch_event_axis_value(tev, 0, mir_touch_axis_y);
+    auto const& coordinates = mev.pointer_coordinates[0];
+
     // TODO: Record both event time and reception time
-    samples_being_prepared.push_back(Sample{x, y, reception_time, {}});
+    samples_being_prepared.push_back(Sample{coordinates.x, coordinates.y, reception_time, {}});
 }
 
 std::vector<TouchSamples::Sample> TouchSamples::get()

=== modified file 'benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp'
--- benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp	2015-03-31 02:35:42 +0000
+++ benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp	2015-05-20 14:01:27 +0000
@@ -36,21 +36,20 @@
 namespace
 {
 
-struct StubDisplaySyncGroup : mg::DisplaySyncGroup
+struct StubDisplayBuffer : mtd::StubDisplayBuffer
 {
-    StubDisplaySyncGroup(geom::Size output_size, int vsync_rate_in_hz) :
-        vsync_rate_in_hz(vsync_rate_in_hz),
-        last_sync(std::chrono::high_resolution_clock::now()),
-        buffer({{0, 0}, output_size})
-    {
-    }
-
-    void for_each_display_buffer(std::function<void(mg::DisplayBuffer&)> const& exec) override
-    {
-        exec(buffer);
-    }
-
-    void post() override
+    StubDisplayBuffer(geom::Size output_size, int vsync_rate_in_hz)
+        : mtd::StubDisplayBuffer({{0, 0}, output_size}),
+          vsync_rate_in_hz(vsync_rate_in_hz),
+          last_sync(std::chrono::high_resolution_clock::now())
+    {
+    }
+    
+    void gl_swap_buffers() override
+    {
+    }
+
+    void flip() override
     {
         auto now = std::chrono::high_resolution_clock::now();
         auto next_sync = last_sync + std::chrono::seconds(1) / vsync_rate_in_hz;
@@ -64,24 +63,22 @@
     double const vsync_rate_in_hz;
 
     std::chrono::high_resolution_clock::time_point last_sync;
-
-    mtd::StubDisplayBuffer buffer;
 };
 
 struct StubDisplay : public mtd::StubDisplay
 {
-    StubDisplay(geom::Size output_size, int vsync_rate_in_hz) :
-        mtd::StubDisplay({{{0,0}, output_size}}),
-        group(output_size, vsync_rate_in_hz)
+    StubDisplay(geom::Size output_size, int vsync_rate_in_hz)
+        : mtd::StubDisplay({{{0,0}, output_size}}),
+          buffer(output_size, vsync_rate_in_hz)
     {
     }
     
-    void for_each_display_sync_group(std::function<void(mg::DisplaySyncGroup&)> const& exec) override
+    void for_each_display_buffer(std::function<void(mg::DisplayBuffer&)> const& exec) override
     {
-        exec(group);
+        exec(buffer);
     }
 
-    StubDisplaySyncGroup group;
+    StubDisplayBuffer buffer;
 };
 
 }

=== modified file 'cmake/ABICheck.cmake'
--- cmake/ABICheck.cmake	2015-05-07 09:06:20 +0000
+++ cmake/ABICheck.cmake	2015-05-20 14:01:27 +0000
@@ -80,14 +80,10 @@
 make_lib_descriptor(server)
 make_lib_descriptor(common INCLUDE_PRIVATE EXCLUDE_HEADERS ${mircommon-exclude-headers})
 make_lib_descriptor(platform INCLUDE_PRIVATE EXCLUDE_HEADERS ${mirplatform-exclude-headers})
-if(MIR_BUILD_PLATFORM_MESA)
 make_lib_descriptor(clientplatformmesa LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
+make_lib_descriptor(clientplatformandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
 make_lib_descriptor(platformgraphicsmesa LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
-endif()
-if(MIR_BUILD_PLATFORM_ANDROID)
-make_lib_descriptor(clientplatformandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
 make_lib_descriptor(platformgraphicsandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
-endif()
 
 add_custom_target(abi-release-dump
   COMMAND /bin/sh -c '${CMAKE_SOURCE_DIR}/tools/generate-abi-base-dump.sh ${CMAKE_SOURCE_DIR}'
@@ -124,13 +120,7 @@
   )
 endmacro(_define_abi_check_for)
 
-set(the_libs mirserver mirclient mircommon mirplatform)
-if(MIR_BUILD_PLATFORM_MESA)
-  set(the_libs ${the_libs} mirclientplatformmesa mirplatformgraphicsmesa)
-endif()
-if(MIR_BUILD_PLATFORM_ANDROID)
-  set(the_libs ${the_libs} mirclientplatformandroid mirplatformgraphicsandroid)
-endif()
+set(the_libs mirserver mirclient mircommon mirplatform mirclientplatformmesa mirclientplatformandroid mirplatformgraphicsmesa mirplatformgraphicsandroid)
 
 foreach(libname ${the_libs})
   _define_abi_dump_for(${libname})

=== modified file 'cmake/FindGtestGmock.cmake'
--- cmake/FindGtestGmock.cmake	2015-03-31 02:35:42 +0000
+++ cmake/FindGtestGmock.cmake	2015-05-20 14:01:27 +0000
@@ -26,8 +26,6 @@
 endif()
 
 set(GTEST_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${GTEST_CXX_FLAGS}")
-list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
-list(APPEND GTEST_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
 if (${CMAKE_CROSSCOMPILING})
   list(APPEND GTEST_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
 endif()

=== modified file 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2015-05-07 09:06:20 +0000
+++ cmake/MirCommon.cmake	2015-05-20 14:01:27 +0000
@@ -1,9 +1,14 @@
 cmake_minimum_required (VERSION 2.6)
 # Create target to discover tests
-include (CMakeParseArguments)
 
 include(CMakeDependentOption)
-file(REMOVE ${CMAKE_BINARY_DIR}/discover_all_tests.sh)
+
+CMAKE_DEPENDENT_OPTION(
+  DISABLE_GTEST_TEST_DISCOVERY
+  "If set to ON, disables fancy test autodiscovery and switches back to classic add_test behavior"
+  OFF
+  "NOT CMAKE_CROSSCOMPILING"
+  ON)
 
 option(
   ENABLE_MEMCHECK_OPTION
@@ -23,82 +28,128 @@
     valgrind)
 
   if(VALGRIND_EXECUTABLE)
-    set(VALGRIND_CMD "${VALGRIND_EXECUTABLE}" "--error-exitcode=1" "--trace-children=yes" "--leak-check=full" "--show-leak-kinds=definite" "--errors-for-leak-kinds=definite")
-    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_ARGS "--error-exitcode=1" "--trace-children=yes" "--leak-check=full" "--show-leak-kinds=definite" "--errors-for-leak-kinds=definite")
+    set(VALGRIND_ARGS ${VALGRIND_ARGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_generic")
+    set(VALGRIND_ARGS ${VALGRIND_ARGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_glibc_2.21")
+    set(DISCOVER_FLAGS "--enable-memcheck")
+    set(DISCOVER_FLAGS ${DISCOVER_FLAGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_generic")
+    set(DISCOVER_FLAGS ${DISCOVER_FLAGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_glibc_2.21")
     if (TARGET_ARCH STREQUAL "arm-linux-gnueabihf")
-      set(VALGRIND_CMD ${VALGRIND_CMD} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_armhf")
+        set(VALGRIND_ARGS ${VALGRIND_ARGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_armhf")
+        set(DISCOVER_FLAGS ${DISCOVER_FLAGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_armhf")
     endif()
   else(VALGRIND_EXECUTABLE)
     message("Not enabling memcheck as valgrind is missing on your system")
   endif(VALGRIND_EXECUTABLE)
 endif(ENABLE_MEMCHECK_OPTION)
 
-function (list_to_string LIST_VAR PREFIX STR_VAR)
-  foreach (value ${LIST_VAR})
-    set(tmp_str "${tmp_str} ${PREFIX} ${value}")
-  endforeach()
-  set(${STR_VAR} "${tmp_str}" PARENT_SCOPE)
-endfunction()
-
 function (mir_discover_tests EXECUTABLE)
-  # Set vars
-  set(test_cmd_no_memcheck "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${EXECUTABLE}")
-  set(test_cmd "${test_cmd_no_memcheck}")
-  set(test_env ${ARGN})
-  set(test_name ${EXECUTABLE})
-  set(test_no_memcheck_filter)
-  set(test_exclusion_filter)
-
-  if(ENABLE_MEMCHECK_OPTION)
-    set(test_cmd ${VALGRIND_CMD} ${test_cmd_no_memcheck})
-    set(test_no_memcheck_filter "*DeathTest.*")
-  endif()
-
-  if(cmake_build_type_lower MATCHES "threadsanitizer")
-    find_program(LLVM_SYMBOLIZER llvm-symbolizer-3.6)
-    if (LLVM_SYMBOLIZER)
-        set(TSAN_EXTRA_OPTIONS "external_symbolizer_path=${LLVM_SYMBOLIZER}")
-    endif()
-    # Space after ${TSAN_EXTRA_OPTIONS} works around bug in TSAN env. variable parsing 
-    list(APPEND test_env "TSAN_OPTIONS=\"suppressions=${CMAKE_SOURCE_DIR}/tools/tsan-suppressions second_deadlock_stack=1 halt_on_error=1 history_size=7 ${TSAN_EXTRA_OPTIONS} \"")
-    # TSan does not support multi-threaded fork
-    # TSan may open fds so "surface_creation_does_not_leak_fds" will not work as written
-    # TSan deadlocks when running StreamTransportTest/0.SendsFullMessagesWhenInterrupted - disable it until understood
-    set(test_exclusion_filter "UnresponsiveClient.does_not_hang_server:DemoInProcessServerWithStubClientPlatform.surface_creation_does_not_leak_fds:StreamTransportTest/0.SendsFullMessagesWhenInterrupted")
-  endif()
-
-  # Final commands
-  set(test_cmd "${test_cmd}" "--gtest_filter=-${test_no_memcheck_filter}:${test_exclusion_filter}")
-  set(test_cmd_no_memcheck "${test_cmd_no_memcheck}" "--gtest_filter=${test_no_memcheck_filter}:-${test_exclusion_filter}")
-
-  # Normal
-  add_test(${test_name} ${test_cmd})
-  set_property(TEST ${test_name} PROPERTY ENVIRONMENT ${test_env})
-  if (test_no_memcheck_filter)
-    add_test(${test_name}_no_memcheck ${test_cmd_no_memcheck})
-    set_property(TEST ${test_name}_no_memcheck PROPERTY ENVIRONMENT ${test_env})
-  endif()
-
-  # ptest
-  list_to_string("${test_env}" "--env" discover_env)
-  list_to_string("${test_cmd}" "" discover_cmd)
-  list_to_string("${test_cmd_no_memcheck}" "" discover_cmd_no_memcheck)
-
-  file(APPEND ${CMAKE_BINARY_DIR}/discover_all_tests.sh
-    "sh ${CMAKE_SOURCE_DIR}/tools/discover_gtests.sh ${discover_env} -- ${discover_cmd}\n")
-  if (test_no_memcheck_filter)
-    file(APPEND ${CMAKE_BINARY_DIR}/discover_all_tests.sh
-      "sh ${CMAKE_SOURCE_DIR}/tools/discover_gtests.sh ${discover_env} -- ${discover_cmd_no_memcheck}\n")
+  if(DISABLE_GTEST_TEST_DISCOVERY)
+    execute_process(
+      COMMAND uname -r
+      OUTPUT_VARIABLE KERNEL_VERSION_FULL
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    string(REGEX MATCH "^[0-9]+[.][0-9]+" KERNEL_VERSION ${KERNEL_VERSION_FULL})
+    message(STATUS "Kernel version detected: " ${KERNEL_VERSION})
+    # Some tests expect kernel version 3.11 and up
+    if (${KERNEL_VERSION} VERSION_LESS "3.11")
+        add_test(${EXECUTABLE} ${VALGRIND_EXECUTABLE} ${VALGRIND_ARGS} ${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE}
+            "--gtest_filter=-*DeathTest.*:AnonymousShmFile.*:MesaBufferAllocatorTest.software_buffers_dont_bypass:MesaBufferAllocatorTest.creates_software_rendering_buffer")
+    else()
+        add_test(${EXECUTABLE} ${VALGRIND_EXECUTABLE} ${VALGRIND_ARGS} ${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE}
+            "--gtest_filter=-*DeathTest.*")
+    endif()
+
+    add_test(${EXECUTABLE}_death_tests ${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE} "--gtest_filter=*DeathTest.*")
+    if (${ARGC} GREATER 1)
+      set_property(TEST ${EXECUTABLE} PROPERTY ENVIRONMENT ${ARGN})
+      set_property(TEST ${EXECUTABLE}_death_tests PROPERTY ENVIRONMENT ${ARGN})
+    endif()
+  else()
+    set(CHECK_TEST_DISCOVERY_TARGET_NAME "check_discover_tests_in_${EXECUTABLE}")
+    set(TEST_DISCOVERY_TARGET_NAME "discover_tests_in_${EXECUTABLE}")
+    message(STATUS "Defining targets: ${CHECK_TEST_DISCOVERY_TARGET_NAME} and ${TEST_DISCOVERY_TARGET_NAME}")
+
+    # These targets are always considered out-of-date, and are always run (at least for normal builds, except for make test/install).
+    add_custom_target(
+      ${CHECK_TEST_DISCOVERY_TARGET_NAME} ALL
+      ${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE} --gtest_list_tests > /dev/null
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      COMMENT "Check that discovering Tests in ${EXECUTABLE} works")
+      
+    if (MIR_BUILD_PLATFORM_ANDROID)
+      add_dependencies(${CHECK_TEST_DISCOVERY_TARGET_NAME} mirplatformgraphicsandroid)
+    endif()
+    
+    if (MIR_BUILD_PLATFORM_MESA)
+      add_dependencies(${CHECK_TEST_DISCOVERY_TARGET_NAME} mirplatformgraphicsmesa)
+    endif()
+
+    if (${ARGC} GREATER 1)
+      foreach (env ${ARGN})
+        list(APPEND EXTRA_ENV_FLAGS "--add-environment" "${env}")
+      endforeach()
+    endif()
+    
+    if(cmake_build_type_lower MATCHES "threadsanitizer")
+        find_program(LLVM_SYMBOLIZER llvm-symbolizer-3.6)
+        if (LLVM_SYMBOLIZER)
+            set(TSAN_EXTRA_OPTIONS "external_symbolizer_path=${LLVM_SYMBOLIZER}")
+        endif()
+        list(APPEND EXTRA_ENV_FLAGS "--add-environment" "TSAN_OPTIONS=suppressions=${CMAKE_SOURCE_DIR}/tools/tsan-suppressions second_deadlock_stack=1 halt_on_error=1 history_size=7 ${TSAN_EXTRA_OPTIONS}")
+        # TSan does not support multi-threaded fork
+        # TSan may open fds so "surface_creation_does_not_leak_fds" will not work as written
+        # TSan deadlocks when running StreamTransportTest/0.SendsFullMessagesWhenInterrupted - disable it until understood
+        set(EXCLUDED_TESTS "UnresponsiveClient.does_not_hang_server:DemoInProcessServerWithStubClientPlatform.surface_creation_does_not_leak_fds:StreamTransportTest/0.SendsFullMessagesWhenInterrupted")
+    endif()
+
+    add_custom_target(
+      ${TEST_DISCOVERY_TARGET_NAME} ALL
+      ${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE} --gtest_list_tests | ${CMAKE_BINARY_DIR}/mir_gtest/mir_discover_gtest_tests --executable=${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE} --exclusions=${EXCLUDED_TESTS} ${DISCOVER_FLAGS}
+      ${EXTRA_ENV_FLAGS}
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      COMMENT "Discovering Tests in ${EXECUTABLE}" VERBATIM)
+
+    add_dependencies(
+      ${CHECK_TEST_DISCOVERY_TARGET_NAME}
+      ${EXECUTABLE})
+
+    add_dependencies(
+      ${TEST_DISCOVERY_TARGET_NAME}
+
+      ${CHECK_TEST_DISCOVERY_TARGET_NAME}
+      ${EXECUTABLE}
+      mir_discover_gtest_tests)
+
   endif()
 endfunction ()
 
 function (mir_add_memcheck_test)
   if (ENABLE_MEMCHECK_OPTION)
-    add_custom_target(memcheck_test ALL)
-    mir_add_test(NAME "memcheck-test"
-      COMMAND ${CMAKE_BINARY_DIR}/mir_gtest/fail_on_success.sh ${VALGRIND_CMD} ${CMAKE_BINARY_DIR}/mir_gtest/mir_test_memory_error)
-    add_dependencies(memcheck_test mir_test_memory_error)
+      if(DISABLE_GTEST_TEST_DISCOVERY)
+	add_custom_target(
+	  memcheck_test ALL
+	)
+	ADD_TEST("memcheck-test" ${CMAKE_BINARY_DIR}/mir_gtest/fail_on_success.sh ${VALGRIND_EXECUTABLE} ${VALGRIND_ARGS} ${CMAKE_BINARY_DIR}/mir_gtest/mir_test_memory_error)
+	add_dependencies(
+	  memcheck_test
+
+	  mir_test_memory_error
+	)
+      else()
+        add_custom_target(
+          memcheck_test ALL
+          ${CMAKE_BINARY_DIR}/mir_gtest/mir_discover_gtest_tests --executable=${CMAKE_BINARY_DIR}/mir_gtest/mir_test_memory_error --memcheck-test ${DISCOVER_FLAGS}
+          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+          COMMENT "Adding memcheck test" VERBATIM)
+
+        add_dependencies(
+          memcheck_test
+
+          mir_discover_gtest_tests
+          mir_test_memory_error)
+      endif()
   endif()
 endfunction()
 
@@ -139,7 +190,7 @@
   if ("${modifier}" STREQUAL "NOINSTALL")
     list(REMOVE_AT ARGN 0)
   else()
-    install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${REAL_EXECUTABLE}
+    install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/${REAL_EXECUTABLE}
       DESTINATION ${CMAKE_INSTALL_BINDIR}
       RENAME ${TARGET}
     )
@@ -152,29 +203,7 @@
   )
 
   add_custom_target(${TARGET}-wrapped
-    ln -fs wrapper ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TARGET}
+    ln -fs wrapper ${CMAKE_BINARY_DIR}/bin/${TARGET}
   )
   add_dependencies(${TARGET} ${TARGET}-wrapped)
 endfunction()
-
-function (mir_add_test)
-  # Add test normally
-  add_test(${ARGN})
-
-  # Add to to discovery for parallel test running
-  set(one_value_args "NAME" WORKING_DIRECTORY)
-  set(multi_value_args "COMMAND")
-  cmake_parse_arguments(MAT "" "${one_value_args}" "${multi_value_args}" ${ARGN})
-
-  foreach (cmd ${MAT_COMMAND})
-    set(cmdstr "${cmdstr} \\\"${cmd}\\\"")
-  endforeach()
-
-  file(APPEND ${CMAKE_BINARY_DIR}/discover_all_tests.sh
-    "echo \"add_test(${MAT_NAME} ${cmdstr})\"\n")
-
-  if (MAT_WORKING_DIRECTORY)
-    file(APPEND ${CMAKE_BINARY_DIR}/discover_all_tests.sh
-      "echo \"set_tests_properties(${MAT_NAME} PROPERTIES WORKING_DIRECTORY \\\"${MAT_WORKING_DIRECTORY}\\\")\"\n")
-  endif()
-endfunction()

=== modified file 'cmake/src/mir/CMakeLists.txt'
--- cmake/src/mir/CMakeLists.txt	2015-05-07 09:06:20 +0000
+++ cmake/src/mir/CMakeLists.txt	2015-05-20 14:01:27 +0000
@@ -1,4 +1,14 @@
 add_executable(
+  mir_discover_gtest_tests
+  EXCLUDE_FROM_ALL
+  ${CMAKE_CURRENT_SOURCE_DIR}/mir_discover_gtest_tests.cpp)
+
+set_target_properties(
+  mir_discover_gtest_tests PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/mir_gtest
+)
+
+add_executable(
   mir_test_memory_error
   EXCLUDE_FROM_ALL
   ${CMAKE_CURRENT_SOURCE_DIR}/mir_test_memory_error.cpp)

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

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-19 14:51:07 +0000
+++ debian/changelog	2015-05-20 14:01:27 +0000
@@ -1,170 +1,15 @@
-mir (0.13.0+15.04.20150512-0ubuntu1) vivid; urgency=medium
+mir (0.12.1-0ubuntu2) UNRELEASED; urgency=medium
 
-  [ Alan Griffiths ]
-  * New upstream release 0.13.0 (https://launchpad.net/mir/+milestone/0.13.0)
-    - Very large release as the previous 0.12 series contained only minimal
-      bug fixes...
+  * demo changes on top of 0.12.1
     - Enhancements:
-      . New demo clients for input testing: mir_demo_client_eglsquare and
-        mir_demo_client_target.
-      . Demo clients: mir_demo_client_tooltip, mir_demo_client_animated_cursor
-      . mir_demo_client_fingerpaint now processes input asynchronously to
-        drawing for a more fluid experience.
-      . New, default window manager in mir_demo_server
-      . mir_demo_server option (--arw-file) to make socket filename globally rw
-      . mir_demo_server demonstrates use of config file
-      . Added support to mir_proving_server for rendering window title strings
-      . Demo servers (mir_proving_server, mir_demo_server): Introduce support
-        for Alt+` switching of windows in multi-window clients.
-      . Added client API support for constructing input method surfaces.
-      . Introduce "buffer streams" properly. This is a generalization of the
-        most basic functionality of a surface.
-      . Log useful OpenGL information on server start-up.
-      . Add support for HWC 1.4
-      . Add display and fencing information to the layers in the HWC report
-      . Add a report_vsync method to display report
-      . Support for second display when running on "android" driver stack
-      . Server buffering strategy is configurable by --nbuffers=N
-        (or environment MIR_SERVER_NBUFFERS=N)
-      . Explicit support for configuring window management in libmirserver.
-      . Remove surface configurator & placement strategy configuration points
-      . Added experimental environment variable MIR_CLIENT_INPUT_RATE=Hz for
-        tweaking the input resampling rate a client experiences (0 = off).
-        Also raised the default input rate from 55Hz to 59Hz for visibly
-        smoother touch scrolling.
-      . Added keymap setting support for surfaces.
-      . Improved automated testing of latency.
-      . Replaced and rewrote automated ABI checking.
-      . New client APIs for basic window management; setting window titles,
-        self-resizing, size constraints and changing type.
-      . Introduced dynamically loadable input platforms.
-      . Work towards libinput integration
-      . Added proof-of-concept support for Snappy packaging for Ubuntu Core.
-      . Drop support for C++11. Now C++14 is required to build Mir.
-      . Deprecated MirEventDelegate. Now you just pass the two fields as
-        parameters directly to mir_surface_set_event_handler().
-      . Legacy functions for creating surfaces marked deprecated
-      . Minor redesign of the new input event API introduced in 0.10/11,
-        so that identifiers are shorter and less convoluted.
-      . Drop libmirclient dependency on client-platform drivers
-      . Drop libmirserver dependency on client-platform drivers
-      . Use the ABI version in platform library names and packages
-      . Rework to reduce "abstraction leaks" in the graphics platform
-      . Add thread sanitizer build option
-      . Update KVM Instructions
-      . Update CMAKE to use CMAKE_*_OUTPUT_DIRECTORY
-    - ABI summary: Servers need rebuilding, but clients do not;
-      . Mirclient ABI unchanged at 8
-      . Mircommon ABI bumped to 4
-      . Mirplatform ABI bumped to 7
-      . Mirserver ABI bumped to 31
-    - Bug fixes:
-      . vivid fails to build Mir as of 2015-03-22: error: #warning "_BSD_SOURCE
-        and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp]
-        (LP: #1435127)
-      . [regression] Mir servers freeze on startup (mouse and keyboard not
-        responsive) (LP: #1444061)
-      . [enhancement] Add support for video/HDMI output on Android
-        (LP: #1296538)
-      . [enhancement] Set custom cursors (LP: #1380463)
-      . [regression] mali, powervr locks up with around the introduction or
-        removal of a third overlay (LP: #1413211)
-      . [regression] Client functions residing in libmircommon (LP: #1415321)
-      . USC - mouse cursor on AMD graphics is drawing incorrectly (LP: #1417581)
-      . [testsfail] SurfaceSwapBuffers.does_not_block_when_surface_is_not_composited
-        fails in CI (LP: #1418002)
-      . Compositing is triggered continously and needlessly when there are
-        occluded surfaces with available buffers (LP: #1418081)
-      . mir_demo_server doesn't emit hover_exit events (LP: #1418569)
-      . SessionMediator locks mutexes in one thread and unlocks them in another
-        (LP: #1427976)
-      . ProtobufResponder::send_response_result race (LP: #1428402)
-      . Some protobuf Closure objects can access dead objects (LP: #1433330)
-      . valgrind on armhf fails with with many errors (LP: #1435186)
-      . [regression] QtMir and USC can't build with lp:mir -
-        fatal error: mir/events/event_builders.h (LP: #1436212)
-      . [regression] mir_acceptance_tests.TestClientInput is hanging
-        (LP: #1436644)
-      . [regression] libmirclient crashes when calling
-        mir_surface_set_event_handler() twice [InputTransport.cpp:110:
-        android::InputChannel::InputChannel(const String8&, int): Assertion
-        `false && "\"result != 0\""' failed.] (LP: #1438160)
-      . [regression] Surfaces can't overlap screen edges any more (LP: #1438660)
-      . losing touches in arale when home button is pressed (LP: #1439285)
-      . [krillin] mirscreencast only creates a still picture, not a playable
-        movie (LP: #1439549)
-      . [regression] Unity8 doesn't detect input sent from USC with latest mir
-        development code (LP: #1439719)
-      . Intermittent CI failures in tests expecting created surfaces to have
-        specific size (LP: #1440088)
-      . [regression] [testsfail] failure in CI on
-        SimpleDispatchThreadTest.keeps_dispatching_after_signal_interruption
-        (LP: #1441620)
-      . [android] Screencasting causes other clients to stop rendering
-        (LP: #1441759)
-      . Intermittent CI failures in
-        MultiThreadedCompositor.does_not_block_in_start_when_compositor_thread_fails
-        (LP: #1442020)
-      . Flickering showing stale buffers on Krillin (LP: #1444047)
-      . Acceptance tests link with static versions of client library and server
-        components (LP: #1445473)
-      . [regression] mir_acceptance_tests:
-        TestClientCursorAPI.cursor_passed_through_nested_server is crashing most
-        of the time (LP: #1447430)
-      . [regression] Clients log verbose info on startup:
-        "Loader: Loading module: ..." (LP: #1414883)
-      . [enhancement] Missing client function for surface resizing
-        (LP: #1420573)
-      . [regression] [multimonitor] Clients (sometimes) run at double frame rate
-        if overlapping two monitors. (LP: #1420678)
-      . [enhancement] Need a client API to specify resize limitations
-        (LP: #1421591)
-      . [enhancement] Add surface morph client API (LP: #1422522)
-      . The process for updating packaging for ABI changes is cumbersome and
-        error-prone (LP: #1427207)
-      . [regression] mir_acceptance_tests.NestedServer failure in clang CI
-        (LP: #1430000)
-      . DisplayConfigurationOutput.physical_size_mm is undefined/zero
-        (LP: #1430315)
-      . Dragging objects in a nested server or a client stutters slightly
-        (LP: #1436192)
-      . [regression] mir_proving_server: Super+N/Super+C does nothing now
-        (LP: #1437166)
-      . [regression] "Playground" event filters get registered twice
-        (LP: #1437174)
-      . [regression] <WARNING> Platform Probing: Failed to probe module.
-        (LP: #1438536)
-      . [regression] Move/resizing in mir_proving_server freezes if the cursor
-        is outside the window (LP: #1438621)
-      . [testsfail] CI failure in ClientLibraryErrorsDeathTest.
-        creating_surface_synchronosly_on_malconstructed_connection_is_fatal
-        (LP: #1438702)
-      . Exceptions thrown due to EGL failures don't include EGL error codes
-        (LP: #1444938)
-      . Can't switch between sibling windows of multi-window apps (LP: #1445538)
-      . [regression] specifying -DMIR_PLATFORM to one platform causes cmake
-        failure (LP: #1447729)
-      . mir_demo_server(_minimal): Can't move surfaces to overlap screen edges
-        (LP: #1447882)
-      . [regression] mir_demo_standalone_render_surfaces fails to start on
-        krillin (LP: #1449198)
-      . [regression] MIR_CLIENT_PERF_REPORT=log now shows "0" for the surface
-        name (LP: #1415305)
-      . Nested display leaks its EGLContext (LP: #1418910)
-      . SimpleDispatchThreadTest.doesnt_call_dispatch_after_first_false_return
-        fails when run repeatedly (LP: #1440005)
-      . Surfaces are not properly released in CustomWindowManagement.
-        state_change_requests_are_associated_with_correct_surface
-        (LP: #1445418)
-      . android reports that the gpu can only support 1 simultaneous output
-        (LP: #1446304)
-      . Support dynamic mouse cursor icons (LP: #1447839)
-
- -- CI Train Bot <[e-mail]>  Tue, 12 May 2015 13:12:55 +0000
-
-mir (0.12.1+15.04.20150324-0ubuntu1) vivid; urgency=medium
-
-  [ Alexandros Frantzis ]
+        . usage of external display in mirror mode
+        . output centering on external display
+        . orientation override for user input
+
+ -- Andreas Pokorny <[e-mail]>  Sun, 01 Mar 2015 15:09:13 +0100
+
+mir (0.12.1-0ubuntu1) UNRELEASED; urgency=medium
+
   * New upstream release 0.12.1 (https://launchpad.net/mir/+milestone/0.12.1)
     - Bug fixes:
       . [regression] mali, powervr locks up with around the introduction or
@@ -183,7 +28,7 @@
         [-Werror=cpp] (LP: #1435127)
       . valgrind on armhf fails with with many errors (LP: #1435186)
 
- -- CI Train Bot <[e-mail]>  Tue, 24 Mar 2015 16:09:54 +0000
+ -- Alexandros Frantzis <[e-mail]>  Tue, 24 Mar 2015 11:07:41 +0200
 
 mir (0.12.0+15.04.20150228-0ubuntu1) vivid; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2015-05-19 04:37:02 +0000
+++ debian/control	2015-05-20 14:01:27 +0000
@@ -10,6 +10,10 @@
                doxygen,
                xsltproc,
                graphviz,
+# We rely on C++11 features, and to prevent from ABI breaks
+# in libstdc++ causing us issues, we explicitly select a G++
+# version.
+               g++-4.9,
                libboost-dev,
                libboost-date-time-dev,
                libboost-program-options-dev,
@@ -32,13 +36,9 @@
                libumockdev-dev (>= 0.6),
                umockdev (>= 0.8.7),
                libudev-dev,
-               libgtest-dev,
                google-mock (>= 1.6.0+svn437),
                valgrind [!arm64],
                libglib2.0-dev,
-               libfreetype6-dev,
-               abi-compliance-checker,
-               libevdev-dev,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/mir
 # If you aren't a member of ~mir-team but need to upload packaging changes,
@@ -61,13 +61,14 @@
 
 #TODO: Packaging infrastructure for better dependency generation,
 #      ala pkg-xorg's xviddriver:Provides and ABI detection.
-Package: libmirserver32
+Package: libmirserver30
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         mir-platform-graphics-mesa1 | mir-platform-graphics-android1,
 Description: Display server for Ubuntu - server library
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -93,7 +94,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmircommon4 (= ${binary:Version}), 
+Depends: libmircommon3 (= ${binary:Version}), 
          libprotobuf-dev (>= 2.4.1),
          libxkbcommon-dev,
          ${misc:Depends},
@@ -127,7 +128,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver32 (= ${binary:Version}),
+Depends: libmirserver30 (= ${binary:Version}),
          libmirplatform-dev (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libglm-dev,
@@ -145,6 +146,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         mir-client-platform-mesa2 | mir-client-platform-android2,
 Description: Display server for Ubuntu - client library
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -216,7 +218,6 @@
 Architecture: i386 amd64 armhf arm64
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Recommends: fonts-liberation
 Description: Display server for Ubuntu - demonstration programs
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -253,7 +254,7 @@
  .
  Contains a tool for stress testing the Mir display server
 
-Package: libmircommon4
+Package: libmircommon3
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -267,7 +268,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-mesa2
+Package: mir-platform-graphics-mesa1
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -281,7 +282,7 @@
  Contains the shared libraries required for the Mir server to interact with
  the hardware platform using the Mesa drivers.
 
-Package: mir-platform-graphics-android2
+Package: mir-platform-graphics-android1
 Section: libs
 Architecture: i386 amd64 armhf
 Multi-Arch: same
@@ -343,7 +344,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-mesa2,
+         mir-platform-graphics-mesa1,
          mir-client-platform-mesa2,
 Description: Display server for Ubuntu - desktop driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
@@ -358,7 +359,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-android2,
+         mir-platform-graphics-android1,
          mir-client-platform-android2,
 Description: Display server for Ubuntu - android driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,

=== modified file 'debian/libmirclient-debug-extension1.install'
--- debian/libmirclient-debug-extension1.install	2015-03-31 02:35:42 +0000
+++ debian/libmirclient-debug-extension1.install	2015-05-20 14:01:27 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirclient-debug-extension.so.1
+usr/lib/*/libmirclient-debug-extension.so.*

=== modified file 'debian/libmirclient-dev.install'
--- debian/libmirclient-dev.install	2015-05-07 09:06:20 +0000
+++ debian/libmirclient-dev.install	2015-05-20 14:01:27 +0000
@@ -1,6 +1,3 @@
 usr/include/mirclient/mir_toolkit/*.h
-usr/include/mirclient/mir/events/*.h
-usr/include/mirclient/mir/event_printer.h
-usr/include/mirclient/mir_toolkit/events
 usr/lib/*/pkgconfig/mirclient.pc
 usr/lib/*/libmirclient.so

=== renamed file 'debian/libmircommon4.install' => 'debian/libmircommon3.install'
--- debian/libmircommon4.install	2015-03-31 02:35:42 +0000
+++ debian/libmircommon3.install	2015-05-20 14:01:27 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmircommon.so.4
+usr/lib/*/libmircommon.so.3

=== renamed file 'debian/libmirserver32.install' => 'debian/libmirserver30.install'
--- debian/libmirserver32.install	2015-05-12 06:58:52 +0000
+++ debian/libmirserver30.install	2015-05-20 14:01:27 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.32
+usr/lib/*/libmirserver.so.30

=== modified file 'debian/mir-demos.install'
--- debian/mir-demos.install	2015-05-15 11:44:45 +0000
+++ debian/mir-demos.install	2015-05-20 14:01:27 +0000
@@ -1,3 +1,2 @@
 usr/bin/mir_demo_*
-usr/bin/mir_proving_*
-usr/lib/*/libmir_demo_*
+usr/bin/mir_proving_*
\ No newline at end of file

=== renamed file 'debian/mir-platform-graphics-android2.install' => 'debian/mir-platform-graphics-android1.install'
--- debian/mir-platform-graphics-android2.install	2015-05-07 09:06:20 +0000
+++ debian/mir-platform-graphics-android1.install	2015-05-20 14:01:27 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/graphics-android.so.2
+usr/lib/*/mir/server-platform/graphics-android.so.1

=== renamed file 'debian/mir-platform-graphics-mesa2.install' => 'debian/mir-platform-graphics-mesa1.install'
--- debian/mir-platform-graphics-mesa2.install	2015-05-07 09:06:20 +0000
+++ debian/mir-platform-graphics-mesa1.install	2015-05-20 14:01:27 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/graphics-mesa.so.2
+usr/lib/*/mir/server-platform/graphics-mesa.so.1

=== modified file 'debian/mir-test-tools.install'
--- debian/mir-test-tools.install	2015-05-19 04:37:02 +0000
+++ debian/mir-test-tools.install	2015-05-20 14:01:27 +0000
@@ -3,9 +3,7 @@
 usr/bin/mir_acceptance_tests
 usr/bin/mir_integration_tests
 usr/bin/mir_performance_tests
-usr/bin/mir_privileged_tests
 usr/lib/*/mir/tools/libmirclientlttng.so
 usr/lib/*/mir/tools/libmirserverlttng.so
 usr/lib/*/mir/server-platform/graphics-dummy.so
-usr/lib/*/mir/server-platform/input-stub.so
 usr/lib/*/mir/client-platform/dummy.so

=== modified file 'debian/rules'
--- debian/rules	2015-05-12 06:58:52 +0000
+++ debian/rules	2015-05-20 14:01:27 +0000
@@ -6,11 +6,17 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
+include /usr/share/dpkg/default.mk
+
+# Explicitly selecting a G{CC,++}-version here to avoid accidental
+# ABI breaks introduced by toolchain updates.
+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
+
 %:
 	dh $@ --parallel --fail-missing
 
-# Enable verbose debugging output from the testsuite
-export MIR_SERVER_LOGGING = on
+#overrding dh_auto_test to get rid of --parallel during testing
 override_dh_auto_test:
 	GTEST_OUTPUT=xml:./ dh_auto_test --max-parallel=1 -- ARGS="-V"
 

=== modified file 'doc/component_reports.md'
--- doc/component_reports.md	2015-03-31 02:35:42 +0000
+++ doc/component_reports.md	2015-05-20 14:01:27 +0000
@@ -16,17 +16,15 @@
 are prefixed with `MIR_SERVER_` and contain underscores ('_') instead of dashes
 ('-').  The available component reports and handlers for the server are:
 
-Report                       | Handlers
----------------------------- | --------
-connector-report             | log,lttng
-compositor-report            | log,lttng
-display-report               | log,lttng
-input-report                 | log,lttng
-legacy-input-report          | log
-msg-processor-report         | log,lttng
-session-mediator-report      | log,lttng
-scene-report                 | log,lttng
-shared-library-prober-report | log,lttng
+Report                  | Handlers
+----------------------- | --------
+connector-report        | log,lttng
+display-report          | log,lttng
+input-report            | log,lttng
+legacy-input-report     | log
+msg-processor-report    | log,lttng
+session-mediator-report | log,lttng
+scene-report            | log,lttng
 
 For example, to enable the LTTng input report, one could either use the
 `--input-report=lttng` command-line option to the server, or set the
@@ -39,12 +37,10 @@
 environment variables are prefixed with `MIR_CLIENT_` and contain only
 underscores. The available reports and handlers for the client are:
 
-Report                | Handlers
---------------------- | --------
-rpc-report            | log,lttng
-input-receiver-report | log,lttng
-shared-library-prober-report | log,lttng
-perf-report           | log,lttng
+Report              | Handlers
+------------------- | --------
+rpc-report          | log,lttng
+input-receiver      | log,lttng
 
 For example, to enable the logging RPC report, one should set the
 `MIR_CLIENT_RPC_REPORT=log` environment variable.

=== modified file 'doc/demo_shell_controls.md'
--- doc/demo_shell_controls.md	2015-05-07 09:06:20 +0000
+++ doc/demo_shell_controls.md	2015-05-20 14:01:27 +0000
@@ -34,7 +34,6 @@
  - Switch back to X: *Ctrl-Alt-F7*
  - Switch virtual terminals (VTs): *Ctrl-Alt-(F1-F12)*
  - Switch apps: *Alt-Tab* or *4-finger swipe left/right*
- - Switch windows of the current app: *Alt-grave*
  - Ask an app to close: *Alt-F4* (it may refuse or not understand)
  - Move window: *Alt-leftmousebutton* or *3-finger drag*
  - Resize window: *Alt-middlemousebutton* or *3-finger pinch/zoom*

=== modified file 'doc/footer.html.in'
--- doc/footer.html.in	2015-05-07 09:06:20 +0000
+++ doc/footer.html.in	2015-05-20 14:01:27 +0000
@@ -1,5 +1,5 @@
 <hr>
-<p align="center">Copyright &copy; 2012-2015 Canonical Ltd. <br />
+<p align="center">Copyright &copy; 2012,2013 Canonical Ltd. <br />
 Generated on @DATE_TODAY@</p>
 </body>
 </html>

=== modified file 'doc/mainpage.md'
--- doc/mainpage.md	2015-05-07 09:06:20 +0000
+++ doc/mainpage.md	2015-05-20 14:01:27 +0000
@@ -93,16 +93,10 @@
    "server_example_input_filter.cpp: print input events to stdout"
  - \subpage server_example_log_options.cpp 
    "server_example_log_options.cpp: replace Mir logger with glog"
- - \subpage server_example_basic_window_manager.h 
-   "server_example_basic_window_manager.h: How to wire up a window manager"
+ - \subpage server_example_window_manager.cpp 
+   "server_example_window_manager.cpp: How to wire up a window manager"
  - \subpage server_example_window_management.cpp 
    "server_example_window_management.cpp: simple window management examples"
- - \subpage server_example_canonical_window_manager.cpp 
-   "server_example_canonical_window_manager.cpp: canonical window management policy"
- - \subpage server_example_tiling_window_manager.cpp 
-   "server_example_tiling_window_manager.cpp: an alternative window management policy"
- - \subpage server_example_custom_compositor.cpp 
-   "server_example_custom_compositor.cpp: demonstrate writing an alternative GL rendering code"
 
 Working on Mir code
 -------------------

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2015-05-18 21:30:28 +0000
+++ examples/CMakeLists.txt	2015-05-20 14:01:27 +0000
@@ -16,29 +16,22 @@
 )
 
 add_library(exampleserverconfig STATIC
-  server_example_canonical_window_manager.cpp
+  server_example_generic_shell.cpp
   server_example_display_configuration_policy.cpp
   server_example_input_event_filter.cpp
   server_example_log_options.cpp
   server_example_input_filter.cpp
+  server_example_fullscreen_placement_strategy.cpp
   server_example_host_lifecycle_event.cpp
   server_example_tiling_window_manager.cpp
   server_example_window_management.cpp
-  server_example_custom_compositor.cpp
-  server_example_adorning_compositor.cpp
+  server_example_shell.cpp
 )
 
 target_link_libraries(eglapp
   mirclient
   ${EGL_LIBRARIES}
   ${GLESv2_LIBRARIES}
-  )
-
-mir_add_wrapped_executable(mir_demo_client_animated_cursor
-  animated_cursor_demo_client.c
-)
-target_link_libraries(mir_demo_client_animated_cursor
-  eglapp
 )
 mir_add_wrapped_executable(mir_demo_client_eglflash
   eglflash.c
@@ -52,12 +45,6 @@
 target_link_libraries(mir_demo_client_egltriangle
   eglapp
 )
-mir_add_wrapped_executable(mir_demo_client_target
-  target.c
-)
-target_link_libraries(mir_demo_client_target
-  eglapp
-)
 mir_add_wrapped_executable(mir_demo_client_eglcounter
   eglcounter.cpp
 )
@@ -117,9 +104,6 @@
 mir_add_wrapped_executable(mir_demo_client_display_config demo_client_display_config.c)
 target_link_libraries(mir_demo_client_display_config eglapp)
 
-mir_add_wrapped_executable(mir_demo_client_eglsquare eglsquare.cpp)
-target_link_libraries(mir_demo_client_eglsquare eglapp)
-
 mir_add_wrapped_executable(mir_demo_client_flicker
   flicker.c
 )
@@ -185,32 +169,6 @@
   ${Boost_LIBRARIES}
 )
 
-add_library(mir_demo_server_loadable MODULE
-  server_example.cpp
-  glog_logger.cpp
-  server_example_test_client.cpp
-)
-
-target_link_libraries(mir_demo_server_loadable
-  mirserver
-  exampleserverconfig
-  ${GLog_LIBRARY}
-  ${GFlags_LIBRARY}
-  ${Boost_LIBRARIES}
-)
-
-install(TARGETS mir_demo_server_loadable
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
-
-mir_add_wrapped_executable(mir_demo_server_loader
-  mir_demo_server_loader.cpp
-)
-
-target_link_libraries(mir_demo_server_loader
-  dl
-)
-
 mir_add_wrapped_executable(mir_demo_server_minimal server_minimal.cpp)
 target_link_libraries(mir_demo_server_minimal mirserver)
 
@@ -223,27 +181,19 @@
     mircommon
 )
 
-if (MIR_ENABLE_TESTS)
+# FIXME: Bug not fixed yet.
+if (MIR_ENABLE_TESTS AND MIR_TEST_CLIENT_ABI)
   # Regression tests for LP: #1415321
 
   # To see reasons for failure:  ctest -V -R Clients-only-use-client-symbols
-  mir_add_test(NAME Clients-only-use-client-symbols
+  add_test(NAME Clients-only-use-client-symbols
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin
     COMMAND /bin/sh -c "!(nm -u .mir_demo_client_* mir_demo_client* | grep -v @@MIR_CLIENT | grep 'U mir_')"
   )
 
-# We use a slightly weaker version of the test with clang as that generates spurious NEEDED
-if (NOT "${CMAKE_CXX_COMPILER}" MATCHES "clang")
   # To see reasons for failure:  ctest -V -R Clients-only-use-client-ABI
-  mir_add_test(NAME Clients-only-use-client-ABI
+  add_test(NAME Clients-only-use-client-ABI
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin
     COMMAND /bin/sh -c "!(objdump -p .mir_demo_client_* mir_demo_client*  | grep NEEDED | grep libmir | grep -v libmirclient)"
   )
-else()
-  # To see reasons for failure:  ctest -V -R Clients-only-use-client-ABI
-  mir_add_test(NAME Clients-only-use-client-ABI
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-    COMMAND /bin/sh -c "!(nm -u .mir_demo_client_* mir_demo_client* | grep -v @@MIR_CLIENT | grep @@MIR_)"
-  )
-endif ()
 endif ()

=== removed file 'examples/animated_cursor_demo_client.c'
--- examples/animated_cursor_demo_client.c	2015-02-25 22:10:35 +0000
+++ examples/animated_cursor_demo_client.c	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-/*
- * Copyright © 2015 Canonical LTD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Robert Carr <[e-mail]>
- */
-
-#define _GNU_SOURCE // for nanosleep
-
-#include "eglapp.h"
-
-#include "mir_toolkit/mir_client_library.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <time.h>
-#include <GLES2/gl2.h>
-
-void animate_cursor(MirBufferStream *stream)
-{
-    static double alpha = 0.0;
-    char fill_color = 0xff * alpha;
-    
-    MirGraphicsRegion region;
-    mir_buffer_stream_get_graphics_region(stream, &region);
-    
-    memset(region.vaddr, fill_color, region.stride*region.height);
-    
-    mir_buffer_stream_swap_buffers_sync(stream);
-    alpha += 0.01;
-    if (alpha >= 1.0)
-        alpha = 0.0;
-    
-}
-
-MirBufferStream* make_cursor_stream(MirConnection *connection, MirSurface *surface)
-{
-    MirBufferStream* stream = mir_connection_create_buffer_stream_sync(connection,
-      24, 24, mir_pixel_format_argb_8888, mir_buffer_usage_software);
-    
-    MirCursorConfiguration* conf = mir_cursor_configuration_from_buffer_stream(stream, 0, 0);
-    mir_wait_for(mir_surface_configure_cursor(surface, conf));
-    mir_cursor_configuration_destroy(conf);
-    
-    return stream;
-}
-
-int main(int argc, char *argv[])
-{
-    unsigned int width = 128, height = 128;
-
-    if (!mir_eglapp_init(argc, argv, &width, &height))
-        return 1;
-
-    glClearColor(0.5, 0.5, 0.5, mir_eglapp_background_opacity);
-    glClear(GL_COLOR_BUFFER_BIT);
-    mir_eglapp_swap_buffers();
-
-    MirBufferStream* stream = make_cursor_stream(mir_eglapp_native_connection(),
-        mir_eglapp_native_surface());
-
-    struct timespec onehundred_millis = {
-        0, 100*1000000
-    };
-
-    while (mir_eglapp_running())
-    {
-        nanosleep(&onehundred_millis, &onehundred_millis);
-        animate_cursor(stream);
-    }
-
-    mir_eglapp_shutdown();
-
-    return 0;
-}

=== modified file 'examples/demo_client_display_config.c'
--- examples/demo_client_display_config.c	2015-03-31 02:35:42 +0000
+++ examples/demo_client_display_config.c	2015-05-20 14:01:27 +0000
@@ -295,11 +295,11 @@
     ctx->reconfigure = 1;
 }
 
-static void handle_keyboard_event(struct ClientContext *ctx, MirKeyboardEvent const* event)
+static void handle_key_input_event(struct ClientContext *ctx, MirKeyInputEvent const* event)
 {
-    if (mir_keyboard_event_action(event) != mir_keyboard_action_up)
+    if (mir_key_input_event_get_action(event) != mir_key_input_event_action_up)
         return;
-    xkb_keysym_t key_code = mir_keyboard_event_key_code(event);
+    xkb_keysym_t key_code = mir_key_input_event_get_key_code(event);
 
     if (key_code >= XKB_KEY_1 &&
         key_code <= XKB_KEY_9)
@@ -340,7 +340,7 @@
     if (mir_input_event_get_type(input_event) != mir_input_event_type_key)
         return;
     
-    handle_keyboard_event(ctx, mir_input_event_get_keyboard_event(input_event));
+    handle_key_input_event(ctx, mir_input_event_get_key_input_event(input_event));
 }
 
 int main(int argc, char *argv[])
@@ -368,7 +368,8 @@
     mir_connection_set_display_config_change_callback(
         connection, display_change_callback, &ctx);
 
-    mir_surface_set_event_handler(surface, event_callback, &ctx);
+    struct MirEventDelegate ed = {event_callback, &ctx};
+    mir_surface_set_event_handler(surface, &ed);
 
     time_t start = time(NULL);
 

=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2015-04-09 08:57:24 +0000
+++ examples/eglapp.c	2015-05-20 14:01:27 +0000
@@ -16,6 +16,8 @@
  * Author: Daniel van Vugt <[e-mail]>
  */
 
+#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
+
 #include "eglapp.h"
 #include "mir_toolkit/mir_client_library.h"
 #include <stdio.h>
@@ -94,10 +96,10 @@
 {
     if (mir_input_event_get_type(event) != mir_input_event_type_key)
         return;
-    MirKeyboardEvent const* kev = mir_input_event_get_keyboard_event(event);
-    if (mir_keyboard_event_action(kev) != mir_keyboard_action_up)
+    MirKeyInputEvent const* kev = mir_input_event_get_key_input_event(event);
+    if (mir_key_input_event_get_action(kev) != mir_key_input_event_action_up)
         return;
-    if (mir_keyboard_event_key_code(kev) != XKB_KEY_q)
+    if (mir_key_input_event_get_key_code(kev) != XKB_KEY_q)
         return;
     
     running = 0;
@@ -142,12 +144,7 @@
          * support for event queuing (directing them to another thread) or
          * full single-threaded callbacks. (LP: #1194384).
          */
-        {
-            MirResizeEvent const* resize = mir_event_get_resize_event(ev);
-            printf("Resized to %dx%d\n",
-                   mir_resize_event_get_width(resize),
-                   mir_resize_event_get_height(resize));
-        }
+        printf("Resized to %dx%d\n", ev->resize.width, ev->resize.height);
         break;
     case mir_event_type_close_surface:
         printf("Received close event from server.\n");
@@ -189,6 +186,11 @@
         EGL_CONTEXT_CLIENT_VERSION, 2,
         EGL_NONE
     };
+    MirEventDelegate delegate = 
+    {
+        mir_eglapp_handle_event,
+        NULL
+    };
     EGLConfig eglconfig;
     EGLint neglconfigs;
     EGLContext eglctx;
@@ -386,14 +388,7 @@
 
     CHECK(spec != NULL, "Can't create a surface spec");
 
-    char const* name = argv[0];
-    for (char const* p = name; *p; p++)
-    {
-        if (*p == '/')
-            name = p + 1;
-    }
-    mir_surface_spec_set_name(spec, name);
-
+    mir_surface_spec_set_name(spec, "eglappsurface");
     if (output_id != mir_display_output_id_invalid)
         mir_surface_spec_set_fullscreen_on_output(spec, output_id);
 
@@ -402,7 +397,7 @@
 
     CHECK(mir_surface_is_valid(surface), "Can't create a surface");
 
-    mir_surface_set_event_handler(surface, mir_eglapp_handle_event, NULL);
+    mir_surface_set_event_handler(surface, &delegate);
     
     MirCursorConfiguration *conf = mir_cursor_configuration_from_name(cursor_name);
     mir_surface_configure_cursor(surface, conf);

=== removed file 'examples/eglsquare.cpp'
--- examples/eglsquare.cpp	2015-05-07 09:06:20 +0000
+++ examples/eglsquare.cpp	1970-01-01 00:00:00 +0000
@@ -1,417 +0,0 @@
-/*
- * Copyright © 2015 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Kevin DuBois <[e-mail]>
- */
-
-#include "mir_toolkit/mir_client_library.h"
-#include <EGL/egl.h>
-#include <GLES2/gl2.h>
-#include <thread>
-#include <memory>
-#include <chrono>
-#include <iostream>
-#include <cstring>
-#include <unistd.h>
-#include <signal.h>
-
-namespace
-{
-class Connection
-{
-public:
-    Connection(char const* socket_file) :
-        connection(mir_connect_sync(socket_file, __PRETTY_FUNCTION__))
-    {
-        if (!mir_connection_is_valid(connection))
-            throw std::runtime_error(std::string("could not connect to server: ") +
-                                     mir_connection_get_error_message(connection));
-    }
-    ~Connection()
-    {
-        mir_connection_release(connection);
-    }
-    operator MirConnection*() { return connection; }
-    Connection(Connection const&) = delete;
-    Connection& operator=(Connection const&) = delete;
-private:
-    MirConnection* connection;
-};
-
-class Context
-{
-public:
-    Context(Connection& connection, MirSurface* surface, int swap_interval) :
-        native_display(reinterpret_cast<EGLNativeDisplayType>(
-            mir_connection_get_egl_native_display(connection))),
-        native_window(reinterpret_cast<EGLNativeWindowType>(
-            mir_buffer_stream_get_egl_native_window(mir_surface_get_buffer_stream(surface)))),
-        display(native_display),
-        config(chooseconfig(display.disp)),
-        surface(display.disp, config, native_window),
-        context(display.disp, config)
-    {
-        make_current();
-        eglSwapInterval(display.disp, swap_interval);
-    }
-    void make_current()
-    {
-        if (eglMakeCurrent(display.disp, surface.surface, surface.surface, context.context) == EGL_FALSE)
-            throw(std::runtime_error("could not makecurrent"));
-    }
-    void release_current()
-    {
-        if (eglMakeCurrent(display.disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT) == EGL_FALSE)
-            throw(std::runtime_error("could not makecurrent"));
-    }
-    void swapbuffers()
-    {
-        if (eglSwapBuffers(display.disp, surface.surface) == EGL_FALSE)
-            throw(std::runtime_error("could not swapbuffers"));
-    }
-    Context(Context const&) = delete;
-    Context& operator=(Context const&) = delete;
-private:
-    EGLConfig chooseconfig(EGLDisplay disp)
-    {
-        int n{0};
-        EGLConfig egl_config;
-        EGLint attribs[] = {
-            EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-            EGL_RED_SIZE, 8,
-            EGL_GREEN_SIZE, 8,
-            EGL_BLUE_SIZE, 8,
-            EGL_ALPHA_SIZE, 8,
-            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-            EGL_NONE };
-        if (eglChooseConfig(disp, attribs, &egl_config, 1, &n) != EGL_TRUE || n != 1)
-            throw std::runtime_error("could not find egl config");
-        return egl_config;
-    }
-    EGLNativeDisplayType native_display;
-    EGLNativeWindowType native_window;
-    struct Display
-    {
-        Display(EGLNativeDisplayType native) :
-            disp(eglGetDisplay(native))
-        {
-            int major{0}, minor{0};
-            if (disp == EGL_NO_DISPLAY)
-                throw std::runtime_error("no egl display");
-            if (eglInitialize(disp, &major, &minor) != EGL_TRUE || major != 1 || minor != 4)
-                throw std::runtime_error("could not init egl");
-        }
-        ~Display()
-        {
-            eglTerminate(disp);
-        }
-        EGLDisplay disp;
-    } display;
-    EGLConfig config;
-    struct Surface
-    {
-        Surface(EGLDisplay display, EGLConfig config, EGLNativeWindowType native_window) :
-            disp(display),
-            surface(eglCreateWindowSurface(disp, config, native_window, NULL))
-        {
-            if (surface == EGL_NO_SURFACE)
-                throw std::runtime_error("could not create egl surface");
-        }
-        ~Surface() {
-            if (eglGetCurrentSurface(EGL_DRAW) == surface)
-                eglMakeCurrent(disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-            eglDestroySurface(disp, surface);
-         }
-        EGLDisplay disp;
-        EGLSurface surface;
-    } surface;
-    struct EglContext
-    {
-        EglContext(EGLDisplay disp, EGLConfig config) :
-            disp(disp),
-            context(eglCreateContext(disp, config, EGL_NO_CONTEXT, context_attribs))
-        {
-            if (context == EGL_NO_CONTEXT)
-                throw std::runtime_error("could not create egl context");
-        }
-        ~EglContext()
-        {
-            eglDestroyContext(disp, context);
-        }
-        EGLint context_attribs[3] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
-        EGLDisplay disp;
-        EGLContext context;
-    } context;
-};
-
-class RenderProgram
-{
-public:
-    RenderProgram(Context& context, unsigned int width, unsigned int height) :
-        vertex(&vtex_shader_src, GL_VERTEX_SHADER),
-        fragment(&frag_shader_src, GL_FRAGMENT_SHADER),
-        program(vertex, fragment)
-    {
-        float square_side = 400.0f;
-        float scale[2] {square_side/width, square_side/height};
-        glUseProgram(program.program);
-        vPositionAttr = glGetAttribLocation(program.program, "vPosition");
-        glVertexAttribPointer(vPositionAttr, 4, GL_FLOAT, GL_FALSE, 0, vertex_data);
-        posUniform = glGetUniformLocation(program.program, "pos");
-        glClearColor(0.1, 0.1, 0.4, 1.0); //light blue
-        glClear(GL_COLOR_BUFFER_BIT);
-        auto scaleUniform = glGetUniformLocation(program.program, "scale");
-        glUniform2fv(scaleUniform, 1, scale);
- 
-        context.swapbuffers();
-        context.release_current();
-    }
-
-    void draw(float x, float y)
-    {
-        float pos[2] = {x, y}; 
-        glUseProgram(program.program);
-        glClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT );
-        glUniform2fv(posUniform, 1, pos);
-        glEnableVertexAttribArray(vPositionAttr);
-        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-        glDisableVertexAttribArray(vPositionAttr);
-    }
-
-    RenderProgram(RenderProgram const&) = delete;
-    RenderProgram& operator=(RenderProgram const&) = delete; 
-private:
-    GLchar const*const frag_shader_src =
-    {
-        "precision mediump float;"
-        "void main() {"
-        "   gl_FragColor = vec4(0.0, 0.0, 1.0, 1.0);"
-        "}"
-    };
-    GLchar const*const vtex_shader_src =
-    {
-        "attribute vec4 vPosition;"
-        "uniform vec2 pos;"
-        "uniform vec2 scale;"
-        "void main() {"
-        "   gl_Position = vec4(vPosition.xy * scale + pos, 0.0, 1.0);"
-        "}"
-    };
-    struct Shader
-    {
-        Shader(GLchar const* const* src, GLuint type) :
-            shader(glCreateShader(type))
-        {
-            glShaderSource(shader, 1, src, 0);
-            glCompileShader(shader);
-        }
-        ~Shader()
-        {
-            glDeleteShader(shader);
-        }
-        GLuint shader;
-    } vertex, fragment;
-    struct Program
-    {
-        Program(Shader& vertex, Shader& fragment) :
-            program(glCreateProgram())
-        {
-            glAttachShader(program, vertex.shader);
-            glAttachShader(program, fragment.shader);
-            glLinkProgram(program);
-        }
-        ~Program()
-        {
-            glDeleteProgram(program);
-        }
-        GLuint program;
-    } program;
-    GLfloat vertex_data[16]
-    {
-        -1.0, -1.0f, 0.0f, 1.0f,
-        -1.0f,  1.0f, 0.0f, 1.0f,
-         1.0f, -1.0f, 0.0f, 1.0f,
-         1.0f,  1.0f, 0.0f, 1.0f,
-    };
-    GLuint vPositionAttr;
-    GLuint posUniform; 
-};
-
-class Surface
-{
-public:
-    Surface(Connection& connection, int swap_interval) :
-        dimensions(active_output_dimensions(connection)),
-        surface{create_surface(connection, dimensions), surface_deleter},
-        context{connection, surface.get(), swap_interval},
-        program{context, dimensions.width, dimensions.height}
-    {
-    }
-
-    void on_event(MirEvent const* ev)
-    {
-        if (mir_event_get_type(ev) != mir_event_type_input)
-            return;
-        float x{0.0f};
-        float y{0.0f};
-        auto ievent = mir_event_get_input_event(ev);
-        if (mir_input_event_get_type(ievent) == mir_input_event_type_touch)
-        {
-            auto tev = mir_input_event_get_touch_event(ievent);
-            x = mir_touch_event_axis_value(tev, 0, mir_touch_axis_x);
-            y = mir_touch_event_axis_value(tev, 0, mir_touch_axis_y);
-        }
-        else if (mir_input_event_get_type(ievent) == mir_input_event_type_pointer)
-        {
-            auto pev = mir_input_event_get_pointer_event(ievent);
-            x = mir_pointer_event_axis_value(pev, mir_pointer_axis_x);
-            y = mir_pointer_event_axis_value(pev, mir_pointer_axis_y);
-        }
-        else
-        {
-            return;
-        }
-        context.make_current();
-        program.draw(
-            x/static_cast<float>(dimensions.width)*2.0 - 1.0,
-            y/static_cast<float>(dimensions.height)*-2.0 + 1.0);
-        context.swapbuffers();
-    }
-
-    Surface(Surface const&) = delete;
-    Surface& operator=(Surface const&) = delete;
-private:
-    struct OutputDimensions
-    {
-        unsigned int const width;
-        unsigned int const height;
-    } const dimensions;
-
-
-    std::function<void(MirSurface*)> const surface_deleter{
-        [](MirSurface* surface)
-        {
-            mir_surface_release_sync(surface);
-        }
-    };
-    std::unique_ptr<MirSurface, decltype(surface_deleter)> surface;
-    Context context;
-    RenderProgram program;
-
-    OutputDimensions active_output_dimensions(MirConnection* connection)
-    {
-        unsigned int width{0};
-        unsigned int height{0};
-        auto display_config = mir_connection_create_display_config(connection);
-        for (auto i = 0u; i < display_config->num_outputs; i++)
-        {
-            MirDisplayOutput const* out = display_config->outputs + i;
-            if (out->used &&
-                out->connected &&
-                out->num_modes &&
-                out->current_mode < out->num_modes)
-            {
-                width = out->modes[out->current_mode].horizontal_resolution;
-                height = out->modes[out->current_mode].vertical_resolution;
-                break;
-            }
-        }
-        mir_display_config_destroy(display_config);
-        if (width == 0 || height == 0)
-            throw std::logic_error("could not determine display size");
-        return {width, height};
-    }
-
-    MirSurface* create_surface(MirConnection* connection, OutputDimensions const& dim)
-    {
-        MirPixelFormat selected_format;
-        unsigned int valid_formats{0};
-        MirPixelFormat pixel_formats[mir_pixel_formats];
-        mir_connection_get_available_surface_formats(connection, pixel_formats, mir_pixel_formats, &valid_formats);
-        if (valid_formats == 0)
-            throw std::runtime_error("no pixel formats for surface");
-        selected_format = pixel_formats[0]; 
-        //select an 8 bit opaque format if we can
-        for(auto i = 0u; i < valid_formats; i++)
-        {
-            if (pixel_formats[i] == mir_pixel_format_xbgr_8888 ||
-                pixel_formats[i] == mir_pixel_format_xrgb_8888)
-            {
-                selected_format = pixel_formats[i];
-                break;
-            }
-        }
-
-        auto deleter = [](MirSurfaceSpec *spec) { mir_surface_spec_release(spec); };
-        std::unique_ptr<MirSurfaceSpec, decltype(deleter)> spec{
-            mir_connection_create_spec_for_normal_surface(connection, dim.width, dim.height, selected_format),
-            deleter
-        };
-
-        mir_surface_spec_set_name(spec.get(), __PRETTY_FUNCTION__);
-        mir_surface_spec_set_buffer_usage(spec.get(), mir_buffer_usage_hardware);
-        auto surface = mir_surface_create_sync(spec.get());
-        mir_surface_set_event_handler(surface, &on_event, this);
-        return surface;
-    }
-    static void on_event(MirSurface*, const MirEvent *event, void *context)
-    {
-        auto surface = reinterpret_cast<Surface*>(context);
-        if (surface) surface->on_event(event);
-    }
-};
-
-}
-
-int main(int argc, char *argv[])
-try
-{
-    using namespace std::literals::chrono_literals;
-
-    auto arg = 0;
-    char const* socket_file = nullptr;
-    int swap_interval = 1;
-    while ((arg = getopt (argc, argv, "nm:")) != -1)
-    {
-        switch (arg)
-        {
-        case 'm':
-            socket_file = optarg;
-            break;
-        case 'n':
-            swap_interval = 0;
-            break;
-        default:
-            throw std::invalid_argument("invalid command line argument");
-        }
-    }
-
-    Connection connection(socket_file);
-    Surface surface(connection, swap_interval);
-
-    sigset_t sigset;
-    siginfo_t siginfo;
-    sigemptyset(&sigset);
-    sigaddset(&sigset, SIGTERM);
-    sigaddset(&sigset, SIGINT);
-    sigprocmask(SIG_BLOCK, &sigset, nullptr);
-    sigwaitinfo(&sigset, &siginfo);
-    return 0;
-}
-catch(std::exception& e)
-{
-    std::cerr << "error : " << e.what() << std::endl;
-    return 1;
-}

=== modified file 'examples/fingerpaint.c'
--- examples/fingerpaint.c	2015-05-07 09:06:20 +0000
+++ examples/fingerpaint.c	2015-05-20 14:01:27 +0000
@@ -16,8 +16,6 @@
  * Author: Daniel van Vugt <[e-mail]>
  */
 
-#define _POSIX_C_SOURCE 200112L  // for setenv() from stdlib.h
-
 #include "mir_toolkit/mir_client_library.h"
 #include "mir_toolkit/events/input/input_event.h"
 
@@ -27,7 +25,6 @@
 #include <stdlib.h>
 #include <unistd.h>  /* sleep() */
 #include <string.h>
-#include <pthread.h>
 
 #define BYTES_PER_PIXEL(f) ((f) == mir_pixel_format_bgr_888 ? 3 : 4)
 #define MIN(a, b) ((a) <= (b) ? (a) : (b))
@@ -37,19 +34,13 @@
     uint8_t r, g, b, a;
 } Color;
 
-static volatile bool running = true;
-
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t change = PTHREAD_COND_INITIALIZER;
-static bool changed = true;
+static volatile sig_atomic_t running = 1;
 
 static void shutdown(int signum)
 {
     if (running)
     {
-        running = false;
-        changed = true;
-        pthread_cond_signal(&change);
+        running = 0;
         printf("Signal %d received. Good night.\n", signum);
     }
 }
@@ -183,9 +174,20 @@
     }
 }
 
+static void redraw(MirSurface *surface, const MirGraphicsRegion *canvas)
+{
+    MirGraphicsRegion backbuffer;
+    MirBufferStream *bs = mir_surface_get_buffer_stream(surface);
+
+    mir_buffer_stream_get_graphics_region(
+        bs, &backbuffer);
+    copy_region(&backbuffer, canvas);
+    mir_buffer_stream_swap_buffers_sync(
+        bs);
+}
+
 static void on_event(MirSurface *surface, const MirEvent *event, void *context)
 {
-    (void)surface;
     MirGraphicsRegion *canvas = (MirGraphicsRegion*)context;
 
     static const Color color[] =
@@ -206,8 +208,6 @@
     
     MirEventType event_type = mir_event_get_type(event);
 
-    pthread_mutex_lock(&mutex);
-
     if (event_type == mir_event_type_input)
     {
         static size_t base_color = 0;
@@ -215,8 +215,8 @@
         static float max_pressure = 1.0f;
 
         MirInputEvent const* input_event = mir_event_get_input_event(event);
-        MirTouchEvent const* tev = NULL;
-        MirPointerEvent const* pev = NULL;
+        MirTouchInputEvent const* tev = NULL;
+        MirPointerInputEvent const* pev = NULL;
         unsigned touch_count = 0;
         bool ended = false;
         MirInputEventType type = mir_input_event_get_type(input_event);
@@ -224,17 +224,18 @@
         switch (type)
         {
         case mir_input_event_type_touch:
-            tev = mir_input_event_get_touch_event(input_event);
-            touch_count = mir_touch_event_point_count(tev);
+            tev = mir_input_event_get_touch_input_event(input_event);
+            touch_count = mir_touch_input_event_get_touch_count(tev);
             ended = touch_count == 1 &&
-                    (mir_touch_event_action(tev, 0) == mir_touch_action_up);
+                    (mir_touch_input_event_get_touch_action(tev, 0) ==
+                     mir_touch_input_event_action_up);
             break;
         case mir_input_event_type_pointer:
-            pev = mir_input_event_get_pointer_event(input_event);
-            ended = mir_pointer_event_action(pev) ==
-                    mir_pointer_action_button_up;
-            touch_count = mir_pointer_event_button_state(pev,
-                               mir_pointer_button_primary) ? 1 : 0;
+            pev = mir_input_event_get_pointer_input_event(input_event);
+            ended = mir_pointer_input_event_get_action(pev) ==
+                mir_pointer_input_event_action_button_up;
+            touch_count = mir_pointer_input_event_get_button_state(pev,
+                               mir_pointer_input_button_primary) ? 1 : 0;
         default:
             break;
         }
@@ -261,18 +262,22 @@
 
                 if (tev != NULL)
                 {
-                    x = mir_touch_event_axis_value(tev, p, mir_touch_axis_x);
-                    y = mir_touch_event_axis_value(tev, p, mir_touch_axis_y);
-                    float size = mir_touch_event_axis_value(tev, p,
-                                                          mir_touch_axis_size);
-                    pressure = mir_touch_event_axis_value(tev, p,
-                                                      mir_touch_axis_pressure);
+                    x = mir_touch_input_event_get_touch_axis_value(tev, p,
+                        mir_touch_input_axis_x);
+                    y = mir_touch_input_event_get_touch_axis_value(tev, p,
+                        mir_touch_input_axis_y);
+                    float size = mir_touch_input_event_get_touch_axis_value(
+                        tev, p, mir_touch_input_axis_size);
+                    pressure = mir_touch_input_event_get_touch_axis_value(tev,
+                        p, mir_touch_input_axis_pressure);
                     radius = size * 50.0f + 1.0f;
                 }
                 else if (pev != NULL)
                 {
-                    x = mir_pointer_event_axis_value(pev, mir_pointer_axis_x);
-                    y = mir_pointer_event_axis_value(pev, mir_pointer_axis_y);
+                    x = mir_pointer_input_event_get_axis_value(pev,
+                        mir_pointer_input_axis_x);
+                    y = mir_pointer_input_event_get_axis_value(pev,
+                        mir_pointer_input_axis_y);
                     pressure = 0.5f;
                     radius = 5;
                 }
@@ -289,7 +294,7 @@
                 draw_box(canvas, x - radius, y - radius, 2*radius, &tone);
             }
     
-            changed = true;
+            redraw(surface, canvas);
         }
     }
     else if (event_type == mir_event_type_close_surface)
@@ -302,17 +307,21 @@
         else if (closing > 1)
         {
             printf("Oh I forgot you can't save your work. Quitting now...\n");
-            running = false;
-            changed = true;
+            running = 0;
         }
     }
     else if (event_type == mir_event_type_resize)
     {
-        changed = true;
+        /* FIXME: https://bugs.launchpad.net/mir/+bug/1194384
+         * mir_event_type_resize will arrive in a different thread to that of
+         * mir_event_type_motion, so we cannot safely redraw from this thread.
+         * Either the callbacks will need to become thread-safe, or we'd have
+         * to employ some non-trivial event queuing and inter-thread signals,
+         * which I think is beyond the scope of this example code.
+         *
+         *    redraw(surface, canvas);
+         */
     }
-
-    pthread_cond_signal(&change);
-    pthread_mutex_unlock(&mutex);
 }
 
 static const MirDisplayOutput *find_active_output(
@@ -344,6 +353,7 @@
     MirConnection *conn;
     MirSurface *surf;
     MirGraphicsRegion canvas;
+    MirEventDelegate delegate = {&on_event, &canvas};
     unsigned int f;
     int swap_interval = 0;
 
@@ -390,14 +400,10 @@
         }
     }
 
-    // We do our own resampling now. We can keep up with raw input...
-    // TODO: Replace setenv with a proper Mir function (LP: #1439590)
-    setenv("MIR_CLIENT_INPUT_RATE", "0", 0);
-
     conn = mir_connect_sync(mir_socket, argv[0]);
     if (!mir_connection_is_valid(conn))
     {
-        fprintf(stderr, "Could not connect to a display server: %s\n", mir_connection_get_error_message(conn));
+        fprintf(stderr, "Could not connect to a display server.\n");
         return 1;
     }
 
@@ -441,7 +447,7 @@
     mir_display_config_destroy(display_config);
 
     MirSurfaceSpec *spec = mir_connection_create_spec_for_normal_surface(conn, width, height, pixel_format);
-    mir_surface_spec_set_name(spec, "Mir Fingerpaint");
+    mir_surface_spec_set_name(spec, "Paint Canvas");
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
 
     surf = mir_surface_create_sync(spec);
@@ -450,7 +456,7 @@
     if (surf != NULL)
     {
         mir_surface_set_swapinterval(surf, swap_interval);
-        mir_surface_set_event_handler(surf, &on_event, &canvas);
+        mir_surface_set_event_handler(surf, &delegate);
     
         canvas.width = width;
         canvas.height = height;
@@ -465,26 +471,15 @@
             signal(SIGHUP, shutdown);
         
             clear_region(&canvas, &background);
+            redraw(surf, &canvas);
         
-            MirBufferStream *bs = mir_surface_get_buffer_stream(surf);
-
             while (running)
             {
-                MirGraphicsRegion backbuffer;
-                mir_buffer_stream_get_graphics_region(bs, &backbuffer);
-
-                pthread_mutex_lock(&mutex);
-                while (!changed)
-                    pthread_cond_wait(&change, &mutex);
-                changed = false;
-                copy_region(&backbuffer, &canvas);
-                pthread_mutex_unlock(&mutex);
-
-                mir_buffer_stream_swap_buffers_sync(bs);
+                sleep(1);  /* Is there a better way yet? */
             }
 
             /* Ensure canvas won't be used after it's freed */
-            mir_surface_set_event_handler(surf, NULL, NULL);
+            mir_surface_set_event_handler(surf, NULL);
             free(canvas.vaddr);
         }
         else

=== removed file 'examples/mir_demo_server_loader.cpp'
--- examples/mir_demo_server_loader.cpp	2015-05-15 11:46:49 +0000
+++ examples/mir_demo_server_loader.cpp	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright © 2015 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alan Griffiths <[e-mail]>
- */
-
-#include <dlfcn.h>
-#include <stdexcept>
-#include <iostream>
-
-namespace
-{
-const char* const library = "libmir_demo_server_loadable.so";
-const char* const entry = "main";
-}
-
-int main(int argc, char const* argv[])
-try
-{
-    auto const so = dlopen(library, RTLD_NOW|RTLD_LOCAL);
-    if (!so) throw std::runtime_error(dlerror());
-
-    int (*loaded_main)(int, char const*[]){nullptr};
-
-    (void*&)loaded_main = dlsym(so, entry);
-    if (!loaded_main) throw std::runtime_error(dlerror());
-
-    return loaded_main(argc, argv);
-
-}
-catch(std::exception const& x)
-{
-    std::cerr << "Error:" << x.what() << std::endl;
-}

=== modified file 'examples/multiwin.c'
--- examples/multiwin.c	2015-05-07 09:06:20 +0000
+++ examples/multiwin.c	2015-05-20 14:01:27 +0000
@@ -21,7 +21,6 @@
 #include <signal.h>
 #include <stdint.h>
 #include <getopt.h>
-#include <stdlib.h>
 
 typedef struct
 {
@@ -134,18 +133,13 @@
     MirConnection *conn;
     Window win[3];
     unsigned int f;
-    int alpha = 0x50;
 
     int arg;
     opterr = 0;
-    while ((arg = getopt (argc, argv, "hm:a:")) != -1)
+    while ((arg = getopt (argc, argv, "hm:")) != -1)
     {
         switch (arg)
         {
-        case 'a':
-            alpha = atoi(optarg);
-            break;
-
         case 'm':
             socket_file = optarg;
             break;
@@ -156,7 +150,6 @@
             puts(argv[0]);
             puts("Usage:");
             puts("    -m <Mir server socket>");
-            puts("    -a Alpha for surfaces");
             puts("    -h: this help text");
             return -1;
         }
@@ -165,7 +158,7 @@
     conn = mir_connect_sync(socket_file, argv[0]);
     if (!mir_connection_is_valid(conn))
     {
-        fprintf(stderr, "Could not connect to a display server: %s\n", mir_connection_get_error_message(conn));
+        fprintf(stderr, "Could not connect to a display server.\n");
         return 1;
     }
 
@@ -207,7 +200,7 @@
     win[0].fill.r = 0xff;
     win[0].fill.g = 0x00;
     win[0].fill.b = 0x00;
-    win[0].fill.a = alpha;
+    win[0].fill.a = 0x50;
     premultiply_alpha(&win[0].fill);
 
     mir_surface_spec_set_name(spec, "green");
@@ -217,7 +210,7 @@
     win[1].fill.r = 0x00;
     win[1].fill.g = 0xff;
     win[1].fill.b = 0x00;
-    win[1].fill.a = alpha;
+    win[1].fill.a = 0x50;
     premultiply_alpha(&win[1].fill);
 
     mir_surface_spec_set_name(spec, "blue");
@@ -227,7 +220,7 @@
     win[2].fill.r = 0x00;
     win[2].fill.g = 0x00;
     win[2].fill.b = 0xff;
-    win[2].fill.a = alpha;
+    win[2].fill.a = 0x50;
     premultiply_alpha(&win[2].fill);
 
     mir_surface_spec_release(spec);

=== modified file 'examples/progressbar.c'
--- examples/progressbar.c	2015-05-07 09:06:20 +0000
+++ examples/progressbar.c	2015-05-20 14:01:27 +0000
@@ -201,7 +201,7 @@
     unsigned int const pf_size = 32;
     MirPixelFormat formats[pf_size];
     unsigned int valid_formats;
-    int hz = 20;
+    int sleep_usec = 50000;
 
     if (argc > 1)
     {
@@ -209,13 +209,13 @@
 
         if (sscanf(argv[1], "%d", &rate) == 1 && rate > 0)
         {
-            hz = rate;
+            sleep_usec = 1000000 / rate;
         }
         else
         {
             fprintf(stderr, "Usage: %s [repeat rate in Hz]\n"
                             "Default repeat rate is %d\n",
-                    argv[0], hz);
+                    argv[0], 1000000 / sleep_usec);
 
             return 1;
         }
@@ -224,7 +224,7 @@
     conn = mir_connect_sync(NULL, argv[0]);
     if (!mir_connection_is_valid(conn))
     {
-        fprintf(stderr, "Could not connect to a display server: %s\n", mir_connection_get_error_message(conn));
+        fprintf(stderr, "Could not connect to a display server.\n");
         return 1;
     }
 
@@ -259,13 +259,7 @@
         return 1;
     }
 
-    {
-        char name[128];
-        snprintf(name, sizeof(name)-1, "Progress Bars (%dHz)", hz);
-        name[sizeof(name)-1] = '\0';
-        mir_surface_spec_set_name(spec, name);
-    }
-
+    mir_surface_spec_set_name(spec, "Progress Bars");
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
 
     surf = mir_surface_create_sync(spec);
@@ -305,7 +299,7 @@
                 draw_box(&canvas, x, y, box_width, foreground);
 
                 redraw(surf, &canvas);
-                usleep(1000000 / hz);
+                usleep(sleep_usec);
             }
 
             free(canvas.vaddr);

=== modified file 'examples/render_overlays.cpp'
--- examples/render_overlays.cpp	2015-03-31 02:35:42 +0000
+++ examples/render_overlays.cpp	2015-05-20 14:01:27 +0000
@@ -194,7 +194,7 @@
     auto client2 = std::make_shared<DemoOverlayClient>(
         *buffer_allocator, buffer_properties, 0xFFFFFF00);
 
-    mg::RenderableList renderlist
+    std::list<std::shared_ptr<mg::Renderable>> renderlist
     {
         std::make_shared<DemoRenderable>(client1, geom::Rectangle{{0,0} , buffer_properties.size}),
         std::make_shared<DemoRenderable>(client2, geom::Rectangle{{80,80} , buffer_properties.size})
@@ -202,16 +202,12 @@
 
     while (running)
     {
-        client1->update_green_channel();
-        client2->update_green_channel();
-        display->for_each_display_sync_group([&](mg::DisplaySyncGroup& group)
+        display->for_each_display_buffer([&](mg::DisplayBuffer& buffer)
         {
-            group.for_each_display_buffer([&](mg::DisplayBuffer& buffer)
-            {
-                buffer.make_current();
-                buffer.post_renderables_if_optimizable(renderlist);
-            });
-            group.post();
+            buffer.make_current();
+            client1->update_green_channel();
+            client2->update_green_channel();
+            buffer.post_renderables_if_optimizable(renderlist);
         });
     }
 }

=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2015-05-18 21:30:28 +0000
+++ examples/render_surfaces.cpp	2015-05-20 14:01:27 +0000
@@ -30,8 +30,6 @@
 #include "mir/options/option.h"
 #include "mir/scene/surface.h"
 #include "mir/scene/surface_coordinator.h"
-#include "mir/scene/buffer_stream_factory.h"
-#include "mir/scene/surface_factory.h"
 #include "mir/server.h"
 #include "mir/report_exception.h"
 
@@ -141,10 +139,10 @@
     Moveable(std::shared_ptr<ms::Surface> const& s, const geom::Size& display_size,
              float dx, float dy, const glm::vec3& rotation_axis, float alpha_offset)
         : surface(s), display_size(display_size),
-          x{s->top_left().x.as_float()},
-          y{s->top_left().y.as_float()},
-          w{s->size().width.as_float()},
-          h{s->size().height.as_float()},
+          x{static_cast<float>(s->top_left().x.as_uint32_t())},
+          y{static_cast<float>(s->top_left().y.as_uint32_t())},
+          w{static_cast<float>(s->size().width.as_uint32_t())},
+          h{static_cast<float>(s->size().height.as_uint32_t())},
           dx{dx},
           dy{dy},
           rotation_axis(rotation_axis),
@@ -251,6 +249,7 @@
             stop_watch.restart();
         }
 
+        glClearColor(0.0, 1.0, 0.0, 1.0);
         db_compositor->composite(std::move(scene_sequence));
 
         for (auto& m : moveables)
@@ -333,19 +332,14 @@
         std::cout << "Rendering " << moveables.size() << " surfaces" << std::endl;
 
         auto const display = the_display();
-        auto const buffer_stream_factory = the_buffer_stream_factory();
-        auto const surface_factory = the_surface_factory();
         auto const surface_coordinator = the_surface_coordinator();
         auto const gl_context = the_display()->create_gl_context();
 
         /* TODO: Get proper configuration */
         geom::Rectangles view_area;
-        display->for_each_display_sync_group([&](mg::DisplaySyncGroup& group)
+        display->for_each_display_buffer([&view_area](mg::DisplayBuffer const& db)
         {
-            group.for_each_display_buffer([&](mg::DisplayBuffer& db)
-            {
-                view_area.add(db.view_area());
-            });
+            view_area.add(db.view_area());
         });
         geom::Size const display_size{view_area.bounding_rectangle().size};
         uint32_t const surface_side{300};
@@ -359,19 +353,16 @@
         int i = 0;
         for (auto& m : moveables)
         {
-            auto params = ms::a_surface()
-                .of_size(surface_size)
-                .of_pixel_format(surface_pf)
-                .of_buffer_usage(mg::BufferUsage::hardware);
-            mg::BufferProperties properties{params.size, params.pixel_format, params.buffer_usage};
-            auto const stream = buffer_stream_factory->create_buffer_stream(properties); 
-            auto const surface = surface_factory->create_surface(stream, params);
-            surface_coordinator->add_surface(surface, params.depth, params.input_mode, nullptr);
+            auto const s = surface_coordinator->add_surface(
+                    ms::a_surface().of_size(surface_size)
+                                   .of_pixel_format(surface_pf)
+                                   .of_buffer_usage(mg::BufferUsage::hardware),
+                    nullptr);
 
             {
                 mg::Buffer* buffer{nullptr};
                 auto const complete = [&](mg::Buffer* new_buf){ buffer = new_buf; };
-                surface->primary_buffer_stream()->swap_buffers(buffer, complete); // Fetch buffer for rendering
+                s->swap_buffers(buffer, complete); // Fetch buffer for rendering
                 {
                     gl_context->make_current();
 
@@ -384,7 +375,7 @@
 
                     gl_context->release_current();
                 }
-                surface->primary_buffer_stream()->swap_buffers(buffer, complete); // Post rendered buffer
+                s->swap_buffers(buffer, complete); // Post rendered buffer
             }
 
             /*
@@ -394,8 +385,8 @@
             uint32_t const x = w * (0.5 + 0.25 * cos(i * angular_step)) - surface_side / 2.0;
             uint32_t const y = h * (0.5 + 0.25 * sin(i * angular_step)) - surface_side / 2.0;
 
-            surface->move_to({x, y});
-            m = Moveable(surface, display_size,
+            s->move_to({x, y});
+            m = Moveable(s, display_size,
                     cos(0.1f + i * M_PI / 6.0f) * w / 3.0f,
                     sin(0.1f + i * M_PI / 6.0f) * h / 3.0f,
                     glm::vec3{(i % 3 == 0) * 1.0f, (i % 3 == 1) * 1.0f, (i % 3 == 2) * 1.0f},

=== modified file 'examples/render_to_fb.cpp'
--- examples/render_to_fb.cpp	2015-03-31 02:35:42 +0000
+++ examples/render_to_fb.cpp	2015-05-20 14:01:27 +0000
@@ -53,26 +53,22 @@
 
     mir::draw::glAnimationBasic gl_animation;
 
-    display->for_each_display_sync_group([&](mg::DisplaySyncGroup& group)
+    display->for_each_display_buffer([&](mg::DisplayBuffer& buffer)
     {
-        group.for_each_display_buffer([&](mg::DisplayBuffer& buffer)
-        {
-            buffer.make_current();
-            gl_animation.init_gl();
-        });
+        buffer.make_current();
+        gl_animation.init_gl();
     });
 
     while (running)
     {
-        display->for_each_display_sync_group([&](mg::DisplaySyncGroup& group)
+        display->for_each_display_buffer([&](mg::DisplayBuffer& buffer)
         {
-            group.for_each_display_buffer([&](mg::DisplayBuffer& buffer)
-            {
-                buffer.make_current();
-                gl_animation.render_gl();
-                buffer.gl_swap_buffers();
-            });
-            group.post();
+            buffer.make_current();
+
+            gl_animation.render_gl();
+
+            buffer.gl_swap_buffers();
+            buffer.flip();
         });
 
         gl_animation.step();

=== modified file 'examples/server_example.cpp'
--- examples/server_example.cpp	2015-05-07 09:06:20 +0000
+++ examples/server_example.cpp	2015-05-20 14:01:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012-2015 Canonical Ltd.
+ * Copyright © 2012-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -22,7 +22,6 @@
 #include "server_example_display_configuration_policy.h"
 #include "server_example_host_lifecycle_event_listener.h"
 #include "server_example_window_management.h"
-#include "server_example_custom_compositor.h"
 #include "server_example_test_client.h"
 
 #include "mir/server.h"
@@ -65,13 +64,14 @@
 
     server.add_configuration_option(timeout_opt, timeout_descr, mir::OptionType::integer);
 
-    server.add_init_callback([&server]
+    server.add_init_callback([&]
     {
         const auto options = server.get_options();
         if (options->is_set(timeout_opt))
         {
-            static auto const exit_action = server.the_main_loop()->create_alarm([&server] { server.stop(); });
-            exit_action->reschedule_in(std::chrono::seconds(options->get<int>(timeout_opt)));
+            static auto const exit_action = server.the_main_loop()->notify_in(
+                std::chrono::seconds(options->get<int>(timeout_opt)),
+                [&] { server.stop(); });
         }
     });
 }
@@ -82,15 +82,11 @@
 {
     mir::Server server;
 
-    // Use config options file in e.g. ~/.config/mir/mir_demo_server.config
-    server.set_config_filename("mir/mir_demo_server.config");
-
     // Add example options for display layout, logging, launching clients and timeout
     me::add_display_configuration_options_to(server);
     me::add_log_host_lifecycle_option_to(server);
     me::add_glog_options_to(server);
     me::add_window_manager_option_to(server);
-    me::add_custom_compositor_option_to(server);
     add_launcher_option_to(server);
     add_timeout_option_to(server);
 

=== removed file 'examples/server_example_adorning_compositor.cpp'
--- examples/server_example_adorning_compositor.cpp	2015-04-07 13:19:22 +0000
+++ examples/server_example_adorning_compositor.cpp	1970-01-01 00:00:00 +0000
@@ -1,163 +0,0 @@
-/*
- * Copyright © 2015 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored By: Kevin DuBois <[e-mail]>
- */
-
-#include "server_example_adorning_compositor.h"
-#include "mir/graphics/display_buffer.h"
-#include "mir/graphics/buffer.h"
-#include "mir/compositor/scene_element.h"
-#include <GLES2/gl2.h>
-
-namespace me = mir::examples;
-namespace mg = mir::graphics;
-namespace mc = mir::compositor;
-
-bool make_current(mg::DisplayBuffer& db)
-{
-    db.make_current();
-    return true;
-}
-
-me::AdorningDisplayBufferCompositor::Shader::Shader(GLchar const* const* src, GLuint type) :
-    shader(glCreateShader(type))
-{
-    glShaderSource(shader, 1, src, 0);
-    glCompileShader(shader);
-}
-
-me::AdorningDisplayBufferCompositor::Shader::~Shader()
-{
-    glDeleteShader(shader);
-}
-
-me::AdorningDisplayBufferCompositor::Program::Program(Shader& vertex, Shader& fragment) :
-    program(glCreateProgram())
-{
-    glAttachShader(program, vertex.shader);
-    glAttachShader(program, fragment.shader);
-    glLinkProgram(program);
-}
-
-me::AdorningDisplayBufferCompositor::Program::~Program()
-{
-    glDeleteProgram(program);
-}
-
-me::AdorningDisplayBufferCompositor::AdorningDisplayBufferCompositor(
-    mg::DisplayBuffer& display_buffer,
-    std::tuple<float, float, float> const& background_rgb) :
-    db{display_buffer},
-    vert_shader_src{
-        "attribute vec4 vPosition;"
-        "uniform vec2 pos;"
-        "uniform vec2 scale;"
-        "attribute vec2 uvCoord;"
-        "varying vec2 texcoord;"
-        "void main() {"
-        "   gl_Position = vec4(vPosition.xy * scale + pos, 0.0, 1.0);"
-        "   texcoord = uvCoord.xy;"
-        "}"
-    },
-    frag_shader_src{
-        "precision mediump float;"
-        "varying vec2 texcoord;"
-        "uniform sampler2D tex;"
-        "uniform float alpha;"
-        "void main() {"
-        "   gl_FragColor = texture2D(tex, texcoord) * alpha;"
-        "}"
-    },
-    current(make_current(db)),
-    vertex(&vert_shader_src, GL_VERTEX_SHADER),
-    fragment(&frag_shader_src, GL_FRAGMENT_SHADER),
-    program(vertex,  fragment)
-{
-    glUseProgram(program.program);
-    vPositionAttr = glGetAttribLocation(program.program, "vPosition");
-    glVertexAttribPointer(vPositionAttr, 4, GL_FLOAT, GL_FALSE, 0, vertex_data);
-    uvCoord = glGetAttribLocation(program.program, "uvCoord");
-    glVertexAttribPointer(uvCoord, 2, GL_FLOAT, GL_FALSE, 0, uv_data);
-    posUniform = glGetUniformLocation(program.program, "pos");
-    glClearColor(std::get<0>(background_rgb), std::get<1>(background_rgb), std::get<2>(background_rgb), 1.0);
-    scaleUniform = glGetUniformLocation(program.program, "scale");
-    alphaUniform = glGetUniformLocation(program.program, "alpha");
-
-    glGenTextures(1, &texture);
-    glBindTexture(GL_TEXTURE_2D, texture);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-}
-
-void me::AdorningDisplayBufferCompositor::composite(compositor::SceneElementSequence&& scene_sequence)
-{
-    //note: If what should be drawn is expressible as a SceneElementSequence,
-    //      mg::DisplayBuffer::post_renderables_if_optimizable() should be used,
-    //      to give the the display hardware a chance at an optimized render of
-    //      the scene. In this example though, we want some custom elements, so
-    //      we'll always use GLES.
-    db.make_current();
-
-    auto display_width  = db.view_area().size.width.as_float();
-    auto display_height = db.view_area().size.height.as_float();
-
-    glUseProgram(program.program);
-    glClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT );
-    
-    for(auto& element : scene_sequence)
-    {
-        //courteously inform the client that its rendered
-        //if something is not to be rendered, mc::SceneElementSequence::occluded() should be called 
-        element->rendered();
-
-        auto const renderable = element->renderable();
-        float width  = renderable->screen_position().size.width.as_float();
-        float height = renderable->screen_position().size.height.as_float();
-        float x = renderable->screen_position().top_left.x.as_float() - db.view_area().top_left.x.as_float();
-        float y = renderable->screen_position().top_left.y.as_float() - db.view_area().top_left.y.as_float();
-        float scale[2] {
-            width/display_width * 2,
-            height/display_height * -2};
-        float position[2] {
-            (x / display_width * 2.0f) - 1.0f,
-            1.0f - (y / display_height * 2.0f)
-        };
-        float const plane_alpha = renderable->alpha();
-        if (renderable->shaped() || plane_alpha < 1.0)
-            glEnable(GL_BLEND);
-        else
-            glDisable(GL_BLEND);
-
-        glUniform2fv(posUniform, 1, position);
-        glUniform2fv(scaleUniform, 1, scale);
-        glUniform1fv(alphaUniform, 1, &plane_alpha);
-
-        glActiveTexture(GL_TEXTURE0);
-        glBindTexture(GL_TEXTURE_2D, texture);
-        renderable->buffer()->gl_bind_to_texture();
-
-        glEnableVertexAttribArray(vPositionAttr);
-        glEnableVertexAttribArray(uvCoord);
-        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-        glDisableVertexAttribArray(uvCoord);
-        glDisableVertexAttribArray(vPositionAttr);
-    }
-
-    db.gl_swap_buffers();
-}

=== removed file 'examples/server_example_adorning_compositor.h'
--- examples/server_example_adorning_compositor.h	2015-04-07 12:43:16 +0000
+++ examples/server_example_adorning_compositor.h	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-/*
- * Copyright © 2015 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored By: Kevin DuBois <[e-mail]>
- */
-
-#ifndef MIR_EXAMPLES_ADORNING_COMPOSITOR_H_
-#define MIR_EXAMPLES_ADORNING_COMPOSITOR_H_
-#include "mir/compositor/display_buffer_compositor.h"
-#include <GLES2/gl2.h>
-#include <tuple>
-
-namespace mir
-{
-namespace graphics
-{
-class DisplayBuffer;
-}
-namespace examples
-{
-class AdorningDisplayBufferCompositor : public compositor::DisplayBufferCompositor
-{
-public:
-    AdorningDisplayBufferCompositor(graphics::DisplayBuffer&, std::tuple<float, float, float> const& background_rgb);
-    void composite(compositor::SceneElementSequence&& scene_sequence) override;
-private:
-    graphics::DisplayBuffer& db;
-    GLchar const*const vert_shader_src;
-    GLchar const*const frag_shader_src;
-    bool current;
-    struct Shader
-    {
-        Shader(GLchar const* const* src, GLuint type);
-        ~Shader();
-        GLuint shader;
-    } vertex, fragment;
-    struct Program
-    {
-        Program(Shader& vertex, Shader& fragment);
-        ~Program();
-        GLuint program;
-    } program;
-
-    GLfloat vertex_data[16]
-    {
-        0.0f, 0.0f, 0.0f, 1.0f,
-        0.0f, 1.0f, 0.0f, 1.0f,
-        1.0f, 0.0f, 0.0f, 1.0f,
-        1.0f, 1.0f, 0.0f, 1.0f,
-    };
-    GLfloat uv_data[8]
-    {
-        0.0f, 0.0f,
-        0.0f, 1.0f,
-        1.0f, 0.0f,
-        1.0f, 1.0f,
-
-    };
-
-    GLuint vPositionAttr;
-    GLuint uvCoord;
-    GLuint scaleUniform;
-    GLuint posUniform;
-    GLuint alphaUniform; 
-    GLuint texture;
-};
-}
-}
-
-#endif /* MIR_EXAMPLES_ADORNING_COMPOSITOR_H_ */

=== modified file 'examples/server_example_basic_window_manager.h'
--- examples/server_example_basic_window_manager.h	2015-05-07 09:06:20 +0000
+++ examples/server_example_basic_window_manager.h	2015-05-20 14:01:27 +0000
@@ -19,12 +19,11 @@
 #ifndef MIR_EXAMPLE_BASIC_WINDOW_MANAGER_H_
 #define MIR_EXAMPLE_BASIC_WINDOW_MANAGER_H_
 
+#include "server_example_generic_shell.h"
+
 #include "mir/geometry/rectangles.h"
 #include "mir/scene/session.h"
-#include "mir/scene/surface.h"
 #include "mir/scene/surface_creation_parameters.h"
-#include "mir/shell/abstract_shell.h"
-#include "mir/shell/window_manager.h"
 
 #include <map>
 #include <mutex>
@@ -36,8 +35,6 @@
 {
 namespace examples
 {
-using shell::SurfaceSet;
-
 template<typename Info>
 struct SurfaceTo
 {
@@ -53,9 +50,8 @@
 /// The interface through which the policy instructs the controller.
 /// These functions assume that the BasicWindowManager data structures can be accessed freely.
 /// I.e. should only be invoked by the policy handle_... methods (where any necessary locks are held).
-// TODO extract commonality with FocusController (once that's separated from shell::FocusController)
 template<typename SessionInfo, typename SurfaceInfo>
-class BasicWindowManagerToolsCopy
+class BasicWindowManagerTools
 {
 public:
     virtual auto find_session(std::function<bool(SessionInfo const& info)> const& predicate)
@@ -65,26 +61,16 @@
 
     virtual auto info_for(std::weak_ptr<scene::Surface> const& surface) const -> SurfaceInfo& = 0;
 
-    virtual std::shared_ptr<scene::Session> focused_session() const = 0;
-
-    virtual std::shared_ptr<scene::Surface> focused_surface() const = 0;
-
-    virtual void focus_next_session() = 0;
-
-    virtual void set_focus_to(
-        std::shared_ptr<scene::Session> const& focus,
-        std::shared_ptr<scene::Surface> const& surface) = 0;
-
-    virtual auto surface_at(geometry::Point cursor) const -> std::shared_ptr<scene::Surface> = 0;
-
-    virtual void raise(SurfaceSet const& surfaces) = 0;
-
-    virtual auto active_display() -> geometry::Rectangle const = 0;
-
-    virtual ~BasicWindowManagerToolsCopy() = default;
-    BasicWindowManagerToolsCopy() = default;
-    BasicWindowManagerToolsCopy(BasicWindowManagerToolsCopy const&) = delete;
-    BasicWindowManagerToolsCopy& operator=(BasicWindowManagerToolsCopy const&) = delete;
+    virtual std::weak_ptr<scene::Session> focussed_application() const = 0;
+
+    virtual void focus_next() = 0;
+
+    virtual void set_focus_to(std::shared_ptr<scene::Session> const& focus) = 0;
+
+    virtual ~BasicWindowManagerTools() = default;
+    BasicWindowManagerTools() = default;
+    BasicWindowManagerTools(BasicWindowManagerTools const&) = delete;
+    BasicWindowManagerTools& operator=(BasicWindowManagerTools const&) = delete;
 };
 
 /// A policy based window manager.
@@ -100,20 +86,20 @@
 /// - void handle_new_surface(std::shared_ptr<ms::Session> const& session, std::shared_ptr<ms::Surface> const& surface);
 /// - void handle_delete_surface(std::shared_ptr<ms::Session> const& /*session*/, std::weak_ptr<ms::Surface> const& /*surface*/);
 /// - int handle_set_state(std::shared_ptr<ms::Surface> const& surface, MirSurfaceState value);
-/// - bool handle_keyboard_event(MirKeyboardEvent const* event);
-/// - bool handle_touch_event(MirTouchEvent const* event);
-/// - bool handle_pointer_event(MirPointerEvent const* event);
+/// - bool handle_key_event(MirKeyInputEvent const* event);
+/// - bool handle_touch_event(MirTouchInputEvent const* event);
+/// - bool handle_pointer_event(MirPointerInputEvent const* event);
 ///
 /// \tparam SessionInfo must be default constructable.
 ///
-/// \tparam SurfaceInfo must be constructable from (std::shared_ptr<ms::Session>, std::shared_ptr<ms::Surface>, ms::SurfaceCreationParameters const& params)
+/// \tparam SurfaceInfo must be constructable from (std::shared_ptr<ms::Session>, std::shared_ptr<ms::Surface>)
 template<typename WindowManagementPolicy, typename SessionInfo, typename SurfaceInfo>
-class BasicWindowManagerCopy : public shell::WindowManager,
-    private BasicWindowManagerToolsCopy<SessionInfo, SurfaceInfo>
+class BasicWindowManager : public WindowManager,
+    private BasicWindowManagerTools<SessionInfo, SurfaceInfo>
 {
 public:
     template <typename... PolicyArgs>
-    BasicWindowManagerCopy(
+    BasicWindowManager(
         shell::FocusController* focus_controller,
         PolicyArgs&&... policy_args) :
         focus_controller(focus_controller),
@@ -145,24 +131,14 @@
         scene::SurfaceCreationParameters const placed_params = policy.handle_place_new_surface(session, params);
         auto const result = build(session, placed_params);
         auto const surface = session->surface(result);
-        surface_info.emplace(surface, SurfaceInfo{session, surface, placed_params});
         policy.handle_new_surface(session, surface);
-        policy.generate_decorations_for(session, surface, surface_info);
+        surface_info.emplace(surface, SurfaceInfo{session, surface});
         return result;
     }
 
-    void modify_surface(
-        std::shared_ptr<scene::Session> const& session,
-        std::shared_ptr<scene::Surface> const& surface,
-        shell::SurfaceSpecification const& modifications) override
-    {
-        std::lock_guard<decltype(mutex)> lock(mutex);
-        policy.handle_modify_surface(session, surface, modifications);
-    }
-
     void remove_surface(
-        std::shared_ptr<scene::Session> const& session,
-        std::weak_ptr<scene::Surface> const& surface) override
+        std::weak_ptr<scene::Surface> const& surface,
+        std::shared_ptr<scene::Session> const& session) override
     {
         std::lock_guard<decltype(mutex)> lock(mutex);
         policy.handle_delete_surface(session, surface);
@@ -184,46 +160,28 @@
         policy.handle_displays_updated(session_info, displays);
     }
 
-    bool handle_keyboard_event(MirKeyboardEvent const* event) override
+    bool handle_key_event(MirKeyInputEvent const* event) override
     {
         std::lock_guard<decltype(mutex)> lock(mutex);
-        return policy.handle_keyboard_event(event);
+        return policy.handle_key_event(event);
     }
 
-    bool handle_touch_event(MirTouchEvent const* event) override
+    bool handle_touch_event(MirTouchInputEvent const* event) override
     {
         std::lock_guard<decltype(mutex)> lock(mutex);
         return policy.handle_touch_event(event);
     }
 
-    bool handle_pointer_event(MirPointerEvent const* event) override
+    bool handle_pointer_event(MirPointerInputEvent const* event) override
     {
         std::lock_guard<decltype(mutex)> lock(mutex);
-
-        cursor = {
-            mir_pointer_event_axis_value(event, mir_pointer_axis_x),
-            mir_pointer_event_axis_value(event, mir_pointer_axis_y)};
-
         return policy.handle_pointer_event(event);
     }
 
-    int set_surface_attribute(
-        std::shared_ptr<scene::Session> const& /*session*/,
-        std::shared_ptr<scene::Surface> const& surface,
-        MirSurfaceAttrib attrib,
-        int value) override
+    int handle_set_state(std::shared_ptr<scene::Surface> const& surface, MirSurfaceState value) override
     {
         std::lock_guard<decltype(mutex)> lock(mutex);
-        switch (attrib)
-        {
-        case mir_surface_attrib_state:
-        {
-            auto const state = policy.handle_set_state(surface, MirSurfaceState(value));
-            return surface->configure(attrib, state);
-        }
-        default:
-            return surface->configure(attrib, value);
-        }
+        return policy.handle_set_state(surface, value);
     }
 
     auto find_session(std::function<bool(SessionInfo const& info)> const& predicate)
@@ -250,83 +208,19 @@
         return const_cast<SurfaceInfo&>(surface_info.at(surface));
     }
 
-    std::shared_ptr<scene::Session> focused_session() const override
-    {
-        return focus_controller->focused_session();
-    }
-
-    std::shared_ptr<scene::Surface> focused_surface() const override
-    {
-        return focus_controller->focused_surface();
-    }
-
-    void focus_next_session() override
-    {
-        focus_controller->focus_next_session();
-    }
-
-    void set_focus_to(
-        std::shared_ptr<scene::Session> const& focus,
-        std::shared_ptr<scene::Surface> const& surface) override
-    {
-        focus_controller->set_focus_to(focus, surface);
-    }
-
-    auto surface_at(geometry::Point cursor) const -> std::shared_ptr<scene::Surface> override
-    {
-        return focus_controller->surface_at(cursor);
-    }
-
-    void raise(SurfaceSet const& surfaces) override
-    {
-        focus_controller->raise(surfaces);
-    }
-
-    auto active_display() -> geometry::Rectangle const override
-    {
-        geometry::Rectangle result;
-
-        // 1. If a window has input focus, whichever display contains the largest
-        //    proportion of the area of that window.
-        if (auto const surface = focused_surface())
-        {
-            auto const surface_rect = surface->input_bounds();
-            int max_overlap_area = -1;
-
-            for (auto const& display : displays)
-            {
-                auto const intersection = surface_rect.intersection_with(display).size;
-                if (intersection.width.as_int()*intersection.height.as_int() > max_overlap_area)
-                {
-                    max_overlap_area = intersection.width.as_int()*intersection.height.as_int();
-                    result = display;
-                }
-            }
-            return result;
-        }
-
-        // 2. Otherwise, if any window previously had input focus, for the window that had
-        //    it most recently, the display that contained the largest proportion of the
-        //    area of that window at the moment it closed, as long as that display is still
-        //    available.
-
-        // 3. Otherwise, the display that contains the pointer, if there is one.
-        for (auto const& display : displays)
-        {
-            if (display.contains(cursor))
-            {
-                // Ignore the (unspecified) possiblity of overlapping displays
-                return display;
-            }
-        }
-
-        // 4. Otherwise, the primary display, if there is one (for example, the laptop display).
-
-        // 5. Otherwise, the first display.
-        if (displays.size())
-            result = *displays.begin();
-
-        return result;
+    std::weak_ptr<scene::Session> focussed_application() const override
+    {
+        return focus_controller->focussed_application();
+    }
+
+    void focus_next() override
+    {
+        focus_controller->focus_next();
+    }
+
+    void set_focus_to(std::shared_ptr<scene::Session> const& focus) override
+    {
+        focus_controller->set_focus_to(focus);
     }
 
     shell::FocusController* const focus_controller;
@@ -336,7 +230,6 @@
     typename SessionTo<SessionInfo>::type session_info;
     typename SurfaceTo<SurfaceInfo>::type surface_info;
     geometry::Rectangles displays;
-    geometry::Point cursor;
 };
 }
 }

=== removed file 'examples/server_example_canonical_window_manager.cpp'
--- examples/server_example_canonical_window_manager.cpp	2015-05-19 21:42:19 +0000
+++ examples/server_example_canonical_window_manager.cpp	1970-01-01 00:00:00 +0000
@@ -1,948 +0,0 @@
-/*
- * Copyright © 2015 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored By: Alan Griffiths <[e-mail]>
- */
-
-#include "server_example_canonical_window_manager.h"
-
-#include "mir/scene/surface.h"
-#include "mir/scene/null_surface_observer.h"
-#include "mir/shell/display_layout.h"
-#include "mir/shell/surface_specification.h"
-#include "mir/shell/surface_ready_observer.h"
-#include "mir/geometry/displacement.h"
-
-#include "mir/graphics/buffer.h"
-
-#include <linux/input.h>
-#include <csignal>
-#include <mutex>
-#include <condition_variable>
-#include <algorithm>
-
-namespace me = mir::examples;
-namespace ms = mir::scene;
-using namespace mir::geometry;
-
-///\example server_example_canonical_window_manager.cpp
-// Based on "Mir and Unity: Surfaces, input, and displays (v0.3)"
-
-namespace
-{
-int const title_bar_height = 10;
-Size titlebar_size_for_window(Size window_size)
-{
-    return {window_size.width, Height{title_bar_height}};
-}
-
-Point titlebar_position_for_window(Point window_position)
-{
-    return {
-        window_position.x,
-        window_position.y - DeltaY(title_bar_height)
-    };
-}
-}
-
-me::CanonicalSurfaceInfoCopy::CanonicalSurfaceInfoCopy(
-    std::shared_ptr<scene::Session> const& session,
-    std::shared_ptr<scene::Surface> const& surface,
-    scene::SurfaceCreationParameters const& params) :
-    state{mir_surface_state_restored},
-    restore_rect{surface->top_left(), surface->size()},
-    session{session},
-    parent{params.parent},
-    min_width{params.min_width},
-    min_height{params.min_height},
-    max_width{params.max_width},
-    max_height{params.max_height},
-    width_inc{params.width_inc},
-    height_inc{params.height_inc},
-    min_aspect{params.min_aspect},
-    max_aspect{params.max_aspect}
-{
-}
-
-me::CanonicalWindowManagerPolicyCopy::CanonicalWindowManagerPolicyCopy(
-    Tools* const tools,
-    std::shared_ptr<shell::DisplayLayout> const& display_layout) :
-    tools{tools},
-    display_layout{display_layout}
-{
-}
-
-void me::CanonicalWindowManagerPolicyCopy::click(Point cursor)
-{
-    if (auto const surface = tools->surface_at(cursor))
-        select_active_surface(surface);
-
-    old_cursor = cursor;
-}
-
-void me::CanonicalWindowManagerPolicyCopy::handle_session_info_updated(CanonicalSessionInfoMap& /*session_info*/, Rectangles const& /*displays*/)
-{
-}
-
-void me::CanonicalWindowManagerPolicyCopy::handle_displays_updated(CanonicalSessionInfoMap& /*session_info*/, Rectangles const& displays)
-{
-    display_area = displays.bounding_rectangle();
-}
-
-void me::CanonicalWindowManagerPolicyCopy::resize(Point cursor)
-{
-    select_active_surface(tools->surface_at(old_cursor));
-    resize(active_surface(), cursor, old_cursor, display_area);
-    old_cursor = cursor;
-}
-
-auto me::CanonicalWindowManagerPolicyCopy::handle_place_new_surface(
-    std::shared_ptr<ms::Session> const& session,
-    ms::SurfaceCreationParameters const& request_parameters)
--> ms::SurfaceCreationParameters
-{
-    auto parameters = request_parameters;
-    parameters.size.height = parameters.size.height + DeltaY{title_bar_height};
-
-    auto const active_display = tools->active_display();
-
-    auto const width = parameters.size.width.as_int();
-    auto const height = parameters.size.height.as_int();
-
-    bool positioned = false;
-
-    auto const parent = parameters.parent.lock();
-
-    if (parameters.output_id != mir::graphics::DisplayConfigurationOutputId{0})
-    {
-        Rectangle rect{parameters.top_left, parameters.size};
-        display_layout->place_in_output(parameters.output_id, rect);
-        parameters.top_left = rect.top_left;
-        parameters.size = rect.size;
-        parameters.state = mir_surface_state_fullscreen;
-        positioned = true;
-    }
-    else if (!parent) // No parent => client can't suggest positioning
-    {
-        if (auto const default_surface = session->default_surface())
-        {
-            static Displacement const offset{title_bar_height, title_bar_height};
-
-            parameters.top_left = default_surface->top_left() + offset;
-
-            geometry::Rectangle display_for_app{default_surface->top_left(), default_surface->size()};
-
-            display_layout->size_to_output(display_for_app);
-
-            positioned = display_for_app.overlaps(Rectangle{parameters.top_left, parameters.size});
-        }
-    }
-
-    if (parent && parameters.aux_rect.is_set() && parameters.edge_attachment.is_set())
-    {
-        auto const edge_attachment = parameters.edge_attachment.value();
-        auto const aux_rect = parameters.aux_rect.value();
-        auto const parent_top_left = parent->top_left();
-        auto const top_left = aux_rect.top_left     -Point{} + parent_top_left;
-        auto const top_right= aux_rect.top_right()  -Point{} + parent_top_left;
-        auto const bot_left = aux_rect.bottom_left()-Point{} + parent_top_left;
-
-        if (edge_attachment && mir_edge_attachment_vertical)
-        {
-            if (active_display.contains(top_right + Displacement{width, height}))
-            {
-                parameters.top_left = top_right;
-                positioned = true;
-            }
-            else if (active_display.contains(top_left + Displacement{-width, height}))
-            {
-                parameters.top_left = top_left + Displacement{-width, 0};
-                positioned = true;
-            }
-        }
-
-        if (edge_attachment && mir_edge_attachment_horizontal)
-        {
-            if (active_display.contains(bot_left + Displacement{width, height}))
-            {
-                parameters.top_left = bot_left;
-                positioned = true;
-            }
-            else if (active_display.contains(top_left + Displacement{width, -height}))
-            {
-                parameters.top_left = top_left + Displacement{0, -height};
-                positioned = true;
-            }
-        }
-    }
-
-    if (!positioned)
-    {
-        auto centred = active_display.top_left + 0.5*(
-            as_displacement(active_display.size) - as_displacement(parameters.size));
-
-        parameters.top_left = centred - DeltaY{(active_display.size.height.as_int()-height)/6};
-
-        if (parameters.top_left.y < display_area.top_left.y)
-            parameters.top_left.y = display_area.top_left.y;
-    }
-
-    parameters.top_left.y = parameters.top_left.y + DeltaY{title_bar_height};
-    parameters.size.height = parameters.size.height - DeltaY{title_bar_height};
-    return parameters;
-}
-
-//TODO: provide an easier way for the server to write to a surface!
-//TODO: this is painful to use mg::Buffer::write()
-namespace
-{
-void swap_buffers(
-    std::shared_ptr<ms::Surface> const& surface,
-    mir::graphics::Buffer*& surface_buffer)
-{
-    std::mutex mut;
-    std::condition_variable cv;
-
-    auto const callback = [&](mir::graphics::Buffer* buffer)
-        {
-            std::unique_lock<decltype(mut)> lk(mut);
-            surface_buffer = buffer;
-            cv.notify_one();
-        };
-
-    auto const old_buffer = surface_buffer;
-
-    surface->primary_buffer_stream()->swap_buffers(surface_buffer, callback);
-
-    std::unique_lock<decltype(mut)> lk(mut);
-    cv.wait(lk, [&]{return old_buffer != surface_buffer;});
-}
-
-void paint_titlebar(
-    std::shared_ptr<ms::Surface> const& titlebar,
-    mir::examples::CanonicalSurfaceInfoCopy& titlebar_info,
-    int intensity)
-{
-    auto stream = titlebar->primary_buffer_stream();
-    auto const format = stream->pixel_format();
-
-    if (!titlebar_info.buffer)
-        swap_buffers(titlebar, titlebar_info.buffer);
-
-    auto const sz = titlebar_info.buffer->size().height.as_int() *
-                    titlebar_info.buffer->size().width.as_int() * MIR_BYTES_PER_PIXEL(format);
-
-    std::vector<unsigned char> pixels(sz, intensity);
-    titlebar_info.buffer->write(pixels.data(), sz);
-
-    swap_buffers(titlebar, titlebar_info.buffer);
-}
-}
-
-void me::CanonicalWindowManagerPolicyCopy::generate_decorations_for(
-    std::shared_ptr<scene::Session> const& session,
-    std::shared_ptr<scene::Surface> const& surface,
-    CanonicalSurfaceInfoMap& surface_map)
-{
-    auto format = mir_pixel_format_xrgb_8888;
-    ms::SurfaceCreationParameters params;
-    params.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);
-    auto id = session->create_surface(params);
-    auto titlebar = session->surface(id);
-    titlebar->set_alpha(0.9);
-
-    auto& surface_info = tools->info_for(surface);
-    surface_info.titlebar = titlebar;
-    surface_info.children.push_back(titlebar);
-
-    CanonicalSurfaceInfoCopy titlebar_info{session, titlebar, ms::SurfaceCreationParameters{}};
-    titlebar_info.is_titlebar = true;
-    titlebar_info.parent = surface;
-
-    paint_titlebar(titlebar, titlebar_info, 0x3F);
-
-    surface_map.emplace(titlebar, std::move(titlebar_info));
-}
-
-void me::CanonicalWindowManagerPolicyCopy::handle_new_surface(std::shared_ptr<ms::Session> const& session, std::shared_ptr<ms::Surface> const& surface)
-{
-    if (auto const parent = surface->parent())
-    {
-        tools->info_for(parent).children.push_back(surface);
-    }
-
-    tools->info_for(session).surfaces++;
-
-    switch (surface->type())
-    {
-    case mir_surface_type_normal:       /**< AKA "regular"                       */
-    case mir_surface_type_utility:      /**< AKA "floating"                      */
-    case mir_surface_type_dialog:
-    case mir_surface_type_satellite:    /**< AKA "toolbox"/"toolbar"             */
-    case mir_surface_type_freestyle:
-    case mir_surface_type_menu:
-    case mir_surface_type_inputmethod:  /**< AKA "OSK" or handwriting etc.       */
-        // TODO There's currently no way to insert surfaces into an active (or inactive)
-        // TODO window tree while keeping the order stable or consistent with spec.
-        // TODO Nor is there a way to update the "default surface" when appropriate!!
-        surface->add_observer(std::make_shared<shell::SurfaceReadyObserver>(
-            [this](std::shared_ptr<scene::Session> const& /*session*/,
-                   std::shared_ptr<scene::Surface> const& surface)
-                {
-                    select_active_surface(surface);
-                },
-            session,
-            surface));
-        break;
-
-    case mir_surface_type_gloss:
-    case mir_surface_type_tip:          /**< AKA "tooltip"                       */
-    default:
-        // Cannot have input focus
-        break;
-    }
-}
-
-void me::CanonicalWindowManagerPolicyCopy::handle_modify_surface(
-    std::shared_ptr<scene::Session> const& /*session*/,
-    std::shared_ptr<scene::Surface> const& surface,
-    shell::SurfaceSpecification const& modifications)
-{
-    auto& surface_info = tools->info_for(surface);
-
-    #define COPY_IF_SET(field)\
-        if (modifications.field.is_set())\
-        surface_info.field = modifications.field
-
-    COPY_IF_SET(min_width);
-    COPY_IF_SET(min_height);
-    COPY_IF_SET(max_width);
-    COPY_IF_SET(max_height);
-    COPY_IF_SET(min_width);
-    COPY_IF_SET(width_inc);
-    COPY_IF_SET(height_inc);
-    COPY_IF_SET(min_aspect);
-    COPY_IF_SET(max_aspect);
-
-    #undef COPY_IF_SET
-
-    if (modifications.name.is_set())
-        surface->rename(modifications.name.value());
-
-    if (modifications.width.is_set() || modifications.height.is_set())
-    {
-        auto new_size = surface->size();
-
-        if (modifications.width.is_set())
-            new_size.width = modifications.width.value();
-
-        if (modifications.height.is_set())
-            new_size.height = modifications.height.value();
-
-        constrained_resize(
-            surface,
-            surface->top_left(),
-            new_size,
-            false,
-            false,
-            display_area);
-    }
-}
-
-void me::CanonicalWindowManagerPolicyCopy::handle_delete_surface(std::shared_ptr<ms::Session> const& session, std::weak_ptr<ms::Surface> const& surface)
-{
-    if (auto const parent = tools->info_for(surface).parent.lock())
-    {
-        auto& siblings = tools->info_for(parent).children;
-
-        for (auto i = begin(siblings); i != end(siblings); ++i)
-        {
-            if (surface.lock() == i->lock())
-            {
-                siblings.erase(i);
-                break;
-            }
-        }
-    }
-
-    if (!--tools->info_for(session).surfaces && session == tools->focused_session())
-    {
-        active_surface_.reset();
-        tools->focus_next_session();
-        select_active_surface(tools->focused_surface());
-    }
-}
-
-int me::CanonicalWindowManagerPolicyCopy::handle_set_state(std::shared_ptr<ms::Surface> const& surface, MirSurfaceState value)
-{
-    auto& info = tools->info_for(surface);
-
-    switch (value)
-    {
-    case mir_surface_state_restored:
-    case mir_surface_state_maximized:
-    case mir_surface_state_vertmaximized:
-    case mir_surface_state_horizmaximized:
-    case mir_surface_state_fullscreen:
-        break;
-
-    default:
-        return info.state;
-    }
-
-    if (info.state == mir_surface_state_restored)
-    {
-        info.restore_rect = {surface->top_left(), surface->size()};
-    }
-
-    if (info.state == value)
-    {
-        return info.state;
-    }
-
-    auto const old_pos = surface->top_left();
-    Displacement movement;
-
-    switch (value)
-    {
-    case mir_surface_state_restored:
-        movement = info.restore_rect.top_left - old_pos;
-        surface->resize(info.restore_rect.size);
-        info.titlebar->resize(titlebar_size_for_window(info.restore_rect.size));
-        info.titlebar->show();
-        break;
-
-    case mir_surface_state_maximized:
-        movement = display_area.top_left - old_pos;
-        surface->resize(display_area.size);
-        info.titlebar->hide();
-        break;
-
-    case mir_surface_state_horizmaximized:
-        movement = Point{display_area.top_left.x, info.restore_rect.top_left.y} - old_pos;
-        surface->resize({display_area.size.width, info.restore_rect.size.height});
-        info.titlebar->resize(titlebar_size_for_window({display_area.size.width, info.restore_rect.size.height}));
-        info.titlebar->show();
-        break;
-
-    case mir_surface_state_vertmaximized:
-        movement = Point{info.restore_rect.top_left.x, display_area.top_left.y} - old_pos;
-        surface->resize({info.restore_rect.size.width, display_area.size.height});
-        info.titlebar->hide();
-        break;
-
-    case mir_surface_state_fullscreen:
-    {
-        Rectangle rect{old_pos, surface->size()};
-        display_layout->size_to_output(rect);
-        movement = rect.top_left - old_pos;
-        surface->resize(rect.size);
-    }
-
-    default:
-        break;
-    }
-
-    // TODO It is rather simplistic to move a tree WRT the top_left of the root
-    // TODO when resizing. But for more sophistication we would need to encode
-    // TODO some sensible layout rules.
-    move_tree(surface, movement);
-
-    return info.state = value;
-}
-
-void me::CanonicalWindowManagerPolicyCopy::drag(Point cursor)
-{
-    select_active_surface(tools->surface_at(old_cursor));
-    drag(active_surface(), cursor, old_cursor, display_area);
-    old_cursor = cursor;
-}
-
-bool me::CanonicalWindowManagerPolicyCopy::handle_keyboard_event(MirKeyboardEvent const* event)
-{
-    auto const action = mir_keyboard_event_action(event);
-    auto const scan_code = mir_keyboard_event_scan_code(event);
-    auto const modifiers = mir_keyboard_event_modifiers(event) & modifier_mask;
-
-    if (action == mir_keyboard_action_down && scan_code == KEY_F11)
-    {
-        switch (modifiers)
-        {
-        case mir_input_event_modifier_alt:
-            toggle(mir_surface_state_maximized);
-            return true;
-
-        case mir_input_event_modifier_shift:
-            toggle(mir_surface_state_vertmaximized);
-            return true;
-
-        case mir_input_event_modifier_ctrl:
-            toggle(mir_surface_state_horizmaximized);
-            return true;
-
-        default:
-            break;
-        }
-    }
-    else if (action == mir_keyboard_action_down && scan_code == KEY_F4)
-    {
-        if (auto const session = tools->focused_session())
-        {
-            switch (modifiers)
-            {
-            case mir_input_event_modifier_alt:
-                kill(session->process_id(), SIGTERM);
-                return true;
-
-            case mir_input_event_modifier_ctrl:
-                if (auto const surf = session->default_surface())
-                {
-                    surf->request_client_surface_close();
-                    return true;
-                }
-
-            default:
-                break;
-            }
-        }
-    }
-    else if (action == mir_keyboard_action_down &&
-            modifiers == mir_input_event_modifier_alt &&
-            scan_code == KEY_TAB)
-    {
-        tools->focus_next_session();
-        if (auto const surface = tools->focused_surface())
-            select_active_surface(surface);
-
-        return true;
-    }
-    else if (action == mir_keyboard_action_down &&
-            modifiers == mir_input_event_modifier_alt &&
-            scan_code == KEY_GRAVE)
-    {
-        if (auto const prev = tools->focused_surface())
-        {
-            if (auto const app = tools->focused_session())
-                select_active_surface(app->surface_after(prev));
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
-bool me::CanonicalWindowManagerPolicyCopy::handle_touch_event(MirTouchEvent const* event)
-{
-    auto const count = mir_touch_event_point_count(event);
-
-    long total_x = 0;
-    long total_y = 0;
-
-    for (auto i = 0U; i != count; ++i)
-    {
-        total_x += mir_touch_event_axis_value(event, i, mir_touch_axis_x);
-        total_y += mir_touch_event_axis_value(event, i, mir_touch_axis_y);
-    }
-
-    Point const cursor{total_x/count, total_y/count};
-
-    bool is_drag = true;
-    for (auto i = 0U; i != count; ++i)
-    {
-        switch (mir_touch_event_action(event, i))
-        {
-        case mir_touch_action_up:
-            return false;
-
-        case mir_touch_action_down:
-            is_drag = false;
-
-        case mir_touch_action_change:
-            continue;
-        }
-    }
-
-    if (is_drag && count == 3)
-    {
-        drag(cursor);
-        return true;
-    }
-    else
-    {
-        click(cursor);
-        return false;
-    }
-}
-
-bool me::CanonicalWindowManagerPolicyCopy::handle_pointer_event(MirPointerEvent const* event)
-{
-    auto const action = mir_pointer_event_action(event);
-    auto const modifiers = mir_pointer_event_modifiers(event) & modifier_mask;
-    Point const cursor{
-        mir_pointer_event_axis_value(event, mir_pointer_axis_x),
-        mir_pointer_event_axis_value(event, mir_pointer_axis_y)};
-
-    if (action == mir_pointer_action_button_down)
-    {
-        click(cursor);
-        return false;
-    }
-    else if (action == mir_pointer_action_motion &&
-             modifiers == mir_input_event_modifier_alt)
-    {
-        if (mir_pointer_event_button_state(event, mir_pointer_button_primary))
-        {
-            drag(cursor);
-            return true;
-        }
-
-        if (mir_pointer_event_button_state(event, mir_pointer_button_tertiary))
-        {
-            resize(cursor);
-            return true;
-        }
-    }
-    else if (action == mir_pointer_action_motion && !modifiers)
-    {
-        if (mir_pointer_event_button_state(event, mir_pointer_button_primary))
-        {
-            if (auto const possible_titlebar = tools->surface_at(old_cursor))
-            {
-                if (tools->info_for(possible_titlebar).is_titlebar)
-                {
-                    drag(cursor);
-                    return true;
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-void me::CanonicalWindowManagerPolicyCopy::toggle(MirSurfaceState state)
-{
-    if (auto const surface = active_surface())
-    {
-        auto& info = tools->info_for(surface);
-
-        if (info.state == state)
-            state = mir_surface_state_restored;
-
-        auto const value = handle_set_state(surface, MirSurfaceState(state));
-        surface->configure(mir_surface_attrib_state, value);
-    }
-}
-
-void me::CanonicalWindowManagerPolicyCopy::select_active_surface(std::shared_ptr<ms::Surface> const& surface)
-{
-    if (surface == active_surface_.lock())
-        return;
-
-    if (!surface)
-    {
-        if (auto const active_surface = active_surface_.lock())
-        {
-            if (auto const titlebar = tools->info_for(active_surface).titlebar)
-            {
-                paint_titlebar(titlebar, tools->info_for(titlebar), 0x3F);
-            }
-        }
-
-        if (active_surface_.lock())
-            tools->set_focus_to({}, {});
-
-        active_surface_.reset();
-        return;
-    }
-
-    auto const& info_for = tools->info_for(surface);
-
-    switch (surface->type())
-    {
-    case mir_surface_type_normal:       /**< AKA "regular"                       */
-    case mir_surface_type_utility:      /**< AKA "floating"                      */
-    case mir_surface_type_dialog:
-    case mir_surface_type_satellite:    /**< AKA "toolbox"/"toolbar"             */
-    case mir_surface_type_freestyle:
-    case mir_surface_type_menu:
-    case mir_surface_type_inputmethod:  /**< AKA "OSK" or handwriting etc.       */
-        if (auto const active_surface = active_surface_.lock())
-        {
-            if (auto const titlebar = tools->info_for(active_surface).titlebar)
-            {
-                paint_titlebar(titlebar, tools->info_for(titlebar), 0x3F);
-            }
-        }
-        if (auto const titlebar = tools->info_for(surface).titlebar)
-        {
-            paint_titlebar(titlebar, tools->info_for(titlebar), 0xFF);
-        }
-        tools->set_focus_to(info_for.session.lock(), surface);
-        raise_tree(surface);
-        active_surface_ = surface;
-        break;
-
-    case mir_surface_type_gloss:
-    case mir_surface_type_tip:          /**< AKA "tooltip"                       */
-    default:
-        // Cannot have input focus - try the parent
-        if (auto const parent = info_for.parent.lock())
-            select_active_surface(parent);
-        break;
-    }
-}
-
-auto me::CanonicalWindowManagerPolicyCopy::active_surface() const
--> std::shared_ptr<ms::Surface>
-{
-    if (auto const surface = active_surface_.lock())
-        return surface;
-
-    if (auto const session = tools->focused_session())
-    {