Merge lp:~robertcarr/platform-api/mir2 into lp:platform-api

[Robert Carr]

Add mir suport.

Add mir support, both for applications and for inprocess mir clients (i.e. the shell).

Stub sensors build to enable qtubuntu on the desktop against mir. Some refactoring of the hybris bridge to enable loading of real sensor module on mir on phone.

Packaging branch lives in lp:~robertcarr/platform-api/mir-with-packaging

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:128
http://jenkins.qa.ubuntu.com/job/platform-api-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/40/rebuild

review: Approve (continuous-integration)

[lp:~robertcarr/platform-api/mir2]

129. By Robert Carr on 2013-06-17

mirserver: Use the surface factory to construct shell (mirserver) surfaces as opposed to going through the mir frontend

[Ricardo Salveti (rsalveti)]

46 +find_library(Hybris
47 + NAMES hybris_ics
48 +)

Mind changing to hybris-common? _ics was provided by the old pacakge, which is now just a link to hybris-common.

235 +if(ENABLE_HYBRIS_IMPLEMENTATION)
236 + add_subdirectory(hybris/)
237 +endif()
238 +
239 +if(ENABLE_MIRSERVER_IMPLEMENTATION OR ENABLE_MIRCLIENT_IMPLEMENTATION)
240 +add_subdirectory(mircommon)
241 +endif()

Cosmetics, please also append '/' for mircommon.

review: Needs Fixing

[lp:~robertcarr/platform-api/mir2]

130. By Robert Carr on 2013-06-17

hybris_ics->hybris-common

131. By Robert Carr on 2013-06-17

CMake cosmetics

[Robert Carr (robertcarr)]

Thanks! r130 and 131.

[Ricardo Salveti (rsalveti)]

$ mmm ubuntu/platform-api/android/hybris/ failed:
...

Install: /media/rsalveti/home/dev/android/build/public/out/target/product/mako/system/bin/direct_ubuntu_application_sensors_for_hybris_test
Import includes file: /media/rsalveti/home/dev/android/build/public/out/target/product/mako/obj/EXECUTABLES/ubuntuappmanager_test_intermediates/import_includes
target thumb C++: ubuntuappmanager_test <= ubuntu/platform-api/android/hybris/application_manager.cpp
target thumb C++: ubuntuappmanager_test <= ubuntu/platform-api/android/hybris/default_application_manager_test.cpp
ubuntu/platform-api/android/hybris/default_application_manager_test.cpp: In function 'int main(int, char**)':
ubuntu/platform-api/android/hybris/default_application_manager_test.cpp:142:16: error: no matching function for call to 'android::BpApplicationManager::start_a_new_session(const int32_t&, const int32_t&, android::String8, android::String8, android::sp<{anonymous}::ApplicationManagerSession>&, int&)'
ubuntu/platform-api/android/hybris/default_application_manager_test.cpp:142:16: note: candidate is:
In file included from ubuntu/platform-api/android/hybris/default_application_manager_test.cpp:18:0:
ubuntu/platform-api/android/hybris/application_manager.h:321:10: note: virtual void android::BpApplicationManager::start_a_new_session(int32_t, int32_t, const android::String8&, const android::String8&, const android::sp<android::IApplicationManagerSession>&, int, uint32_t)
ubuntu/platform-api/android/hybris/application_manager.h:321:10: note: candidate expects 7 arguments, 6 provided
make: *** [/media/rsalveti/home/dev/android/build/public/out/target/product/mako/obj/EXECUTABLES/ubuntuappmanager_test_intermediates/default_application_manager_test.o] Error 1
make: Leaving directory `/media/rsalveti/home/dev/android/build/public'

Might not be related with this mr though.

review: Needs Fixing

[lp:~robertcarr/platform-api/mir2]

132. By Robert Carr on 2013-06-18

Merge trunk

[Ricardo Salveti (rsalveti)]

Code looks fine, but better someone with more familiarity with mir to review the specifics.

Other than that, tested with maguro and mako, with flipped and unflipped, no regression.

review: Approve

[Ricardo Mendoza (ricmm)]

Tested on maguro, flipped / non-flipped as well as under Mir and it all works fine. No regressions.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-05-21 21:54:07 +0000
+++ CMakeLists.txt	2013-06-18 00:07:29 +0000
@@ -9,6 +9,53 @@
                                  LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
                                  ARCHIVE DESTINATION "${LIB_INSTALL_DIR}")
 
+option(
+  ENABLE_HYBRIS_IMPLEMENTATION
+  "Enable hybris based platform API implementation"
+  ON
+)
+
+option(
+  ENABLE_MIRSERVER_IMPLEMENTATION
+  "Enable mirserver based platorm API implementation"
+  OFF
+)
+
+if(ENABLE_MIRSERVER_IMPLEMENTATION)
+  find_package(PkgConfig)
+  pkg_check_modules(MIRSERVER REQUIRED mirserver)
+endif(ENABLE_MIRSERVER_IMPLEMENTATION)
+
+option(
+  ENABLE_MIRCLIENT_IMPLEMENTATION
+  "Enable mirclient based platform API implementation"
+  OFF
+)
+
+if(ENABLE_MIRCLIENT_IMPLEMENTATION)
+  find_package(PkgConfig)
+  pkg_check_modules(MIRCLIENT REQUIRED mirclient)
+endif(ENABLE_MIRCLIENT_IMPLEMENTATION)
+
+if(ENABLE_MIRCLIENT_IMPLEMENTATION OR ENABLE_MIRSERVER_IMPLEMENTATION)
+  pkg_check_modules(MIRCOMMON REQUIRED mircommon)
+endif()
+
+# Sanity-check options
+if(NOT DEFINED USE_GLES)
+  set(USE_GLES 1)
+endif()
+
+# Try to find hybris, and disable hybris from build if not found
+find_library(Hybris
+  NAMES hybris-common
+)
+
+if(NOT Hybris)
+  message("Notice: libhybris-common.so not found, disabling hybris support")
+  set(ENABLE_HYBRIS_IMPLEMENTATION OFF)
+endif()
+
 include_directories(include)
 include_directories(android/include)
 

=== modified file 'android/default/default_ubuntu_application_ui.cpp'
--- android/default/default_ubuntu_application_ui.cpp	2013-06-07 01:08:41 +0000
+++ android/default/default_ubuntu_application_ui.cpp	2013-06-18 00:07:29 +0000
@@ -145,6 +145,14 @@
     return s->value->vertical_resolution();
 }
 
+EGLNativeDisplayType
+ua_ui_display_get_native_type(
+    UAUiDisplay* display)
+{
+    // Always EGL_DEFAULT_DISPLAY with android EGL.
+    return EGL_DEFAULT_DISPLAY;
+}                              
+
 /*
  * Window Properties
  */

=== modified file 'include/ubuntu/application/archive.h'
--- include/ubuntu/application/archive.h	2013-05-27 21:49:05 +0000
+++ include/ubuntu/application/archive.h	2013-06-18 00:07:29 +0000
@@ -21,6 +21,7 @@
 #define UBUNTU_APPLICATION_ARCHIVE_H_
 
 #include <stdint.h>
+#include <stddef.h>
 #include "ubuntu/status.h"
 
 struct UApplicationArchive;

=== modified file 'include/ubuntu/application/id.h'
--- include/ubuntu/application/id.h	2013-05-27 22:14:00 +0000
+++ include/ubuntu/application/id.h	2013-06-18 00:07:29 +0000
@@ -20,6 +20,8 @@
 #ifndef UBUNTU_APPLICATION_ID_H_
 #define UBUNTU_APPLICATION_ID_H_
 
+#include <stdlib.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

=== modified file 'include/ubuntu/application/ui/display.h'
--- include/ubuntu/application/ui/display.h	2013-05-27 22:14:00 +0000
+++ include/ubuntu/application/ui/display.h	2013-06-18 00:07:29 +0000
@@ -20,6 +20,8 @@
 #ifndef UBUNTU_APPLICATION_UI_DISPLAY_H_
 #define UBUNTU_APPLICATION_UI_DISPLAY_H_
 
+#include <EGL/egl.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -42,6 +44,10 @@
     ua_ui_display_query_vertical_res(
         UAUiDisplay* display);
     
+    EGLNativeDisplayType
+    ua_ui_display_get_native_type(
+        UAUiDisplay* display);
+    
 #ifdef __cplusplus
 }
 #endif

=== modified file 'include/ubuntu/application/ui/input/event.h'
--- include/ubuntu/application/ui/input/event.h	2013-05-27 17:11:21 +0000
+++ include/ubuntu/application/ui/input/event.h	2013-06-18 00:07:29 +0000
@@ -25,6 +25,81 @@
 extern "C" {
 #endif
 
+// TODO<papi>: Perhaps we should update the struct to use these enum types. But then we need to move action/flags
+// in to the internal typed event structs.
+
+typedef enum {
+    U_KEY_ACTION_DOWN     = 0,
+    U_KEY_ACTION_UP       = 1,
+    U_KEY_ACTION_MULTIPLE = 2
+} UKeyAction;
+
+typedef enum {
+    U_KEY_FLAG_WOKE_HERE           = 0x1,
+    U_KEY_FLAG_SOFT_KEYBOARD       = 0x2,
+    U_KEY_FLAG_KEEP_TOUCH_MODE     = 0x4,
+    U_KEY_FLAG_FROM_SYSTEM         = 0x8,
+    U_KEY_FLAG_EDITOR_ACTION       = 0x10,
+    U_KEY_FLAG_CANCELED            = 0x20,
+    U_KEY_FLAG_VIRTUAL_HARD_KEY    = 0x40,
+    U_KEY_FLAG_LONG_PRESS          = 0x80,
+    U_KEY_FLAG_CANCELED_LONG_PRESS = 0x100,
+    U_KEY_FLAG_TRACKING            = 0x200,
+    U_KEY_FLAG_FALLBACK            = 0x400
+} UKeyFlag;
+
+typedef enum {
+    U_KEY_MODIFIER_NONE        = 0,
+    U_KEY_MODIFIER_ALT         = 0x02,
+    U_KEY_MODIFIER_ALT_LEFT    = 0x10,
+    U_KEY_MODIFIER_ALT_RIGHT   = 0x20,
+    U_KEY_MODIFIER_SHIFT       = 0x01,
+    U_KEY_MODIFIER_SHIFT_LEFT  = 0x40,
+    U_KEY_MODIFIER_SHIFT_RIGHT = 0x80,
+    U_KEY_MODIFIER_SYM         = 0x04,
+    U_KEY_MODIFIER_FUNCTION    = 0x08,
+    U_KEY_MODIFIER_CTRL        = 0x1000,
+    U_KEY_MODIFIER_CTRL_LEFT   = 0x2000,
+    U_KEY_MODIFIER_CTRL_RIGHT  = 0x4000,
+    U_KEY_MODIFIER_META        = 0x10000,
+    U_KEY_MODIFIER_META_LEFT   = 0x20000,
+    U_KEY_MODIFIER_META_RIGHT  = 0x40000,
+    U_KEY_MODIFIER_CAPS_LOCK   = 0x100000,
+    U_KEY_MODIFIER_NUM_LOCK    = 0x200000,
+    U_KEY_MODIFIER_SCROLL_LOCK = 0x400000
+} UKeyModifierMask;
+
+#define U_MOTION_ACTION_POINTER_INDEX_SHIFT 8
+#define U_MOTION_ACTION_MASK 0xff
+#define U_MOTION_ACTION_POINTER_INDEX_MASK 0xff00
+
+typedef enum {
+    U_MOTION_ACTION_DOWN         = 0,
+    U_MOTION_ACTION_UP           = 1,
+    U_MOTION_ACTION_MOVE         = 2,
+    U_MOTION_ACTION_CANCEL       = 3,
+    U_MOTION_ACTION_OUTSIDE      = 4,
+    U_MOTION_ACTION_POINTER_DOWN = 5,
+    U_MOTION_ACTION_POINTER_UP   = 6,
+    U_MOTION_ACTION_HOVER_MOVE   = 7,
+    U_MOTION_ACTION_SCROLL       = 8,
+    U_MOTION_ACTION_HOVER_ENTER  = 9,
+    U_MOTION_ACTION_HOVER_EXIT   = 10
+} UMotionAction;
+
+typedef enum {
+    U_MOTION_FLAG_WINDOW_IS_OBSCURED = 0x1
+} UMotionFlag;
+
+typedef enum {
+    U_MOTION_BUTTON_PRIMARY   = 1 << 0,
+    U_MOTION_BUTTON_SECONDARY = 1 << 1,
+    U_MOTION_BUTTON_TERTIARY  = 1 << 2,
+    U_MOTION_BUTTON_BACK      = 1 << 3,
+    U_MOTION_BUTTON_FORWARD   = 1 << 4
+} UMotionButtonMask;
+
+
     /** Maximum number of pointers reported within one input event. */
 #define UBUNTU_APPLICATION_UI_INPUT_EVENT_MAX_POINTER_COUNT (16)
 

=== modified file 'include/ubuntu/application/ui/session.h'
--- include/ubuntu/application/ui/session.h	2013-06-05 01:22:24 +0000
+++ include/ubuntu/application/ui/session.h	2013-06-18 00:07:29 +0000
@@ -20,6 +20,8 @@
 #ifndef UBUNTU_APPLICATION_UI_SESSION_H_
 #define UBUNTU_APPLICATION_UI_SESSION_H_
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-02-05 06:58:40 +0000
+++ src/CMakeLists.txt	2013-06-18 00:07:29 +0000
@@ -1,1 +1,19 @@
-add_subdirectory(android/)
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+if(ENABLE_HYBRIS_IMPLEMENTATION)
+  add_subdirectory(hybris/)
+endif()
+
+if(ENABLE_MIRSERVER_IMPLEMENTATION OR ENABLE_MIRCLIENT_IMPLEMENTATION)
+  add_subdirectory(mircommon/)
+endif()
+
+if(ENABLE_MIRSERVER_IMPLEMENTATION)
+  add_subdirectory(mirserver/)
+endif()
+
+if(ENABLE_MIRCLIENT_IMPLEMENTATION)
+  add_subdirectory(mirclient/)
+endif()

=== renamed directory 'src/android' => 'src/hybris'
=== modified file 'src/hybris/CMakeLists.txt'
--- src/android/CMakeLists.txt	2013-04-10 14:42:09 +0000
+++ src/hybris/CMakeLists.txt	2013-06-18 00:07:29 +0000
@@ -1,4 +1,8 @@
-set(SOURCES ubuntu_application_api.cpp)
+set(SOURCES 
+  hybris_bridge.cpp
+  ubuntu_application_api_hybris.cpp
+  ubuntu_application_sensors_hybris.cpp
+)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
 
@@ -13,7 +17,7 @@
 
 target_link_libraries(
 	ubuntu_application_api
-	hybris_ics
+	hybris-common
 )
 
 set_target_properties(

=== added file 'src/hybris/hybris_bridge.cpp'
--- src/hybris/hybris_bridge.cpp	1970-01-01 00:00:00 +0000
+++ src/hybris/hybris_bridge.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2013 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: Thomas Voss <[e-mail]>
+ *              Ricardo Mendoza <[e-mail]>
+ */
+
+#include "hybris_bridge.h"
+
+#include <dlfcn.h>
+#include <assert.h>
+
+namespace uh = ubuntu::hybris;
+
+extern "C" {
+
+extern void *android_dlopen(const char *filename, int flag);
+extern void *android_dlsym(void *handle, const char *symbol);
+
+}
+
+const char* uh::Bridge::path_to_library()
+{
+    return "/system/lib/libubuntu_application_api.so";
+}
+
+uh::Bridge& uh::Bridge::instance()
+{
+    static uh::Bridge bridge;
+    return bridge;
+}
+
+uh::Bridge::Bridge()
+    : lib_handle(android_dlopen(path_to_library(), RTLD_LAZY))
+{
+    assert(lib_handle && "Error loading ubuntu_application_api");
+}
+
+uh::Bridge::~Bridge()
+{
+    // TODO android_dlclose(libcamera_handle);
+}
+
+void* uh::Bridge::resolve_symbol(const char* symbol) const
+{
+    return android_dlsym(lib_handle, symbol);
+}

=== added file 'src/hybris/hybris_bridge.h'
--- src/hybris/hybris_bridge.h	1970-01-01 00:00:00 +0000
+++ src/hybris/hybris_bridge.h	2013-06-18 00:07:29 +0000
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2013 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: Thomas Voss <[e-mail]>
+ *              Ricardo Mendoza <[e-mail]>
+ */
+
+#ifndef UBUNTU_APPLICATION_API_HYBRIS_BRIDGE_H_
+#define UBUNTU_APPLICATION_API_HYBRIS_BRIDGE_H_
+
+#include <stddef.h>
+
+namespace ubuntu
+{
+namespace hybris
+{
+
+struct Bridge
+{
+    Bridge();
+    ~Bridge();
+
+    static const char* path_to_library();
+    static Bridge& instance();
+    
+    void* resolve_symbol(const char* symbol) const;
+
+    void* lib_handle;
+};
+
+}
+}
+
+// Sweet and beautiful music.
+#define DLSYM(fptr, sym) if (*(fptr) == NULL) { *((void**)fptr) = (void *) ubuntu::hybris::Bridge::instance().resolve_symbol(sym); }
+    
+#define IMPLEMENT_FUNCTION0(return_type, symbol)  \
+    return_type symbol()                          \
+    {                                             \
+        static return_type (*f)() = NULL;         \
+        DLSYM(&f, #symbol);                       \
+        return f();}
+
+#define IMPLEMENT_VOID_FUNCTION0(symbol)          \
+    void symbol()                                 \
+    {                                             \
+        static void (*f)() = NULL;                \
+        DLSYM(&f, #symbol);                       \
+        f();}
+    
+#define IMPLEMENT_FUNCTION1(return_type, symbol, arg1) \
+    return_type symbol(arg1 _1)                        \
+    {                                                  \
+        static return_type (*f)(arg1) = NULL;          \
+        DLSYM(&f, #symbol);                     \
+        return f(_1); }
+
+#define IMPLEMENT_SF_FUNCTION1(return_type, symbol, arg1) \
+    return_type symbol(arg1 _1)                        \
+    {                                                  \
+        static return_type (*f)(arg1) __attribute__((pcs("aapcs"))) = NULL; \
+        DLSYM(&f, #symbol);                     \
+        return f(_1); }
+
+
+#define IMPLEMENT_VOID_FUNCTION1(symbol, arg1)               \
+    void symbol(arg1 _1)                                     \
+    {                                                        \
+        static void (*f)(arg1) = NULL;                       \
+        DLSYM(&f, #symbol);                           \
+        f(_1); }
+
+#define IMPLEMENT_FUNCTION2(return_type, symbol, arg1, arg2)    \
+    return_type symbol(arg1 _1, arg2 _2)                        \
+    {                                                           \
+        static return_type (*f)(arg1, arg2) = NULL;             \
+        DLSYM(&f, #symbol);                              \
+        return f(_1, _2); }
+
+#define IMPLEMENT_VOID_FUNCTION2(symbol, arg1, arg2)            \
+    void symbol(arg1 _1, arg2 _2)                               \
+    {                                                           \
+        static void (*f)(arg1, arg2) = NULL;                    \
+        DLSYM(&f, #symbol);                              \
+        f(_1, _2); }
+
+#define IMPLEMENT_FUNCTION3(return_type, symbol, arg1, arg2, arg3)    \
+    return_type symbol(arg1 _1, arg2 _2, arg3 _3)                     \
+    {                                                                 \
+        static return_type (*f)(arg1, arg2, arg3) = NULL;             \
+        DLSYM(&f, #symbol);                                           \
+        return f(_1, _2, _3); } 
+
+#define IMPLEMENT_VOID_FUNCTION3(symbol, arg1, arg2, arg3)      \
+    void symbol(arg1 _1, arg2 _2, arg3 _3)                      \
+    {                                                           \
+        static void (*f)(arg1, arg2, arg3) = NULL;              \
+        DLSYM(&f, #symbol);                                     \
+        f(_1, _2, _3); }
+
+#define IMPLEMENT_VOID_FUNCTION4(symbol, arg1, arg2, arg3, arg4) \
+    void symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4)              \
+    {                                                            \
+        static void (*f)(arg1, arg2, arg3, arg4) = NULL;         \
+        DLSYM(&f, #symbol);                                      \
+        f(_1, _2, _3, _4); }
+
+#define IMPLEMENT_FUNCTION4(return_type, symbol, arg1, arg2, arg3, arg4) \
+    return_type symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4)               \
+    {                                                                    \
+        static return_type (*f)(arg1, arg2, arg3, arg4) = NULL;          \
+        DLSYM(&f, #symbol);                                              \
+        return f(_1, _2, _3, _4); }
+
+#define IMPLEMENT_FUNCTION6(return_type, symbol, arg1, arg2, arg3, arg4, arg5, arg6) \
+    return_type symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4, arg5 _5, arg6 _6)         \
+    {                                                                                \
+        static return_type (*f)(arg1, arg2, arg3, arg4, arg5, arg6) = NULL;          \
+        DLSYM(&f, #symbol);                                                          \
+        return f(_1, _2, _3, _4, _5, _6); }
+
+#define IMPLEMENT_VOID_FUNCTION7(symbol, arg1, arg2, arg3, arg4, arg5, arg6, arg7) \
+    void symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4, arg5 _5, arg6 _6, arg7 _7) \
+    {                                                                   \
+        static void (*f)(arg1, arg2, arg3, arg4, arg5, arg6, arg7) = NULL; \
+        DLSYM(&f, #symbol);                                             \
+        f(_1, _2, _3, _4, _5, _6, _7); }
+
+#define IMPLEMENT_VOID_FUNCTION8(symbol, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) \
+    void symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4, arg5 _5, arg6 _6, arg7 _7, arg8 _8) \
+    {                                                                   \
+        static void (*f)(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) = NULL; \
+        DLSYM(&f, #symbol);                                             \
+        f(_1, _2, _3, _4, _5, _6, _7, _8); }
+
+#endif // UBUNTU_APPLICATION_API_HYBRIS_BRIDGE_H_

=== modified file 'src/hybris/tests/CMakeLists.txt'
--- src/android/tests/CMakeLists.txt	2013-02-05 06:58:40 +0000
+++ src/hybris/tests/CMakeLists.txt	2013-06-18 00:07:29 +0000
@@ -1,4 +1,4 @@
-set(SOURCES ubuntu_application_api.cpp)
+set(SOURCES ubuntu_application_api_hybris.cpp)
 
 add_executable(test_android_ubuntu_app_api test_c_api.cpp)
 target_link_libraries(test_android_ubuntu_app_api ubuntu_application_api EGL GLESv2)

=== renamed file 'src/android/ubuntu_application_api.cpp' => 'src/hybris/ubuntu_application_api_hybris.cpp'
--- src/android/ubuntu_application_api.cpp	2013-06-07 01:08:41 +0000
+++ src/hybris/ubuntu_application_api_hybris.cpp	2013-06-18 00:07:29 +0000
@@ -29,56 +29,12 @@
 #include <ubuntu/application/ui/session.h>
 #include <ubuntu/application/ui/clipboard.h>
 #include <ubuntu/application/ui/display.h>
-#include <ubuntu/application/sensors/accelerometer.h>
-#include <ubuntu/application/sensors/proximity.h>
-#include <ubuntu/application/sensors/light.h>
 
 #include <assert.h>
 #include <dlfcn.h>
 #include <stddef.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void *android_dlopen(const char *filename, int flag);
-extern void *android_dlsym(void *handle, const char *symbol);
-
-#ifdef __cplusplus
-}
-#endif
-
-namespace
-{
-
-struct Bridge
-{
-    static const char* path_to_library()
-    {
-        return "/system/lib/libubuntu_application_api.so";
-    }
-
-    static Bridge& instance() { static Bridge bridge; return bridge; }
-    
-    Bridge() : lib_handle(android_dlopen(path_to_library(), RTLD_LAZY))
-    {
-        assert(lib_handle && "Error loading ubuntu_application_api");
-    }
-
-    ~Bridge()
-    {
-        // TODO android_dlclose(libcamera_handle);
-    }
-
-    void* resolve_symbol(const char* symbol) const
-    {
-        return android_dlsym(lib_handle, symbol);
-    }
-
-    void* lib_handle;
-};
-
-}
+#include "hybris_bridge.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -88,106 +44,6 @@
 /*********** Implementation starts here *******************/
 /**********************************************************/
 
-#define DLSYM(fptr, sym) if (*(fptr) == NULL) { *((void**)fptr) = (void *) Bridge::instance().resolve_symbol(sym); }
-    
-#define IMPLEMENT_FUNCTION0(return_type, symbol)  \
-    return_type symbol()                          \
-    {                                             \
-        static return_type (*f)() = NULL;         \
-        DLSYM(&f, #symbol);                       \
-        return f();}
-
-#define IMPLEMENT_VOID_FUNCTION0(symbol)          \
-    void symbol()                                 \
-    {                                             \
-        static void (*f)() = NULL;                \
-        DLSYM(&f, #symbol);                       \
-        f();}
-    
-#define IMPLEMENT_FUNCTION1(return_type, symbol, arg1) \
-    return_type symbol(arg1 _1)                        \
-    {                                                  \
-        static return_type (*f)(arg1) = NULL;          \
-        DLSYM(&f, #symbol);                     \
-        return f(_1); }
-
-#define IMPLEMENT_SF_FUNCTION1(return_type, symbol, arg1) \
-    return_type symbol(arg1 _1)                        \
-    {                                                  \
-        static return_type (*f)(arg1) __attribute__((pcs("aapcs"))) = NULL; \
-        DLSYM(&f, #symbol);                     \
-        return f(_1); }
-
-
-#define IMPLEMENT_VOID_FUNCTION1(symbol, arg1)               \
-    void symbol(arg1 _1)                                     \
-    {                                                        \
-        static void (*f)(arg1) = NULL;                       \
-        DLSYM(&f, #symbol);                           \
-        f(_1); }
-
-#define IMPLEMENT_FUNCTION2(return_type, symbol, arg1, arg2)    \
-    return_type symbol(arg1 _1, arg2 _2)                        \
-    {                                                           \
-        static return_type (*f)(arg1, arg2) = NULL;             \
-        DLSYM(&f, #symbol);                              \
-        return f(_1, _2); }
-
-#define IMPLEMENT_VOID_FUNCTION2(symbol, arg1, arg2)            \
-    void symbol(arg1 _1, arg2 _2)                               \
-    {                                                           \
-        static void (*f)(arg1, arg2) = NULL;                    \
-        DLSYM(&f, #symbol);                              \
-        f(_1, _2); }
-
-#define IMPLEMENT_FUNCTION3(return_type, symbol, arg1, arg2, arg3)    \
-    return_type symbol(arg1 _1, arg2 _2, arg3 _3)                     \
-    {                                                                 \
-        static return_type (*f)(arg1, arg2, arg3) = NULL;             \
-        DLSYM(&f, #symbol);                                           \
-        return f(_1, _2, _3); } 
-
-#define IMPLEMENT_VOID_FUNCTION3(symbol, arg1, arg2, arg3)      \
-    void symbol(arg1 _1, arg2 _2, arg3 _3)                      \
-    {                                                           \
-        static void (*f)(arg1, arg2, arg3) = NULL;              \
-        DLSYM(&f, #symbol);                                     \
-        f(_1, _2, _3); }
-
-#define IMPLEMENT_VOID_FUNCTION4(symbol, arg1, arg2, arg3, arg4) \
-    void symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4)              \
-    {                                                            \
-        static void (*f)(arg1, arg2, arg3, arg4) = NULL;         \
-        DLSYM(&f, #symbol);                                      \
-        f(_1, _2, _3, _4); }
-
-#define IMPLEMENT_FUNCTION4(return_type, symbol, arg1, arg2, arg3, arg4) \
-    return_type symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4)               \
-    {                                                                    \
-        static return_type (*f)(arg1, arg2, arg3, arg4) = NULL;          \
-        DLSYM(&f, #symbol);                                              \
-        return f(_1, _2, _3, _4); }
-
-#define IMPLEMENT_FUNCTION6(return_type, symbol, arg1, arg2, arg3, arg4, arg5, arg6) \
-    return_type symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4, arg5 _5, arg6 _6)         \
-    {                                                                                \
-        static return_type (*f)(arg1, arg2, arg3, arg4, arg5, arg6) = NULL;          \
-        DLSYM(&f, #symbol);                                                          \
-        return f(_1, _2, _3, _4, _5, _6); }
-
-#define IMPLEMENT_VOID_FUNCTION7(symbol, arg1, arg2, arg3, arg4, arg5, arg6, arg7) \
-    void symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4, arg5 _5, arg6 _6, arg7 _7) \
-    {                                                                   \
-        static void (*f)(arg1, arg2, arg3, arg4, arg5, arg6, arg7) = NULL; \
-        DLSYM(&f, #symbol);                                             \
-        f(_1, _2, _3, _4, _5, _6, _7); }
-
-#define IMPLEMENT_VOID_FUNCTION8(symbol, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) \
-    void symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4, arg5 _5, arg6 _6, arg7 _7, arg8 _8) \
-    {                                                                   \
-        static void (*f)(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) = NULL; \
-        DLSYM(&f, #symbol);                                             \
-        f(_1, _2, _3, _4, _5, _6, _7, _8); }
 
 // Session helpers
 IMPLEMENT_FUNCTION0(UAUiSessionProperties*, ua_ui_session_properties_new);
@@ -236,6 +92,7 @@
 IMPLEMENT_VOID_FUNCTION1(ua_ui_display_destroy, UAUiDisplay*);
 IMPLEMENT_FUNCTION1(uint32_t, ua_ui_display_query_horizontal_res, UAUiDisplay*);
 IMPLEMENT_FUNCTION1(uint32_t, ua_ui_display_query_vertical_res, UAUiDisplay*);
+IMPLEMENT_FUNCTION1(EGLNativeDisplayType, ua_ui_display_get_native_type, UAUiDisplay*);
 
 
 // UAUiWindowProperties
@@ -256,52 +113,6 @@
 IMPLEMENT_VOID_FUNCTION1(ua_ui_window_request_fullscreen, UAUiWindow*);
 IMPLEMENT_FUNCTION1(EGLNativeWindowType, ua_ui_window_get_native_type, UAUiWindow*);
 
-// Ubuntu Application Sensors
-
-// Acceleration Sensor
-IMPLEMENT_FUNCTION0(UASensorsAccelerometer*, ua_sensors_accelerometer_new);
-IMPLEMENT_FUNCTION1(UStatus, ua_sensors_accelerometer_enable, UASensorsAccelerometer*);
-IMPLEMENT_FUNCTION1(UStatus, ua_sensors_accelerometer_disable, UASensorsAccelerometer*);
-IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_accelerometer_get_min_delay, UASensorsAccelerometer*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_accelerometer_get_min_value, UASensorsAccelerometer*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_accelerometer_get_max_value, UASensorsAccelerometer*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_accelerometer_get_resolution, UASensorsAccelerometer*);
-IMPLEMENT_VOID_FUNCTION3(ua_sensors_accelerometer_set_reading_cb, UASensorsAccelerometer*, on_accelerometer_event_cb, void*);
-
-// Acceleration Sensor Event
-IMPLEMENT_FUNCTION1(uint64_t, uas_accelerometer_event_get_timestamp, UASAccelerometerEvent*);
-IMPLEMENT_SF_FUNCTION1(float, uas_accelerometer_event_get_acceleration_x, UASAccelerometerEvent*);
-IMPLEMENT_SF_FUNCTION1(float, uas_accelerometer_event_get_acceleration_y, UASAccelerometerEvent*);
-IMPLEMENT_SF_FUNCTION1(float, uas_accelerometer_event_get_acceleration_z, UASAccelerometerEvent*);
-
-// Proximity Sensor
-IMPLEMENT_FUNCTION0(UASensorsProximity*, ua_sensors_proximity_new);
-IMPLEMENT_FUNCTION1(UStatus, ua_sensors_proximity_enable, UASensorsProximity*);
-IMPLEMENT_FUNCTION1(UStatus, ua_sensors_proximity_disable, UASensorsProximity*);
-IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_proximity_get_min_delay, UASensorsProximity*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_proximity_get_min_value, UASensorsProximity*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_proximity_get_max_value, UASensorsProximity*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_proximity_get_resolution, UASensorsProximity*);
-IMPLEMENT_VOID_FUNCTION3(ua_sensors_proximity_set_reading_cb, UASensorsProximity*, on_proximity_event_cb, void*);
-
-// Proximity Sensor Event
-IMPLEMENT_FUNCTION1(uint64_t, uas_proximity_event_get_timestamp, UASProximityEvent*);
-IMPLEMENT_FUNCTION1(UASProximityDistance, uas_proximity_event_get_distance, UASProximityEvent*);
-
-// Ambient Light Sensor
-IMPLEMENT_FUNCTION0(UASensorsLight*, ua_sensors_light_new);
-IMPLEMENT_FUNCTION1(UStatus, ua_sensors_light_enable, UASensorsLight*);
-IMPLEMENT_FUNCTION1(UStatus, ua_sensors_light_disable, UASensorsLight*);
-IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_light_get_min_delay, UASensorsLight*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_light_get_min_value, UASensorsLight*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_light_get_max_value, UASensorsLight*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_light_get_resolution, UASensorsLight*);
-IMPLEMENT_VOID_FUNCTION3(ua_sensors_light_set_reading_cb, UASensorsLight*, on_light_event_cb, void*);
-
-// Ambient Light Sensor Event
-IMPLEMENT_FUNCTION1(uint64_t, uas_light_event_get_timestamp, UASLightEvent*);
-IMPLEMENT_SF_FUNCTION1(float, uas_light_event_get_light, UASLightEvent*);
-
 /* -------------------------------------------------------------------------- *
  * * * * * * * * * * * * * * * Deprecated API * * * * * * * * * * * * * * * * *
  * -------------------------------------------------------------------------- *

=== added file 'src/hybris/ubuntu_application_sensors_hybris.cpp'
--- src/hybris/ubuntu_application_sensors_hybris.cpp	1970-01-01 00:00:00 +0000
+++ src/hybris/ubuntu_application_sensors_hybris.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voss <[e-mail]>
+ *              Ricardo Mendoza <[e-mail]>
+ */
+
+#include <ubuntu/application/sensors/accelerometer.h>
+#include <ubuntu/application/sensors/proximity.h>
+#include <ubuntu/application/sensors/light.h>
+
+#include "hybris_bridge.h"
+
+// Ubuntu Application Sensors
+
+// Acceleration Sensor
+IMPLEMENT_FUNCTION0(UASensorsAccelerometer*, ua_sensors_accelerometer_new);
+IMPLEMENT_FUNCTION1(UStatus, ua_sensors_accelerometer_enable, UASensorsAccelerometer*);
+IMPLEMENT_FUNCTION1(UStatus, ua_sensors_accelerometer_disable, UASensorsAccelerometer*);
+IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_accelerometer_get_min_delay, UASensorsAccelerometer*);
+IMPLEMENT_SF_FUNCTION1(float, ua_sensors_accelerometer_get_min_value, UASensorsAccelerometer*);
+IMPLEMENT_SF_FUNCTION1(float, ua_sensors_accelerometer_get_max_value, UASensorsAccelerometer*);
+IMPLEMENT_SF_FUNCTION1(float, ua_sensors_accelerometer_get_resolution, UASensorsAccelerometer*);
+IMPLEMENT_VOID_FUNCTION3(ua_sensors_accelerometer_set_reading_cb, UASensorsAccelerometer*, on_accelerometer_event_cb, void*);
+
+// Acceleration Sensor Event
+IMPLEMENT_FUNCTION1(uint64_t, uas_accelerometer_event_get_timestamp, UASAccelerometerEvent*);
+IMPLEMENT_SF_FUNCTION1(float, uas_accelerometer_event_get_acceleration_x, UASAccelerometerEvent*);
+IMPLEMENT_SF_FUNCTION1(float, uas_accelerometer_event_get_acceleration_y, UASAccelerometerEvent*);
+IMPLEMENT_SF_FUNCTION1(float, uas_accelerometer_event_get_acceleration_z, UASAccelerometerEvent*);
+
+// Proximity Sensor
+IMPLEMENT_FUNCTION0(UASensorsProximity*, ua_sensors_proximity_new);
+IMPLEMENT_FUNCTION1(UStatus, ua_sensors_proximity_enable, UASensorsProximity*);
+IMPLEMENT_FUNCTION1(UStatus, ua_sensors_proximity_disable, UASensorsProximity*);
+IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_proximity_get_min_delay, UASensorsProximity*);
+IMPLEMENT_SF_FUNCTION1(float, ua_sensors_proximity_get_min_value, UASensorsProximity*);
+IMPLEMENT_SF_FUNCTION1(float, ua_sensors_proximity_get_max_value, UASensorsProximity*);
+IMPLEMENT_SF_FUNCTION1(float, ua_sensors_proximity_get_resolution, UASensorsProximity*);
+IMPLEMENT_VOID_FUNCTION3(ua_sensors_proximity_set_reading_cb, UASensorsProximity*, on_proximity_event_cb, void*);
+
+// Proximity Sensor Event
+IMPLEMENT_FUNCTION1(uint64_t, uas_proximity_event_get_timestamp, UASProximityEvent*);
+IMPLEMENT_FUNCTION1(UASProximityDistance, uas_proximity_event_get_distance, UASProximityEvent*);
+
+// Ambient Light Sensor
+IMPLEMENT_FUNCTION0(UASensorsLight*, ua_sensors_light_new);
+IMPLEMENT_FUNCTION1(UStatus, ua_sensors_light_enable, UASensorsLight*);
+IMPLEMENT_FUNCTION1(UStatus, ua_sensors_light_disable, UASensorsLight*);
+IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_light_get_min_delay, UASensorsLight*);
+IMPLEMENT_SF_FUNCTION1(float, ua_sensors_light_get_min_value, UASensorsLight*);
+IMPLEMENT_SF_FUNCTION1(float, ua_sensors_light_get_max_value, UASensorsLight*);
+IMPLEMENT_SF_FUNCTION1(float, ua_sensors_light_get_resolution, UASensorsLight*);
+IMPLEMENT_VOID_FUNCTION3(ua_sensors_light_set_reading_cb, UASensorsLight*, on_light_event_cb, void*);
+
+// Ambient Light Sensor Event
+IMPLEMENT_FUNCTION1(uint64_t, uas_light_event_get_timestamp, UASLightEvent*);
+IMPLEMENT_SF_FUNCTION1(float, uas_light_event_get_light, UASLightEvent*);

=== added directory 'src/mirclient'
=== added file 'src/mirclient/CMakeLists.txt'
--- src/mirclient/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/mirclient/CMakeLists.txt	2013-06-18 00:07:29 +0000
@@ -0,0 +1,34 @@
+set(SOURCES 
+  ubuntu_application_api_mirclient.cpp
+  application_instance_mirclient.cpp
+  window_properties_mirclient.cpp
+  window_mirclient.cpp
+)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
+
+add_library(
+	ubuntu_application_api_mirclient SHARED
+	${SOURCES}
+)
+
+include_directories(
+    ${CMAKE_BINARY_DIR}/include
+    ${MIRCLIENT_INCLUDE_DIRS}
+)
+
+target_link_libraries(
+	ubuntu_application_api_mirclient
+        ${MIRCLIENT_LDFLAGS} ${MIRCLIENT_LIBRARIES}
+        -Wl,--whole-archive ubuntu_application_api_mircommon
+        -Wl,--no-whole-archive
+)
+
+set_target_properties(
+	ubuntu_application_api_mirclient
+	PROPERTIES
+	VERSION 1.0
+	SOVERSION 1
+)
+
+install(TARGETS ubuntu_application_api_mirclient ${INSTALL_TARGETS_DEFAULT_ARGS})

=== added file 'src/mirclient/application_instance_mirclient.cpp'
--- src/mirclient/application_instance_mirclient.cpp	1970-01-01 00:00:00 +0000
+++ src/mirclient/application_instance_mirclient.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#include "application_instance_mirclient_priv.h"
+
+namespace uamc = ubuntu::application::mir::client;
+
+uamc::Instance::Instance()
+    : con(nullptr),
+      ref_count(1)
+{
+    
+}
+
+UApplicationInstance* uamc::Instance::as_u_application_instance()
+{
+    return static_cast<UApplicationInstance*>(this);
+}
+
+uamc::Instance* uamc::Instance::from_u_application_instance(UApplicationInstance* u_instance)
+{
+    return static_cast<uamc::Instance*>(u_instance);
+}
+
+void uamc::Instance::ref()
+{
+    ref_count++;
+}
+
+void uamc::Instance::unref()
+{
+    ref_count--;
+    if (ref_count == 0)
+        delete this;
+}
+
+MirConnection* uamc::Instance::connection() const
+{
+    return con.get();
+}
+
+bool uamc::Instance::connect(std::string const& application_name)
+{
+    auto mir_connection = mir_connect_sync(NULL, application_name.c_str());
+    if (mir_connection == nullptr)
+        return false;
+    con = ConnectionPtr(mir_connection,
+        [](MirConnection *c)
+        {
+            mir_connection_release(c);
+        });
+    return true;
+}

=== added file 'src/mirclient/application_instance_mirclient_priv.h'
--- src/mirclient/application_instance_mirclient_priv.h	1970-01-01 00:00:00 +0000
+++ src/mirclient/application_instance_mirclient_priv.h	2013-06-18 00:07:29 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2013 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 UBUNTU_APPLICATION_INSTANCE_MIRCLIENT_PRIV_H_
+#define UBUNTU_APPLICATION_INSTANCE_MIRCLIENT_PRIV_H_
+
+#include <ubuntu/application/instance.h>
+
+#include <memory>
+#include <string>
+
+#include <mir_toolkit/mir_client_library.h>
+
+namespace ubuntu
+{
+namespace application
+{
+namespace mir
+{
+namespace client
+{
+
+class Instance
+{
+public:
+    Instance();
+    ~Instance() = default;
+    
+    UApplicationInstance* as_u_application_instance();
+    static Instance* from_u_application_instance(UApplicationInstance* u_instance);
+    
+    void ref();
+    void unref();
+    
+    MirConnection* connection() const;
+    bool connect(std::string const& application_name);
+    
+protected:
+    Instance(Instance const&) = delete;
+    Instance& operator=(Instance const&) = delete;
+
+private:
+    typedef std::unique_ptr<MirConnection, std::function<void(MirConnection*)>> ConnectionPtr;
+    ConnectionPtr con;
+    int ref_count;
+};
+
+}
+}
+}
+} // namespace ubuntu
+
+#endif // UBUNTU_APPLICATION_INSTANCE_MIRCLIENT_PRIV_H_

=== added file 'src/mirclient/ubuntu_application_api_mirclient.cpp'
--- src/mirclient/ubuntu_application_api_mirclient.cpp	1970-01-01 00:00:00 +0000
+++ src/mirclient/ubuntu_application_api_mirclient.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,279 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#include "application_instance_mirclient_priv.h"
+#include "window_properties_mirclient_priv.h"
+#include "window_mirclient_priv.h"
+
+#include "mircommon/application_id_mir_priv.h"
+
+#include <ubuntu/application/lifecycle_delegate.h>
+#include <ubuntu/application/ui/window.h>
+#include <ubuntu/application/ui/options.h>
+#include <ubuntu/application/ui/session.h>
+#include <ubuntu/application/ui/clipboard.h>
+#include <ubuntu/application/ui/display.h>
+#include <ubuntu/application/sensors/accelerometer.h>
+#include <ubuntu/application/sensors/proximity.h>
+#include <ubuntu/application/sensors/light.h>
+
+#include <mir_toolkit/mir_client_library.h>
+
+#include <stdlib.h>
+#include <assert.h>
+#include <string.h>
+
+namespace uam = ubuntu::application::mir;
+namespace uamc = uam::client;
+
+namespace
+{
+
+// We use a global instance as some platform-api functions, i.e. display_new_with_index
+// do not supply dependencies, but a MirConnection is required for all queries.
+static uamc::Instance*
+global_mir_instance()
+{
+    // Obviously ref counting is whacky here...
+    static uamc::Instance instance;
+    instance.ref(); // We leak a reference, this object can't be destroyed
+    return &instance;
+}
+
+// Display info
+static MirDisplayInfo*
+u_display_mir_display(UAUiDisplay *display)
+{
+    return static_cast<MirDisplayInfo*>(display);
+}
+
+static UAUiDisplay*
+mir_display_u_display(MirDisplayInfo *display)
+{
+    return static_cast<UAUiDisplay*>(display);
+}
+
+};
+
+extern "C"
+{
+
+// TODO<papi>: Eliminate global instance by adding Instance to some functions (i.e. display queries)
+// TODO: We can't take ownership of description and options until we get rid of the global instance
+// so we leak them.
+UApplicationInstance* u_application_instance_new_from_description_with_options(UApplicationDescription* description, UApplicationOptions* options)
+{
+    auto instance = global_mir_instance();
+
+    auto id = uam::Id::from_u_application_id(u_application_description_get_application_id(description));
+    auto connect_suceeded = instance->connect(id->name);
+    assert(connect_suceeded);
+
+    return instance->as_u_application_instance();
+}
+
+void
+u_application_instance_ref(UApplicationInstance *u_instance)
+{
+    auto instance = uamc::Instance::from_u_application_instance(u_instance);
+    instance->ref();
+}
+    
+void
+u_application_instance_unref(UApplicationInstance *u_instance)
+{
+    auto instance = uamc::Instance::from_u_application_instance(u_instance);
+    instance->unref();
+}
+    
+void
+u_application_instance_destroy(UApplicationInstance *u_instance)
+{
+    // TODO<papi>: What are the proper semantics here.
+    u_application_instance_unref(u_instance);
+}
+    
+void
+u_application_instance_run(UApplicationInstance *instance)
+{
+    // TODO<papi>: What is this supposed to do? Seems to be no-op on hybris.
+    (void) instance;
+}
+
+void ua_ui_set_clipboard_content(void* content, size_t content_size)
+{
+    // TODO<papi,mir>: Implement. We will need a MirConnection
+    (void) content;
+    (void) content_size;
+}
+
+void ua_ui_get_clipboard_content(void** out_content, size_t* out_content_size)
+{
+    // TODO<papi,mir>: Implement, see get_clipboard_comment.
+    *out_content = NULL;
+    *out_content_size = 0;
+}
+
+//
+// TODO <papi>: We need to expose the EGLNativeDisplay somehow
+//
+
+// TODO <papi>: This function should take an application instance so we can eliminate the global mir instance.
+// TODO <mir>: Perhaps this should be noop for Mir as there is no need to construct
+// a display object, the connection already has everything we need, as it receives
+// the display info at connect time.
+UAUiDisplay* ua_ui_display_new_with_index(size_t index)
+{
+    // TODO<papi,mir>: What are the semantics of index. How should we use it?
+    (void) index;
+    auto instance = global_mir_instance();
+
+    auto display = new MirDisplayInfo;
+    mir_connection_get_display_info(instance->connection(), display);
+
+    return mir_display_u_display(display);
+}
+
+void ua_ui_display_destroy(UAUiDisplay* display)
+{
+    auto mir_display = u_display_mir_display(display);
+    delete mir_display;
+}
+
+uint32_t ua_ui_display_query_horizontal_res(UAUiDisplay* display)
+{
+    auto mir_display = u_display_mir_display(display);
+
+    // TODO<mir>: Line up return types from mirclient
+    return static_cast<uint32_t>(mir_display->width);
+}
+
+uint32_t ua_ui_display_query_vertical_res(UAUiDisplay* display)
+{
+    auto mir_display = u_display_mir_display(display);
+
+    // TODO<mir>: Line up return types from mirclient
+    return static_cast<uint32_t>(mir_display->height);
+}
+
+EGLNativeDisplayType ua_ui_display_get_native_type(UAUiDisplay* display)
+{
+    auto instance = global_mir_instance();
+
+    // TODO<mir>: Careful with this cast
+    return reinterpret_cast<EGLNativeDisplayType>(mir_connection_get_egl_native_display(instance->connection()));
+}
+
+UAUiWindowProperties* ua_ui_window_properties_new_for_normal_window()
+{
+    return (new uamc::WindowProperties)->as_u_window_properties();
+}
+
+void ua_ui_window_properties_destroy(UAUiWindowProperties* u_properties)
+{
+    auto properties = uamc::WindowProperties::from_u_window_properties(u_properties);
+    delete properties;
+}
+
+void ua_ui_window_properties_set_titlen(UAUiWindowProperties* u_properties, const char* title, size_t title_length)
+{
+    auto properties = uamc::WindowProperties::from_u_window_properties(u_properties);
+
+    properties->set_title(title, title_length);
+}
+
+const char* ua_ui_window_properties_get_title(UAUiWindowProperties* u_properties)
+{
+    auto properties = uamc::WindowProperties::from_u_window_properties(u_properties);
+    return properties->surface_parameters().name;
+}
+
+void ua_ui_window_properties_set_role(UAUiWindowProperties* properties, UAUiWindowRole role)
+{
+    // TODO<papi>: Doesn't seem like this is meaningful for mirclient. Perhaps it should leave platform-api.
+    (void) properties;
+    (void) role;
+}
+
+void ua_ui_window_properties_set_input_cb_and_ctx(UAUiWindowProperties* u_properties, UAUiWindowInputEventCb cb, void* ctx)
+{
+    auto properties = uamc::WindowProperties::from_u_window_properties(u_properties);
+    properties->set_input_cb_and_ctx(cb, ctx);
+}
+
+UAUiWindow* ua_ui_window_new_for_application_with_properties(UApplicationInstance* u_instance, UAUiWindowProperties* u_properties)
+{
+    auto instance = uamc::Instance::from_u_application_instance(u_instance);
+    auto properties = uamc::WindowProperties::from_u_window_properties(u_properties);
+
+    auto window = new uamc::Window(*instance, properties);
+    return window->as_u_window();
+}
+
+void ua_ui_window_destroy(UAUiWindow* u_window)
+{
+    auto window = uamc::Window::from_u_window(u_window);
+    delete window;
+}
+
+UStatus ua_ui_window_move(UAUiWindow* u_window, uint32_t x, uint32_t y)
+{
+    // TODO<papi,mir>: Implement. Assuming this should exist on mirclient?
+    (void) u_window;
+    (void) x;
+    (void) y;
+    return (UStatus) 0;
+}
+
+UStatus ua_ui_window_resize(UAUiWindow* u_window, uint32_t width, uint32_t height)
+{
+    // TODO<mir>: Implement
+    (void) u_window;
+    (void) width;
+    (void) height;
+    return (UStatus) 0;
+}
+
+UStatus ua_ui_window_hide(UAUiWindow* u_window)
+{
+    // TODO<mir>: Implement
+    (void) u_window;
+    return (UStatus) 0;
+}
+
+UStatus ua_ui_window_show(UAUiWindow* u_window)
+{
+    // TODO<mir>: Implement
+    (void) u_window;
+    return (UStatus) 0;
+}
+
+void ua_ui_window_request_fullscreen(UAUiWindow* u_window)
+{
+    // TODO<mir>: Implement
+    (void) u_window;
+}
+
+EGLNativeWindowType ua_ui_window_get_native_type(UAUiWindow* u_window)
+{
+    auto window = uamc::Window::from_u_window(u_window);
+    return window->get_native_type();
+}
+
+// TODO: Sensors
+}

=== added file 'src/mirclient/window_mirclient.cpp'
--- src/mirclient/window_mirclient.cpp	1970-01-01 00:00:00 +0000
+++ src/mirclient/window_mirclient.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#include "window_mirclient_priv.h"
+#include "application_instance_mirclient_priv.h"
+#include "window_properties_mirclient_priv.h"
+#include "window_mirclient_priv.h"
+
+#include "mircommon/event_helpers_mir.h"
+
+namespace uamc = ubuntu::application::mir::client;
+namespace uaum = ubuntu::application::ui::mir;
+
+namespace ubuntu
+{
+namespace application
+{
+namespace mir
+{
+namespace client
+{
+
+struct InputContext
+{
+    UAUiWindowInputEventCb cb;
+    void *ctx;
+};
+
+static void
+ua_ui_window_mir_handle_event(MirSurface* surface, MirEvent const* mir_ev, void* ctx)
+{
+    // TODO<mir>: Perhaps this indicates that mirclient library should not pass a surface argument here.
+    (void) surface;
+
+    Event ubuntu_ev;
+    uaum::event_to_ubuntu_event(mir_ev, ubuntu_ev);
+    auto mir_ctx = static_cast<uamc::InputContext*>(ctx);
+    mir_ctx->cb(mir_ctx->ctx, &ubuntu_ev);
+}
+
+}
+}
+}
+}
+
+namespace
+{
+
+static MirPixelFormat
+mir_choose_default_pixel_format(MirConnection *connection)
+{
+    MirDisplayInfo info;
+    mir_connection_get_display_info(connection, &info);
+    return info.supported_pixel_format[0];
+}
+
+static MirSurface*
+create_surface_with_parameters(MirConnection *connection,
+                               MirSurfaceParameters parameters)
+{
+}
+
+}
+
+uamc::Window::Window(uamc::Instance& instance,
+                     uamc::WindowProperties* properties)
+    : instance(instance)
+{
+    window_properties = WindowPropertiesPtr(properties,
+        [](uamc::WindowProperties *p)
+        {
+            ua_ui_window_properties_destroy(p->as_u_window_properties());
+        });
+
+    MirSurfaceParameters parameters = properties->surface_parameters();
+    auto connection = instance.connection();
+    parameters.pixel_format = mir_choose_default_pixel_format(connection);
+
+    auto mir_surface = mir_connection_create_surface_sync(connection, &parameters);
+    // TODO: create_surface_sync is unsafe as there is a race between setting the event handler and receiving surfaces
+    input_ctx = InputContextPtr(new uamc::InputContext{properties->input_cb(), properties->input_context()},
+        [](InputContext *c)
+        {
+            delete c;
+        });
+    
+    MirEventDelegate delegate = 
+        { 
+            uamc::ua_ui_window_mir_handle_event,
+            input_ctx.get()
+        };
+    mir_surface_set_event_handler(mir_surface, &delegate);
+    surface = SurfacePtr(mir_surface, 
+        [](MirSurface *s)
+        {
+            mir_surface_release_sync(s);
+        });
+}
+
+UAUiWindow* uamc::Window::as_u_window()
+{
+    return static_cast<UAUiWindow*>(this);
+}
+
+uamc::Window* uamc::Window::from_u_window(UAUiWindow *u_window)
+{
+    return static_cast<uamc::Window*>(u_window);
+}
+
+EGLNativeWindowType uamc::Window::get_native_type()
+{
+    return reinterpret_cast<EGLNativeWindowType>(mir_surface_get_egl_native_window(surface.get()));
+}

=== added file 'src/mirclient/window_mirclient_priv.h'
--- src/mirclient/window_mirclient_priv.h	1970-01-01 00:00:00 +0000
+++ src/mirclient/window_mirclient_priv.h	2013-06-18 00:07:29 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2013 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 UBUNTU_APPLICATION_UI_WINDOW_MIRCLIENT_PRIV_H_
+#define UBUNTU_APPLICATION_UI_WINDOW_MIRCLIENT_PRIV_H_
+
+#include <ubuntu/application/ui/window.h>
+#include <mir_toolkit/mir_client_library.h>
+
+#include <EGL/egl.h>
+
+#include <stddef.h>
+
+#include <functional>
+#include <memory>
+#include <string>
+
+namespace ubuntu
+{
+namespace application
+{
+namespace mir
+{
+namespace client
+{
+class Instance;
+class WindowProperties;
+struct InputContext;
+
+class Window
+{
+public:
+    Window(Instance& instance, WindowProperties* window);
+    ~Window() = default;
+
+    UAUiWindow* as_u_window();
+    static Window* from_u_window(UAUiWindow* u_window);
+    
+    EGLNativeWindowType get_native_type();
+protected:
+    Window(Window const&) = delete;
+    Window& operator=(Window const&) = delete;
+
+private:
+    Instance& instance;
+
+    typedef std::unique_ptr<WindowProperties, std::function<void(WindowProperties*)>> WindowPropertiesPtr;
+    typedef std::unique_ptr<MirSurface, std::function<void(MirSurface*)>> SurfacePtr;
+    typedef std::unique_ptr<InputContext, std::function<void(InputContext*)>> InputContextPtr;
+
+    WindowPropertiesPtr window_properties;
+    SurfacePtr surface;
+    InputContextPtr input_ctx;
+};
+    
+}
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_WINDOW_MIRCLIENT_PRIV_H_

=== added file 'src/mirclient/window_properties_mirclient.cpp'
--- src/mirclient/window_properties_mirclient.cpp	1970-01-01 00:00:00 +0000
+++ src/mirclient/window_properties_mirclient.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#include "window_properties_mirclient_priv.h"
+
+namespace uamc = ubuntu::application::mir::client;
+
+uamc::WindowProperties::WindowProperties()
+    : cb(nullptr),
+      input_ctx(nullptr)
+{
+    parameters.name = nullptr;
+    parameters.width = 0;
+    parameters.height = 0;
+    parameters.buffer_usage = mir_buffer_usage_hardware;
+}
+
+UAUiWindowProperties* uamc::WindowProperties::as_u_window_properties()
+{
+    return static_cast<UAUiWindowProperties*>(this);
+}
+uamc::WindowProperties* uamc::WindowProperties::from_u_window_properties(UAUiWindowProperties* u_properties)
+{
+    return static_cast<uamc::WindowProperties*>(u_properties);
+}
+
+void uamc::WindowProperties::set_title(char const* window_title, size_t length)
+{
+    title = std::string(window_title, length);
+    parameters.name = title.c_str();
+}
+
+void uamc::WindowProperties::set_input_cb_and_ctx(UAUiWindowInputEventCb callback, void* ctx)
+{
+    cb = callback;
+    input_ctx = ctx;
+}
+
+MirSurfaceParameters const& uamc::WindowProperties::surface_parameters() const
+{
+    return parameters;
+}
+
+UAUiWindowInputEventCb uamc::WindowProperties::input_cb() const
+{
+    return cb;
+}
+
+void* uamc::WindowProperties::input_context() const
+{
+    return input_ctx;
+}
+

=== added file 'src/mirclient/window_properties_mirclient_priv.h'
--- src/mirclient/window_properties_mirclient_priv.h	1970-01-01 00:00:00 +0000
+++ src/mirclient/window_properties_mirclient_priv.h	2013-06-18 00:07:29 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2013 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 UBUNTU_APPLICATION_UI_WINDOW_PROPERTIES_MIRCLIENT_PRIV_H_
+#define UBUNTU_APPLICATION_UI_WINDOW_PROPERTIES_MIRCLIENT_PRIV_H_
+
+#include <ubuntu/application/ui/window.h>
+#include <mir_toolkit/mir_client_library.h>
+
+#include <stddef.h>
+
+#include <string>
+
+namespace ubuntu
+{
+namespace application
+{
+namespace mir
+{
+namespace client
+{
+
+class WindowProperties
+{
+public:
+    WindowProperties();
+    ~WindowProperties() = default;
+
+    UAUiWindowProperties* as_u_window_properties();
+    static WindowProperties* from_u_window_properties(UAUiWindowProperties* u_properties);
+    
+    void set_title(char const* title, size_t length);
+    void set_input_cb_and_ctx(UAUiWindowInputEventCb cb, void* ctx);
+    
+    MirSurfaceParameters const& surface_parameters() const;
+    UAUiWindowInputEventCb input_cb() const;
+    void* input_context() const;
+    
+protected:
+    WindowProperties(WindowProperties const&) = delete;
+    WindowProperties& operator=(WindowProperties const&) = delete;
+
+private:
+    MirSurfaceParameters parameters;
+
+    std::string title;
+
+    UAUiWindowInputEventCb cb;
+    void *input_ctx;
+};
+    
+}
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_WINDOW_PROPERTIES_MIRCLIENT_PRIV_H_

=== added directory 'src/mircommon'
=== added file 'src/mircommon/CMakeLists.txt'
--- src/mircommon/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/mircommon/CMakeLists.txt	2013-06-18 00:07:29 +0000
@@ -0,0 +1,44 @@
+set(SOURCES
+  event_helpers_mir.cpp
+  application_id_mir.cpp
+  application_options_mir.cpp
+  application_description_mir.cpp
+  lifecycle_delegate_mir.cpp
+  session_mir.cpp
+)
+
+set(LINK_LIBRARIES
+  ${MIR_COMMON_LDFLAGS} ${MIR_COMMON_LIBRARIES}
+)
+
+if(ENABLE_HYBRIS_IMPLEMENTATION)
+  list(APPEND SOURCES
+    ../hybris/hybris_bridge.cpp
+    ../hybris/ubuntu_application_sensors_hybris.cpp
+    )
+  list(APPEND LINK_LIBRARIES
+    hybris-common
+    )
+else()
+  list(APPEND SOURCES
+    ubuntu_application_sensors_desktop.cpp
+    )
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC --std=c++11")
+
+include_directories(
+  ${MIRCOMMON_INCLUDE_DIRS}
+)
+
+add_library(
+	ubuntu_application_api_mircommon STATIC
+	${SOURCES}
+)
+
+target_link_libraries(
+	ubuntu_application_api_mircommon
+        ${LINK_LIBRARIES}
+)
+
+

=== added file 'src/mircommon/application_description_mir.cpp'
--- src/mircommon/application_description_mir.cpp	1970-01-01 00:00:00 +0000
+++ src/mircommon/application_description_mir.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#include "application_description_mir_priv.h"
+
+namespace uam = ubuntu::application::mir;
+
+uam::Description::Description()
+    : application_id(nullptr),
+      lifecycle_delegate(nullptr)
+{
+}
+
+UApplicationDescription* uam::Description::as_u_application_description()
+{
+    return static_cast<UApplicationDescription*>(this);
+}
+
+uam::Description* uam::Description::from_u_application_description(UApplicationDescription* description)
+{
+    return static_cast<uam::Description*>(description);
+}
+
+UApplicationDescription*
+u_application_description_new()
+{
+    auto description = new uam::Description();
+    return description->as_u_application_description();
+}
+    
+void
+u_application_description_destroy(UApplicationDescription *u_description)
+{
+    auto description = uam::Description::from_u_application_description(u_description);
+    delete description;
+}
+    
+void
+u_application_description_set_application_id(UApplicationDescription *u_description,
+    UApplicationId *id)
+{
+    auto description = uam::Description::from_u_application_description(u_description);
+    
+    description->application_id = std::unique_ptr<UApplicationId, std::function<void(UApplicationId*)>>(id,
+        [](UApplicationId *p)
+        {
+            u_application_id_destroy(p);
+        });
+}
+    
+UApplicationId* 
+u_application_description_get_application_id(UApplicationDescription *u_description)
+{
+    auto description = uam::Description::from_u_application_description(u_description);
+    return description->application_id.get();
+}
+    
+void
+u_application_description_set_application_lifecycle_delegate(UApplicationDescription *u_description,
+    UApplicationLifecycleDelegate *lifecycle_delegate)
+{
+    auto description = uam::Description::from_u_application_description(u_description);
+
+    // TODO: We don't take a ref as it is created with a floating ref but this should be made more explicit...
+    description->lifecycle_delegate = 
+        std::unique_ptr<UApplicationLifecycleDelegate, std::function<void(UApplicationLifecycleDelegate*)>>(lifecycle_delegate,
+            [](UApplicationLifecycleDelegate *p)
+            {
+                u_application_lifecycle_delegate_unref(p);
+            });
+
+}
+    
+UApplicationLifecycleDelegate* 
+u_application_description_get_application_lifecycle_delegate(UApplicationDescription *u_description)
+{
+    auto description = uam::Description::from_u_application_description(u_description);
+    return description->lifecycle_delegate.get();
+}

=== added file 'src/mircommon/application_description_mir_priv.h'
--- src/mircommon/application_description_mir_priv.h	1970-01-01 00:00:00 +0000
+++ src/mircommon/application_description_mir_priv.h	2013-06-18 00:07:29 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013 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 UBUNTU_APPLICATION_DESCRIPTION_MIR_PRIV_H_
+#define UBUNTU_APPLICATION_DESCRIPTION_MIR_PRIV_H_
+
+#include <ubuntu/application/description.h>
+
+#include <memory>
+#include <functional>
+
+namespace ubuntu
+{
+namespace application
+{
+namespace mir
+{
+
+class Description
+{
+public:
+    Description();
+    ~Description() = default;
+    
+    UApplicationDescription* as_u_application_description();
+    static Description* from_u_application_description(UApplicationDescription* u_description);
+
+    // TODO<papi> Do we really own these?
+    std::unique_ptr<UApplicationId, std::function<void(UApplicationId*)>> application_id;
+    std::unique_ptr<UApplicationLifecycleDelegate, std::function<void(UApplicationLifecycleDelegate*)>> lifecycle_delegate;
+
+protected:
+    Description(Description const&) = delete;
+    Description& operator=(Description const&) = delete;
+};
+
+}
+}
+} // namespace ubuntu
+
+#endif // UBUNTU_APPLICATION_DESCRIPTION_MIR_PRIV_H_

=== added file 'src/mircommon/application_id_mir.cpp'
--- src/mircommon/application_id_mir.cpp	1970-01-01 00:00:00 +0000
+++ src/mircommon/application_id_mir.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#include "application_id_mir_priv.h"
+
+namespace uam = ubuntu::application::mir;
+
+uam::Id::Id(const char *name, size_t size)
+    : name(name, size)
+{
+}
+
+UApplicationId* uam::Id::as_u_application_id()
+{
+    return static_cast<UApplicationId*>(this);
+}
+
+uam::Id* uam::Id::from_u_application_id(UApplicationId *id)
+{
+    return static_cast<uam::Id*>(id);
+}
+
+UApplicationId*
+u_application_id_new_from_stringn(const char *string, size_t size)
+{
+    auto id = new uam::Id(string, size);
+    return id->as_u_application_id();
+}
+
+void u_application_id_destroy(UApplicationId *u_id)
+{
+    auto id = uam::Id::from_u_application_id(u_id);
+    delete id;
+}
+
+int u_application_id_compare(UApplicationId* u_lhs, UApplicationId* u_rhs)
+{
+    auto lhs = uam::Id::from_u_application_id(u_lhs);
+    auto rhs = uam::Id::from_u_application_id(u_rhs);
+    return lhs->name.compare(rhs->name);
+}

=== added file 'src/mircommon/application_id_mir_priv.h'
--- src/mircommon/application_id_mir_priv.h	1970-01-01 00:00:00 +0000
+++ src/mircommon/application_id_mir_priv.h	2013-06-18 00:07:29 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2013 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 UBUNTU_APPLICATION_ID_MIR_PRIV_H_
+#define UBUNTU_APPLICATION_ID_MIR_PRIV_H_
+
+#include <ubuntu/application/id.h>
+
+#include <string>
+
+namespace ubuntu
+{
+namespace application
+{
+namespace mir
+{
+
+class Id
+{
+public:
+    Id(const char *name, size_t size);
+    ~Id() = default;
+    
+    UApplicationId* as_u_application_id();
+    static Id* from_u_application_id(UApplicationId* id);
+
+    std::string const name;
+
+protected:
+    Id(const Id&) = delete;
+    Id& operator=(const Id&) = delete;
+};
+
+}
+}
+} // namespace ubuntu
+
+#endif // UBUNTU_APPLICATION_ID_MIR_PRIV_H_

=== added file 'src/mircommon/application_options_mir.cpp'
--- src/mircommon/application_options_mir.cpp	1970-01-01 00:00:00 +0000
+++ src/mircommon/application_options_mir.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#include "application_options_mir_priv.h"
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+
+#include <tuple>
+#include <string>
+
+namespace uam = ubuntu::application::mir;
+
+UApplicationOptions* uam::Options::as_u_application_options()
+{
+    return static_cast<UApplicationOptions*>(this);
+}
+uam::Options* uam::Options::from_u_application_options(UApplicationOptions* options)
+{
+    return static_cast<uam::Options*>(options);
+}
+
+namespace
+{
+
+UAUiStage
+string_to_stage(std::string const& s)
+{
+    if (s == "main_stage")
+        return U_MAIN_STAGE;
+    else if (s == "side_stage")
+        return U_SIDE_STAGE;
+    else if (s == "share_stage")
+        return U_SHARE_STAGE;
+}
+
+UAUiFormFactor
+string_to_form_factor(std::string const& s)
+{
+    if (s == "desktop")
+        return U_DESKTOP;
+    else if (s == "phone")
+        return U_PHONE;
+    else if (s == "tablet")
+        return U_TABLET;
+}
+
+void print_help_and_exit()
+{
+    printf("Usage: executable "
+           "[--form_factor_hint={desktop, phone, tablet}] "
+           "[--stage_hint={main_stage, side_stage, share_stage}] "
+           "[--desktop_file_hint=absolute_path_to_desktop_file]\n");
+    exit(EXIT_SUCCESS);
+}
+
+}
+
+extern "C"
+{
+UApplicationOptions*
+u_application_options_new_from_cmd_line(int argc, char** argv)
+{
+    static const int uninteresting_flag_value = 0;
+    static struct option long_options[] =
+    {        
+        {"form_factor_hint", required_argument, NULL, uninteresting_flag_value},
+        {"stage_hint", required_argument, NULL, uninteresting_flag_value},
+        {"desktop_file_hint", required_argument, NULL, uninteresting_flag_value},
+        {"help", no_argument, NULL, uninteresting_flag_value},
+        {0, 0, 0, 0}
+    };
+
+    static const int form_factor_hint_index = 0;
+    static const int stage_hint_index = 1;
+    static const int desktop_file_hint_index = 2;
+    static const int help_index = 3;
+
+    auto app_options = new uam::Options;
+
+    while(true)
+    {
+        int option_index = 0;
+
+        int c = getopt_long(argc,
+                            argv,
+                            "",
+                            long_options,
+                            &option_index);
+
+        if (c == -1)
+            break;
+
+        switch (c)
+        {
+        case 0:
+            // If this option set a flag, do nothing else now.
+            if (long_options[option_index].flag != 0)
+                break;
+            if (option_index == help_index)
+                print_help_and_exit();
+            if (optarg)
+            {
+                switch(option_index)
+                {
+                case form_factor_hint_index:
+                    app_options->form_factor = string_to_form_factor(std::string(optarg));
+                    break;
+                case stage_hint_index:
+                    app_options->stage = string_to_stage(std::string(optarg));
+                    break;
+                case desktop_file_hint_index:
+                    app_options->desktop_file = std::string(optarg);
+                    break;                
+                }
+            }
+            break;
+        case '?':
+            break;
+        }
+    }
+    
+    return app_options->as_u_application_options();
+}
+
+void
+u_application_options_destroy(UApplicationOptions* u_options)
+{
+    auto options = uam::Options::from_u_application_options(u_options);
+    delete options;
+}
+
+UApplicationOperationMode
+u_application_options_get_operation_mode(UApplicationOptions *u_options)
+{
+    auto options = uam::Options::from_u_application_options(u_options);
+    return options->operation_mode;
+}
+
+UAUiFormFactor
+u_application_options_get_form_factor(UApplicationOptions* u_options)
+{
+    auto options = uam::Options::from_u_application_options(u_options);
+    return options->form_factor;
+}
+
+UAUiStage
+u_application_options_get_stage(UApplicationOptions* u_options)
+{
+    auto options = uam::Options::from_u_application_options(u_options);
+    return options->stage;
+}
+}

=== added file 'src/mircommon/application_options_mir_priv.h'
--- src/mircommon/application_options_mir_priv.h	1970-01-01 00:00:00 +0000
+++ src/mircommon/application_options_mir_priv.h	2013-06-18 00:07:29 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2013 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 UBUNTU_APPLICATION_OPTIONS_MIR_PRIV_H_
+#define UBUNTU_APPLICATION_OPTIONS_MIR_PRIV_H_
+
+#include <ubuntu/application/options.h>
+#include <ubuntu/application/ui/options.h>
+
+#include <string>
+
+namespace ubuntu
+{
+namespace application
+{
+namespace mir
+{
+
+class Options
+{
+public:
+    Options() = default;
+    ~Options() = default;
+    
+    UApplicationOptions* as_u_application_options();
+    static Options* from_u_application_options(UApplicationOptions* u_options);
+
+    UApplicationOperationMode operation_mode = U_APPLICATION_FOREGROUND_APP;
+    UAUiFormFactor form_factor = U_DESKTOP;
+    UAUiStage stage = U_MAIN_STAGE;
+    
+    std::string desktop_file;
+
+protected:
+    Options(Options const&) = delete;
+    Options& operator=(Options const&) = delete;
+};
+
+}
+}
+} // namespace ubuntu
+
+#endif // UBUNTU_APPLICATION_OPTIONS_MIR_PRIV_H_

=== added file 'src/mircommon/event_helpers_mir.cpp'
--- src/mircommon/event_helpers_mir.cpp	1970-01-01 00:00:00 +0000
+++ src/mircommon/event_helpers_mir.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#include "event_helpers_mir.h"
+
+namespace uaum = ubuntu::application::ui::mir;
+
+// TODO<mir>: This begs the question: Why does MirEvent exist? It's difficult to ensure this function is kept in sync 
+// at the unit test level.
+void
+uaum::event_to_ubuntu_event(MirEvent const* mir_event, Event& ubuntu_ev)
+{
+    switch (mir_event->type)
+    {
+    case mir_event_type_key:
+        ubuntu_ev.type = KEY_EVENT_TYPE;
+        ubuntu_ev.device_id = mir_event->key.device_id;
+        ubuntu_ev.source_id = mir_event->key.source_id;
+        ubuntu_ev.action = mir_event->key.action;
+        ubuntu_ev.flags = mir_event->key.flags;
+        ubuntu_ev.meta_state = mir_event->key.modifiers;
+        ubuntu_ev.details.key.key_code = mir_event->key.key_code;
+        ubuntu_ev.details.key.scan_code = mir_event->key.scan_code;
+        ubuntu_ev.details.key.repeat_count = mir_event->key.repeat_count;
+        ubuntu_ev.details.key.down_time = mir_event->key.down_time;
+        ubuntu_ev.details.key.event_time = mir_event->key.event_time;
+        ubuntu_ev.details.key.is_system_key = mir_event->key.is_system_key;
+        break;
+    case mir_event_type_motion:
+        ubuntu_ev.type = MOTION_EVENT_TYPE;
+        ubuntu_ev.device_id = mir_event->motion.device_id;
+        ubuntu_ev.source_id = mir_event->motion.source_id;
+        ubuntu_ev.action = mir_event->motion.action;
+        ubuntu_ev.flags = mir_event->motion.flags;
+        ubuntu_ev.meta_state = mir_event->motion.modifiers;
+        ubuntu_ev.details.motion.edge_flags = mir_event->motion.edge_flags;
+        ubuntu_ev.details.motion.button_state = mir_event->motion.button_state;
+        ubuntu_ev.details.motion.x_offset = mir_event->motion.x_offset;
+        ubuntu_ev.details.motion.y_offset = mir_event->motion.y_offset;
+        ubuntu_ev.details.motion.x_precision = mir_event->motion.x_precision;
+        ubuntu_ev.details.motion.y_precision = mir_event->motion.y_precision;
+        ubuntu_ev.details.motion.down_time = mir_event->motion.down_time;
+        ubuntu_ev.details.motion.event_time = mir_event->motion.event_time;
+        ubuntu_ev.details.motion.pointer_count = mir_event->motion.pointer_count;
+        for (int i = 0; i < mir_event->motion.pointer_count; i++)
+        {
+            ubuntu_ev.details.motion.pointer_coordinates[i].id = mir_event->motion.pointer_coordinates[i].id;
+            ubuntu_ev.details.motion.pointer_coordinates[i].x = mir_event->motion.pointer_coordinates[i].x;
+            ubuntu_ev.details.motion.pointer_coordinates[i].raw_x = mir_event->motion.pointer_coordinates[i].raw_x;
+            ubuntu_ev.details.motion.pointer_coordinates[i].y = mir_event->motion.pointer_coordinates[i].y;
+            ubuntu_ev.details.motion.pointer_coordinates[i].raw_y = mir_event->motion.pointer_coordinates[i].raw_y;
+            ubuntu_ev.details.motion.pointer_coordinates[i].touch_major = mir_event->motion.pointer_coordinates[i].touch_major;
+            ubuntu_ev.details.motion.pointer_coordinates[i].touch_minor = mir_event->motion.pointer_coordinates[i].touch_minor;
+            ubuntu_ev.details.motion.pointer_coordinates[i].size = mir_event->motion.pointer_coordinates[i].size;
+            ubuntu_ev.details.motion.pointer_coordinates[i].pressure = mir_event->motion.pointer_coordinates[i].pressure;
+            ubuntu_ev.details.motion.pointer_coordinates[i].orientation = mir_event->motion.pointer_coordinates[i].orientation;
+        }
+        break;
+    default:
+        break;
+    }
+}

=== added file 'src/mircommon/event_helpers_mir.h'
--- src/mircommon/event_helpers_mir.h	1970-01-01 00:00:00 +0000
+++ src/mircommon/event_helpers_mir.h	2013-06-18 00:07:29 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2013 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 UBUNTU_EVENT_HELPERS_MIR_COMMON_H_
+#define UBUNTU_EVENT_HELPERS_MIR_COMMON_H_
+
+#include <ubuntu/application/ui/input/event.h>
+#include <mir_toolkit/event.h>
+
+namespace ubuntu
+{
+namespace application
+{
+namespace ui
+{
+namespace mir
+{
+void event_to_ubuntu_event(MirEvent const* mir_event, Event& ubuntu_ev);
+}
+}
+}
+}
+
+#endif // UBUNTU_EVENT_HELPERS_MIR_COMMON_H_

=== added file 'src/mircommon/lifecycle_delegate_mir.cpp'
--- src/mircommon/lifecycle_delegate_mir.cpp	1970-01-01 00:00:00 +0000
+++ src/mircommon/lifecycle_delegate_mir.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#include "lifecycle_delegate_mir_priv.h"
+
+namespace uam = ubuntu::application::mir;
+
+// TODO<papi, mir>: This implementation as a stub as we 
+// currently don't do anything with this in Mir. I am not sure
+// what exactly we should be doing either so we need some alignment
+// on this.
+
+uam::LifecycleDelegate::LifecycleDelegate()
+    : resumed_cb(nullptr),
+      stop_cb(nullptr),
+      ctx(nullptr)
+{
+}
+
+UApplicationLifecycleDelegate* uam::LifecycleDelegate::as_u_lifecycle_delegate()
+{
+    return static_cast<UApplicationLifecycleDelegate*>(this);
+}
+
+uam::LifecycleDelegate* uam::LifecycleDelegate::from_u_lifecycle_delegate(UApplicationLifecycleDelegate *u_delegate)
+{
+    return static_cast<uam::LifecycleDelegate*>(u_delegate);
+}
+
+void uam::LifecycleDelegate::ref()
+{
+    ref_count++;
+}
+
+void uam::LifecycleDelegate::unref()
+{
+    ref_count--;
+    if (ref_count == 0)
+        delete this;
+}
+
+
+extern "C"
+{
+
+UApplicationLifecycleDelegate*
+u_application_lifecycle_delegate_new()
+{
+    return (new uam::LifecycleDelegate)->as_u_lifecycle_delegate();
+}
+    
+void
+u_application_lifecycle_delegate_destroy(UApplicationLifecycleDelegate *u_delegate)
+{
+    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
+
+    // TODO: What are the intended semantics of this?
+    delegate->unref();
+}
+    
+void
+u_application_lifecycle_delegate_ref(UApplicationLifecycleDelegate *u_delegate)
+{
+    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
+    delegate->ref();
+}
+    
+void
+u_application_lifecycle_delegate_unref(UApplicationLifecycleDelegate *u_delegate)
+{
+    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
+    delegate->unref();
+}
+    
+void
+u_application_lifecycle_delegate_set_application_resumed_cb(UApplicationLifecycleDelegate *u_delegate,
+    u_on_application_resumed cb)
+{
+    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
+    delegate->resumed_cb = cb;
+}
+    
+u_on_application_resumed
+u_application_lifecycle_delegate_get_application_resumed_cb(UApplicationLifecycleDelegate *u_delegate)
+{
+    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
+    return delegate->resumed_cb;
+}
+    
+void
+u_application_lifecycle_delegate_set_application_about_to_stop_cb(UApplicationLifecycleDelegate *u_delegate,
+    u_on_application_about_to_stop cb)
+{
+    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
+    delegate->stop_cb = cb;
+}
+    
+u_on_application_about_to_stop
+u_application_lifecycle_delegate_get_application_about_to_stop_cb(UApplicationLifecycleDelegate *u_delegate)
+{
+    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
+    return delegate->stop_cb;
+}
+    
+void
+u_application_lifecycle_delegate_set_context(UApplicationLifecycleDelegate *u_delegate,
+    void *context)
+{
+    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
+    delegate->ctx = context;
+}
+    
+void*
+u_application_lifecycle_delegate_get_context(UApplicationLifecycleDelegate *u_delegate,
+    void *context)
+{
+    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
+    return delegate->ctx;
+}
+
+}

=== added file 'src/mircommon/lifecycle_delegate_mir_priv.h'
--- src/mircommon/lifecycle_delegate_mir_priv.h	1970-01-01 00:00:00 +0000
+++ src/mircommon/lifecycle_delegate_mir_priv.h	2013-06-18 00:07:29 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2013 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 UBUNTU_APPLICATION_LIECYCLE_DELEGATE_MIR_PRIV_H_
+#define UBUNTU_APPLICATION_LIECYCLE_DELEGATE_MIR_PRIV_H_
+
+#include <ubuntu/application/lifecycle_delegate.h>
+
+namespace ubuntu
+{
+namespace application
+{
+namespace mir
+{
+
+class LifecycleDelegate
+{
+public:
+    LifecycleDelegate();
+    ~LifecycleDelegate() = default;
+
+    UApplicationLifecycleDelegate* as_u_lifecycle_delegate();
+    static LifecycleDelegate* from_u_lifecycle_delegate(UApplicationLifecycleDelegate *u_delegate);
+
+    void ref();
+    void unref();
+    
+    u_on_application_resumed resumed_cb;
+    u_on_application_about_to_stop stop_cb;
+    void *ctx;
+
+protected:
+    LifecycleDelegate(LifecycleDelegate const&) = delete;
+    LifecycleDelegate& operator=(LifecycleDelegate const&) = delete;
+
+private:
+    unsigned int ref_count;
+};
+
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_LIECYCLE_DELEGATE_MIR_PRIV_H_

=== added file 'src/mircommon/session_mir.cpp'
--- src/mircommon/session_mir.cpp	1970-01-01 00:00:00 +0000
+++ src/mircommon/session_mir.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#include <ubuntu/application/ui/session.h>
+
+// TODO<papi>: Not sure what this should do for mir. ApplicationInstance maps to the mir
+// concept of a session and this doesn't really seem to be used
+
+extern "C"
+{
+
+UAUiSession* ua_ui_session_new_with_properties(UAUiSessionProperties *properties)
+{
+    return nullptr;
+}
+    
+UAUiSessionProperties* ua_ui_session_properties_new()
+{
+    return nullptr;
+}
+   
+void ua_ui_session_properties_set_type(UAUiSessionProperties* properties,
+    UAUiSessionType type)
+{
+    (void) properties;
+    (void) type;
+}
+}

=== added file 'src/mircommon/ubuntu_application_sensors_desktop.cpp'
--- src/mircommon/ubuntu_application_sensors_desktop.cpp	1970-01-01 00:00:00 +0000
+++ src/mircommon/ubuntu_application_sensors_desktop.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voss <[e-mail]>
+ *              Ricardo Mendoza <[e-mail]>
+ */
+
+#include <ubuntu/application/sensors/accelerometer.h>
+#include <ubuntu/application/sensors/proximity.h>
+#include <ubuntu/application/sensors/light.h>
+
+#include <stddef.h>
+
+// Ubuntu Application Sensors. Null desktop implementation
+
+// Acceleration Sensor
+UASensorsAccelerometer* ua_sensors_accelerometer_new()
+{
+    return NULL;
+}
+
+UStatus ua_sensors_accelerometer_enable(UASensorsAccelerometer*)
+{
+    return (UStatus) 0;
+}
+
+UStatus ua_sensors_accelerometer_disable(UASensorsAccelerometer*)
+{
+    return (UStatus) 0;
+}
+
+uint32_t ua_sensors_accelerometer_get_min_delay(UASensorsAccelerometer*)
+{
+    return 0;
+}
+
+float ua_sensors_accelerometer_get_min_value(UASensorsAccelerometer*)
+{
+    return 0.0;
+}
+
+float ua_sensors_accelerometer_get_max_value(UASensorsAccelerometer*)
+{
+    return 0.0;
+}
+
+float ua_sensors_accelerometer_get_resolution(UASensorsAccelerometer*)
+{
+    return 0.0;
+}
+
+void ua_sensors_accelerometer_set_reading_cb(UASensorsAccelerometer*, on_accelerometer_event_cb, void*)
+{
+}
+
+// Acceleration Sensor Event
+uint64_t uas_accelerometer_event_get_timestamp(UASAccelerometerEvent*)
+{
+    return 0;
+}
+
+float uas_accelerometer_event_get_acceleration_x(UASAccelerometerEvent*)
+{
+    return 0.0;
+}
+
+float uas_accelerometer_event_get_acceleration_y(UASAccelerometerEvent*)
+{
+    return 0.0;
+}
+
+float uas_accelerometer_event_get_acceleration_z(UASAccelerometerEvent*)
+{
+    return 0.0;
+}
+
+// Proximity Sensor
+UASensorsProximity* ua_sensors_proximity_new()
+{
+    return NULL;
+}
+
+UStatus ua_sensors_proximity_enable(UASensorsProximity*)
+{
+    return (UStatus) 0;
+}
+
+UStatus ua_sensors_proximity_disable(UASensorsProximity*)
+{
+    return (UStatus) 0;
+}
+
+uint32_t ua_sensors_proximity_get_min_delay(UASensorsProximity*)
+{
+    return 0;
+}
+
+float ua_sensors_proximity_get_min_value(UASensorsProximity*)
+{
+    return 0.0;
+}
+
+float ua_sensors_proximity_get_max_value(UASensorsProximity*)
+{
+    return 0.0;
+}
+
+float ua_sensors_proximity_get_resolution(UASensorsProximity*)
+{
+    return 0.0;
+}
+
+void ua_sensors_proximity_set_reading_cb(UASensorsProximity*, on_proximity_event_cb, void*)
+{
+}
+
+// Proximity Sensor Event
+uint64_t uas_proximity_event_get_timestamp(UASProximityEvent*)
+{
+    return 0;
+}
+
+UASProximityDistance uas_proximity_event_get_distance(UASProximityEvent*)
+{
+    return (UASProximityDistance) 0;
+}
+
+
+// Ambient Light Sensor
+UASensorsLight* ua_sensors_light_new()
+{
+    return NULL;
+}
+
+UStatus ua_sensors_light_enable(UASensorsLight*)
+{
+    return (UStatus) 0;
+}
+
+UStatus ua_sensors_light_disable(UASensorsLight*)
+{
+    return (UStatus) 0;
+}
+
+uint32_t ua_sensors_light_get_min_delay(UASensorsLight*)
+{
+    return 0;
+}
+
+float ua_sensors_light_get_min_value(UASensorsLight*)
+{
+    return 0.0;
+}
+
+float ua_sensors_light_get_max_value(UASensorsLight*)
+{
+    return 0.0;
+}
+
+float ua_sensors_light_get_resolution(UASensorsLight*)
+{
+    return 0.0;
+}
+
+void ua_sensors_light_set_reading_cb(UASensorsLight*, on_light_event_cb, void*)
+{
+}
+
+// Ambient Light Sensor Event
+uint64_t uas_light_event_get_timestamp(UASLightEvent*)
+{
+    return 0;
+}
+
+float uas_light_event_get_light(UASLightEvent*)
+{
+    return 0.0;
+}

=== added directory 'src/mirserver'
=== added file 'src/mirserver/CMakeLists.txt'
--- src/mirserver/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/mirserver/CMakeLists.txt	2013-06-18 00:07:29 +0000
@@ -0,0 +1,38 @@
+set(SOURCES
+  ubuntu_application_api_mirserver.cpp
+  application_instance_mirserver.cpp
+  window_properties_mirserver.cpp
+  window_mirserver.cpp
+)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
+
+add_library(
+	ubuntu_application_api_mirserver SHARED
+	${SOURCES}
+)
+
+include_directories(
+    ${CMAKE_BINARY_DIR}/include
+    ${MIRSERVER_INCLUDE_DIRS}
+)
+
+target_link_libraries(
+	ubuntu_application_api_mirserver
+        ${MIRSERVER_LDFLAGS} ${MIRSERVER_LIBRARIES}
+        -Wl,--whole-archive ubuntu_application_api_mircommon
+        -Wl,--no-whole-archive
+)
+
+
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu_application_api_mirserver_priv.h DESTINATION include/ubuntu/priv/mirserver)
+
+set_target_properties(
+	ubuntu_application_api_mirserver
+	PROPERTIES
+	VERSION 1.0
+	SOVERSION 1
+)
+
+install(TARGETS ubuntu_application_api_mirserver ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(FILES ubuntu_application_api_mirserver_priv.h DESTINATION include/ubuntu/application)

=== added file 'src/mirserver/application_instance_mirserver.cpp'
--- src/mirserver/application_instance_mirserver.cpp	1970-01-01 00:00:00 +0000
+++ src/mirserver/application_instance_mirserver.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#include "application_instance_mirserver_priv.h"
+
+#include "mircommon/application_description_mir_priv.h"
+#include "mircommon/application_options_mir_priv.h"
+#include "mircommon/application_id_mir_priv.h"
+
+#include <mir/shell/surface.h>
+#include <mir/shell/surface_factory.h>
+#include <mir/shell/surface_creation_parameters.h>
+
+namespace uam = ubuntu::application::mir;
+namespace uams = uam::server;
+
+namespace mf = mir::frontend;
+namespace me = mir::events;
+namespace msh = mir::shell;
+
+uams::Instance::Instance(std::shared_ptr<msh::SurfaceFactory> const &surface_factory,
+                         uam::Description* description_,
+                         uam::Options *options_)
+    : surface_factory(surface_factory),
+      ref_count(1)
+{
+    description = DescriptionPtr(description_, 
+        [] (uam::Description* p)
+        {
+            delete p;
+        });
+    options = OptionsPtr(options_,
+        [] (uam::Options* p)
+        {
+            delete p;
+        });
+}
+
+UApplicationInstance* uams::Instance::as_u_application_instance()
+{
+    return static_cast<UApplicationInstance*>(this);
+}
+
+uams::Instance* uams::Instance::from_u_application_instance(UApplicationInstance *u_instance)
+{
+    return static_cast<uams::Instance*>(u_instance);
+}
+
+void uams::Instance::ref()
+{
+    ref_count++;
+}
+
+void uams::Instance::unref()
+{
+    ref_count--;
+    if (ref_count == 0)
+        delete this;
+}
+
+std::shared_ptr<msh::Surface> uams::Instance::create_surface(msh::SurfaceCreationParameters const& parameters)
+{
+    static std::shared_ptr<me::EventSink> const null_event_sink{nullptr};
+    static mf::SurfaceId const default_surface_id{0};
+
+    return surface_factory->create_surface(parameters, default_surface_id,
+                                           null_event_sink);
+}

=== added file 'src/mirserver/application_instance_mirserver_priv.h'
--- src/mirserver/application_instance_mirserver_priv.h	1970-01-01 00:00:00 +0000
+++ src/mirserver/application_instance_mirserver_priv.h	2013-06-18 00:07:29 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2013 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 UBUNTU_APPLICATION_INSTANCE_MIRSERVER_PRIV_H_
+#define UBUNTU_APPLICATION_INSTANCE_MIRSERVER_PRIV_H_
+
+#include <ubuntu/application/instance.h>
+
+#include <memory>
+#include <functional>
+
+namespace mir
+{
+namespace shell
+{
+class SurfaceCreationParameters;
+class Surface;
+class SurfaceFactory;
+}
+}
+
+namespace ubuntu
+{
+namespace application
+{
+namespace mir
+{
+class Description;
+class Options;
+
+namespace server
+{
+
+class Instance
+{
+public:
+    Instance(std::shared_ptr< ::mir::shell::SurfaceFactory> const& surface_factory,
+             ubuntu::application::mir::Description* description, 
+             ubuntu::application::mir::Options *options);
+    ~Instance() = default;
+    
+    UApplicationInstance* as_u_application_instance();
+    static Instance* from_u_application_instance(UApplicationInstance* u_instance);
+    
+    void ref();
+    void unref();
+    
+    std::shared_ptr< ::mir::shell::Surface> create_surface( ::mir::shell::SurfaceCreationParameters const& parameters);
+    
+protected:
+    Instance(Instance const&) = delete;
+    Instance& operator=(Instance const&) = delete;
+
+private:
+    typedef std::unique_ptr<Description, std::function<void(Description*)>> DescriptionPtr;
+    typedef std::unique_ptr<Options, std::function<void(Options*)>> OptionsPtr;
+    
+    OptionsPtr options;
+    DescriptionPtr description;
+    
+    std::shared_ptr< ::mir::shell::SurfaceFactory> const surface_factory;
+    int ref_count;
+};
+
+}
+}
+}
+} // namespace ubuntu
+
+#endif // UBUNTU_APPLICATION_INSTANCE_MIRSERVER_PRIV_H_

=== added file 'src/mirserver/ubuntu_application_api_mirserver.cpp'
--- src/mirserver/ubuntu_application_api_mirserver.cpp	1970-01-01 00:00:00 +0000
+++ src/mirserver/ubuntu_application_api_mirserver.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,320 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#include "ubuntu_application_api_mirserver_priv.h"
+#include "application_instance_mirserver_priv.h"
+#include "window_properties_mirserver_priv.h"
+#include "window_mirserver_priv.h"
+
+#include "mircommon/application_id_mir_priv.h"
+#include "mircommon/application_description_mir_priv.h"
+#include "mircommon/application_options_mir_priv.h"
+
+// C APIs
+#include <ubuntu/application/lifecycle_delegate.h>
+#include <ubuntu/application/ui/window.h>
+#include <ubuntu/application/ui/options.h>
+#include <ubuntu/application/ui/session.h>
+#include <ubuntu/application/ui/clipboard.h>
+#include <ubuntu/application/ui/display.h>
+#include <ubuntu/application/sensors/accelerometer.h>
+#include <ubuntu/application/sensors/proximity.h>
+#include <ubuntu/application/sensors/light.h>
+
+#include <mir/default_server_configuration.h>
+
+#include <mir/graphics/display.h>
+#include <mir/graphics/platform.h>
+#include <mir/compositor/graphic_buffer_allocator.h>
+#include <mir/frontend/session.h>
+#include <mir/frontend/shell.h>
+#include <mir/shell/surface_creation_parameters.h>
+#include <mir/shell/surface.h>
+#include <mir/graphics/internal_client.h>
+#include <mir/input/input_platform.h>
+
+#include <assert.h>
+
+#include <memory>
+#include <functional>
+
+namespace uam = ubuntu::application::mir;
+namespace uams = ubuntu::application::mir::server;
+
+namespace
+{
+
+struct MirServerContext
+{
+    std::shared_ptr<mir::graphics::Display> display;
+    std::shared_ptr<mir::compositor::GraphicBufferAllocator> buffer_allocator;
+    std::shared_ptr<mir::shell::SurfaceFactory> surface_factory;
+    std::shared_ptr<mir::input::receiver::InputPlatform> input_platform;
+    std::shared_ptr<mir::graphics::InternalClient> egl_client;
+};
+
+MirServerContext *
+global_mirserver_context()
+{
+    static MirServerContext context;
+    return &context;
+}
+
+extern "C"
+{
+void ua_ui_mirserver_init(mir::DefaultServerConfiguration& config)
+{
+    auto context = global_mirserver_context();
+
+    context->display = config.the_display();
+    context->buffer_allocator = config.the_buffer_allocator();
+    context->surface_factory = config.the_shell_surface_factory();
+    context->input_platform = mir::input::receiver::InputPlatform::create();
+    context->egl_client = config.the_graphics_platform()->create_internal_client();
+}
+
+void ua_ui_mirserver_finish()
+{
+    auto context = global_mirserver_context();
+
+    context->display.reset();
+    context->surface_factory.reset();
+    context->input_platform.reset();
+    context->egl_client.reset();
+}
+}
+
+}
+
+
+extern "C"
+{
+
+UApplicationInstance* u_application_instance_new_from_description_with_options(UApplicationDescription* u_description, UApplicationOptions* u_options)
+{
+    auto surface_factory = global_mirserver_context()->surface_factory;
+    assert(surface_factory);
+
+    auto description = uam::Description::from_u_application_description(u_description);
+    auto options = uam::Options::from_u_application_options(u_options);
+
+    auto instance = new uams::Instance(surface_factory, description, options);
+
+    return instance->as_u_application_instance();
+}
+
+void
+u_application_instance_ref(UApplicationInstance *u_instance)
+{
+    auto instance = uams::Instance::from_u_application_instance(u_instance);
+    instance->ref();
+}
+    
+void
+u_application_instance_unref(UApplicationInstance *u_instance)
+{
+    auto instance = uams::Instance::from_u_application_instance(u_instance);
+    instance->unref();
+}
+    
+void
+u_application_instance_destroy(UApplicationInstance *instance)
+{
+    // TODO<papi>: What are the proper semantics here.
+    u_application_instance_unref(instance);
+}
+    
+void
+u_application_instance_run(UApplicationInstance *instance)
+{
+    // TODO<papi>: What is this supposed to do? Seems to be no-op on hybris.
+    (void) instance;
+}
+
+void ua_ui_set_clipboard_content(void* content, size_t content_size)
+{
+    // TODO<mir,papi>: Implement. Probably need more arguments?
+    (void) content;
+    (void) content_size;
+}
+
+void ua_ui_get_clipboard_content(void** out_content, size_t* out_content_size)
+{
+    // TODO<mir,papi>: Implement
+    *out_content = NULL;
+    *out_content_size = 0;
+}
+
+UAUiDisplay* ua_ui_display_new_with_index(size_t index)
+{
+    // TODO<mir>: Make use of index. This is kind of strangely done...
+    return reinterpret_cast<UAUiDisplay*>(index);
+}
+
+void ua_ui_display_destroy(UAUiDisplay* display)
+{
+    // TODO: Implement. Or is this a noop for mirserver?
+    (void) display;
+}
+
+uint32_t ua_ui_display_query_horizontal_res(UAUiDisplay* display)
+{
+    (void) display; // TODO<mir>: Multiple displays
+
+    auto mir_display = global_mirserver_context()->display;
+    assert(mir_display);
+    
+    return mir_display->view_area().size.width.as_uint32_t();
+}
+
+uint32_t ua_ui_display_query_vertical_res(UAUiDisplay* display)
+{
+    (void) display; // TODO<mir>: Multiple displays
+
+    auto mir_display = global_mirserver_context()->display;
+    assert(mir_display);
+    
+    return mir_display->view_area().size.height.as_uint32_t();
+}
+
+EGLNativeDisplayType ua_ui_display_get_native_type(UAUiDisplay* display)
+{
+    auto internal_client = global_mirserver_context()->egl_client;
+    assert(internal_client);
+    
+    return internal_client->egl_native_display();
+}
+
+namespace
+{
+static mir::geometry::PixelFormat choose_pixel_format(std::shared_ptr<mir::compositor::GraphicBufferAllocator> const& allocator)
+{
+    auto formats = allocator->supported_pixel_formats();
+    return formats[0];
+}
+}
+
+UAUiWindowProperties* ua_ui_window_properties_new_for_normal_window()
+{
+    auto properties = new uams::WindowProperties();
+
+    return properties->as_u_window_properties();
+}
+
+void ua_ui_window_properties_destroy(UAUiWindowProperties* u_properties)
+{
+    auto properties = uams::WindowProperties::from_u_window_properties(u_properties);
+    delete properties;
+}
+
+void ua_ui_window_properties_set_titlen(UAUiWindowProperties* u_properties, const char* title, size_t title_length)
+{
+    auto properties = uams::WindowProperties::from_u_window_properties(u_properties);
+    properties->set_title(title, title_length);
+}
+
+const char* ua_ui_window_properties_get_title(UAUiWindowProperties* u_properties)
+{
+    auto properties = uams::WindowProperties::from_u_window_properties(u_properties);
+    return properties->surface_parameters().name.c_str();
+}
+
+void ua_ui_window_properties_set_role(UAUiWindowProperties* properties, UAUiWindowRole role)
+{
+    // TODO<papi>: Implement. Or is this a noop for us?
+    (void) properties;
+    (void) role;
+}
+
+void ua_ui_window_properties_set_input_cb_and_ctx(UAUiWindowProperties* u_properties, UAUiWindowInputEventCb cb, void* ctx)
+{
+    auto properties = uams::WindowProperties::from_u_window_properties(u_properties);
+    properties->set_input_cb_and_ctx(cb, ctx);
+}
+
+UAUiWindow* ua_ui_window_new_for_application_with_properties(UApplicationInstance* u_instance, UAUiWindowProperties* u_properties)
+{
+    auto input_platform = global_mirserver_context()->input_platform;
+    assert(input_platform);
+    auto internal_client = global_mirserver_context()->egl_client;
+    assert(internal_client);
+
+    auto instance = uams::Instance::from_u_application_instance(u_instance);
+    auto properties = uams::WindowProperties::from_u_window_properties(u_properties);
+    
+    // A bit of a wart.
+    properties->set_pixel_format(choose_pixel_format(global_mirserver_context()->buffer_allocator));
+    
+    auto window = new uams::Window(*instance, properties, input_platform, internal_client);
+
+    return window->as_u_window();
+}
+
+void ua_ui_window_destroy(UAUiWindow* u_window)
+{
+    auto window = uams::Window::from_u_window(u_window);
+    delete window;
+}
+
+UStatus ua_ui_window_move(UAUiWindow* window, uint32_t x, uint32_t y)
+{
+    // TODO<mir,papi>: Implement. But should this exist?
+    (void) window;
+    (void) x;
+    (void) y;
+    return (UStatus) 0;
+}
+
+UStatus ua_ui_window_resize(UAUiWindow* window, uint32_t width, uint32_t height)
+{
+    // TODO<mir>: Implement
+    (void) window;
+    (void) width;
+    (void) height;
+    return (UStatus) 0;
+}
+
+UStatus ua_ui_window_hide(UAUiWindow* window)
+{
+    // TODO<mir>: Implement
+    (void) window;
+    return (UStatus) 0;
+}
+
+UStatus ua_ui_window_show(UAUiWindow* window)
+{
+    // TODO<mir>: Implement
+    (void) window;
+    return (UStatus) 0;
+}
+
+void ua_ui_window_request_fullscreen(UAUiWindow* window)
+{
+    // TODO<mir>: Implement
+    (void) window;
+}
+
+EGLNativeWindowType ua_ui_window_get_native_type(UAUiWindow* u_window)
+{
+    auto window = uams::Window::from_u_window(u_window);
+
+    return window->get_native_type();
+}
+
+// TODO: Sensors
+}

=== added file 'src/mirserver/ubuntu_application_api_mirserver_priv.h'
--- src/mirserver/ubuntu_application_api_mirserver_priv.h	1970-01-01 00:00:00 +0000
+++ src/mirserver/ubuntu_application_api_mirserver_priv.h	2013-06-18 00:07:29 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2013 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 UBUNTU_APPLICATION_API_MIRSERVER_PRIV_H_
+#define UBUNTU_APPLICATION_API_MIRSERVER_PRIV_H_
+
+namespace mir
+{
+class DefaultServerConfiguration;
+}
+
+// We need to provide the platform API with Mir server objects as dependency. The analog
+// on the client side is of course the named socket for connection to Mir. This should be
+// invoked from the run_mir handler prior to creation of a UApplicationInstance or usage of
+// any ua_ui functions.
+
+extern "C"
+{
+void ua_ui_mirserver_init(mir::DefaultServerConfiguration& config);
+
+// Release platform-api ownership of Mir server objects to allow for clean shutdown.
+void ua_ui_mirserver_finish();
+}
+
+#endif // UBUNTU_APPLICATION_API_MIRSERVER_PRIV_H_
+

=== added file 'src/mirserver/window_mirserver.cpp'
--- src/mirserver/window_mirserver.cpp	1970-01-01 00:00:00 +0000
+++ src/mirserver/window_mirserver.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#include "mircommon/event_helpers_mir.h"
+
+#include "window_mirserver_priv.h"
+#include "application_instance_mirserver_priv.h"
+#include "window_properties_mirserver_priv.h"
+
+
+#include <mir/shell/surface.h>
+#include <mir/input/input_platform.h>
+#include <mir/input/input_receiver_thread.h>
+#include <mir/graphics/internal_client.h>
+
+namespace uams = ubuntu::application::mir::server;
+namespace uaum = ubuntu::application::ui::mir;
+
+namespace mg = mir::graphics;
+namespace msh = mir::shell;
+namespace mircv = mir::input::receiver;
+
+namespace
+{
+
+static void ua_ui_window_handle_event(UAUiWindowInputEventCb cb, void* ctx, MirEvent* mir_event)
+{
+    Event ubuntu_ev;
+    uaum::event_to_ubuntu_event(mir_event, ubuntu_ev);
+    cb(ctx, &ubuntu_ev);
+}
+
+}
+
+uams::Window::Window(uams::Instance& instance, uams::WindowProperties* properties,
+                     std::shared_ptr<mircv::InputPlatform> const& input_platform,
+                     std::shared_ptr<mg::InternalClient> const& internal_client)
+    : window_properties(properties),
+      surface(instance.create_surface(properties->surface_parameters())),
+      internal_client(internal_client)
+{
+    input_thread = input_platform->create_input_thread(surface->client_input_fd(),
+        std::bind(ua_ui_window_handle_event, properties->input_cb(), properties->input_context(), std::placeholders::_1));
+    input_thread->start();
+}
+
+uams::Window::~Window()
+{
+    input_thread->stop();
+    input_thread->join();
+}
+
+UAUiWindow* uams::Window::as_u_window()
+{
+    return static_cast<UAUiWindow*>(this);
+}
+
+uams::Window* uams::Window::from_u_window(UAUiWindow *u_window)
+{
+    return static_cast<uams::Window*>(u_window);
+}
+
+EGLNativeWindowType uams::Window::get_native_type()
+{
+    return internal_client->egl_native_window(surface);
+}

=== added file 'src/mirserver/window_mirserver_priv.h'
--- src/mirserver/window_mirserver_priv.h	1970-01-01 00:00:00 +0000
+++ src/mirserver/window_mirserver_priv.h	2013-06-18 00:07:29 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2013 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 UBUNTU_APPLICATION_UI_WINDOW_MIRSERVER_PRIV_H_
+#define UBUNTU_APPLICATION_UI_WINDOW_MIRSERVER_PRIV_H_
+
+#include <ubuntu/application/ui/window.h>
+
+#include <EGL/egl.h>
+
+#include <stddef.h>
+
+#include <functional>
+#include <memory>
+#include <string>
+
+namespace mir
+{
+namespace shell
+{
+class Surface;
+}
+namespace input
+{
+namespace receiver
+{
+class InputReceiverThread;
+class InputPlatform;
+}
+}
+namespace graphics
+{
+class InternalClient;
+}
+}
+
+namespace ubuntu
+{
+namespace application
+{
+namespace mir
+{
+namespace server
+{
+class Instance;
+class WindowProperties;
+
+class Window
+{
+public:
+    Window(Instance& instance, WindowProperties* properties,
+           std::shared_ptr< ::mir::input::receiver::InputPlatform> const& platform,
+           std::shared_ptr< ::mir::graphics::InternalClient> const& internal_client);
+    ~Window();
+
+    UAUiWindow* as_u_window();
+    static Window* from_u_window(UAUiWindow* u_window);
+    
+    EGLNativeWindowType get_native_type();
+
+protected:
+    Window(Window const&) = delete;
+    Window& operator=(Window const&) = delete;
+
+private:
+    std::unique_ptr<WindowProperties> window_properties;
+    std::shared_ptr< ::mir::shell::Surface> surface;
+    std::shared_ptr< ::mir::input::receiver::InputReceiverThread> input_thread;
+    std::shared_ptr< ::mir::graphics::InternalClient> internal_client;
+};
+    
+}
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_WINDOW_MIRSERVER_PRIV_H_

=== added file 'src/mirserver/window_properties_mirserver.cpp'
--- src/mirserver/window_properties_mirserver.cpp	1970-01-01 00:00:00 +0000
+++ src/mirserver/window_properties_mirserver.cpp	2013-06-18 00:07:29 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#include "window_properties_mirserver_priv.h"
+
+#include <string>
+
+namespace uams = ubuntu::application::mir::server;
+namespace msh = mir::shell;
+namespace geom = mir::geometry;
+
+uams::WindowProperties::WindowProperties()
+    : parameters(msh::a_surface()),
+      cb(nullptr),
+      input_ctx(nullptr)
+{
+}
+
+UAUiWindowProperties* uams::WindowProperties::as_u_window_properties()
+{
+    return static_cast<UAUiWindowProperties*>(this);
+}
+
+uams::WindowProperties* uams::WindowProperties::from_u_window_properties(UAUiWindowProperties* u_properties)
+{
+    return static_cast<uams::WindowProperties*>(u_properties);
+}
+    
+void uams::WindowProperties::set_title(char const* title, size_t length)
+{
+    parameters = parameters.of_name(std::string(title, length));
+}
+
+void uams::WindowProperties::set_input_cb_and_ctx(UAUiWindowInputEventCb callback, void* ctx)
+{
+    cb = callback;
+    input_ctx = ctx;
+}
+
+void uams::WindowProperties::set_pixel_format(geom::PixelFormat const& format)
+{
+    parameters = parameters.of_pixel_format(format);
+}
+    
+msh::SurfaceCreationParameters const& uams::WindowProperties::surface_parameters() const
+{
+    return parameters;
+}
+
+UAUiWindowInputEventCb uams::WindowProperties::input_cb() const
+{
+    return cb;
+}
+
+void* uams::WindowProperties::input_context() const
+{
+    return input_ctx;
+}

=== added file 'src/mirserver/window_properties_mirserver_priv.h'
--- src/mirserver/window_properties_mirserver_priv.h	1970-01-01 00:00:00 +0000
+++ src/mirserver/window_properties_mirserver_priv.h	2013-06-18 00:07:29 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2013 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 UBUNTU_APPLICATION_UI_WINDOW_PROPERTIES_MIRSERVER_PRIV_H_
+#define UBUNTU_APPLICATION_UI_WINDOW_PROPERTIES_MIRSERVER_PRIV_H_
+
+#include <ubuntu/application/ui/window.h>
+
+#include <mir/shell/surface_creation_parameters.h>
+#include <mir/geometry/pixel_format.h>
+
+namespace ubuntu
+{
+namespace application
+{
+namespace mir
+{
+namespace server
+{
+
+class WindowProperties
+{
+public:
+    WindowProperties();
+    ~WindowProperties() = default;
+
+    UAUiWindowProperties* as_u_window_properties();
+    static WindowProperties* from_u_window_properties(UAUiWindowProperties* u_properties);
+    
+    void set_title(char const* title, size_t length);
+    void set_input_cb_and_ctx(UAUiWindowInputEventCb cb, void* ctx);
+    void set_pixel_format( ::mir::geometry::PixelFormat const& format);
+    
+    ::mir::shell::SurfaceCreationParameters const& surface_parameters() const;
+    UAUiWindowInputEventCb input_cb() const;
+    void* input_context() const;
+    
+protected:
+    WindowProperties(WindowProperties const&) = delete;
+    WindowProperties& operator=(WindowProperties const&) = delete;
+
+private:
+    ::mir::shell::SurfaceCreationParameters parameters;
+
+    UAUiWindowInputEventCb cb;
+    void *input_ctx;
+};
+
+}
+}
+}
+}
+
+#endif