Merge lp:mir/0.2 into lp:mir/ubuntu

[Cemil Azizoglu]

0.2.0 promotion of Mir from lp:mir/0.2 at r1669 minus r1581 and r1622.

0.2.0 promotion of Mir from lp:mir/0.2 at r1669 minus r1581 and r1622.

[kevin gunn (kgunn72)]

Did you test your feature/code change/bug fix ? what device(s) ?

demo clients on laptops, n4, n10, n7

Did you break mir server API or ABI and have the relevant bumps to .so and debian docs been made ?

break to server abi, libmirserver bump to libmirserver20

Did you break mir client API or ABI and have you followed up with the known clients & announced on mir-devel mailing list ?

no break on client API

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Alberto Aguirre (albaguirre)]

Changelog needs adjustment due to reverts.

=== modified file '3rd_party/android-deps/std/Thread.h'
--- 3rd_party/android-deps/std/Thread.h	2013-05-06 22:22:39 +0000
+++ 3rd_party/android-deps/std/Thread.h	2014-06-05 12:56:04 +0000
@@ -32,6 +32,11 @@
 #include <pthread.h>
 #endif
 
+namespace mir
+{
+void terminate_with_current_exception();
+}
+
 namespace mir_input
 {
 class Thread : virtual public RefBase
@@ -56,8 +61,15 @@
 
         thread = std::thread([this]() -> void
             {
-                if (auto result = readyToRun()) status.store(result);
-                else while (!exitPending() && threadLoop());
+                try
+                {
+                    if (auto result = readyToRun()) status.store(result);
+                    else while (!exitPending() && threadLoop());
+                }
+                catch (...)
+                {
+                    mir::terminate_with_current_exception();
+                }
             });
 
 #ifdef HAVE_PTHREADS

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/EventHub.h'
--- 3rd_party/android-input/android/frameworks/base/services/input/EventHub.h	2014-03-26 05:48:59 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/EventHub.h	2014-06-05 12:56:04 +0000
@@ -310,7 +310,6 @@
     virtual void monitor();
     virtual void flush();
 
-protected:
     virtual ~EventHub();
 
 private:

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp	2014-03-11 11:50:11 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp	2014-06-05 12:56:04 +0000
@@ -171,13 +171,15 @@
 
 // --- InputDispatcher ---
 
-InputDispatcher::InputDispatcher(const sp<InputDispatcherPolicyInterface>& policy, 
-    std::shared_ptr<mi::InputReport> const& input_report) :
+InputDispatcher::InputDispatcher(std::shared_ptr<InputDispatcherPolicyInterface> const& policy,
+    std::shared_ptr<mi::InputReport> const& input_report,
+    std::shared_ptr<InputEnumerator> const& enumerator) :
         input_report(input_report),
         mPolicy(policy),
         mPendingEvent(NULL), mAppSwitchSawKeyDown(false), mAppSwitchDueTime(LONG_LONG_MAX),
         mNextUnblockedEvent(NULL),
         mDispatchEnabled(false), mDispatchFrozen(false), mInputFilterEnabled(false),
+        mEnumerator(enumerator),
         mInputTargetWaitCause(INPUT_TARGET_WAIT_CAUSE_NONE) {
     mLooper = new Looper(false);
 
@@ -186,12 +188,6 @@
     policy->getDispatcherConfiguration(&mConfig);
 }
 
-void InputDispatcher::setInputEnumerator(sp<InputEnumerator> const& enumerator)
-{
-    AutoMutex _l(mLock);
-    mEnumerator = enumerator;
-}
-
 InputDispatcher::~InputDispatcher() {
     { // acquire lock
         AutoMutex _l(mLock);
@@ -4284,7 +4280,7 @@
 
 // --- InputDispatcherThread ---
 
-InputDispatcherThread::InputDispatcherThread(const sp<InputDispatcherInterface>& dispatcher) :
+InputDispatcherThread::InputDispatcherThread(std::shared_ptr<InputDispatcherInterface> const& dispatcher) :
         Thread(/*canCallJava*/ true), mDispatcher(dispatcher) {
 }
 

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h	2014-03-06 06:05:17 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h	2014-06-05 12:56:04 +0000
@@ -284,13 +284,6 @@
     virtual ~InputDispatcherInterface() { }
 
 public:
-    /* 
-     * Sets the enumerator of input targets. This must be called prior to enabling input dispatch.
-     *
-     * This method may be called by any thread.
-     */
-    virtual void setInputEnumerator(sp<InputEnumerator> const& enumerator) = 0;
-
     /* Dumps the state of the input dispatcher.
      *
      * This method may be called on any thread (usually by the input manager). */
@@ -387,13 +380,9 @@
  *     A 'LockedInterruptible' method may called a 'Locked' method, but NOT vice-versa.
  */
 class InputDispatcher : public InputDispatcherInterface {
-protected:
+public:
     virtual ~InputDispatcher();
-
-public:
-    explicit InputDispatcher(const sp<InputDispatcherPolicyInterface>& policy, std::shared_ptr<mir::input::InputReport> const& input_report);
-
-    virtual void setInputEnumerator(sp<InputEnumerator> const& enumerator);
+    explicit InputDispatcher(std::shared_ptr<InputDispatcherPolicyInterface> const& policy, std::shared_ptr<mir::input::InputReport> const& input_report, std::shared_ptr<InputEnumerator> const& enumerator);
 
     virtual void dump(String8& dump);
     virtual void monitor();
@@ -862,7 +851,7 @@
         DROP_REASON_STALE = 5
     };
 
-    sp<InputDispatcherPolicyInterface> mPolicy;
+    std::shared_ptr<InputDispatcherPolicyInterface> mPolicy;
     InputDispatcherConfiguration mConfig;
 
     Mutex mLock;
@@ -941,7 +930,7 @@
     bool mDispatchFrozen;
     bool mInputFilterEnabled;
 
-    sp<InputEnumerator> mEnumerator;
+    std::shared_ptr<InputEnumerator> mEnumerator;
 
     sp<InputWindowHandle> getWindowHandleLocked(const sp<InputChannel>& inputChannel) const;
     bool hasWindowHandleLocked(const sp<InputWindowHandle>& windowHandle) const;
@@ -1122,13 +1111,13 @@
 /* Enqueues and dispatches input events, endlessly. */
 class InputDispatcherThread : public Thread {
 public:
-    explicit InputDispatcherThread(const sp<InputDispatcherInterface>& dispatcher);
+    explicit InputDispatcherThread(std::shared_ptr<InputDispatcherInterface> const& dispatcher);
     ~InputDispatcherThread();
 
 private:
     virtual bool threadLoop();
 
-    sp<InputDispatcherInterface> mDispatcher;
+    std::shared_ptr<InputDispatcherInterface> mDispatcher;
 };
 
 } // namespace android

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputListener.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputListener.cpp	2012-11-06 18:05:11 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputListener.cpp	2014-06-05 12:56:04 +0000
@@ -35,8 +35,8 @@
         eventTime(other.eventTime) {
 }
 
-void NotifyConfigurationChangedArgs::notify(const sp<InputListenerInterface>& listener) const {
-    listener->notifyConfigurationChanged(this);
+void NotifyConfigurationChangedArgs::notify(InputListenerInterface& listener) const {
+    listener.notifyConfigurationChanged(this);
 }
 
 
@@ -59,8 +59,8 @@
         metaState(other.metaState), downTime(other.downTime) {
 }
 
-void NotifyKeyArgs::notify(const sp<InputListenerInterface>& listener) const {
-    listener->notifyKey(this);
+void NotifyKeyArgs::notify(InputListenerInterface& listener) const {
+    listener.notifyKey(this);
 }
 
 
@@ -95,8 +95,8 @@
     }
 }
 
-void NotifyMotionArgs::notify(const sp<InputListenerInterface>& listener) const {
-    listener->notifyMotion(this);
+void NotifyMotionArgs::notify(InputListenerInterface& listener) const {
+    listener.notifyMotion(this);
 }
 
 
@@ -113,8 +113,8 @@
         switchCode(other.switchCode), switchValue(other.switchValue) {
 }
 
-void NotifySwitchArgs::notify(const sp<InputListenerInterface>& listener) const {
-    listener->notifySwitch(this);
+void NotifySwitchArgs::notify(InputListenerInterface& listener) const {
+    listener.notifySwitch(this);
 }
 
 
@@ -128,14 +128,14 @@
         eventTime(other.eventTime), deviceId(other.deviceId) {
 }
 
-void NotifyDeviceResetArgs::notify(const sp<InputListenerInterface>& listener) const {
-    listener->notifyDeviceReset(this);
+void NotifyDeviceResetArgs::notify(InputListenerInterface& listener) const {
+    listener.notifyDeviceReset(this);
 }
 
 
 // --- QueuedInputListener ---
 
-QueuedInputListener::QueuedInputListener(const sp<InputListenerInterface>& innerListener) :
+QueuedInputListener::QueuedInputListener(const std::shared_ptr<InputListenerInterface>& innerListener) :
         mInnerListener(innerListener) {
 }
 
@@ -171,7 +171,7 @@
     size_t count = mArgsQueue.size();
     for (size_t i = 0; i < count; i++) {
         NotifyArgs* args = mArgsQueue[i];
-        args->notify(mInnerListener);
+        args->notify(*mInnerListener);
         delete args;
     }
     mArgsQueue.clear();

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputListener.h'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputListener.h	2014-03-06 06:05:17 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputListener.h	2014-06-05 12:56:04 +0000
@@ -20,6 +20,7 @@
 #include <androidfw/Input.h>
 #include <std/RefBase.h>
 #include <std/Vector.h>
+#include <memory>
 
 namespace android {
 
@@ -30,7 +31,7 @@
 struct NotifyArgs {
     virtual ~NotifyArgs() { }
 
-    virtual void notify(const sp<InputListenerInterface>& listener) const = 0;
+    virtual void notify(InputListenerInterface& listener) const = 0;
 };
 
 
@@ -46,7 +47,7 @@
 
     virtual ~NotifyConfigurationChangedArgs() { }
 
-    virtual void notify(const sp<InputListenerInterface>& listener) const;
+    virtual void notify(InputListenerInterface& listener) const;
 };
 
 
@@ -73,7 +74,7 @@
 
     virtual ~NotifyKeyArgs() { }
 
-    virtual void notify(const sp<InputListenerInterface>& listener) const;
+    virtual void notify(InputListenerInterface& listener) const;
 };
 
 
@@ -107,7 +108,7 @@
 
     virtual ~NotifyMotionArgs() { }
 
-    virtual void notify(const sp<InputListenerInterface>& listener) const;
+    virtual void notify(InputListenerInterface& listener) const;
 };
 
 
@@ -127,7 +128,7 @@
 
     virtual ~NotifySwitchArgs() { }
 
-    virtual void notify(const sp<InputListenerInterface>& listener) const;
+    virtual void notify(InputListenerInterface& listener) const;
 };
 
 
@@ -145,7 +146,7 @@
 
     virtual ~NotifyDeviceResetArgs() { }
 
-    virtual void notify(const sp<InputListenerInterface>& listener) const;
+    virtual void notify(InputListenerInterface& listener) const;
 };
 
 
@@ -175,7 +176,7 @@
     virtual ~QueuedInputListener();
 
 public:
-    QueuedInputListener(const sp<InputListenerInterface>& innerListener);
+    QueuedInputListener(const std::shared_ptr<InputListenerInterface>& innerListener);
 
     virtual void notifyConfigurationChanged(const NotifyConfigurationChangedArgs* args);
     virtual void notifyKey(const NotifyKeyArgs* args);
@@ -186,7 +187,7 @@
     void flush();
 
 private:
-    sp<InputListenerInterface> mInnerListener;
+    std::shared_ptr<InputListenerInterface> mInnerListener;
     Vector<NotifyArgs*> mArgsQueue;
 };
 

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp	2014-03-06 06:05:17 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp	2014-06-05 12:56:04 +0000
@@ -244,9 +244,9 @@
 
 // --- InputReader ---
 
-InputReader::InputReader(const sp<EventHubInterface>& eventHub,
-        const sp<InputReaderPolicyInterface>& policy,
-        const sp<InputListenerInterface>& listener) :
+InputReader::InputReader(std::shared_ptr<EventHubInterface> const& eventHub,
+        std::shared_ptr<InputReaderPolicyInterface> const& policy,
+        std::shared_ptr<InputListenerInterface> const& listener) :
         mContext(this), mEventHub(eventHub), mPolicy(policy),
         mGlobalMetaState(0), mGeneration(1),
         mDisableVirtualKeysTimeout(LLONG_MIN), mNextTimeout(LLONG_MAX),
@@ -851,7 +851,7 @@
 
 // --- InputReaderThread ---
 
-InputReaderThread::InputReaderThread(const sp<InputReaderInterface>& reader) :
+InputReaderThread::InputReaderThread(std::shared_ptr<InputReaderInterface> const& reader) :
         Thread(/*canCallJava*/ true), mReader(reader) {
 }
 

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputReader.h'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputReader.h	2014-03-06 06:05:17 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputReader.h	2014-06-05 12:56:04 +0000
@@ -334,9 +334,9 @@
  */
 class InputReader : public InputReaderInterface {
 public:
-    InputReader(const sp<EventHubInterface>& eventHub,
-            const sp<InputReaderPolicyInterface>& policy,
-            const sp<InputListenerInterface>& listener);
+    InputReader(const std::shared_ptr<EventHubInterface>& eventHub,
+            const std::shared_ptr<InputReaderPolicyInterface>& policy,
+            const std::shared_ptr<InputListenerInterface>& listener);
     virtual ~InputReader();
 
     virtual void dump(String8& dump);
@@ -393,8 +393,8 @@
 
     Condition mReaderIsAliveCondition;
 
-    sp<EventHubInterface> mEventHub;
-    sp<InputReaderPolicyInterface> mPolicy;
+    std::shared_ptr<EventHubInterface> mEventHub;
+    std::shared_ptr<InputReaderPolicyInterface> mPolicy;
     sp<QueuedInputListener> mQueuedListener;
 
     InputReaderConfiguration mConfig;
@@ -449,11 +449,11 @@
 /* Reads raw events from the event hub and processes them, endlessly. */
 class InputReaderThread : public Thread {
 public:
-    InputReaderThread(const sp<InputReaderInterface>& reader);
+    InputReaderThread(std::shared_ptr<InputReaderInterface> const& reader);
     virtual ~InputReaderThread();
 
 private:
-    sp<InputReaderInterface> mReader;
+    std::shared_ptr<InputReaderInterface> mReader;
 
     virtual bool threadLoop();
 };

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-04-15 08:13:37 +0000
+++ CMakeLists.txt	2014-06-05 12:56:04 +0000
@@ -27,8 +27,8 @@
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 0)
-set(MIR_VERSION_MINOR 1)
-set(MIR_VERSION_PATCH 9)
+set(MIR_VERSION_MINOR 2) # This should change at least with every MIRSERVER_ABI
+set(MIR_VERSION_PATCH 0)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 execute_process(
@@ -76,7 +76,7 @@
 include_directories(include/shared)
 
 # Check for boost
-find_package(Boost 1.48.0 COMPONENTS chrono date_time filesystem system thread program_options regex REQUIRED)
+find_package(Boost 1.48.0 COMPONENTS chrono date_time filesystem system thread program_options regex iostreams REQUIRED)
 include_directories (
   ${Boost_INCLUDE_DIRS}
 )
@@ -129,6 +129,7 @@
 include_directories (${GLM_INCLUDE_DIRS})
 
 if (MIR_BUILD_PLATFORM_ANDROID)
+  find_package(AndroidProperties REQUIRED)
   find_package(LibHardware REQUIRED)
 endif()
 

=== modified file 'benchmarks/android-input/input_reader_perf.cpp'
--- benchmarks/android-input/input_reader_perf.cpp	2013-10-16 13:26:25 +0000
+++ benchmarks/android-input/input_reader_perf.cpp	2014-06-05 12:56:04 +0000
@@ -24,6 +24,7 @@
 
 #include <chrono>
 #include <iostream>
+#include <memory>
 
 // local
 #include "ntrig_input_events.h"
@@ -42,12 +43,10 @@
     InputReaderConfiguration mConfig;
     Vector<InputDeviceInfo> mInputDevices;
 
-protected:
+public:
+    FakeInputReaderPolicy() {}
     virtual ~FakeInputReaderPolicy() { }
 
-public:
-    FakeInputReaderPolicy() {}
-
     void setDisplayInfo(int32_t displayId, int32_t width, int32_t height, int32_t orientation) {
         // Set the size of both the internal and external display at the same time.
         mConfig.setDisplayInfo(displayId, false /*external*/, width, height, orientation);
@@ -119,7 +118,7 @@
     const int32_t DEVICE_ID = 2;
     const int32_t DISPLAY_ID = 0;
 
-    sp<FakeEventHub> fakeEventHub = new FakeEventHub;
+    std::shared_ptr<FakeEventHub> fakeEventHub = std::make_shared<FakeEventHub>();
     fakeEventHub->addDevice(DEVICE_ID, String8("N-Trig MultiTouch"), INPUT_DEVICE_CLASS_TOUCH_MT);
     fakeEventHub->addConfigurationProperty(DEVICE_ID, "touch.deviceType", "touchScreen");
     fakeEventHub->addConfigurationProperty(DEVICE_ID, "device.internal", "1");
@@ -130,10 +129,10 @@
     fakeEventHub->addAbsoluteAxis(DEVICE_ID, ABS_MT_TOUCH_MINOR, 0, 7200, 0, 0, 37);
     fakeEventHub->addAbsoluteAxis(DEVICE_ID, ABS_MT_ORIENTATION, 0, 1, 0, 0, 0);
 
-    sp<FakeInputReaderPolicy> fakePolicy = new FakeInputReaderPolicy;
+    std::shared_ptr<FakeInputReaderPolicy> fakePolicy = std::make_shared<FakeInputReaderPolicy>();
     fakePolicy->setDisplayInfo(DISPLAY_ID, 1024, 768, DISPLAY_ORIENTATION_0);
 
-    sp<InputListener> listener = new InputListener;
+    std::shared_ptr<InputListener> listener = std::make_shared<InputListener>();
 
     int32_t total_duration = 0;
     int32_t execution_number;

=== modified file 'cmake/Doxygen.cmake'
--- cmake/Doxygen.cmake	2013-10-21 17:41:35 +0000
+++ cmake/Doxygen.cmake	2014-06-05 12:56:04 +0000
@@ -23,5 +23,7 @@
                     COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
                     SOURCES ${PROJECT_BINARY_DIR}/Doxyfile
                     DEPENDS guides)
-  install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/mir-doc/)
+  if (BUILD_DOXYGEN)
+    install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/mir-doc/)
+  endif()
 endif()

=== added file 'cmake/FindAndroidProperties.cmake'
--- cmake/FindAndroidProperties.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindAndroidProperties.cmake	2014-06-05 12:56:04 +0000
@@ -0,0 +1,22 @@
+# Variables defined by this module:
+#   ANDROID_PROPERTIES_FOUND
+#   ANDROID_PROPERTIES_LIBRARIES
+#   ANDROID_PROPERTIES_INCLUDE_DIRS
+
+INCLUDE(FindPackageHandleStandardArgs)
+
+find_package( PkgConfig )
+pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)
+
+find_path(ANDROID_PROPERTIES_INCLUDE_DIR hybris/properties/properties.h
+          HINTS ${PC_ANDROID_PROPERTIES_INCLUDEDIR} ${PC_ANDROID_PROPERTIES_INCLUDE_DIRS})
+find_library(ANDROID_PROPERTIES_LIBRARIES
+             NAMES        libandroid-properties.so
+             HINTS ${PC_ANDROID_PROPERTIES_LIBDIR} ${PC_ANDROID_PROPERTIES_LIBRARY_DIRS})
+
+# handle the QUIETLY and REQUIRED arguments and set ANDROID_PROPERTIES_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(ANDROID_PROPERTIES DEFAULT_MSG
+                                  ANDROID_PROPERTIES_LIBRARIES)
+
+mark_as_advanced(ANDROID_PROPERTIES_INCLUDE_DIR ANDROID_PROPERTIES_LIBRARY )

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-30 13:26:58 +0000
+++ debian/changelog	2014-06-05 12:56:04 +0000
@@ -1,3 +1,129 @@
+mir (0.2.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release 0.2.0 (https://launchpad.net/mir/+milestone/0.2.0)
+    - mirclient ABI unchanged, still at 7. Clients do not need rebuilding.
+    - mirserver ABI bumped to 20. Shells need rebuilding.
+      . Cursor::set_image() parameters changed.
+      . Display::the_cursor() renamed to Display::create_hardware_cursor()
+      . Platform::create_display() requires a new parameter; gl_program_factory
+      . Renderable::buffer() no longer accepts any parameter at all. Multi-
+        monitor frame sync is guaranteed in other ways now.
+      . Scene::generate_renderable_list() renamed to renderable_list_for(id)
+        where id is an opaque compositor ID of your choosing.
+      . Scene::set_change_callback() replaced by the more generic:
+        add_observer() and remove_observer() functions.
+      . Added default implementation for SceneObserver.  
+      . SessionCreator renamed to ConnectionCreator.
+      . ConnectedSessions renamed to Connections.
+      . ProtobufSessionCreator renamed to ProtobufConnectionCreator.
+      . SessionAuthorizer: pid_t parameters replaced by SessionCredentials.
+      . Massive architectural changes to Input-everything.
+      . Surface no longer implements Renderable, but emits one via
+        compositor_snapshot().
+      . Pass the full renderable list to Renderer::render().
+      . Graceful handling of exceptions thrown from server threads.
+      . Clarify size position interfaces in the Surface classes.
+      . Plumbing for trusted sessions.
+      . Allow posting and managing custom main-loop actions.
+      . Timer extension.
+      . Identify client process when client connects to Mir not when socket
+        connects.
+      . Use the ServerActionQueue for display config.
+      . Recomposition signal moved to the MultiThreadedCompositor.
+      . Make timer service replaceable.
+      . Clarify assumptions about how many buffers a client can fill without
+        blocking.
+      . Introduce EmergencyCleanup interface.
+    - Demo shell enhancements:
+      . You can now change graphics modes on the fly using Ctrl+Alt+(-/=).
+        To reset to the preferred mode use Ctrl+Alt+0.
+      . The above mode changing as well as existing screen rotation keys
+        (Ctrl+Alt+arrows) are now per-display; only applied to the monitor
+        the mouse pointer is on.
+      . New shell controls documented.
+    - A new testing category, performance test, was introduced. It currently
+      runs glmark2-es2 and compares the result to a minimum threshold. 
+    - MIR_VERSION_MINOR is tied to MIRSERVER_ABI in the sense that a change
+      in the former now requires dependent projects that a rebuild is 
+      necessary.
+    - SwitchingBundle was replaced by BufferQueue.
+    - Expand credentials to include uid/gid for session authorizer.
+    - Bypass control is now Mesa-specific and tied to the command line options.
+      So the environment variable MIR_BYPASS has changed to MIR_SERVER_BYPASS.
+    - Ongoing architectural changes in the compositor/renderer logic to
+      prepare for overlay support, and to reduce locking overhead.
+    - Made InputDispatcher replaceable.
+    - Progress made on new cursor interfaces with the end goal of client and
+      toolkit control of the mouse cursor appearance. More work required.
+    - Updated cross-compile docs and scripts to support the latest utopic
+      devel images.
+    - Replaced uses of android::sp with std::shared_ptr.
+    - Client cursor API infrastructure.
+    - Enabled eglSwapInternal(0).
+    - Make texture caching algorithm reuseable.
+    - Add a DPI surface attribute.
+    - Exclude arm64 from build.
+    - Bugs fixed:
+      . Mir doesn't install cleanly if docs are not built. (LP: #1304271)
+      . Unity-system-compositor crashed [what(): Failed to set DRM crtc].
+        (LP: #1294510)
+      . [regression] unity8 fails to load libmirplatformgraphics
+        (undefined symbol: _ZN3mir8graphics9GLProgramD1Ev). (LP: #1317200)
+      . [regression] unity8 rendering artifacts. (LP: #1317260)
+      . [regression] [BufferQueue] 
+        BufferQueueTest.compositor_never_owns_client_buffers occasionally
+        crashes with: what(): unexpected release: buffer was not given to
+        compositor. (LP: #1317801)
+      . Hardcoded size for serialization buffers is neither reliable nor
+        secure. (LP: #1320187)
+      . [regression] [BufferQueue] mir does not composite last client given
+        buffer. (LP: #1321861)
+      . [regression] stale frame on seen on greeter when screen is unblanked
+        and toolkit/apps are laggy/throttled. (LP: #1321886)
+      . [regression] [BufferQueue] current_buffer_users vector memory usage
+        grows unbounded. (LP: #1317808)
+      . Intermittent test failures in 
+        CustomInputDispatcherFixture.custom_input_dispatcher_receives_input.
+        (LP: #1318587)
+      . [regression] [BufferQueue] Race condition in 
+        BufferQueue::compositor_acquire could underflow shared_ptr refcount and
+        delete prematurely, crash. (LP: #1318632)
+      . Overflow in 
+        mir::client::rpc::MirSocketRpcChannel::receive_file_descriptors as
+        reported by address sanitizer. (LP: #1320821)
+      . [regression] [input] Scroll events are now always zero: 
+        event.motion.pointer_coordinates[0].vscroll. (LP: #1321077)
+      . CI failures in CustomInputDispatcherFixture
+        .custom_input_dispatcher_gets_started_and_stopped. (LP: #1321215)
+      . [regression] Mir cursor vanishes after switching VTs. (LP: #1323225)
+      . Server library links against libmirserverlttng. (LP: #1323317)
+      . [DRM/GBM] Killing (or crashing) Mir often leaves the screen blank and
+        difficult to recover. (LP: #1189770)
+      . Frame rates of GL clients are limited to 60Hz on Android, even with
+        swapinterval=0. (LP: #1206400)
+      . mir_surface_is_valid(NULL) crashes instead of returning false.
+        (LP: #1248474)
+      . [regression] tests/unit-tests/shell/test_mediating_display_changer.cpp
+        is not compiled and executed. (LP: #1312832)
+      . Android platform does not reset the compositionType to HWC_FRAMEBUFFER
+        before prepare() on every frame. (LP: #1314399)
+      . The client process is identified when the socket connects, not when the
+        client connects to Mir. (LP: #1314574)
+      . [regression] Clients can't acquire multiple buffers any more.
+        (LP: #1315302)
+      . [regression] Enabling SwitchingBundleTest 
+        DISABLED_synchronous_clients_only_get_two_real_buffers now crashes with
+        no usable stack trace. It used to only fail. (LP: #1315312)
+      . [regression] [BufferQueue] double-buffered client freezes as no buffer
+        is returned on compositor_release. (LP: #1319765)
+      . Uninitialized mem in OutputBuilder.hwc_version_11_success.
+        (LP: #1312867)
+      . [enhancement] In the tests make it possible to get a
+        DefaultConfiguration initialized from the command line (LP: #1316987)
+      . ci train blocked due to missing arm64 libandroid-properties-dev.
+        (LP: #1323504)
+ -- Daniel van Vugt <[e-mail]>  Thu, 01 May 2014 15:15:39 +0800
+
 mir (0.1.9+14.10.20140430.1-0ubuntu1) utopic; urgency=medium
 
   [ Daniel van Vugt ]

=== modified file 'debian/control'
--- debian/control	2014-04-15 05:32:16 +0000
+++ debian/control	2014-06-05 12:56:04 +0000
@@ -18,6 +18,7 @@
                libboost-thread-dev,
                libboost-regex-dev,
                libboost-filesystem-dev,
+               libboost-iostreams-dev,
                protobuf-compiler,
                libdrm-dev,
                libegl1-mesa-dev,
@@ -28,6 +29,7 @@
                pkg-config,
                android-headers (>=4.2.2) [i386 amd64 armhf],
                libhardware-dev [i386 amd64 armhf],
+               libandroid-properties-dev [i386 amd64 armhf],
                libgoogle-glog-dev,
                liblttng-ust-dev,
                libxkbcommon-dev,
@@ -70,7 +72,7 @@
  .
  Contains the protocol's definition files.
 
-Package: libmirserver19
+Package: libmirserver20
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -148,7 +150,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver19 (= ${binary:Version}),
+Depends: libmirserver20 (= ${binary:Version}),
          libmirprotobuf-dev (= ${binary:Version}),
          mircommon-dev (= ${binary:Version}),
          libglm-dev,

=== renamed file 'debian/libmirserver19.install' => 'debian/libmirserver20.install'
--- debian/libmirserver19.install	2014-04-15 05:32:16 +0000
+++ debian/libmirserver20.install	2014-06-05 12:56:04 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.19
+usr/lib/*/libmirserver.so.20

=== modified file 'debian/mir-test-tools.install'
--- debian/mir-test-tools.install	2014-03-06 06:05:17 +0000
+++ debian/mir-test-tools.install	2014-06-05 12:56:04 +0000
@@ -2,5 +2,6 @@
 usr/bin/mir_unit_tests
 usr/bin/mir_acceptance_tests
 usr/bin/mir_integration_tests
+usr/bin/mir_performance_tests
 usr/lib/*/mir/tools/libmirclientlttng.so
 usr/lib/*/mir/tools/libmirserverlttng.so

=== modified file 'doc/building_source_for_android.md'
--- doc/building_source_for_android.md	2014-03-06 06:05:17 +0000
+++ doc/building_source_for_android.md	2014-06-05 12:56:04 +0000
@@ -53,8 +53,8 @@
 
 Initial setup of a desktop machine for cross-compiling to armhf is simple:
 
-    $ sudo apt-get install g++-arm-linux-gnueabihf/trusty debootstrap
-    $ sudo sh -c 'echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe multiverse" > /etc/apt/sources.list.d/armhf-xcompile.list'
+    $ sudo apt-get install g++-arm-linux-gnueabihf debootstrap
+    $ sudo sh -c 'echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ utopic main restricted universe multiverse" > /etc/apt/sources.list.d/armhf-xcompile.list'
     $ sudo apt-get update
 
 Now to test that everything is working you can try downloading a package like

=== added file 'doc/demo_shell_controls.md'
--- doc/demo_shell_controls.md	1970-01-01 00:00:00 +0000
+++ doc/demo_shell_controls.md	2014-06-05 12:56:04 +0000
@@ -0,0 +1,45 @@
+Demo Shell Controls {#demo_shell_controls}
+===================
+
+Mir's demo shell (`mir_demo_server_shell`) is a basic environment for testing
+Mir server features as well as running natively ported apps/toolkits. It is
+still primitive and requires some explaining to make proper use of, so read
+on.
+
+Running Demo Shell
+------------------
+
+Remember to always run `mir_demo_server_shell` as root on PC (not required on
+Android), as this is required for input device support (open bug
+https://bugs.launchpad.net/mir/+bug/1286252);
+
+    sudo mir_demo_server_shell
+
+And if you're not already on the VT you wish to use, that needs to be
+specified:
+
+    sudo mir_demo_server_shell --vt 1
+
+There are plenty more options available if you run:
+
+    mir_demo_server_shell --help
+
+Controls
+--------
+
+All controls have a keyboard/mouse combination and where possible also have
+touch alternatives for phones/tablets:
+
+ - Quit the shell (shut down the Mir server): *Ctrl-Alt-Backspace*
+ - Switch back to X: *Ctrl-Alt-F7*
+ - Switch virtual terminals (VTs): *Ctrl-Alt-(F1-F12)*
+ - Switch apps: *Alt-Tab* or *4-finger swipe left/right*
+ - Move window: *Alt-leftmousebutton* or *3-finger drag*
+ - Resize window: *Alt-middlemousebutton* or *3-finger pinch/zoom*
+ - Sleep/wake all displays: *Alt-P* or *Android power button*
+ - Rotate the focussed monitor: *Ctrl-Alt-(Left/Right/Up/Down)*
+ - Change display mode of the focussed monitor: *Ctrl-Alt-(=/-)*
+ - Reset display mode to default, on focussed monitor: *Ctrl-Alt-0*
+ - Adjust window opacity/alpha: *Alt-mousewheel*
+
+Want more? Log your requests at: https://bugs.launchpad.net/mir/+filebug

=== modified file 'doc/mainpage.md'
--- doc/mainpage.md	2014-03-06 06:05:17 +0000
+++ doc/mainpage.md	2014-06-05 12:56:04 +0000
@@ -35,6 +35,7 @@
  - \ref using_mir_on_pc
  - \ref using_mir_on_android
  - \ref debug_for_xmir
+ - \ref demo_shell_controls
 
 Getting involved
 ----------------

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2014-04-15 02:41:33 +0000
+++ examples/CMakeLists.txt	2014-06-05 12:56:04 +0000
@@ -183,6 +183,11 @@
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 
+add_executable(mir_demo_server_minimal minimal_server.cpp)
+target_link_libraries(mir_demo_server_minimal mirserver)
+install(TARGETS mir_demo_server_minimal
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
 
 add_executable(mir_demo_server_translucent
   translucent_server.cpp

=== modified file 'examples/demo-shell/demo_renderer.cpp'
--- examples/demo-shell/demo_renderer.cpp	2014-04-24 08:42:12 +0000
+++ examples/demo-shell/demo_renderer.cpp	2014-06-05 12:56:04 +0000
@@ -18,6 +18,7 @@
 
 #include "demo_renderer.h"
 #include <mir/graphics/renderable.h>
+#include <mir/compositor/recently_used_cache.h>
 #include <cmath>
 
 using namespace mir;
@@ -137,7 +138,9 @@
 DemoRenderer::DemoRenderer(
     graphics::GLProgramFactory const& program_factory,
     geometry::Rectangle const& display_area)
-    : GLRenderer(program_factory, display_area)
+    : GLRenderer(program_factory,
+        std::unique_ptr<graphics::GLTextureCache>(new compositor::RecentlyUsedCache()),
+        display_area)
     , corner_radius(0.5f)
 {
     shadow_corner_tex = generate_shadow_corner_texture(0.4f);
@@ -158,16 +161,15 @@
     glClear(GL_COLOR_BUFFER_BIT);
 }
 
-void DemoRenderer::tessellate(std::vector<Primitive>& primitives,
-                              graphics::Renderable const& renderable,
-                              geometry::Size const& buf_size) const
+void DemoRenderer::tessellate(std::vector<graphics::GLPrimitive>& primitives,
+                              graphics::Renderable const& renderable) const
 {
-    GLRenderer::tessellate(primitives, renderable, buf_size);
+    GLRenderer::tessellate(primitives, renderable);
     tessellate_shadow(primitives, renderable, 80.0f);
     tessellate_frame(primitives, renderable, 30.0f);
 }
 
-void DemoRenderer::tessellate_shadow(std::vector<Primitive>& primitives,
+void DemoRenderer::tessellate_shadow(std::vector<graphics::GLPrimitive>& primitives,
                                      graphics::Renderable const& renderable,
                                      float radius) const
 {
@@ -262,7 +264,7 @@
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }
 
-void DemoRenderer::tessellate_frame(std::vector<Primitive>& primitives,
+void DemoRenderer::tessellate_frame(std::vector<graphics::GLPrimitive>& primitives,
                                     graphics::Renderable const& renderable,
                                     float titlebar_height) const
 {

=== modified file 'examples/demo-shell/demo_renderer.h'
--- examples/demo-shell/demo_renderer.h	2014-04-24 08:42:12 +0000
+++ examples/demo-shell/demo_renderer.h	2014-06-05 12:56:04 +0000
@@ -33,13 +33,12 @@
     ~DemoRenderer();
 
     void begin() const override;
-    void tessellate(std::vector<Primitive>& primitives,
-                    graphics::Renderable const& renderable,
-                    geometry::Size const& buf_size) const override;
-    void tessellate_shadow(std::vector<Primitive>& primitives,
+    void tessellate(std::vector<graphics::GLPrimitive>& primitives,
+                    graphics::Renderable const& renderable) const override;
+    void tessellate_shadow(std::vector<graphics::GLPrimitive>& primitives,
                     graphics::Renderable const& renderable,
                     float radius) const;
-    void tessellate_frame(std::vector<Primitive>& primitives,
+    void tessellate_frame(std::vector<graphics::GLPrimitive>& primitives,
                     graphics::Renderable const& renderable,
                     float titlebar_height) const;
 

=== modified file 'examples/demo-shell/window_manager.cpp'
--- examples/demo-shell/window_manager.cpp	2014-04-15 05:31:19 +0000
+++ examples/demo-shell/window_manager.cpp	2014-06-05 12:56:04 +0000
@@ -160,6 +160,8 @@
         {
             MirOrientation orientation = mir_orientation_normal;
             bool rotating = true;
+            int mode_change = 0;
+            bool preferred_mode = false;
 
             switch (event.key.scan_code)
             {
@@ -170,14 +172,41 @@
             default:        rotating = false; break;
             }
 
-            if (rotating)
+            switch (event.key.scan_code)
+            {
+            case KEY_MINUS: mode_change = -1;      break;
+            case KEY_EQUAL: mode_change = +1;      break;
+            case KEY_0:     preferred_mode = true; break;
+            default:                               break;
+            }
+
+            if (rotating || mode_change || preferred_mode)
             {
                 compositor->stop();
                 auto conf = display->configuration();
                 conf->for_each_output(
                     [&](mg::UserDisplayConfigurationOutput& output) -> void
                     {
-                        output.orientation = orientation;
+                        // Only apply changes to the monitor the cursor is on
+                        if (!output.extents().contains(old_cursor))
+                            return;
+
+                        if (rotating)
+                            output.orientation = orientation;
+
+                        if (preferred_mode)
+                        {
+                            output.current_mode_index =
+                                output.preferred_mode_index;
+                        }
+                        else if (mode_change)
+                        {
+                            size_t nmodes = output.modes.size();
+                            if (nmodes)
+                                output.current_mode_index =
+                                    (output.current_mode_index + nmodes +
+                                     mode_change) % nmodes;
+                        }
                     }
                 );
                 display->configure(*conf);
@@ -192,7 +221,7 @@
     {
         geometry::Point cursor = average_pointer(event.motion);
 
-        // FIXME: https://bugs.launchpad.net/mir/+bug/1197108
+        // FIXME: https://bugs.launchpad.net/mir/+bug/1311699
         MirMotionAction action = static_cast<MirMotionAction>(event.motion.action & ~0xff00);
 
         auto const app = focus_controller->focussed_application().lock();
@@ -235,8 +264,6 @@
                                     drag.dx.as_int();
                         int height = old_size.height.as_int() +
                                      drag.dy.as_int();
-                        if (width <= 0) width = 1;
-                        if (height <= 0) height = 1; 
                         surf->resize({width, height});
                     }
                     else
@@ -267,8 +294,6 @@
 
                         int width = old_size.width.as_int() + dx;
                         int height = old_size.height.as_int() + dy;
-                        if (width <= 0) width = 1; 
-                        if (height <= 0) height = 1; 
                         surf->resize({width, height});
                     }
 
@@ -290,7 +315,6 @@
                 old_pos = surf->top_left();
                 old_size = surf->size();
                 old_pinch_diam = pinch_diam;
-                old_cursor = cursor;
             }
         }
 
@@ -303,6 +327,8 @@
                 handled = true;
             }
         }
+
+        old_cursor = cursor;
     }
     return handled;
 }

=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2014-03-06 06:05:17 +0000
+++ examples/eglapp.c	2014-06-05 12:56:04 +0000
@@ -391,6 +391,7 @@
     *width = surfaceparm.width;
     *height = surfaceparm.height;
 
+    printf("Surface %d DPI\n", mir_surface_get_dpi(surface));
     eglSwapInterval(egldisplay, swapinterval);
 
     running = 1;

=== modified file 'examples/eglcounter.cpp'
--- examples/eglcounter.cpp	2014-04-15 02:41:33 +0000
+++ examples/eglcounter.cpp	2014-06-05 12:56:04 +0000
@@ -25,6 +25,7 @@
 #include <vector>
 #include <stdexcept>
 #include <iostream>
+#include <algorithm>
 
 static GLuint load_shader(const char *src, GLenum type)
 {
@@ -73,12 +74,9 @@
 {
 public:
     TwoDigitCounter(GLuint prog, float thickness, unsigned int max_count)
-        : count{0}, max_count{max_count}, program{prog},
+        : count{0}, max_count{std::min(max_count, 99u)}, program{prog},
           vertices{create_vertices(thickness)}, digit_drawables{create_digits()}
     {
-        if (max_count > 99)
-            max_count = 99;
-
         vpos = glGetAttribLocation(program, "vPosition");
         if (vpos == -1)
             throw std::runtime_error("Failed to obtain vPosition attribute");
@@ -191,7 +189,7 @@
     }
 
     unsigned int count;
-    unsigned int max_count;
+    unsigned int const max_count;
 
     GLint vpos;
     GLint xoff;

=== modified file 'examples/fingerpaint.c'
--- examples/fingerpaint.c	2014-03-06 06:05:17 +0000
+++ examples/fingerpaint.c	2014-06-05 12:56:04 +0000
@@ -207,7 +207,7 @@
         static size_t max_fingers = 0;
         static float max_pressure = 1.0f;
         
-        // FIXME: https://bugs.launchpad.net/mir/+bug/1197108
+        // FIXME: https://bugs.launchpad.net/mir/+bug/1311699
         MirMotionAction masked_action = event->motion.action & ~0xff00;
 
         if (masked_action == mir_motion_action_up)
@@ -286,7 +286,7 @@
 
 int main(int argc, char *argv[])
 {
-    static const Color background = {0x40, 0x40, 0x40, 0xff};
+    static const Color background = {180, 180, 150, 255};
     MirConnection *conn;
     MirSurfaceParameters parm;
     MirSurface *surf;

=== added file 'examples/minimal_server.cpp'
--- examples/minimal_server.cpp	1970-01-01 00:00:00 +0000
+++ examples/minimal_server.cpp	2014-06-05 12:56:04 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * 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: Daniel van Vugt <[e-mail]>
+ */
+
+#include "mir/default_server_configuration.h"
+#include "mir/run_mir.h"
+
+int main(int argc, char const* argv[])
+{
+    mir::DefaultServerConfiguration config(argc, argv);
+    run_mir(config, [](mir::DisplayServer&){} );
+    return 0;
+}
+

=== modified file 'examples/render_overlays.cpp'
--- examples/render_overlays.cpp	2014-04-15 05:31:19 +0000
+++ examples/render_overlays.cpp	2014-06-05 12:56:04 +0000
@@ -110,7 +110,7 @@
         return this;
     }
 
-    std::shared_ptr<mg::Buffer> buffer(void const*) const override
+    std::shared_ptr<mg::Buffer> buffer() const override
     {
         return client->last_rendered();
     }
@@ -173,9 +173,7 @@
     mir::DefaultServerConfiguration conf{argc, argv};
 
     auto platform = conf.the_graphics_platform();
-    auto display = platform->create_display(
-        conf.the_display_configuration_policy(),
-        conf.the_gl_config());
+    auto display = conf.the_display();
     auto buffer_allocator = platform->create_buffer_allocator(conf.the_buffer_initializer());
 
      mg::BufferProperties buffer_properties{
@@ -189,8 +187,8 @@
 
     std::list<std::shared_ptr<mg::Renderable>> renderlist
     {
-        std::make_shared<DemoRenderable>(client1, geom::Rectangle{{0,0} , {512, 512}}),
-        std::make_shared<DemoRenderable>(client2, geom::Rectangle{{80,80} , {592,592}})
+        std::make_shared<DemoRenderable>(client1, geom::Rectangle{{0,0} , buffer_properties.size}),
+        std::make_shared<DemoRenderable>(client2, geom::Rectangle{{80,80} , buffer_properties.size})
     };
 
     while (running)
@@ -200,8 +198,7 @@
             buffer.make_current();
             client1->update_green_channel();
             client2->update_green_channel();
-            auto render_fn = [](mg::Renderable const&) {};
-            buffer.render_and_post_update(renderlist, render_fn);
+            buffer.post_renderables_if_optimizable(renderlist);
         });
     }
    return 0;

=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2014-04-15 10:19:19 +0000
+++ examples/render_surfaces.cpp	2014-06-05 12:56:04 +0000
@@ -26,7 +26,6 @@
 #include "mir/geometry/size.h"
 #include "mir/geometry/rectangles.h"
 #include "mir/graphics/buffer_initializer.h"
-#include "mir/graphics/cursor.h"
 #include "mir/graphics/display.h"
 #include "mir/graphics/display_buffer.h"
 #include "mir/graphics/gl_context.h"
@@ -89,62 +88,10 @@
 namespace
 {
 std::atomic<bool> created{false};
-bool input_is_on = false;
-std::weak_ptr<mg::Cursor> cursor;
-static const uint32_t bg_color = 0x00000000;
-static const uint32_t fg_color = 0xffdd4814;
+
 static const float min_alpha = 0.3f;
 
-void update_cursor(uint32_t bg_color, uint32_t fg_color)
-{
-    if (auto cursor = ::cursor.lock())
-    {
-        static const int width = 64;
-        static const int height = 64;
-        std::vector<uint32_t> image(height * width, bg_color);
-        for (int i = 0; i != width-1; ++i)
-        {
-            if (i < 16)
-            {
-                image[0 * height + i] = fg_color;
-                image[1 * height + i] = fg_color;
-                image[i * height + 0] = fg_color;
-                image[i * height + 1] = fg_color;
-            }
-            image[i * height + i] = fg_color;
-            image[(i+1) * height + i] = fg_color;
-            image[i * height + i + 1] = fg_color;
-        }
-        cursor->set_image(image.data(), geom::Size{width, height});
-    }
-}
-
-void animate_cursor()
-{
-    if (!input_is_on)
-    {
-        if (auto cursor = ::cursor.lock())
-        {
-            static int cursor_pos = 0;
-            if (++cursor_pos == 300)
-            {
-                cursor_pos = 0;
-
-                static const uint32_t fg_colors[3] = { fg_color, 0xffffffff, 0x3f000000 };
-                static int fg_color = 0;
-
-                if (++fg_color == 3) fg_color = 0;
-
-                update_cursor(bg_color, fg_colors[fg_color]);
-            }
-
-            cursor->move_to(geom::Point{cursor_pos, cursor_pos});
-        }
-    }
-}
-
 char const* const surfaces_to_render = "surfaces-to-render";
-char const* const display_cursor     = "display-cursor";
 
 ///\internal [StopWatch_tag]
 // tracks elapsed time - for animation.
@@ -278,9 +225,7 @@
 
             result->add_options()
                 (surfaces_to_render, po::value<int>()->default_value(5),
-                    "Number of surfaces to render")
-                (display_cursor, po::value<bool>()->default_value(false),
-                    "Display test cursor. (If input is disabled it gets animated.)");
+                    "Number of surfaces to render");
 
             return result;
         }())
@@ -296,7 +241,7 @@
             void start() {}
             void stop() {}
             int client_socket_fd() const override { return 0; }
-            void remove_endpoint() const override { }
+            int client_socket_fd(std::function<void(std::shared_ptr<mf::Session> const&)> const&) const override { return 0; }
         };
 
         return std::make_shared<NullConnector>();
@@ -382,7 +327,6 @@
             bool composite()
             {
                 while (!created) std::this_thread::yield();
-                animate_cursor();
                 stop_watch.stop();
                 if (stop_watch.elapsed_seconds_since_last_restart() >= 1)
                 {
@@ -501,23 +445,6 @@
         created = true;
     }
 
-    bool input_is_on()
-    {
-        return the_options()->get<bool>(mo::enable_input_opt);
-    }
-
-    std::weak_ptr<mg::Cursor> the_cursor()
-    {
-        if (the_options()->get<bool>(display_cursor))
-        {
-            return the_display()->the_cursor();
-        }
-        else
-        {
-            return {};
-        }
-    }
-
 private:
     std::vector<Moveable> moveables;
 };
@@ -532,9 +459,6 @@
 
     mir::run_mir(conf, [&](mir::DisplayServer&)
     {
-        cursor = conf.the_cursor();
-
-        input_is_on = conf.input_is_on();
     });
     ///\internal [main_tag]
 

=== modified file 'include/client/mir_toolkit/mir_connection.h'
--- include/client/mir_toolkit/mir_connection.h	2014-03-31 14:36:08 +0000
+++ include/client/mir_toolkit/mir_connection.h	2014-06-05 12:56:04 +0000
@@ -169,6 +169,25 @@
     MirConnection* connection, MirPixelFormat* formats,
     unsigned const int format_size, unsigned int *num_valid_formats);
 
+/**
+ * Allocate some FDs for trusted clients to connect on
+ *
+ * Trust session helpers need to allocate connection FDs it will pass to
+ * trusted clients to use when connecting to the server. The server can
+ * then associate them with the trust session.
+ *
+ *   \warning This API is tentative until the implementation of trust sessions is complete
+ *   \param [in] connection     The connection
+ *   \param [in] no_of_fds      The number of fds to allocate
+ *   \param [in] callback       Callback invoked when request completes
+ *   \param [in,out] context    User data passed to the callback function
+ *   \return                    A handle that can be passed to mir_wait_for
+ */
+MirWaitHandle* mir_connection_new_fds_for_trusted_clients(
+    MirConnection* connection,
+    unsigned int no_of_fds,
+    mir_client_fd_callback callback,
+    void * context);
 
 #ifdef __cplusplus
 }

=== added file 'include/client/mir_toolkit/mir_cursor_configuration.h'
--- include/client/mir_toolkit/mir_cursor_configuration.h	1970-01-01 00:00:00 +0000
+++ include/client/mir_toolkit/mir_cursor_configuration.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MIR_TOOLKIT_MIR_CURSOR_H_
+#define MIR_TOOLKIT_MIR_CURSOR_H_
+
+/**
+ * Opaque structure containing cursor parameterization. Create with mir_cursor* family.
+ * Used with mir_surface_configure_cursor.
+ */
+typedef struct MirCursorConfiguration MirCursorConfiguration;
+
+#ifdef __cplusplus
+/**
+ * \addtogroup mir_toolkit
+ * @{
+ */
+extern "C" {
+#endif
+
+/**
+ * A special cursor name for use with mir_cursor_configuration_from_name
+ * representing the system default cursor.
+ */
+extern char const *const mir_default_cursor_name;
+/**
+ * A special cursor name for use with mir_cursor_configuration_from_name
+ * representing a disabled cursor image.
+ */
+extern char const *const mir_disabled_cursor_name;
+
+/**
+ * Release resources assosciated with cursor parameters
+ *     \param [in] parameters The operand
+ */
+void mir_cursor_configuration_destroy(MirCursorConfiguration *parameters);
+
+/**
+ * Returns a new MirCursorConfiguration representing a named cursor
+ * from the system cursor theme. Currently only the symbolic values,
+ * mir_default_cursor_name and mir_disabled_cursor_name are supported
+ * as input.
+ *    \param [in] name The cursor name
+ *    \return A cursor parameters object which must be passed
+ *            to_mir_cursor_configuration_destroy
+ */
+MirCursorConfiguration *mir_cursor_configuration_from_name(char const* name);
+
+#ifdef __cplusplus
+}
+/**@}*/
+#endif
+
+#endif /* MIR_TOOLKIT_MIR_CURSOR_H_ */

=== modified file 'include/client/mir_toolkit/mir_surface.h'
--- include/client/mir_toolkit/mir_surface.h	2014-03-31 14:36:08 +0000
+++ include/client/mir_toolkit/mir_surface.h	2014-06-05 12:56:04 +0000
@@ -21,6 +21,7 @@
 #include <mir_toolkit/mir_native_buffer.h>
 #include <mir_toolkit/client_types.h>
 #include <mir_toolkit/common.h>
+#include <mir_toolkit/mir_cursor_configuration.h>
 
 #ifdef __cplusplus
 /**
@@ -246,6 +247,25 @@
  */
 int mir_surface_get_swapinterval(MirSurface* surface);
 
+/**
+ * Query the DPI value of the surface (dots per inch). This will vary depending
+ * on the physical display configuration and where the surface is within it.
+ *   \return  The DPI of the surface, or zero if unknown.
+ */
+int mir_surface_get_dpi(MirSurface* surface);
+
+/**
+ * Choose the cursor state for a surface: whether a cursor is shown, 
+ * and which cursor if so.
+ *    \param [in] surface    The surface to operate on
+ *    \param [in] parameters The configuration parameters obtained
+ *                           from mir_cursor* family of functions.
+ *    \return                A wait handle that can be passed to mir_wait_for,
+ *                           or NULL if parameters is invalid.
+ *
+ */
+MirWaitHandle* mir_surface_configure_cursor(MirSurface *surface, MirCursorConfiguration const* parameters);
+
 #ifdef __cplusplus
 }
 /**@}*/

=== added file 'include/platform/mir/emergency_cleanup_registry.h'
--- include/platform/mir/emergency_cleanup_registry.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/emergency_cleanup_registry.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alexandros Frantzis <[e-mail]>
+ */
+
+
+#ifndef MIR_EMERGENCY_CLEANUP_REGISTRY_H_
+#define MIR_EMERGENCY_CLEANUP_REGISTRY_H_
+
+#include <functional>
+
+namespace mir
+{
+
+typedef std::function<void()> EmergencyCleanupHandler;
+
+class EmergencyCleanupRegistry
+{
+public:
+    virtual ~EmergencyCleanupRegistry() = default;
+
+    virtual void add(EmergencyCleanupHandler const& handler) = 0;
+
+protected:
+    EmergencyCleanupRegistry() = default;
+    EmergencyCleanupRegistry(EmergencyCleanupRegistry const&) = delete;
+    EmergencyCleanupRegistry& operator=(EmergencyCleanupRegistry const&) = delete;
+};
+
+}
+
+#endif /* MIR_EMERGENCY_CLEANUP_REGISTRY_H_ */

=== modified file 'include/platform/mir/graphics/cursor.h'
--- include/platform/mir/graphics/cursor.h	2013-08-28 03:41:48 +0000
+++ include/platform/mir/graphics/cursor.h	2014-06-05 12:56:04 +0000
@@ -23,14 +23,19 @@
 #include "mir/geometry/size.h"
 #include "mir/geometry/point.h"
 
+#include <memory>
+
 namespace mir
 {
 namespace graphics
 {
+class CursorImage;
 class Cursor
 {
 public:
-    virtual void set_image(void const* raw_argb, geometry::Size size) = 0;
+    virtual void show(CursorImage const& cursor_image) = 0;
+    virtual void hide() = 0;
+
     virtual void move_to(geometry::Point position) = 0;
 
 protected:

=== added file 'include/platform/mir/graphics/cursor_image.h'
--- include/platform/mir/graphics/cursor_image.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/graphics/cursor_image.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+
+#ifndef MIR_GRAPHICS_CURSOR_IMAGE_H_
+#define MIR_GRAPHICS_CURSOR_IMAGE_H_
+
+#include "mir/geometry/size.h"
+
+namespace mir
+{
+namespace graphics
+{
+class CursorImage
+{
+public:
+    virtual ~CursorImage() = default;
+
+    virtual void const* as_argb_8888() const = 0;
+    virtual geometry::Size size() const = 0;
+
+protected:
+    CursorImage() = default;
+    CursorImage(CursorImage const&) = delete;
+    CursorImage& operator=(CursorImage const&) = delete;
+};
+}
+}
+
+
+#endif /* MIR_GRAPHICS_CURSOR_IMAGE_H_ */

=== modified file 'include/platform/mir/graphics/display.h'
--- include/platform/mir/graphics/display.h	2014-01-31 07:48:24 +0000
+++ include/platform/mir/graphics/display.h	2014-06-05 12:56:04 +0000
@@ -31,6 +31,7 @@
 class DisplayBuffer;
 class DisplayConfiguration;
 class Cursor;
+class CursorImage;
 class GLContext;
 class EventHandlerRegister;
 
@@ -97,9 +98,9 @@
     virtual void resume() = 0;
 
     /**
-     * Gets the hardware cursor object.
+     * Create a hardware cursor object.
      */
-    virtual std::weak_ptr<Cursor> the_cursor() = 0;
+    virtual std::shared_ptr<Cursor> create_hardware_cursor(std::shared_ptr<CursorImage> const& initial_image) = 0;
 
     /**
      * Creates a GLContext object that shares resources with the Display's GL context.

=== modified file 'include/platform/mir/graphics/display_buffer.h'
--- include/platform/mir/graphics/display_buffer.h	2014-03-26 05:48:59 +0000
+++ include/platform/mir/graphics/display_buffer.h	2014-06-05 12:56:04 +0000
@@ -24,7 +24,6 @@
 #include <mir_toolkit/common.h>
 
 #include <memory>
-#include <functional>
 
 namespace mir
 {
@@ -51,13 +50,22 @@
     /** This will trigger OpenGL rendering and post the result to the screen. */
     virtual void post_update() = 0;
 
-    /** This will render renderlist to the screen and post the result to the screen.
-        For each renderable, the DisplayBuffer will decide if its more efficient to render
-        that Renderable via OpenGL, or via another method. If the Renderable is to be rendered
-        via OpenGL, render_fn will be invoked on that Renderable. */
-    virtual void render_and_post_update(
-        RenderableList const& renderlist,
-        std::function<void(Renderable const&)> const& render_fn) = 0;
+    /** This will render renderlist to the screen and post the result to the 
+     *  screen if there is a hardware optimization that can be done.
+     *  \param [in] renderlist 
+     *      The renderables that should appear on the screen if the hardware
+     *      is capable of optmizing that list somehow. If what you want
+     *      displayed on the screen cannot be represented by a RenderableList,
+     *      then you should draw using OpenGL and use post_update()
+     *  \returns
+     *      true if the hardware can optimize the rendering of the list.
+     *      When this call completes, the renderlist will have been posted
+     *      to the screen.
+     *      false if the hardware platform cannot optimize the list. The screen
+     *      will not be updated. The caller should render the list another way,
+     *      and post using post_update()
+    **/
+    virtual bool post_renderables_if_optimizable(RenderableList const& renderlist) = 0;
 
     /** to be deprecated */
     virtual bool can_bypass() const = 0;

=== modified file 'include/platform/mir/graphics/display_configuration.h'
--- include/platform/mir/graphics/display_configuration.h	2014-03-26 05:48:59 +0000
+++ include/platform/mir/graphics/display_configuration.h	2014-06-05 12:56:04 +0000
@@ -139,6 +139,7 @@
     MirOrientation& orientation;
 
     UserDisplayConfigurationOutput(DisplayConfigurationOutput& master);
+    geometry::Rectangle extents() const;
 };
 
 std::ostream& operator<<(std::ostream& out, DisplayConfigurationCard const& val);

=== added file 'include/platform/mir/graphics/gl_primitive.h'
--- include/platform/mir/graphics/gl_primitive.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/graphics/gl_primitive.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Daniel van Vugt <[e-mail]>
+ *              Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_GL_PRIMITIVE_H_
+#define MIR_GRAPHICS_GL_PRIMITIVE_H_
+
+#include <GLES2/gl2.h>
+#include <vector>
+
+namespace mir
+{
+namespace graphics
+{
+struct GLVertex
+{
+    GLfloat position[3];
+    GLfloat texcoord[2];
+};
+
+struct GLPrimitive
+{
+    GLenum type; // GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES etc
+    GLuint tex_id;  // GL texture ID (or 0 to represent the surface itself)
+    std::vector<GLVertex> vertices;
+};
+}
+}
+#endif /* MIR_GRAPHICS_GL_PRIMITIVE_H_ */

=== renamed file 'include/server/mir/graphics/gl_program.h' => 'include/platform/mir/graphics/gl_program.h'
--- include/server/mir/graphics/gl_program.h	2014-04-24 08:42:12 +0000
+++ include/platform/mir/graphics/gl_program.h	2014-06-05 12:56:04 +0000
@@ -2,15 +2,15 @@
  * Copyright © 2013-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,
+ * under the terms of the GNU Lesser General Public License version 3,
  * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Kevin DuBois <[e-mail]>
@@ -43,17 +43,26 @@
 class GLProgram
 {
 public:
-    GLProgram(
+    virtual ~GLProgram() = default;
+    virtual operator GLuint() const = 0;
+
+protected:
+    GLProgram() = default;
+private:
+    GLProgram(GLProgram const&) = delete;
+    GLProgram& operator=(GLProgram const&) = delete;
+};
+
+class SimpleGLProgram : public GLProgram
+{
+public:
+    SimpleGLProgram(
         GLchar const* vertex_shader_src,
         GLchar const* fragment_shader_src);
-    ~GLProgram();
-
-    operator GLuint() const;
-
+    ~SimpleGLProgram();
+
+    operator GLuint() const override;
 private:
-    GLProgram(GLProgram const&) = delete;
-    GLProgram& operator=(GLProgram const&) = delete;
-
     GLShader const vertex_shader; 
     GLShader const fragment_shader;
     GLuint const program;

=== modified file 'include/platform/mir/graphics/gl_program_factory.h'
--- include/platform/mir/graphics/gl_program_factory.h	2014-04-22 16:45:27 +0000
+++ include/platform/mir/graphics/gl_program_factory.h	2014-06-05 12:56:04 +0000
@@ -20,6 +20,7 @@
 #define MIR_COMPOSITOR_GL_PROGRAM_FACTORY_H_
 
 #include "mir/graphics/gl_program.h"
+#include "mir/graphics/gl_texture_cache.h"
 #include <memory>
 
 namespace mir
@@ -34,7 +35,7 @@
 
     virtual std::unique_ptr<GLProgram>
         create_gl_program(std::string const&, std::string const&) const = 0;
-
+    virtual std::unique_ptr<GLTextureCache> create_texture_cache() const = 0;
 protected:
     GLProgramFactory() = default;
 

=== added file 'include/platform/mir/graphics/gl_texture.h'
--- include/platform/mir/graphics/gl_texture.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/graphics/gl_texture.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_GL_TEXTURE_H_
+#define MIR_GRAPHICS_GL_TEXTURE_H_
+
+#include <GLES2/gl2.h>
+
+namespace mir
+{
+namespace graphics
+{
+class GLTexture
+{
+public:
+    GLTexture();
+    ~GLTexture();
+    void bind() const;
+
+private:
+    GLTexture(GLTexture const&) = delete;
+    GLTexture& operator=(GLTexture const&) = delete;
+    GLuint generate_id() const;
+    GLuint const id;
+};
+}
+}
+
+#endif /* MIR_GRAPHICS_GL_TEXTURE_H_ */

=== added file 'include/platform/mir/graphics/gl_texture_cache.h'
--- include/platform/mir/graphics/gl_texture_cache.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/graphics/gl_texture_cache.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Daniel van Vugt <[e-mail]>
+ *              Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_GL_TEXTURE_CACHE_H_
+#define MIR_GRAPHICS_GL_TEXTURE_CACHE_H_
+
+#include "mir/graphics/renderable.h"
+
+namespace mir
+{
+namespace graphics
+{
+class GLTexture;
+class GLTextureCache
+{
+public:
+    virtual ~GLTextureCache() = default;
+
+    /**
+     * Loads texture from the renderable. Must be called with a current GL
+     * context.
+     *   \param [in] renderable
+     *       The Renderable that needs to be used as a texture
+     *   \returns 
+     *       The texture that represents the renderable.
+     */ 
+    virtual std::shared_ptr<GLTexture> load(Renderable const&) = 0;
+
+    /**
+     * Mark all entries in the cache as out-of-date to ensure fresh textures
+     * are loaded next time. This function _must_ be implemented in a way that
+     * does not require a GL context, as it will typically be called without
+     * one.
+     */ 
+    virtual void invalidate() = 0;
+
+    /**
+     * Free textures that were not used (loaded) since the last
+     * drop/invalidate. Must be called with a current GL context.
+     */
+    virtual void drop_unused() = 0;
+
+protected:
+    GLTextureCache() = default;
+private:
+    GLTextureCache(GLTextureCache const&) = delete;
+    GLTextureCache& operator=(GLTextureCache const&) = delete;
+};
+}
+}
+#endif /* MIR_GRAPHICS_GL_TEXTURE_CACHE_H_ */

=== modified file 'include/platform/mir/graphics/platform.h'
--- include/platform/mir/graphics/platform.h	2014-03-27 09:52:04 +0000
+++ include/platform/mir/graphics/platform.h	2014-06-05 12:56:04 +0000
@@ -50,6 +50,7 @@
 class DisplayConfigurationPolicy;
 class GraphicBufferAllocator;
 class GLConfig;
+class GLProgramFactory;
 
 /**
  * \defgroup platform_enablement Mir platform enablement
@@ -84,6 +85,7 @@
      */
     virtual std::shared_ptr<Display> create_display(
         std::shared_ptr<DisplayConfigurationPolicy> const& initial_conf_policy,
+        std::shared_ptr<GLProgramFactory> const& gl_program_factory,
         std::shared_ptr<GLConfig> const& gl_config) = 0;
 
     /**

=== modified file 'include/platform/mir/graphics/renderable.h'
--- include/platform/mir/graphics/renderable.h	2014-04-15 05:31:19 +0000
+++ include/platform/mir/graphics/renderable.h	2014-06-05 12:56:04 +0000
@@ -33,6 +33,8 @@
 class Renderable
 {
 public:
+    virtual ~Renderable() = default;
+
     typedef void const* ID; // Mostly opaque, but zero is reserved as "invalid"
 
     /**
@@ -42,17 +44,9 @@
     virtual ID id() const = 0;
 
     /**
-     * Return the next buffer that should be composited/rendered.
-     *
-     * \param [in] user_id An arbitrary unique identifier used to distinguish
-     *                     separate threads/monitors/components which need
-     *                     to concurrently receive the same buffer. Calling
-     *                     with the same user_id will return a new (different)
-     *                     buffer to that user each time. For consistency,
-     *                     all callers need to determine their user_id in the
-     *                     same way (e.g. always use "this" pointer).
+     * Return the buffer that should be composited/rendered.
      */
-    virtual std::shared_ptr<Buffer> buffer(void const* user_id) const = 0;
+    virtual std::shared_ptr<Buffer> buffer() const = 0;
 
     virtual bool alpha_enabled() const = 0;
     virtual geometry::Rectangle screen_position() const = 0;
@@ -87,7 +81,6 @@
 
 protected:
     Renderable() = default;
-    virtual ~Renderable() = default;
     Renderable(Renderable const&) = delete;
     Renderable& operator=(Renderable const&) = delete;
 };

=== added file 'include/platform/mir/graphics/tessellation_helpers.h'
--- include/platform/mir/graphics/tessellation_helpers.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/graphics/tessellation_helpers.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_TESSELLATION_HELPERS_H_
+#define MIR_GRAPHICS_TESSELLATION_HELPERS_H_
+#include "mir/graphics/gl_primitive.h"
+
+namespace mir
+{
+namespace graphics
+{
+class Renderable;
+GLPrimitive tessellate_renderable_into_rectangle(Renderable const& renderable);
+}
+}
+#endif /* MIR_GRAPHICS_TESSELLATION_HELPERS_H_ */

=== modified file 'include/server/mir/asio_main_loop.h'
--- include/server/mir/asio_main_loop.h	2013-06-28 15:16:39 +0000
+++ include/server/mir/asio_main_loop.h	2014-06-05 12:56:04 +0000
@@ -24,14 +24,23 @@
 #include <boost/asio.hpp>
 #include <memory>
 #include <vector>
+#include <mutex>
+#include <utility>
+#include <deque>
+#include <set>
 
 namespace mir
 {
 
+namespace time
+{
+class Clock;
+}
+
 class AsioMainLoop : public MainLoop
 {
 public:
-    AsioMainLoop();
+    explicit AsioMainLoop(std::shared_ptr<time::Clock> const& clock);
     ~AsioMainLoop() noexcept(true);
 
     void run();
@@ -45,13 +54,28 @@
         std::initializer_list<int> fd,
         std::function<void(int)> const& handler);
 
+    std::unique_ptr<time::Alarm> notify_in(std::chrono::milliseconds delay,
+                                           std::function<void()> callback) override;
+    std::unique_ptr<time::Alarm> notify_at(mir::time::Timestamp time_point,
+                                           std::function<void()> callback) override;
+    void enqueue(void const* owner, ServerAction const& action);
+    void pause_processing_for(void const* owner);
+    void resume_processing_for(void const* owner);
+
 private:
     class SignalHandler;
     class FDHandler;
+    bool should_process(void const*);
+    void process_server_actions();
 
     boost::asio::io_service io;
+    boost::asio::io_service::work work;
     std::vector<std::unique_ptr<SignalHandler>> signal_handlers;
     std::vector<std::unique_ptr<FDHandler>> fd_handlers;
+    std::mutex server_actions_mutex;
+    std::deque<std::pair<void const*,ServerAction>> server_actions;
+    std::set<void const*> do_not_process;
+    std::shared_ptr<time::Clock> const clock;
 };
 
 }

=== modified file 'include/server/mir/compositor/gl_renderer.h'
--- include/server/mir/compositor/gl_renderer.h	2014-04-24 08:42:12 +0000
+++ include/server/mir/compositor/gl_renderer.h	2014-06-05 12:56:04 +0000
@@ -24,7 +24,9 @@
 #include <mir/geometry/rectangle.h>
 #include <mir/graphics/buffer_id.h>
 #include <mir/graphics/renderable.h>
+#include <mir/graphics/gl_primitive.h>
 #include <mir/graphics/gl_program_factory.h>
+#include <mir/graphics/gl_texture_cache.h>
 #include <GLES2/gl2.h>
 #include <unordered_map>
 #include <unordered_set>
@@ -40,32 +42,19 @@
 public:
     GLRenderer(
         graphics::GLProgramFactory const& program_factory,
+        std::unique_ptr<graphics::GLTextureCache> && texture_cache, 
         geometry::Rectangle const& display_area);
-    virtual ~GLRenderer() noexcept;
 
     // These are called with a valid GL context:
     void set_viewport(geometry::Rectangle const& rect) override;
     void set_rotation(float degrees) override;
     void begin() const override;
-    void render(graphics::Renderable const& renderable) const override;
+    void render(graphics::RenderableList const&) const override;
     void end() const override;
 
     // This is called _without_ a GL context:
     void suspend() override;
 
-    struct Vertex
-    {
-        GLfloat position[3];
-        GLfloat texcoord[2];
-    };
-
-    struct Primitive
-    {
-        GLenum type; // GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES etc
-        GLuint tex_id;  // GL texture ID (or 0 to represent the surface itself)
-        std::vector<Vertex> vertices;
-    };
-
     /**
      * tessellate defines the list of triangles that will be used to render
      * the surface. By default it just returns 4 vertices for a rectangle.
@@ -75,11 +64,6 @@
      * \param [in,out] primitives The list of rendering primitives to be
      *                            grown and/or modified.
      * \param [in]     renderable The renderable surface being tessellated.
-     * \param [in]     buf_size   The dimensions of the buffer being rendered,
-     *                            which can be particularly useful in
-     *                            calculating texcoords for a surface being
-     *                            actively resized (as the buf_size doesn't
-     *                            yet match renderable.size()).
      *
      * \note The cohesion of this function to GLRenderer is quite loose and it
      *       does not strictly need to reside here.
@@ -87,21 +71,13 @@
      *       the only OpenGL-specific class in the display server, and
      *       tessellation is very much OpenGL-specific.
      */
-    virtual void tessellate(std::vector<Primitive>& primitives,
-                            graphics::Renderable const& renderable,
-                            geometry::Size const& buf_size) const;
-
-    /**
-     * Load the texture for a surface any which way you like. The default
-     * implementation does so with efficient GPU-side caching built in.
-     *
-     * \returns The OpenGL texture name for the surface.
-     */
-    virtual GLuint load_texture(graphics::Renderable const& renderable,
-                                graphics::Buffer& buffer) const;
-
+    virtual void tessellate(std::vector<graphics::GLPrimitive>& primitives,
+                            graphics::Renderable const& renderable) const;
+
+    virtual void render(graphics::Renderable const& renderable) const;
 private:
     std::unique_ptr<graphics::GLProgram> program;
+    std::unique_ptr<graphics::GLTextureCache> mutable texture_cache;
     GLuint position_attr_loc;
     GLuint texcoord_attr_loc;
     GLuint centre_uniform_loc;
@@ -111,17 +87,6 @@
     float rotation;
 
     geometry::Rectangle viewport;
-
-    struct Texture
-    {
-        GLuint id = 0;
-        graphics::BufferID origin;
-        bool used;
-    };
-    mutable std::unordered_map<graphics::Renderable::ID, Texture> textures;
-    mutable std::unordered_set<std::shared_ptr<graphics::Buffer>> saved_resources;
-    mutable bool skipped = false;
-
 };
 
 }

=== added file 'include/server/mir/compositor/recently_used_cache.h'
--- include/server/mir/compositor/recently_used_cache.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/compositor/recently_used_cache.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2013-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 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: Daniel van Vugt <[e-mail]>
+ *              Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_COMPOSITOR_RECENTLY_USED_CACHE_H_
+#define MIR_COMPOSITOR_RECENTLY_USED_CACHE_H_
+
+#include "mir/graphics/gl_texture_cache.h"
+#include "mir/graphics/gl_texture.h"
+#include "mir/graphics/buffer_id.h"
+#include <unordered_map>
+
+namespace mir
+{
+namespace compositor 
+{
+class RecentlyUsedCache : public graphics::GLTextureCache
+{
+public:
+    std::shared_ptr<graphics::GLTexture> load(graphics::Renderable const& renderable) override;
+    void invalidate() override;
+    void drop_unused() override;
+
+private:
+    struct Entry
+    {
+        Entry()
+         : texture(std::make_shared<graphics::GLTexture>())
+        {}
+        std::shared_ptr<graphics::GLTexture> texture;
+        graphics::BufferID last_bound_buffer;
+        bool used{true};
+        std::shared_ptr<graphics::Buffer> resource;
+    };
+
+    std::unordered_map<graphics::Renderable::ID, Entry> textures;
+};
+}
+}
+
+#endif /* MIR_COMPOSITOR_RECENTLY_USED_CACHE_H_ */

=== modified file 'include/server/mir/compositor/renderer.h'
--- include/server/mir/compositor/renderer.h	2014-04-09 14:46:52 +0000
+++ include/server/mir/compositor/renderer.h	2014-06-05 12:56:04 +0000
@@ -20,14 +20,12 @@
 #define MIR_COMPOSITOR_RENDERER_H_
 
 #include "mir/geometry/rectangle.h"
+#include "mir/graphics/renderable.h"
 
 namespace mir
 {
-namespace graphics
-{
-class Buffer;
-class Renderable;
-}
+namespace graphics { class Buffer; }
+
 namespace compositor
 {
 
@@ -39,7 +37,7 @@
     virtual void set_viewport(geometry::Rectangle const& rect) = 0;
     virtual void set_rotation(float degrees) = 0;
     virtual void begin() const = 0;
-    virtual void render(graphics::Renderable const& renderable) const = 0;
+    virtual void render(graphics::RenderableList const&) const = 0;
     virtual void end() const = 0;
 
     virtual void suspend() = 0; // called when begin/render/end skipped

=== modified file 'include/server/mir/compositor/scene.h'
--- include/server/mir/compositor/scene.h	2014-04-15 05:31:19 +0000
+++ include/server/mir/compositor/scene.h	2014-06-05 12:56:04 +0000
@@ -27,6 +27,11 @@
 
 namespace mir
 {
+namespace scene
+{
+class Observer;
+}
+
 namespace compositor
 {
 
@@ -37,19 +42,20 @@
 
     /**
      * Generate a valid list of renderables based on the current state of the Scene.
-     * \returns a list of mg::Renderables. The list is in stacking order from back to front.
+     * \param [in] id      An arbitrary unique identifier used to distinguish
+     *                     separate compositors which need to receive a list
+     *                     for rendering. Calling with the same id will return
+     *                     a new (different) list to that user each time. For
+     *                     consistency, all callers need to determine their id
+     *                     in the same way (e.g. always use "this" pointer).
+     * \returns a list of mg::Renderables for the compositor id. The list is in
+     *          stacking order from back to front.
      */
-    virtual graphics::RenderableList generate_renderable_list() const = 0;
+    typedef void const* CompositorID;
+    virtual graphics::RenderableList renderable_list_for(CompositorID id) const = 0;
 
-    /**
-     * Sets a callback to be called whenever the state of the
-     * Scene changes.
-     *
-     * The supplied callback should not directly or indirectly (e.g.,
-     * by changing a property of a surface) change the state of
-     * the Scene, otherwise a deadlock may occur.
-     */
-    virtual void set_change_callback(std::function<void()> const& f) = 0;
+    virtual void add_observer(std::shared_ptr<scene::Observer> const& observer) = 0;
+    virtual void remove_observer(std::weak_ptr<scene::Observer> const& observer) = 0;
 
 protected:
     Scene() = default;

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2014-04-24 08:42:12 +0000
+++ include/server/mir/default_server_configuration.h	2014-06-05 12:56:04 +0000
@@ -24,8 +24,18 @@
 #include <memory>
 #include <string>
 
+namespace android
+{
+class InputDispatcherInterface;
+class InputDispatcherPolicyInterface;
+}
+
+namespace droidinput = android;
+
 namespace mir
 {
+class ServerActionQueue;
+
 namespace compositor
 {
 class Renderer;
@@ -43,7 +53,7 @@
 class Connector;
 class ConnectorReport;
 class ProtobufIpcFactory;
-class SessionCreator;
+class ConnectionCreator;
 class SessionMediatorReport;
 class MessageProcessorReport;
 class SessionAuthorizer;
@@ -75,13 +85,12 @@
 class SessionEventSink;
 class SessionEventHandlerRegister;
 class SessionListener;
-class SessionManager;
+class SessionCoordinator;
 class SnapshotStrategy;
 class SurfaceCoordinator;
 class SurfaceConfigurator;
 class SurfaceStackModel;
 class SurfaceStack;
-class InputRegistrar;
 class SceneReport;
 }
 namespace graphics
@@ -91,6 +100,9 @@
 class BufferInitializer;
 class DisplayReport;
 class GraphicBufferAllocator;
+class Cursor;
+class CursorImage;
+class CursorImages;
 class GLConfig;
 class GLProgramFactory;
 namespace nested { class HostConnection; }
@@ -98,6 +110,7 @@
 namespace input
 {
 class InputReport;
+class InputTargets;
 class InputManager;
 class CompositeEventFilter;
 class InputChannelFactory;
@@ -106,6 +119,11 @@
 class InputRegion;
 class NestedInputRelay;
 class EventHandler;
+namespace android
+{
+class InputRegistrar;
+class InputThread;
+}
 }
 
 namespace logging
@@ -142,6 +160,8 @@
     virtual std::shared_ptr<DisplayChanger>         the_display_changer();
     virtual std::shared_ptr<graphics::Platform>     the_graphics_platform();
     virtual std::shared_ptr<input::InputConfiguration> the_input_configuration();
+    virtual std::shared_ptr<input::InputDispatcher> the_input_dispatcher();
+    virtual std::shared_ptr<EmergencyCleanup>  the_emergency_cleanup();
     /** @} */
 
     /** @name graphics configuration - customization
@@ -151,7 +171,6 @@
     virtual std::shared_ptr<compositor::RendererFactory>   the_renderer_factory();
     virtual std::shared_ptr<graphics::DisplayConfigurationPolicy> the_display_configuration_policy();
     virtual std::shared_ptr<graphics::nested::HostConnection> the_host_connection();
-    virtual std::shared_ptr<input::EventFilter> the_nested_event_filter();
     virtual std::shared_ptr<graphics::GLConfig> the_gl_config();
     /** @} */
 
@@ -159,6 +178,10 @@
      * dependencies of graphics on the rest of the Mir
      *  @{ */
     virtual std::shared_ptr<graphics::DisplayReport> the_display_report();
+    virtual std::shared_ptr<graphics::Cursor> the_cursor();
+    virtual std::shared_ptr<graphics::CursorImage> the_default_cursor_image();
+    virtual std::shared_ptr<graphics::CursorImages> the_cursor_images();
+
     /** @} */
 
     /** @name compositor configuration - customization
@@ -181,6 +204,8 @@
     virtual std::shared_ptr<frontend::SessionMediatorReport>  the_session_mediator_report();
     virtual std::shared_ptr<frontend::MessageProcessorReport> the_message_processor_report();
     virtual std::shared_ptr<frontend::SessionAuthorizer>      the_session_authorizer();
+    // TODO clients should customize the_session_coordinator() instead of the_frontend_shell();
+    // TODO once the_session_coordinator() has landed and clients updated this should become non-virtual
     virtual std::shared_ptr<frontend::Shell>                  the_frontend_shell();
     virtual std::shared_ptr<frontend::EventSink>              the_global_event_sink();
     virtual std::shared_ptr<frontend::DisplayChanger>         the_frontend_display_changer();
@@ -188,11 +213,13 @@
     /** @name frontend configuration - internal dependencies
      * internal dependencies of frontend
      *  @{ */
-    virtual std::shared_ptr<frontend::SessionCreator>         the_session_creator();
+    virtual std::shared_ptr<frontend::ConnectionCreator>      the_connection_creator();
     virtual std::shared_ptr<frontend::ConnectorReport>        the_connector_report();
     /** @} */
     /** @} */
 
+    // TODO clients should customize the_session_coordinator() instead of the_focus_controller();
+    // TODO once the_session_coordinator() has landed and clients updated this should become non-virtual
     virtual std::shared_ptr<shell::FocusController> the_focus_controller();
 
     /** @name shell configuration - customization
@@ -224,6 +251,7 @@
      *  @{ */
     virtual std::shared_ptr<scene::BufferStreamFactory> the_buffer_stream_factory();
     virtual std::shared_ptr<scene::SceneReport>      the_scene_report();
+    virtual std::shared_ptr<scene::SessionCoordinator>  the_session_coordinator();
     /** @} */
 
 
@@ -231,8 +259,8 @@
      *  @{ */
     virtual std::shared_ptr<input::InputReport> the_input_report();
     virtual std::shared_ptr<input::CompositeEventFilter> the_composite_event_filter();
-    virtual std::shared_ptr<scene::InputRegistrar> the_input_registrar();
     virtual std::shared_ptr<shell::InputTargeter> the_input_targeter();
+    virtual std::shared_ptr<input::InputTargets>  the_input_targets();
     virtual std::shared_ptr<input::CursorListener> the_cursor_listener();
     virtual std::shared_ptr<input::InputRegion>    the_input_region();
     /** @} */
@@ -244,6 +272,7 @@
     /** @} */
 
     virtual std::shared_ptr<time::Clock> the_clock();
+    virtual std::shared_ptr<ServerActionQueue> the_server_action_queue();
 
 protected:
     std::shared_ptr<options::Option> the_options() const;
@@ -255,6 +284,29 @@
         std::shared_ptr<frontend::Shell> const& shell,
         std::shared_ptr<graphics::GraphicBufferAllocator> const& allocator);
 
+    /** @name input dispatcher related configuration
+     *  @{ */
+    virtual std::shared_ptr<input::android::InputRegistrar> the_input_registrar();
+    virtual std::shared_ptr<droidinput::InputDispatcherInterface> the_android_input_dispatcher();
+    virtual std::shared_ptr<input::android::InputThread> the_dispatcher_thread();
+    virtual std::shared_ptr<droidinput::InputDispatcherPolicyInterface> the_dispatcher_policy();
+    virtual bool is_key_repeat_enabled() const;
+    /** @} */
+
+    /** @Convenience wrapper functions
+     *  @{ */
+    virtual std::shared_ptr<scene::SurfaceCoordinator>  wrap_surface_coordinator(
+        std::shared_ptr<scene::SurfaceCoordinator> const& wrapped);
+
+    virtual std::shared_ptr<scene::SessionCoordinator>  wrap_session_coordinator(
+        std::shared_ptr<scene::SessionCoordinator> const& wrapped);
+/** @} */
+
+    CachedPtr<input::android::InputRegistrar> input_registrar;
+    CachedPtr<input::android::InputThread> dispatcher_thread;
+    CachedPtr<droidinput::InputDispatcherInterface> android_input_dispatcher;
+    CachedPtr<droidinput::InputDispatcherPolicyInterface> android_dispatcher_policy;
+
     CachedPtr<frontend::Connector>   connector;
 
     CachedPtr<input::InputConfiguration> input_configuration;
@@ -262,14 +314,17 @@
     CachedPtr<input::InputReport> input_report;
     CachedPtr<input::CompositeEventFilter> composite_event_filter;
     CachedPtr<input::InputManager>    input_manager;
+    CachedPtr<input::InputDispatcher> input_dispatcher;
     CachedPtr<input::InputRegion>     input_region;
-    CachedPtr<scene::InputRegistrar> input_registrar;
     CachedPtr<shell::InputTargeter> input_targeter;
     CachedPtr<input::CursorListener> cursor_listener;
     CachedPtr<graphics::Platform>     graphics_platform;
     CachedPtr<graphics::BufferInitializer> buffer_initializer;
     CachedPtr<graphics::GraphicBufferAllocator> buffer_allocator;
     CachedPtr<graphics::Display>      display;
+    CachedPtr<graphics::Cursor>       cursor;
+    CachedPtr<graphics::CursorImage>  default_cursor_image;
+    CachedPtr<graphics::CursorImages> cursor_images;
 
     CachedPtr<frontend::ConnectorReport>   connector_report;
     CachedPtr<frontend::ProtobufIpcFactory>  ipc_factory;
@@ -277,7 +332,7 @@
     CachedPtr<frontend::MessageProcessorReport> message_processor_report;
     CachedPtr<frontend::SessionAuthorizer> session_authorizer;
     CachedPtr<frontend::EventSink> global_event_sink;
-    CachedPtr<frontend::SessionCreator>    session_creator;
+    CachedPtr<frontend::ConnectionCreator> connection_creator;
     CachedPtr<frontend::Screencast> screencast;
     CachedPtr<compositor::RendererFactory> renderer_factory;
     CachedPtr<compositor::BufferStreamFactory> buffer_stream_factory;
@@ -307,6 +362,8 @@
     CachedPtr<scene::MediatingDisplayChanger> mediating_display_changer;
     CachedPtr<graphics::GLProgramFactory> gl_program_factory;
     CachedPtr<graphics::GLConfig> gl_config;
+    CachedPtr<scene::SessionCoordinator> session_coordinator;
+    CachedPtr<EmergencyCleanup> emergency_cleanup;
 
 private:
     std::shared_ptr<options::Configuration> const configuration_options;
@@ -317,12 +374,8 @@
     // The following caches and factory functions are internal to the
     // default implementations of corresponding the Mir components
     CachedPtr<scene::BroadcastingSessionEventSink> broadcasting_session_event_sink;
-    CachedPtr<input::NestedInputRelay> nested_input_relay;
-    CachedPtr<scene::SessionManager> session_manager;
 
     std::shared_ptr<scene::BroadcastingSessionEventSink> the_broadcasting_session_event_sink();
-    std::shared_ptr<input::NestedInputRelay>        the_nested_input_relay();
-    std::shared_ptr<scene::SessionManager>       the_session_manager();
 
     auto report_factory(char const* report_opt) -> std::unique_ptr<report::ReportFactory>;
 };

=== modified file 'include/server/mir/display_changer.h'
--- include/server/mir/display_changer.h	2013-08-13 13:54:24 +0000
+++ include/server/mir/display_changer.h	2014-06-05 12:56:04 +0000
@@ -39,6 +39,9 @@
         std::shared_ptr<graphics::DisplayConfiguration> const& conf,
         SystemStateHandling pause_resume_system) = 0;
 
+    virtual void pause_display_config_processing() = 0;
+    virtual void resume_display_config_processing() = 0;
+
 protected:
     DisplayChanger() = default;
     DisplayChanger(DisplayChanger const&) = delete;

=== added file 'include/server/mir/emergency_cleanup.h'
--- include/server/mir/emergency_cleanup.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/emergency_cleanup.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alexandros Frantzis <[e-mail]>
+ */
+
+#ifndef MIR_EMERGENCY_CLEANUP_H_
+#define MIR_EMERGENCY_CLEANUP_H_
+
+#include "mir/emergency_cleanup_registry.h"
+
+namespace mir
+{
+
+class EmergencyCleanup : public EmergencyCleanupRegistry
+{
+public:
+    virtual void operator()() const = 0;
+};
+
+}
+
+#endif /* MIR_EMERGENCY_CLEANUP_H_ */

=== added file 'include/server/mir/frontend/connection_context.h'
--- include/server/mir/frontend/connection_context.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/frontend/connection_context.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef MIR_FRONTEND_CONNECTION_CONTEXT_H_
+#define MIR_FRONTEND_CONNECTION_CONTEXT_H_
+
+#include <functional>
+#include <memory>
+
+namespace mir
+{
+namespace frontend
+{
+class Connector;
+class Session;
+
+class ConnectionContext
+{
+public:
+    ConnectionContext(Connector const* connector) :
+        ConnectionContext([](std::shared_ptr<Session> const&){}, connector) {}
+    ConnectionContext(
+        std::function<void(std::shared_ptr<Session> const& session)> const connect_handler,
+        Connector const* connector);
+
+    int fd_for_new_client(std::function<void(std::shared_ptr<Session> const& session)> const& connect_handler) const;
+
+    void handle_client_connect(std::shared_ptr<Session> const& session) const { connect_handler(session); }
+
+private:
+    std::function<void(std::shared_ptr<Session> const& session)> const connect_handler;
+    Connector const* const connector;
+};
+}
+}
+
+#endif /* MIR_FRONTEND_CONNECTION_CONTEXT_H_ */

=== renamed file 'include/server/mir/frontend/session_creator.h' => 'include/server/mir/frontend/connection_creator.h'
--- include/server/mir/frontend/session_creator.h	2013-09-24 09:41:04 +0000
+++ include/server/mir/frontend/connection_creator.h	2014-06-05 12:56:04 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-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,
@@ -16,8 +16,8 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#ifndef MIR_FRONTEND_SESSION_CREATOR_H_
-#define MIR_FRONTEND_SESSION_CREATOR_H_
+#ifndef MIR_FRONTEND_CONNECTION_CREATOR_H_
+#define MIR_FRONTEND_CONNECTION_CREATOR_H_
 
 #include <boost/asio.hpp>
 
@@ -27,18 +27,22 @@
 {
 namespace frontend
 {
-class SessionCreator
+class ConnectionContext;
+
+class ConnectionCreator
 {
 public:
-    virtual void create_session_for(std::shared_ptr<boost::asio::local::stream_protocol::socket> const& socket) = 0;
+    virtual void create_connection_for(
+        std::shared_ptr<boost::asio::local::stream_protocol::socket> const& socket,
+        ConnectionContext const& connection_context) = 0;
 
 protected:
-    SessionCreator() = default;
-    virtual ~SessionCreator() noexcept = default;
-    SessionCreator(SessionCreator const&) = delete;
-    SessionCreator& operator=(SessionCreator const&) = delete;
+    ConnectionCreator() = default;
+    virtual ~ConnectionCreator() noexcept = default;
+    ConnectionCreator(ConnectionCreator const&) = delete;
+    ConnectionCreator& operator=(ConnectionCreator const&) = delete;
 };
 }
 }
 
-#endif /* MIR_FRONTEND_SESSION_CREATOR_H_ */
+#endif /* MIR_FRONTEND_CONNECTION_CREATOR_H_ */

=== renamed file 'include/server/mir/frontend/connected_sessions.h' => 'include/server/mir/frontend/connections.h'
--- include/server/mir/frontend/connected_sessions.h	2014-03-06 06:05:17 +0000
+++ include/server/mir/frontend/connections.h	2014-06-05 12:56:04 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 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,
@@ -16,8 +16,8 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#ifndef MIR_FRONTEND_CONNECTED_SESSIONS_H_
-#define MIR_FRONTEND_CONNECTED_SESSIONS_H_
+#ifndef MIR_FRONTEND_CONNECTIONS_H_
+#define MIR_FRONTEND_CONNECTIONS_H_
 
 #include <memory>
 #include <mutex>
@@ -29,47 +29,47 @@
 {
 namespace detail
 {
-template<class Session>
-class ConnectedSessions
+template<class Connection>
+class Connections
 {
 public:
-    ConnectedSessions() {}
-    ~ConnectedSessions() { clear(); }
+    Connections() {}
+    ~Connections() { clear(); }
 
-    void add(std::shared_ptr<Session> const& session)
+    void add(std::shared_ptr<Connection> const& connection)
     {
         std::unique_lock<std::mutex> lock(mutex);
-        shell_list[session->id()] = session;
+        connections[connection->id()] = connection;
     }
 
     void remove(int id)
     {
         std::unique_lock<std::mutex> lock(mutex);
-        shell_list.erase(id);
+        connections.erase(id);
     }
 
     bool includes(int id) const
     {
         std::unique_lock<std::mutex> lock(mutex);
-        return shell_list.find(id) != shell_list.end();
+        return connections.find(id) != connections.end();
     }
 
     void clear()
     {
         std::unique_lock<std::mutex> lock(mutex);
-        shell_list.clear();
+        connections.clear();
     }
 
 
 private:
-    ConnectedSessions(ConnectedSessions const&) = delete;
-    ConnectedSessions& operator =(ConnectedSessions const&) = delete;
+    Connections(Connections const&) = delete;
+    Connections& operator =(Connections const&) = delete;
 
     std::mutex mutex;
-    std::map<int, std::shared_ptr<Session>> shell_list;
+    std::map<int, std::shared_ptr<Connection>> connections;
 };
 }
 }
 }
 
-#endif // MIR_FRONTEND_CONNECTED_SESSIONS_H_
+#endif // MIR_FRONTEND_CONNECTIONS_H_

=== modified file 'include/server/mir/frontend/connector.h'
--- include/server/mir/frontend/connector.h	2013-10-15 08:53:10 +0000
+++ include/server/mir/frontend/connector.h	2014-06-05 12:56:04 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 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,
@@ -19,10 +19,15 @@
 #ifndef MIR_FRONTEND_CONNECTOR_H_
 #define MIR_FRONTEND_CONNECTOR_H_
 
+#include <functional>
+#include <memory>
+
 namespace mir
 {
 namespace frontend
 {
+class Session;
+
 /// Handle client process connections
 class Connector
 {
@@ -31,7 +36,8 @@
     virtual void stop() = 0;
 
     virtual int client_socket_fd() const = 0;
-    virtual void remove_endpoint() const = 0;
+
+    virtual int client_socket_fd(std::function<void(std::shared_ptr<Session> const& session)> const& connect_handler) const = 0;
 
 protected:
     Connector() = default;

=== modified file 'include/server/mir/frontend/message_processor.h'
--- include/server/mir/frontend/message_processor.h	2014-03-06 06:05:17 +0000
+++ include/server/mir/frontend/message_processor.h	2014-06-05 12:56:04 +0000
@@ -51,6 +51,7 @@
 {
 public:
     virtual bool dispatch(Invocation const& invocation) = 0;
+    virtual void client_pid(int pid) = 0;
 
 protected:
     MessageProcessor() = default;

=== renamed file 'include/server/mir/frontend/protobuf_session_creator.h' => 'include/server/mir/frontend/protobuf_connection_creator.h'
--- include/server/mir/frontend/protobuf_session_creator.h	2014-03-06 06:05:17 +0000
+++ include/server/mir/frontend/protobuf_connection_creator.h	2014-06-05 12:56:04 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-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,
@@ -16,17 +16,16 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#ifndef MIR_FRONTEND_PROTOBUF_SESSION_CREATOR_H_
-#define MIR_FRONTEND_PROTOBUF_SESSION_CREATOR_H_
+#ifndef MIR_FRONTEND_PROTOBUF_CONNECTION_CREATOR_H_
+#define MIR_FRONTEND_PROTOBUF_CONNECTION_CREATOR_H_
 
-#include "mir/frontend/session_creator.h"
-#include "mir/frontend/connected_sessions.h"
+#include "mir/frontend/connection_creator.h"
+#include "mir/frontend/connections.h"
 
 #include <atomic>
 
 namespace mir
 {
-namespace protobuf { class DisplayServer; }
 namespace frontend
 {
 class MessageProcessorReport;
@@ -35,25 +34,28 @@
 
 namespace detail
 {
-struct SocketSession;
+class DisplayServer;
+class SocketConnection;
 class MessageProcessor;
 class ProtobufMessageSender;
 }
 
-class ProtobufSessionCreator : public SessionCreator
+class ProtobufConnectionCreator : public ConnectionCreator
 {
 public:
-    ProtobufSessionCreator(
+    ProtobufConnectionCreator(
         std::shared_ptr<ProtobufIpcFactory> const& ipc_factory,
         std::shared_ptr<SessionAuthorizer> const& session_authorizer,
         std::shared_ptr<MessageProcessorReport> const& report);
-    ~ProtobufSessionCreator() noexcept;
+    ~ProtobufConnectionCreator() noexcept;
 
-    void create_session_for(std::shared_ptr<boost::asio::local::stream_protocol::socket> const& socket);
+    void create_connection_for(
+        std::shared_ptr<boost::asio::local::stream_protocol::socket> const& socket,
+        ConnectionContext const& connection_context) override;
 
     virtual std::shared_ptr<detail::MessageProcessor> create_processor(
         std::shared_ptr<detail::ProtobufMessageSender> const& sender,
-        std::shared_ptr<protobuf::DisplayServer> const& display_server,
+        std::shared_ptr<detail::DisplayServer> const& display_server,
         std::shared_ptr<MessageProcessorReport> const& report) const;
 
 private:
@@ -63,9 +65,9 @@
     std::shared_ptr<SessionAuthorizer> const session_authorizer;
     std::shared_ptr<MessageProcessorReport> const report;
     std::atomic<int> next_session_id;
-    std::shared_ptr<detail::ConnectedSessions<detail::SocketSession>> const connected_sessions;
+    std::shared_ptr<detail::Connections<detail::SocketConnection>> const connections;
 };
 }
 }
 
-#endif /* MIR_FRONTEND_PROTOBUF_SESSION_CREATOR_H_ */
+#endif /* MIR_FRONTEND_PROTOBUF_CONNECTION_CREATOR_H_ */

=== modified file 'include/server/mir/frontend/session.h'
--- include/server/mir/frontend/session.h	2014-04-15 05:31:19 +0000
+++ include/server/mir/frontend/session.h	2014-06-05 12:56:04 +0000
@@ -22,8 +22,6 @@
 #include "mir_toolkit/common.h"
 #include "mir/frontend/surface_id.h"
 
-#include <mutex>
-#include <atomic>
 #include <memory>
 #include <string>
 
@@ -46,7 +44,7 @@
 class Session
 {
 public:
-    virtual ~Session() {}
+    virtual ~Session() = default;
 
     virtual SurfaceId create_surface(scene::SurfaceCreationParameters const& params) = 0;
     virtual void destroy_surface(SurfaceId surface) = 0;

=== modified file 'include/server/mir/frontend/session_authorizer.h'
--- include/server/mir/frontend/session_authorizer.h	2014-03-26 05:48:59 +0000
+++ include/server/mir/frontend/session_authorizer.h	2014-06-05 12:56:04 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-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,
@@ -19,21 +19,23 @@
 #ifndef MIR_FRONTEND_SESSION_AUTHORIZER_H_
 #define MIR_FRONTEND_SESSION_AUTHORIZER_H_
 
-#include <sys/types.h>
+
 
 namespace mir
 {
 namespace frontend
 {
 
+class SessionCredentials;
+
 class SessionAuthorizer
 {
 public:
     virtual ~SessionAuthorizer() = default;
 
-    virtual bool connection_is_allowed(pid_t pid) = 0;
-    virtual bool configure_display_is_allowed(pid_t pid) = 0;
-    virtual bool screencast_is_allowed(pid_t pid) = 0;
+    virtual bool connection_is_allowed(SessionCredentials const& creds) = 0;
+    virtual bool configure_display_is_allowed(SessionCredentials const& creds) = 0;
+    virtual bool screencast_is_allowed(SessionCredentials const& creds) = 0;
 
 protected:
     SessionAuthorizer() = default;

=== added file 'include/server/mir/frontend/session_credentials.h'
--- include/server/mir/frontend/session_credentials.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/frontend/session_credentials.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as 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/>.
+ *
+ */
+
+#ifndef MIR_FRONTEND_SESSION_CREDENTIALS_ID_H_
+#define MIR_FRONTEND_SESSION_CREDENTIALS_ID_H_
+
+#include <sys/types.h>
+
+namespace mir
+{
+namespace frontend
+{
+class SessionCredentials
+{
+public:
+    SessionCredentials(pid_t pid, uid_t uid, gid_t gid);
+
+    pid_t pid() const;
+    uid_t uid() const;
+    gid_t gid() const;
+
+private:
+    SessionCredentials() = delete;
+
+    pid_t the_pid;
+    uid_t the_uid;
+    gid_t the_gid;
+};
+}
+}
+
+#endif

=== modified file 'include/server/mir/frontend/surface.h'
--- include/server/mir/frontend/surface.h	2014-04-15 05:31:19 +0000
+++ include/server/mir/frontend/surface.h	2014-06-05 12:56:04 +0000
@@ -51,7 +51,8 @@
 
     virtual ~Surface() {}
 
-    virtual geometry::Size size() const = 0;
+    /// Size of the client area of the surface (excluding any decorations)
+    virtual geometry::Size client_size() const = 0;
     virtual MirPixelFormat pixel_format() const = 0;
 
     virtual void swap_buffers(graphics::Buffer* old_buffer, std::function<void(graphics::Buffer* new_buffer)> complete) = 0;

=== modified file 'include/server/mir/frontend/template_protobuf_message_processor.h'
--- include/server/mir/frontend/template_protobuf_message_processor.h	2014-03-06 06:05:17 +0000
+++ include/server/mir/frontend/template_protobuf_message_processor.h	2014-06-05 12:56:04 +0000
@@ -43,11 +43,11 @@
 
 // Boiler plate for unpacking a parameter message, invoking a server function, and
 // sending the result message. Assumes the existence of Self::send_response().
-template<class Self, class Server, class ParameterMessage, class ResultMessage>
+template<class Self, class Server, class ServerX, class ParameterMessage, class ResultMessage>
 void invoke(
     Self* self,
     Server* server,
-    void (Server::*function)(
+    void (ServerX::*function)(
         ::google::protobuf::RpcController* controller,
         const ParameterMessage* request,
         ResultMessage* response,

=== added file 'include/server/mir/graphics/cursor_images.h'
--- include/server/mir/graphics/cursor_images.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/graphics/cursor_images.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+
+#ifndef MIR_GRAPHICS_CURSOR_LOADER_H_
+#define MIR_GRAPHICS_CURSOR_LOADER_H_
+
+#include "mir/geometry/size.h"
+
+#include <memory>
+#include <string>
+
+namespace mir
+{
+namespace graphics
+{
+class CursorImage;
+
+/// CursorImages is used to lookup cursor images.
+class CursorImages
+{
+public:
+    virtual ~CursorImages() = default;
+
+    /// Looks up the image for a named cursor. Cursor names
+    /// follow the XCursor naming conventions.
+    virtual std::shared_ptr<CursorImage> image(std::string const& cursor_name,
+        geometry::Size const& size) = 0;
+
+protected:
+    CursorImages() = default;
+    CursorImages(CursorImages const&) = delete;
+    CursorImages& operator=(CursorImages const&) = delete;
+};
+}
+}
+
+#endif /* MIR_GRAPHICS_CURSOR_LOADER_H_ */

=== modified file 'include/server/mir/input/android/default_android_input_configuration.h'
--- include/server/mir/input/android/default_android_input_configuration.h	2013-09-10 16:42:04 +0000
+++ include/server/mir/input/android/default_android_input_configuration.h	2014-06-05 12:56:04 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-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,
@@ -14,47 +14,72 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Robert Carr <[e-mail]>
+ *              Andreas Pokorny <[e-mail]>
  */
 
 #ifndef MIR_INPUT_ANDROID_DEFAULT_ANDROID_INPUT_CONFIGURATION_H_
 #define MIR_INPUT_ANDROID_DEFAULT_ANDROID_INPUT_CONFIGURATION_H_
 
-#include "mir/input/android/dispatcher_input_configuration.h"
+#include "mir/input/input_configuration.h"
+
+#include "mir/cached_ptr.h"
+
+namespace android
+{
+class InputReaderInterface;
+class InputReaderPolicyInterface;
+class InputListenerInterface;
+class EventHubInterface;
+}
+
+namespace droidinput = android;
 
 namespace mir
 {
 namespace input
 {
+class InputRegion;
+class CursorListener;
+class InputReport;
+class InputDispatcher;
+
 namespace android
 {
-class DefaultInputConfiguration : public DispatcherInputConfiguration
+class InputThread;
+
+class DefaultInputConfiguration : public mir::input::InputConfiguration
 {
 public:
-    DefaultInputConfiguration(std::shared_ptr<EventFilter> const& event_filter,
+    DefaultInputConfiguration(std::shared_ptr<input::InputDispatcher> const& dispatcher,
                               std::shared_ptr<input::InputRegion> const& input_region,
                               std::shared_ptr<CursorListener> const& cursor_listener,
                               std::shared_ptr<input::InputReport> const& input_report);
     virtual ~DefaultInputConfiguration();
 
-    std::shared_ptr<input::InputManager> the_input_manager();
+    std::shared_ptr<input::InputChannelFactory> the_input_channel_factory() override;
+    std::shared_ptr<input::InputManager> the_input_manager() override;
 
 protected:
-    virtual droidinput::sp<droidinput::EventHubInterface> the_event_hub();
-    virtual droidinput::sp<droidinput::InputReaderInterface> the_reader();
+    virtual std::shared_ptr<droidinput::EventHubInterface> the_event_hub();
+    virtual std::shared_ptr<droidinput::InputReaderInterface> the_reader();
+    virtual std::shared_ptr<droidinput::InputListenerInterface> the_input_translator();
 
     virtual std::shared_ptr<InputThread> the_reader_thread();
 
-    virtual droidinput::sp<droidinput::InputReaderPolicyInterface> the_reader_policy();
+    virtual std::shared_ptr<droidinput::InputReaderPolicyInterface> the_reader_policy();
 
 private:
-    droidinput::sp<droidinput::InputDispatcherInterface> the_dispatcher() override;
-
+    CachedPtr<input::InputManager> input_manager;
     CachedPtr<InputThread> reader_thread;
 
-    CachedAndroidPtr<droidinput::EventHubInterface> event_hub;
-    CachedAndroidPtr<droidinput::InputReaderPolicyInterface> reader_policy;
-    CachedAndroidPtr<droidinput::InputReaderInterface> reader;
-    CachedAndroidPtr<droidinput::InputDispatcherInterface> dispatcher;
+    CachedPtr<droidinput::EventHubInterface> event_hub;
+    CachedPtr<droidinput::InputReaderPolicyInterface> reader_policy;
+    CachedPtr<droidinput::InputReaderInterface> reader;
+
+    std::shared_ptr<input::InputDispatcher> const input_dispatcher;
+    std::shared_ptr<input::InputRegion> const input_region;
+    std::shared_ptr<CursorListener> const cursor_listener;
+    std::shared_ptr<input::InputReport> const input_report;
 };
 }
 }

=== removed file 'include/server/mir/input/android/dispatcher_input_configuration.h'
--- include/server/mir/input/android/dispatcher_input_configuration.h	2014-03-06 06:05:17 +0000
+++ include/server/mir/input/android/dispatcher_input_configuration.h	1970-01-01 00:00:00 +0000
@@ -1,129 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alan Griffiths <[e-mail]>
- */
-
-
-#ifndef MIR_INPUT_ANDROID_DISPATCHER_INPUT_CONFIGURATION_H_
-#define MIR_INPUT_ANDROID_DISPATCHER_INPUT_CONFIGURATION_H_
-
-#include "mir/input/input_configuration.h"
-
-#include "mir/cached_ptr.h"
-
-#include <utils/RefBase.h>
-#include <utils/StrongPointer.h>
-
-#include <functional>
-
-namespace droidinput = android;
-
-namespace android
-{
-class InputReaderInterface;
-class InputReaderPolicyInterface;
-class InputDispatcherPolicyInterface;
-class InputDispatcherInterface;
-class EventHubInterface;
-}
-
-namespace mir
-{
-namespace shell
-{
-class InputTargeter;
-}
-namespace input
-{
-class EventFilter;
-class CursorListener;
-class InputReport;
-class InputRegion;
-
-namespace android
-{
-class InputRegistrar;
-class WindowHandleRepository;
-class InputThread;
-
-template <typename Type>
-class CachedAndroidPtr
-{
-    droidinput::wp<Type> cache;
-
-    CachedAndroidPtr(CachedAndroidPtr const&) = delete;
-    CachedAndroidPtr& operator=(CachedAndroidPtr const&) = delete;
-
-public:
-    CachedAndroidPtr() = default;
-
-    droidinput::sp<Type> operator()(std::function<droidinput::sp<Type>()> make)
-    {
-        auto result = cache.promote();
-        if (!result.get())
-        {
-            cache = result = make();
-        }
-        return result;
-    }
-};
-
-class DispatcherInputConfiguration : public input::InputConfiguration
-{
-public:
-    DispatcherInputConfiguration(std::shared_ptr<EventFilter> const& event_filter,
-                              std::shared_ptr<input::InputRegion> const& input_region,
-                              std::shared_ptr<CursorListener> const& cursor_listener,
-                              std::shared_ptr<input::InputReport> const& input_report);
-    virtual ~DispatcherInputConfiguration();
-
-    std::shared_ptr<scene::InputRegistrar> the_input_registrar();
-    std::shared_ptr<shell::InputTargeter> the_input_targeter();
-    std::shared_ptr<input::InputManager> the_input_manager();
-
-    void set_input_targets(std::shared_ptr<input::InputTargets> const& targets);
-
-    virtual bool is_key_repeat_enabled();
-
-protected:
-    virtual droidinput::sp<droidinput::InputDispatcherInterface> the_dispatcher() = 0;
-
-    virtual std::shared_ptr<InputThread> the_dispatcher_thread();
-
-    virtual droidinput::sp<droidinput::InputDispatcherPolicyInterface> the_dispatcher_policy();
-
-    std::shared_ptr<WindowHandleRepository> the_window_handle_repository();
-
-    std::shared_ptr<EventFilter> const event_filter;
-    std::shared_ptr<input::InputRegion> const input_region;
-    std::shared_ptr<CursorListener> const cursor_listener;
-    std::shared_ptr<input::InputReport> const input_report;
-
-    CachedPtr<input::InputManager> input_manager;
-
-private:
-    CachedPtr<InputThread> dispatcher_thread;
-    CachedPtr<InputRegistrar> input_registrar;
-
-    CachedPtr<shell::InputTargeter> input_targeter;
-
-    CachedAndroidPtr<droidinput::InputDispatcherPolicyInterface> dispatcher_policy;
-};
-}
-}
-} // namespace mir
-
-#endif /* MIR_INPUT_ANDROID_DISPATCHER_INPUT_CONFIGURATION_H_ */

=== added file 'include/server/mir/input/input_configuration.h'
--- include/server/mir/input/input_configuration.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/input/input_configuration.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_INPUT_CONFIGURATION_H_
+#define MIR_INPUT_INPUT_CONFIGURATION_H_
+
+#include <memory>
+
+namespace mir
+{
+namespace input
+{
+class InputManager;
+class InputChannelFactory;
+
+class InputConfiguration
+{
+public:
+    virtual ~InputConfiguration() = default;
+
+    virtual std::shared_ptr<InputChannelFactory> the_input_channel_factory() = 0;
+    virtual std::shared_ptr<InputManager> the_input_manager() = 0;
+
+protected:
+    InputConfiguration() = default;
+    InputConfiguration(InputConfiguration const&) = delete;
+    InputConfiguration& operator=(InputConfiguration const&) = delete;
+};
+
+}
+}
+
+#endif

=== removed file 'include/server/mir/input/input_configuration.h'
--- include/server/mir/input/input_configuration.h	2014-03-06 06:05:17 +0000
+++ include/server/mir/input/input_configuration.h	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef MIR_INPUT_INPUT_CONFIGURATION_H_
-#define MIR_INPUT_INPUT_CONFIGURATION_H_
-
-#include <memory>
-
-namespace mir
-{
-namespace scene
-{
-class InputRegistrar;
-}
-namespace shell
-{
-class InputTargeter;
-}
-namespace input
-{
-class InputTargets;
-class InputManager;
-
-class InputConfiguration
-{
-public:
-    virtual ~InputConfiguration() {}
-
-    virtual std::shared_ptr<scene::InputRegistrar> the_input_registrar() = 0;
-    virtual std::shared_ptr<shell::InputTargeter> the_input_targeter() = 0;
-    virtual std::shared_ptr<input::InputManager> the_input_manager() = 0;
-
-    virtual void set_input_targets(std::shared_ptr<input::InputTargets> const& targets) = 0;
-
-protected:
-    InputConfiguration() = default;
-    InputConfiguration(InputConfiguration const&) = delete;
-    InputConfiguration& operator=(InputConfiguration const&) = delete;
-};
-}
-} // namespace mir
-
-#endif // MIR_INPUT_INPUT_CONFIGURATION_H_

=== added file 'include/server/mir/input/input_dispatcher.h'
--- include/server/mir/input/input_dispatcher.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/input/input_dispatcher.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_INPUT_DISPATCHER_H
+#define MIR_INPUT_INPUT_DISPATCHER_H
+
+#include "mir_toolkit/event.h"
+
+namespace mir
+{
+namespace input
+{
+
+/*!
+ * \brief The InputDispatchers role is to decide what should happen with user input events.
+ *
+ * It will receive MirEvents with either MirMotionEvent or MirKeyEvent inside. The InputDispatcher
+ * implementation shall either handle the input without informing any clients or pick a client
+ * surface and send the event to it.
+ */
+class InputDispatcher
+{
+public:
+    /*!
+     * \brief Called when the device configuration changed.
+     */
+    virtual void configuration_changed(nsecs_t when) = 0;
+    /*!
+     * \brief Called when the device \a device_id was added removed or was reset
+     */
+    virtual void device_reset(int32_t device_id, nsecs_t when) = 0;
+    virtual void dispatch(MirEvent const& event) = 0;
+    virtual void start() = 0;
+    virtual void stop() = 0;
+
+    virtual ~InputDispatcher() = default;
+};
+
+}
+}
+
+#endif
+

=== modified file 'include/server/mir/input/input_manager.h'
--- include/server/mir/input/input_manager.h	2013-08-28 03:41:48 +0000
+++ include/server/mir/input/input_manager.h	2014-06-05 12:56:04 +0000
@@ -15,29 +15,23 @@
  *
  * Authored by: Robert Carr <[e-mail]>
  *              Daniel d'Andradra <[e-mail]>
+ *              Andreas Pokorny <[e-mail]>
  */
 
 #ifndef MIR_INPUT_INPUT_MANAGER_H_
 #define MIR_INPUT_INPUT_MANAGER_H_
 
-#include "mir/input/input_channel_factory.h"
-
-#include <memory>
-
 namespace mir
 {
 namespace input
 {
-class InputChannel;
 
-class InputManager : public InputChannelFactory
+class InputManager
 {
 public:
     virtual void start() = 0;
     virtual void stop() = 0;
 
-    virtual std::shared_ptr<InputChannel> make_input_channel() = 0;
-
 protected:
     InputManager() {};
     virtual ~InputManager() {}

=== modified file 'include/server/mir/input/surface.h'
--- include/server/mir/input/surface.h	2014-04-24 08:42:12 +0000
+++ include/server/mir/input/surface.h	2014-06-05 12:56:04 +0000
@@ -19,8 +19,9 @@
 #ifndef MIR_INPUT_SURFACE_H_
 #define MIR_INPUT_SURFACE_H_
 
-#include "mir/geometry/size.h"
 #include "mir/geometry/point.h"
+#include "mir/geometry/rectangle.h"
+#include "mir/input/input_reception_mode.h"
 
 #include <string>
 #include <memory>
@@ -35,11 +36,10 @@
 {
 public:
     virtual std::string name() const = 0;
-    virtual geometry::Point top_left() const = 0;
-    virtual geometry::Size size() const = 0;
-    virtual bool contains(geometry::Point const& point) const = 0;
-
+    virtual geometry::Rectangle input_bounds() const = 0;
+    virtual bool input_area_contains(geometry::Point const& point) const = 0;
     virtual std::shared_ptr<input::InputChannel> input_channel() const = 0;
+    virtual InputReceptionMode reception_mode() const = 0;
 
 protected:
     Surface() = default;

=== modified file 'include/server/mir/main_loop.h'
--- include/server/mir/main_loop.h	2013-08-28 03:41:48 +0000
+++ include/server/mir/main_loop.h	2014-06-05 12:56:04 +0000
@@ -20,11 +20,14 @@
 #define MIR_MAIN_LOOP_H_
 
 #include "mir/graphics/event_handler_register.h"
+#include "mir/time/timer.h"
+#include "mir/server_action_queue.h"
 
 namespace mir
 {
 
-class MainLoop : public graphics::EventHandlerRegister
+class MainLoop : public graphics::EventHandlerRegister, public time::Timer,
+                 public ServerActionQueue
 {
 public:
     virtual void run() = 0;

=== modified file 'include/server/mir/run_mir.h'
--- include/server/mir/run_mir.h	2013-04-25 16:52:27 +0000
+++ include/server/mir/run_mir.h	2014-06-05 12:56:04 +0000
@@ -39,6 +39,8 @@
     std::function<void(DisplayServer&)> init);
 
 void report_exception(std::ostream& out);
+
+void terminate_with_current_exception();
 }
 
 

=== removed file 'include/server/mir/scene/input_registrar.h'
--- include/server/mir/scene/input_registrar.h	2014-03-06 06:05:17 +0000
+++ include/server/mir/scene/input_registrar.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef MIR_SCENE_INPUT_REGISTRAR_H_
-#define MIR_SCENE_INPUT_REGISTRAR_H_
-
-#include "mir/input/input_reception_mode.h"
-
-#include <memory>
-
-namespace mir
-{
-namespace input
-{
-class SessionTarget;
-class InputChannel;
-class Surface;
-}
-
-namespace scene
-{
-
-/// An interface used to register input targets and take care of input assosciation (i.e.
-/// create input channels).
-class InputRegistrar
-{
-public:
-    virtual ~InputRegistrar() = default;
-
-    virtual void input_channel_opened(std::shared_ptr<input::InputChannel> const& opened_channel,
-                                      std::shared_ptr<input::Surface> const& info,
-                                      input::InputReceptionMode input_mode) = 0;
-    virtual void input_channel_closed(std::shared_ptr<input::InputChannel> const& closed_channel) = 0;
-
-protected:
-    InputRegistrar() = default;
-    InputRegistrar(InputRegistrar const&) = delete;
-    InputRegistrar& operator=(InputRegistrar const&) = delete;
-};
-
-}
-} // namespace mir
-
-#endif // MIR_SCENE_INPUT_REGISTRAR_H_

=== added file 'include/server/mir/scene/legacy_scene_change_notification.h'
--- include/server/mir/scene/legacy_scene_change_notification.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/scene/legacy_scene_change_notification.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+#ifndef MIR_SCENE_SIMPLE_OBSERVER_H_
+#define MIR_SCENE_SIMPLE_OBSERVER_H_
+
+#include "mir/scene/observer.h"
+
+#include <functional>
+#include <map>
+#include <mutex>
+
+namespace mir
+{
+namespace scene
+{
+class SurfaceObserver;
+
+// A simple implementation of surface observer which forwards all changes to a provided callback.
+// Also installs surface observers on each added surface which in turn forward each change to 
+// said callback.
+class LegacySceneChangeNotification : public Observer
+{
+public:
+    LegacySceneChangeNotification(
+        std::function<void()> const& scene_notify_change,
+        std::function<void(int)> const& buffer_notify_change);
+    ~LegacySceneChangeNotification();
+
+    void surface_added(Surface* surface) override;
+    void surface_removed(Surface* surface) override;
+    void surfaces_reordered() override;
+
+    void surface_exists(Surface* surface) override;
+    void end_observation() override;
+
+private:
+    std::function<void()> const scene_notify_change;
+    std::function<void(int)> const buffer_notify_change;
+    
+    std::mutex surface_observers_guard;
+    std::map<Surface*, std::weak_ptr<SurfaceObserver>> surface_observers;
+    
+    void add_surface_observer(Surface* surface);
+};
+
+}
+} // namespace mir
+
+#endif // MIR_SCENE_SIMPLE_OBSERVER_H_

=== added file 'include/server/mir/scene/null_observer.h'
--- include/server/mir/scene/null_observer.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/scene/null_observer.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+#ifndef MIR_SCENE_NULL_OBSERVER_H_
+#define MIR_SCENE_NULL_OBSERVER_H_
+
+#include "mir/scene/observer.h"
+
+namespace mir
+{
+namespace scene
+{
+class NullObserver : public Observer
+{
+public:
+    NullObserver() = default;
+    virtual ~NullObserver() = default;
+
+    void surface_added(Surface* surface);
+    void surface_removed(Surface* surface);
+    void surfaces_reordered();
+
+    // Called at observer registration to notify of already existing surfaces.
+    void surface_exists(Surface* surface);
+    // Called when observer is unregistered, for example, to provide a place to
+    // unregister SurfaceObservers which may have been added in surface_added/exists
+    void end_observation();
+
+protected:
+    NullObserver(NullObserver const&) = delete;
+    NullObserver& operator=(NullObserver const&) = delete;
+};
+}
+} // namespace mir
+
+#endif // MIR_SCENE_NULL_OBSERVER_H_

=== added file 'include/server/mir/scene/null_surface_observer.h'
--- include/server/mir/scene/null_surface_observer.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/scene/null_surface_observer.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+#ifndef MIR_SCENE_NULL_SURFACE_OBSERVER_H_
+#define MIR_SCENE_NULL_SURFACE_OBSERVER_H_
+
+#include "mir/scene/surface_observer.h"
+
+namespace mir
+{
+namespace scene
+{
+class NullSurfaceObserver : public SurfaceObserver
+{
+public:
+    NullSurfaceObserver() = default;
+    virtual ~NullSurfaceObserver() = default;
+
+    void attrib_changed(MirSurfaceAttrib attrib, int value);
+    void resized_to(geometry::Size const& size);
+    void moved_to(geometry::Point const& top_left);
+    void hidden_set_to(bool hide);
+    void frame_posted(int frames_available);
+    void alpha_set_to(float alpha);
+    void transformation_set_to(glm::mat4 const& t);
+    void reception_mode_set_to(input::InputReceptionMode mode);
+
+protected:
+    NullSurfaceObserver(NullSurfaceObserver const&) = delete;
+    NullSurfaceObserver& operator=(NullSurfaceObserver const&) = delete;
+};
+}
+}
+
+#endif // MIR_SCENE_NULL_SURFACE_OBSERVER_H_

=== added file 'include/server/mir/scene/observer.h'
--- include/server/mir/scene/observer.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/scene/observer.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+#ifndef MIR_SCENE_OBSERVER_H_
+#define MIR_SCENE_OBSERVER_H_
+
+#include <memory>
+
+namespace mir
+{
+namespace scene
+{
+class Surface;
+
+/// An observer for top level notifications of scene changes. In order
+/// to receive more granular change notifications a user may install
+/// mir::scene::SurfaceObserver in surface_added.
+class Observer
+{
+public:
+    virtual void surface_added(Surface* surface) = 0;
+    virtual void surface_removed(Surface* surface) = 0;
+    virtual void surfaces_reordered() = 0;
+
+    // Called at observer registration to notify of already existing surfaces.
+    virtual void surface_exists(Surface* surface) = 0;
+    // Called when observer is unregistered, for example, to provide a place to
+    // unregister SurfaceObservers which may have been added in surface_added/exists
+    virtual void end_observation() = 0;
+
+protected:
+    Observer() = default;
+    virtual ~Observer() = default;
+    Observer(Observer const&) = delete;
+    Observer& operator=(Observer const&) = delete;
+};
+
+}
+} // namespace mir
+
+#endif // MIR_SCENE_OBSERVER_H_

=== added file 'include/server/mir/scene/session_coordinator.h'
--- include/server/mir/scene/session_coordinator.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/scene/session_coordinator.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored By: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef MIR_SCENE_SESSION_COORDINATOR_H_
+#define MIR_SCENE_SESSION_COORDINATOR_H_
+
+
+#include "mir/frontend/shell.h"
+#include "mir/shell/focus_controller.h"
+
+namespace mir
+{
+namespace scene
+{
+
+class SessionCoordinator : public frontend::Shell, public shell::FocusController
+{
+};
+
+}
+}
+
+#endif /* MIR_SCENE_SESSION_COORDINATOR_H_ */

=== modified file 'include/server/mir/scene/surface.h'
--- include/server/mir/scene/surface.h	2014-04-24 08:42:12 +0000
+++ include/server/mir/scene/surface.h	2014-06-05 12:56:04 +0000
@@ -37,19 +37,27 @@
 class SurfaceObserver;
 
 class Surface :
-    public graphics::Renderable,
     public input::Surface,
     public frontend::Surface,
     public SurfaceBufferAccess
 {
 public:
     // resolve ambiguous member function names
+
     std::string name() const override = 0;
-    geometry::Size size() const override = 0;
-    geometry::Point top_left() const override = 0;
-    float alpha() const override = 0;
+    geometry::Size client_size() const override = 0;
+    geometry::Rectangle input_bounds() const override = 0;
 
     // member functions that don't exist in base classes
+
+    /// Top-left corner (of the window frame if present)
+    virtual geometry::Point top_left() const = 0;
+    /// Size of the surface including window frame (if any)
+    virtual geometry::Size size() const = 0;
+
+    virtual std::unique_ptr<graphics::Renderable> compositor_snapshot(void const* compositor_id) const = 0;
+
+    virtual float alpha() const = 0; //only used in examples/
     virtual MirSurfaceType type() const = 0;
     virtual MirSurfaceState state() const = 0;
     virtual void hide() = 0;
@@ -64,11 +72,12 @@
     virtual void force_requests_to_complete() = 0;
 
     virtual void add_observer(std::shared_ptr<SurfaceObserver> const& observer) = 0;
-    virtual void remove_observer(std::shared_ptr<SurfaceObserver> const& observer) = 0;
+    virtual void remove_observer(std::weak_ptr<SurfaceObserver> const& observer) = 0;
 
     // TODO input_channel() relates to adding and removing the surface
     // TODO from the scene and is probably not cleanest interface for this.
     virtual std::shared_ptr<input::InputChannel> input_channel() const = 0;
+    virtual void set_reception_mode(input::InputReceptionMode mode) = 0;
 };
 }
 }

=== modified file 'include/server/mir/scene/surface_event_source.h'
--- include/server/mir/scene/surface_event_source.h	2014-04-15 05:31:19 +0000
+++ include/server/mir/scene/surface_event_source.h	2014-06-05 12:56:04 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_SCENE_SURFACE_EVENT_SOURCE_H_
 #define MIR_SCENE_SURFACE_EVENT_SOURCE_H_
 
-#include "mir/scene/surface_observer.h"
+#include "mir/scene/null_surface_observer.h"
 #include "mir/frontend/surface_id.h"
 #include "mir/frontend/event_sink.h"
 
@@ -29,15 +29,15 @@
 {
 namespace scene
 {
-class SurfaceEventSource : public SurfaceObserver
+class SurfaceEventSource : public NullSurfaceObserver
 {
 public:
     SurfaceEventSource(
         frontend::SurfaceId id,
         std::shared_ptr<frontend::EventSink> const& event_sink);
 
-    void attrib_changed(MirSurfaceAttrib attrib, int value);
-    void resized_to(geometry::Size const& size);
+    void attrib_changed(MirSurfaceAttrib attrib, int value) override;
+    void resized_to(geometry::Size const& size) override;
 
 private:
     frontend::SurfaceId const id;

=== modified file 'include/server/mir/scene/surface_observer.h'
--- include/server/mir/scene/surface_observer.h	2014-04-15 05:31:19 +0000
+++ include/server/mir/scene/surface_observer.h	2014-06-05 12:56:04 +0000
@@ -21,6 +21,8 @@
 
 #include "mir_toolkit/common.h"
 
+#include "mir/input/input_reception_mode.h"
+
 #include <glm/glm.hpp>
 
 namespace mir
@@ -36,13 +38,14 @@
 class SurfaceObserver
 {
 public:
-    virtual void attrib_changed(MirSurfaceAttrib attrib, int value);
-    virtual void resized_to(geometry::Size const& size);
-    virtual void moved_to(geometry::Point const& top_left);
-    virtual void hidden_set_to(bool hide);
-    virtual void frame_posted();
-    virtual void alpha_set_to(float alpha);
-    virtual void transformation_set_to(glm::mat4 const& t);
+    virtual void attrib_changed(MirSurfaceAttrib attrib, int value) = 0;
+    virtual void resized_to(geometry::Size const& size) = 0;
+    virtual void moved_to(geometry::Point const& top_left) = 0;
+    virtual void hidden_set_to(bool hide) = 0;
+    virtual void frame_posted(int frames_available) = 0;
+    virtual void alpha_set_to(float alpha) = 0;
+    virtual void transformation_set_to(glm::mat4 const& t) = 0;
+    virtual void reception_mode_set_to(input::InputReceptionMode mode) = 0;
 
 protected:
     SurfaceObserver() = default;

=== added file 'include/server/mir/server_action_queue.h'
--- include/server/mir/server_action_queue.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/server_action_queue.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alexandros Frantzis <[e-mail]>
+ */
+
+#ifndef MIR_SERVER_ACTION_QUEUE_H_
+#define MIR_SERVER_ACTION_QUEUE_H_
+
+#include <functional>
+
+namespace mir
+{
+
+typedef std::function<void()> ServerAction;
+
+class ServerActionQueue
+{
+public:
+    virtual ~ServerActionQueue() = default;
+
+    virtual void enqueue(void const* owner, ServerAction const& action) = 0;
+    virtual void pause_processing_for(void const* owner) = 0;
+    virtual void resume_processing_for(void const* owner) = 0;
+
+protected:
+    ServerActionQueue() = default;
+    ServerActionQueue(ServerActionQueue const&) = delete;
+    ServerActionQueue& operator=(ServerActionQueue const&) = delete;
+};
+
+}
+
+#endif /* MIR_SERVER_ACTION_QUEUE_H_ */

=== modified file 'include/server/mir/server_configuration.h'
--- include/server/mir/server_configuration.h	2013-10-16 07:34:22 +0000
+++ include/server/mir/server_configuration.h	2014-06-05 12:56:04 +0000
@@ -44,6 +44,7 @@
 namespace input
 {
 class InputManager;
+class InputDispatcher;
 class EventFilter;
 class InputConfiguration;
 }
@@ -51,6 +52,7 @@
 class MainLoop;
 class ServerStatusListener;
 class DisplayChanger;
+class EmergencyCleanup;
 
 class ServerConfiguration
 {
@@ -61,11 +63,13 @@
     virtual std::shared_ptr<graphics::Display> the_display() = 0;
     virtual std::shared_ptr<compositor::Compositor> the_compositor() = 0;
     virtual std::shared_ptr<input::InputManager> the_input_manager() = 0;
+    virtual std::shared_ptr<input::InputDispatcher> the_input_dispatcher() = 0;
     virtual std::shared_ptr<MainLoop> the_main_loop() = 0;
     virtual std::shared_ptr<ServerStatusListener> the_server_status_listener() = 0;
     virtual std::shared_ptr<DisplayChanger> the_display_changer() = 0;
     virtual std::shared_ptr<graphics::Platform>  the_graphics_platform() = 0;
     virtual std::shared_ptr<input::InputConfiguration> the_input_configuration() = 0;
+    virtual std::shared_ptr<EmergencyCleanup> the_emergency_cleanup() = 0;
 
 protected:
     ServerConfiguration() = default;

=== added file 'include/server/mir/shell/session_coordinator_wrapper.h'
--- include/server/mir/shell/session_coordinator_wrapper.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/shell/session_coordinator_wrapper.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored By: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef MIR_SHELL_SESSION_COORDINATOR_WRAPPER_H_
+#define MIR_SHELL_SESSION_COORDINATOR_WRAPPER_H_
+
+
+#include "mir/scene/session_coordinator.h"
+
+namespace mir
+{
+namespace shell
+{
+class SessionCoordinatorWrapper : public scene::SessionCoordinator
+{
+public:
+    SessionCoordinatorWrapper(std::shared_ptr<scene::SessionCoordinator> const& wrapped);
+
+    virtual std::shared_ptr<frontend::Session> open_session(
+        pid_t client_pid,
+        std::string const& name,
+        std::shared_ptr<frontend::EventSink> const& sink) override;
+
+    virtual void close_session(std::shared_ptr<frontend::Session> const& session) override;
+
+    frontend::SurfaceId create_surface_for(
+        std::shared_ptr<frontend::Session> const& session,
+        scene::SurfaceCreationParameters const& params) override;
+
+    void focus_next() override;
+    std::weak_ptr<scene::Session> focussed_application() const;
+    void set_focus_to(std::shared_ptr<scene::Session> const& focus) override;
+
+    void handle_surface_created(std::shared_ptr<frontend::Session> const& session) override;
+
+protected:
+    std::shared_ptr<scene::SessionCoordinator> const wrapped;
+};
+}
+}
+
+#endif /* MIR_SHELL_SESSION_COORDINATOR_WRAPPER_H_ */

=== added file 'include/server/mir/shell/surface_coordinator_wrapper.h'
--- include/server/mir/shell/surface_coordinator_wrapper.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/shell/surface_coordinator_wrapper.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored By: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef MIR_SHELL_SURFACE_COORDINATOR_WRAPPER_H_
+#define MIR_SHELL_SURFACE_COORDINATOR_WRAPPER_H_
+
+#include "mir/scene/surface_coordinator.h"
+
+namespace mir
+{
+namespace shell
+{
+class SurfaceCoordinatorWrapper : public scene::SurfaceCoordinator
+{
+public:
+    explicit SurfaceCoordinatorWrapper(std::shared_ptr<scene::SurfaceCoordinator> const& wrapped);
+
+    std::shared_ptr<scene::Surface> add_surface(
+        scene::SurfaceCreationParameters const& params,
+        scene::Session* session) override;
+
+    void raise(std::weak_ptr<scene::Surface> const& surface) override;
+
+    void remove_surface(std::weak_ptr<scene::Surface> const& surface) override;
+
+protected:
+    std::shared_ptr<SurfaceCoordinator> const wrapped;
+};
+}
+}
+
+#endif /* MIR_SHELL_SURFACE_COORDINATOR_WRAPPER_H_ */

=== added file 'include/server/mir/time/alarm.h'
--- include/server/mir/time/alarm.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/time/alarm.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as 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: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_TIME_ALARM_H_
+#define MIR_TIME_ALARM_H_
+
+#include "mir/time/clock.h"
+
+namespace mir
+{
+namespace time
+{
+
+/**
+ * A one-shot, resettable handle to trigger a callback at a later time
+ * \note All members of Alarm are threadsafe
+ */
+class Alarm
+{
+public:
+    enum State
+    {
+        pending,    /**< Will trigger the callback at some point in the future */
+        cancelled,  /**< The callback has been cancelled before being triggered */
+        triggered   /**< The callback has been called */
+    };
+
+
+    Alarm() = default;
+    /**
+     * \note Destruction of the Alarm guarantees that the callback will not subsequently be called
+     */
+    virtual ~Alarm() = default;
+
+    /**
+     * Cancels a pending alarm
+     *
+     * \note Has no effect if the Alarm is in the Triggered state.
+     * \note cancel() is idempotent
+     *
+     * \return True iff the state of the Alarm is now Cancelled
+     */
+    virtual bool cancel() = 0;
+    virtual State state() const = 0;
+
+    /**
+     * Reschedule the alarm
+     * \param delay    Delay, in milliseconds, before the Alarm will be triggered
+     * \return         True if this reschedule supercedes a previous not-yet-triggered timeout
+     *
+     * \note This cancels any previous timeout set.
+     */
+    virtual bool reschedule_in(std::chrono::milliseconds delay) = 0;
+
+    /**
+     * Reschedule the alarm
+     * \param timeout  Time point when the alarm should be triggered
+     * \return         True if this reschedule supercedes a previous not-yet-triggered timeout
+     *
+     * \note This cancels any previous timeout set.
+     */
+    virtual bool reschedule_for(Timestamp timeout) = 0;
+
+    Alarm(Alarm const&) = delete;
+    Alarm& operator=(Alarm const&) = delete;
+};
+
+}
+}
+#endif
+

=== added file 'include/server/mir/time/timer.h'
--- include/server/mir/time/timer.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/time/timer.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as 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: Christopher James Halse Rogers <[e-mail]>
+ */
+
+
+#ifndef MIR_TIME_TIMER_H_
+#define MIR_TIME_TIMER_H_
+
+#include "mir/time/alarm.h"
+
+#include <chrono>
+#include <functional>
+#include <memory>
+
+namespace mir
+{
+namespace time
+{
+
+class Alarm;
+
+class Timer
+{
+public:
+    Timer() = default;
+    virtual ~Timer() = default;
+    /**
+     * \brief Create an Alarm that calls the callback after the specified delay
+     *
+     * \param delay     Time from now, in milliseconds, that the callback will fire
+     * \param callback  Function to call when the Alarm signals
+     *
+     * \return A handle to an Alarm that will fire after delay ms.
+     */
+    virtual std::unique_ptr<Alarm> notify_in(std::chrono::milliseconds delay,
+                                             std::function<void()> callback) = 0;
+    /**
+     * \brief Create an Alarm that calls the callback at the specified time
+     *
+     * \param time_point Time point when the alarm should be triggered
+     * \param callback  Function to call when the Alarm signals
+     *
+     * \return A handle to an Alarm that will fire after delay ms.
+     */
+    virtual std::unique_ptr<Alarm> notify_at(Timestamp time_point,
+                                             std::function<void()> callback) = 0;
+
+
+    Timer(Timer const&) = delete;
+    Timer& operator=(Timer const&) = delete;
+};
+
+}
+}
+
+#endif // MIR_TIME_TIMER_H_

=== modified file 'include/shared/mir/geometry/point.h'
--- include/shared/mir/geometry/point.h	2014-03-06 06:05:17 +0000
+++ include/shared/mir/geometry/point.h	2014-06-05 12:56:04 +0000
@@ -50,6 +50,9 @@
     return lhs.x != rhs.x || lhs.y != rhs.y;
 }
 
+inline Point operator+(Point lhs, DeltaX rhs) { return{lhs.x + rhs, lhs.y}; }
+inline Point operator+(Point lhs, DeltaY rhs) { return{lhs.x, lhs.y + rhs}; }
+
 std::ostream& operator<<(std::ostream& out, Point const& value);
 }
 }

=== modified file 'include/shared/mir/geometry/rectangle.h'
--- include/shared/mir/geometry/rectangle.h	2014-03-06 06:05:17 +0000
+++ include/shared/mir/geometry/rectangle.h	2014-06-05 12:56:04 +0000
@@ -42,6 +42,8 @@
      * area, that is, the rectangle is represented as [top_left,bottom_right).
      */
     Point bottom_right() const;
+    Point top_right() const;
+    Point bottom_left() const;
     bool contains(Point const& p) const;
 
     /**

=== added file 'include/shared/mir/variable_length_array.h'
--- include/shared/mir/variable_length_array.h	1970-01-01 00:00:00 +0000
+++ include/shared/mir/variable_length_array.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alexandros Frantzis <[e-mail]>
+ */
+
+#ifndef MIR_VARIABLE_LENGTH_ARRAY_H_
+#define MIR_VARIABLE_LENGTH_ARRAY_H_
+
+#include <sys/types.h>
+#include <memory>
+
+namespace mir
+{
+
+template <size_t BuiltInBufferSize>
+class VariableLengthArray
+{
+public:
+    explicit VariableLengthArray(size_t size) : size_{size}
+    {
+        /* Don't call resize if the initial values of member variables are valid */
+        if (size > BuiltInBufferSize) resize(size);
+    }
+
+    void resize(size_t size)
+    {
+        if (size > BuiltInBufferSize)
+            effective_buffer = BufferUPtr{new unsigned char[size], heap_deleter};
+        else
+            effective_buffer = BufferUPtr{builtin_buffer, null_deleter};
+
+        size_ = size;
+    }
+
+    unsigned char* data() const { return effective_buffer.get(); }
+    size_t size() const { return size_; }
+
+private:
+    typedef std::unique_ptr<unsigned char,void (*)(unsigned char*)> BufferUPtr;
+
+    static void null_deleter(unsigned char*) {}
+    static void heap_deleter(unsigned char* b) { delete[] b; }
+
+    unsigned char builtin_buffer[BuiltInBufferSize];
+    BufferUPtr effective_buffer{builtin_buffer, null_deleter};
+    size_t size_;
+};
+
+}
+
+#endif /* MIR_VARIABLE_LENGTH_ARRAY_H_ */

=== modified file 'include/shared/mir_toolkit/client_types.h'
--- include/shared/mir_toolkit/client_types.h	2014-03-11 16:19:27 +0000
+++ include/shared/mir_toolkit/client_types.h	2014-06-05 12:56:04 +0000
@@ -104,6 +104,19 @@
     MirConnection* connection, void* context);
 
 /**
+ * Callback called when a request for client file descriptors completes
+ *   \param [in] connection     The connection associated with the display change
+ *   \param [in] count          The number of FDs allocated
+ *   \param [in] fds            Array of FDs
+ *   \param [in,out] context    The context provided by client
+ *
+ *   \note Copy the FDs as the array will be invalidated after callback completes
+ */
+
+typedef void (*mir_client_fd_callback)(
+    MirConnection* connection, size_t count, int const* fds, void* context);
+
+/**
  * MirBufferUsage specifies how a surface can and will be used. A "hardware"
  * surface can be used for OpenGL accelerated rendering. A "software" surface
  * is one that can be addressed in main memory and blitted to directly.

=== modified file 'include/shared/mir_toolkit/common.h'
--- include/shared/mir_toolkit/common.h	2014-03-06 06:05:17 +0000
+++ include/shared/mir_toolkit/common.h	2014-06-05 12:56:04 +0000
@@ -37,6 +37,7 @@
     mir_surface_attrib_state,
     mir_surface_attrib_swapinterval,
     mir_surface_attrib_focus,
+    mir_surface_attrib_dpi,
     mir_surface_attribs
 } MirSurfaceAttrib;
 

=== added file 'include/test/mir_test/auto_unblock_thread.h'
--- include/test/mir_test/auto_unblock_thread.h	1970-01-01 00:00:00 +0000
+++ include/test/mir_test/auto_unblock_thread.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * 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: Alberto Aguirre <[e-mail]>
+ */
+
+/** AutoUnblockThread is a helper thread class that can gracefully shutdown
+ * at destruction time. This is helpul for tests that botch create
+ * threads and use ASSERT macros for example (or any other condition that
+ * makes the test exit early). Using naked std::thread would call std::terminate
+ * under such conditions.
+ */
+
+#ifndef MIR_TEST_AUTO_UNBLOCK_THREAD_H_
+#define MIR_TEST_AUTO_UNBLOCK_THREAD_H_
+
+#include <thread>
+#include <functional>
+
+namespace mir
+{
+namespace test
+{
+
+class AutoUnblockThread
+{
+public:
+    template<typename Callable, typename... Args>
+    explicit AutoUnblockThread(std::function<void(void)> const& unblock,
+        Callable&& f,
+        Args&&... args)
+        : unblock{unblock}, thread{f, args...}
+    {}
+
+    ~AutoUnblockThread()
+    {
+        stop();
+    }
+
+    void stop()
+    {
+        unblock();
+        if (thread.joinable())
+            thread.join();
+    }
+
+private:
+    std::function<void(void)> unblock;
+    std::thread thread;
+};
+
+/** AutoJoinThread is a convenience AutoUnblockThread when there is
+ *  no need for unblocking anything to join the thread.
+ */
+class AutoJoinThread : public AutoUnblockThread
+{
+public:
+    template<typename Callable, typename... Args>
+    explicit AutoJoinThread(Callable&& f,
+        Args&&... args)
+        : AutoUnblockThread{[]{}, f, args...}
+    {}
+};
+
+}
+}
+#endif

=== modified file 'include/test/mir_test/client_event_matchers.h'
--- include/test/mir_test/client_event_matchers.h	2013-11-07 17:12:37 +0000
+++ include/test/mir_test/client_event_matchers.h	2014-06-05 12:56:04 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-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,
@@ -14,8 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Robert Carr <[e-mail]>
+ *              Andreas Pokorny <[e-mail]>
  */
 
+#ifndef MIR_TEST_CLIENT_EVENT_MATCHERS_H_
+#define MIR_TEST_CLIENT_EVENT_MATCHERS_H_
+
 #include "mir_toolkit/event.h"
 
 #include <xkbcommon/xkbcommon.h>
@@ -27,37 +31,143 @@
 {
 namespace test
 {
+/*!
+ * Pointer and reference adaptors for MirEvent inside gmock matchers.
+ * \{
+ */
+inline MirEvent const& to_ref(MirEvent const* event)
+{
+    return *event;
+}
+
+inline MirEvent const& to_ref(MirEvent const& event)
+{
+    return event;
+}
+/**
+ * \}
+ */
 
 MATCHER(KeyDownEvent, "")
 {
-    if (arg->type != mir_event_type_key)
+    if (to_ref(arg).type != mir_event_type_key)
         return false;
-    if (arg->key.action != mir_key_action_down) // Key down
+    if (to_ref(arg).key.action != mir_key_action_down) // Key down
         return false;
 
     return true;
 }
+MATCHER(KeyUpEvent, "")
+{
+    if (to_ref(arg).type != mir_event_type_key)
+        return false;
+
+    return to_ref(arg).key.action == mir_key_action_up;
+}
+
+MATCHER_P(KeyWithFlag, flag, "")
+{
+    if (to_ref(arg).type != mir_event_type_key)
+        return false;
+
+    return to_ref(arg).key.flags == flag;
+}
+
+MATCHER_P(KeyWithModifiers, modifiers, "")
+{
+    if (to_ref(arg).type != mir_event_type_key)
+        return false;
+
+    return to_ref(arg).key.modifiers == modifiers;
+}
+
 MATCHER_P(KeyOfSymbol, keysym, "")
 {
-    if (static_cast<xkb_keysym_t>(arg->key.key_code) == (uint)keysym)
+    if (static_cast<xkb_keysym_t>(to_ref(arg).key.key_code) == static_cast<uint32_t>(keysym))
         return true;
     return false;
 }
 
+MATCHER_P(MirKeyEventMatches, event, "")
+{
+    MirEvent const& expected = to_ref(event);
+    MirEvent const& actual = to_ref(arg);
+    return expected.type == actual.type &&
+           expected.key.device_id == actual.key.device_id &&
+           expected.key.source_id == actual.key.source_id &&
+           expected.key.action == actual.key.action &&
+           expected.key.flags == actual.key.flags &&
+           expected.key.modifiers == actual.key.modifiers &&
+           expected.key.key_code == actual.key.key_code &&
+           expected.key.scan_code == actual.key.scan_code &&
+           expected.key.repeat_count == actual.key.repeat_count &&
+           expected.key.down_time == actual.key.down_time &&
+           expected.key.event_time == actual.key.event_time &&
+           expected.key.is_system_key == actual.key.is_system_key;
+}
+
+MATCHER_P(MirMotionEventMatches, event, "")
+{
+    MirEvent const& expected = to_ref(event);
+    MirEvent const& actual = to_ref(arg);
+    bool scalar_members_match =
+        expected.type == actual.type &&
+        expected.motion.device_id == actual.motion.device_id &&
+        expected.motion.source_id == actual.motion.source_id &&
+        expected.motion.action == actual.motion.action &&
+        expected.motion.flags == actual.motion.flags &&
+        expected.motion.modifiers == actual.motion.modifiers &&
+        expected.motion.edge_flags == actual.motion.edge_flags &&
+        expected.motion.button_state == actual.motion.button_state &&
+        expected.motion.x_offset == actual.motion.x_offset &&
+        expected.motion.y_offset == actual.motion.y_offset &&
+        expected.motion.x_precision == actual.motion.x_precision &&
+        expected.motion.y_precision == actual.motion.y_precision &&
+        expected.motion.event_time == actual.motion.event_time &&
+        expected.motion.down_time == actual.motion.down_time &&
+        expected.motion.pointer_count == actual.motion.pointer_count;
+
+    if (!scalar_members_match)
+        return false;
+
+    for (size_t i = 0; i != actual.motion.pointer_count; ++i)
+    {
+        auto const& expected_coord = expected.motion.pointer_coordinates[i];
+        auto const& actual_coord = actual.motion.pointer_coordinates[i];
+        bool same_coord =
+           expected_coord.id == actual_coord.id &&
+           expected_coord.x == actual_coord.x &&
+           expected_coord.y == actual_coord.y &&
+           expected_coord.raw_x == actual_coord.raw_x &&
+           expected_coord.raw_y == actual_coord.raw_y &&
+           expected_coord.touch_major == actual_coord.touch_major &&
+           expected_coord.touch_minor == actual_coord.touch_minor &&
+           expected_coord.size == actual_coord.size &&
+           expected_coord.pressure == actual_coord.pressure &&
+           expected_coord.orientation == actual_coord.orientation &&
+           expected_coord.vscroll == actual_coord.vscroll &&
+           expected_coord.hscroll == actual_coord.hscroll &&
+           expected_coord.tool_type == actual_coord.tool_type;
+        if (!same_coord)
+            return false;
+    }
+    return true;
+}
+
 MATCHER(HoverEnterEvent, "")
 {
-    if (arg->type != mir_event_type_motion)
+    if (to_ref(arg).type != mir_event_type_motion)
         return false;
-    if (arg->motion.action != mir_motion_action_hover_enter)
+    if (to_ref(arg).motion.action != mir_motion_action_hover_enter)
         return false;
 
     return true;
 }
 MATCHER(HoverExitEvent, "")
 {
-    if (arg->type != mir_event_type_motion)
+    if (to_ref(arg).type != mir_event_type_motion)
         return false;
-    if (arg->motion.action != mir_motion_action_hover_exit)
+    if (to_ref(arg).motion.action != mir_motion_action_hover_exit)
         return false;
 
     return true;
@@ -65,55 +175,57 @@
 
 MATCHER_P2(ButtonDownEvent, x, y, "")
 {
-    if (arg->type != mir_event_type_motion)
-        return false;
-    if (arg->motion.action != mir_motion_action_down)
-        return false;
-    if (arg->motion.button_state == 0)
-        return false;
-    if (arg->motion.pointer_coordinates[0].x != x)
-        return false;
-    if (arg->motion.pointer_coordinates[0].y != y)
+    if (to_ref(arg).type != mir_event_type_motion)
+        return false;
+    if (to_ref(arg).motion.action != mir_motion_action_down)
+        return false;
+    if (to_ref(arg).motion.button_state == 0)
+        return false;
+    if (to_ref(arg).motion.pointer_coordinates[0].x != x)
+        return false;
+    if (to_ref(arg).motion.pointer_coordinates[0].y != y)
         return false;
     return true;
 }
 
 MATCHER_P2(ButtonUpEvent, x, y, "")
 {
-    if (arg->type != mir_event_type_motion)
-        return false;
-    if (arg->motion.action != mir_motion_action_up)
-        return false;
-    if (arg->motion.pointer_coordinates[0].x != x)
-        return false;
-    if (arg->motion.pointer_coordinates[0].y != y)
+    if (to_ref(arg).type != mir_event_type_motion)
+        return false;
+    if (to_ref(arg).motion.action != mir_motion_action_up)
+        return false;
+    if (to_ref(arg).motion.pointer_coordinates[0].x != x)
+        return false;
+    if (to_ref(arg).motion.pointer_coordinates[0].y != y)
         return false;
     return true;
 }
 
 MATCHER_P2(MotionEventWithPosition, x, y, "")
 {
-    if (arg->type != mir_event_type_motion)
-        return false;
-    if (arg->motion.action != mir_motion_action_move &&
-        arg->motion.action != mir_motion_action_hover_move)
-        return false;
-    if (arg->motion.pointer_coordinates[0].x != x)
-        return false;
-    if (arg->motion.pointer_coordinates[0].y != y)
+    if (to_ref(arg).type != mir_event_type_motion)
+        return false;
+    if (to_ref(arg).motion.action != mir_motion_action_move &&
+        to_ref(arg).motion.action != mir_motion_action_hover_move)
+        return false;
+    if (to_ref(arg).motion.pointer_coordinates[0].x != x)
+        return false;
+    if (to_ref(arg).motion.pointer_coordinates[0].y != y)
         return false;
     return true;
 }
 
 MATCHER(MovementEvent, "")
 {
-    if (arg->type != mir_event_type_motion)
+    if (to_ref(arg).type != mir_event_type_motion)
         return false;
-    if (arg->motion.action != mir_motion_action_move &&
-        arg->motion.action != mir_motion_action_hover_move)
+    if (to_ref(arg).motion.action != mir_motion_action_move &&
+        to_ref(arg).motion.action != mir_motion_action_hover_move)
         return false;
     return true;
 }
 
 }
 }
+
+#endif

=== modified file 'include/test/mir_test/fake_event_hub.h'
--- include/test/mir_test/fake_event_hub.h	2013-10-01 17:29:49 +0000
+++ include/test/mir_test/fake_event_hub.h	2014-06-05 12:56:04 +0000
@@ -142,6 +142,8 @@
     FakeDevice* getDevice(int32_t deviceId);
     size_t eventsQueueSize() const;
 
+    void throw_exception_in_next_get_events();
+
     // list of RawEvents available for consumption via getEvents
     std::mutex guard;
     std::list<droidinput::RawEvent> events_available;
@@ -155,6 +157,7 @@
 
 private:
     const KeyInfo* getKey(const FakeDevice* device, int32_t scanCode, int32_t usageCode) const;
+    bool throw_in_get_events = false;
 
 };
 }

=== modified file 'include/test/mir_test/fake_event_hub_input_configuration.h'
--- include/test/mir_test/fake_event_hub_input_configuration.h	2014-03-06 06:05:17 +0000
+++ include/test/mir_test/fake_event_hub_input_configuration.h	2014-06-05 12:56:04 +0000
@@ -13,7 +13,7 @@
  * 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]>
+ * Authored by: Robert Carr <[e-mail]>
  */
 
 #ifndef MIR_TEST_DOUBLES_FAKE_EVENT_HUB_INPUT_CONFIGURATION_H_
@@ -21,7 +21,7 @@
 
 #include "mir/input/android/default_android_input_configuration.h"
 
-#include <utils/StrongPointer.h>
+#include <memory>
 
 namespace droidinput = android;
 
@@ -51,24 +51,23 @@
 class FakeEventHubInputConfiguration : public input::android::DefaultInputConfiguration
 {
 public:
-    FakeEventHubInputConfiguration(std::shared_ptr<input::EventFilter> const& event_filter,
-                                   std::shared_ptr<input::InputRegion> const& input_region,
-                                   std::shared_ptr<input::CursorListener> const& cursor_listener,
-                                   std::shared_ptr<input::InputReport> const& input_report);
+    FakeEventHubInputConfiguration(
+        std::shared_ptr<input::InputDispatcher> const& input_dispatcher,
+        std::shared_ptr<input::InputRegion> const& input_region,
+        std::shared_ptr<input::CursorListener> const& cursor_listener,
+        std::shared_ptr<input::InputReport> const& input_report);
+
     virtual ~FakeEventHubInputConfiguration();
 
-    droidinput::sp<droidinput::EventHubInterface> the_event_hub();
+    std::shared_ptr<droidinput::EventHubInterface> the_event_hub();
     input::android::FakeEventHub* the_fake_event_hub();
 
-    bool is_key_repeat_enabled() override { return false; }
-
-
 protected:
     FakeEventHubInputConfiguration(FakeEventHubInputConfiguration const&) = delete;
     FakeEventHubInputConfiguration& operator=(FakeEventHubInputConfiguration const&) = delete;
 
 private:
-    droidinput::sp<input::android::FakeEventHub> event_hub;
+    std::shared_ptr<input::android::FakeEventHub> event_hub;
 };
 
 }

=== added file 'include/test/mir_test/popen.h'
--- include/test/mir_test/popen.h	1970-01-01 00:00:00 +0000
+++ include/test/mir_test/popen.h	2014-06-05 12:56:04 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as 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: Alberto Aguirre <[e-mail]>
+ */
+
+
+#ifndef MIR_TEST_POPEN_H_
+#define MIR_TEST_POPEN_H_
+
+#include <cstdio>
+#include <memory>
+#include <string>
+#include <streambuf>
+#include <istream>
+
+namespace mir
+{
+namespace test
+{
+/**
+ *  Popen - A popen c++ wrapper
+ */
+class Popen
+{
+public:
+    Popen(std::string const& cmd);
+
+    /**
+     * Read a line from the output of the executed command
+     * returns false if there is nothing more to read
+     */
+    bool get_line(std::string& line);
+
+private: