Merge lp:~robertcarr/platform-api/mir-client-and-server into lp:platform-api

[Robert Carr]

Provide mirclient and mirserver based implementations of ubuntu_application_ui_* to form mir support in qtubuntu.

Provide mirclient and mirserver based implementations of ubuntu_application_ui_* to form mir support in qtubuntu.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/platform-api-ci/15/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-raring-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-raring-i386-ci/5/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/platform-api-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-amd64-ci/13
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-ci/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-i386-ci/6

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/platform-api-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-i386-ci/7

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Old, please update and resubmit if you want it

review: Needs Resubmitting

Unmerged revisions

57. By Robert Carr on 2013-05-13

Initial mirserver draft

56. By Robert Carr on 2013-05-13

Move some code to mircommon

55. By Robert Carr on 2013-05-13

Import mirclient impl

54. By Robert Carr on 2013-05-13

Check for mirclient in pkgconfig

53. By Robert Carr on 2013-05-13

Only build android with hybris implementation

52. By Robert Carr on 2013-05-13

Define APPLICATION_UI_IMPLEMENTATION

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-02-06 00:32:45 +0000
+++ CMakeLists.txt	2013-05-13 21:03:28 +0000
@@ -9,6 +9,26 @@
                                  LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
                                  ARCHIVE DESTINATION "${LIB_INSTALL_DIR}")
 
+set(
+  APPLICATION_UI_IMPLEMENTATION
+  hybris
+  CACHE
+  STRING
+  "Application ui implementation to build (options are 'hybris', 'mirclient', or 'mirserver')" # TODO: Update with mir options ~racarr
+)
+
+if (APPLICATION_UI_IMPLEMENTATION STREQUAL "mirclient")
+  find_package(PkgConfig)
+  pkg_check_modules(MIR_CLIENT mirclient)
+  pkg_check_modules(MIR_COMMON mircommon)
+endif()
+
+if (APPLICATION_UI_IMPLEMENTATION STREQUAL "mirserver")
+  find_package(PkgConfig)
+  pkg_check_modules(MIR_SERVER mirserver)
+  pkg_check_modules(MIR_COMMON mircommon)
+endif()
+
 include_directories(include/)
 
 add_subdirectory(src/)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-02-05 06:58:40 +0000
+++ src/CMakeLists.txt	2013-05-13 21:03:28 +0000
@@ -1,1 +1,11 @@
-add_subdirectory(android/)
+include_directories(.)
+
+if (APPLICATION_UI_IMPLEMENTATION STREQUAL "hybris")
+  add_subdirectory(android/)
+elseif(APPLICATION_UI_IMPLEMENTATION STREQUAL "mirclient")
+  add_subdirectory(mirclient/)
+  add_subdirectory(mircommon/)
+elseif(APPLICATION_UI_IMPLEMENTATION STREQUAL "mirserver")
+  add_subdirectory(mirserver/)
+  add_subdirectory(mircommon/)
+endif()

=== 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-05-13 21:03:28 +0000
@@ -0,0 +1,28 @@
+set(SOURCES ubuntu_application_api_mirclient.cpp)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
+
+include_directories(
+  ${MIR_CLIENT_INCLUDE_DIRS}
+)
+
+add_library(
+	ubuntu_application_api_mirclient SHARED
+	${SOURCES}
+)
+
+target_link_libraries(
+	ubuntu_application_api_mirclient
+        ${MIR_CLIENT_LDFLAGS} ${MIR_CLIENT_LIBRARIES}
+        ubuntu_application_api_mircommon
+)
+
+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/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-05-13 21:03:28 +0000
@@ -0,0 +1,219 @@
+/*
+ * 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/ubuntu_application_ui.h>
+#include <mir_toolkit/mir_client_library.h>
+
+#include "mircommon/ubuntu_application_api_mircommon.h"
+
+#include <assert.h>
+
+namespace
+{
+    char const* const socket_file = "/tmp/mir_socket";
+    MirConnection *global_connection = NULL;
+}
+
+typedef struct {
+    MirSurface *mir_surface;
+    input_event_cb ubuntu_input_cb;
+    void *input_ctx;
+} ubuntu_application_ui_mir_surface;
+
+    
+void
+ubuntu_application_ui_init(int argc, char**argv)
+{
+    if (global_connection)
+        return;
+    global_connection = mir_connect_sync(socket_file, argc ? argv[0] : "");
+    assert(global_connection);
+}
+
+StageHint
+ubuntu_application_ui_setup_get_stage_hint()
+{
+    // TODO: Implement ~racarr
+    return MAIN_STAGE_HINT;
+}
+
+FormFactorHint
+ubuntu_application_ui_setup_get_form_factor_hint()
+{
+    // TODO: Implement ~racarr
+    return DESKTOP_FORM_FACTOR_HINT;
+}
+
+void
+ubuntu_application_ui_start_a_new_session(SessionCredentials* creds)
+{
+    // TODO: Is this the correct place to call mir_connect_sync?
+    // It seems this is never called by QtUbuntu ~racarr
+}
+
+EGLNativeDisplayType
+ubuntu_application_ui_get_native_display()
+{
+    return static_cast<EGLNativeDisplayType>(mir_connection_get_egl_native_display(global_connection));
+}
+
+void
+ubuntu_application_ui_set_clipboard_content(void* data, size_t size)
+{
+    // TODO: Implement ~racarr
+}
+
+void
+ubuntu_application_ui_get_clipboard_content(void** data, size_t* size)
+{
+    *size = 0;
+    *data = NULL;
+    // TODO: Implement ~racarr
+}
+
+void
+ubuntu_application_ui_create_display_info(ubuntu_application_ui_physical_display_info* info, size_t index)
+{
+    // TODO: Implement ~racarr
+    // Noop for mirclient?
+}
+
+void
+ubuntu_application_ui_destroy_display_info(ubuntu_application_ui_physical_display_info info)
+{
+    // TODO: Implement ~racarr
+    // Noop for mirclient?
+}
+
+int32_t
+ubuntu_application_ui_query_horizontal_resolution(ubuntu_application_ui_physical_display_info info)
+{
+    MirDisplayInfo display_info;
+
+    assert(global_connection);
+
+    mir_connection_get_display_info(global_connection, &display_info);
+    return static_cast<int32_t>(display_info.width);
+}
+
+int32_t
+ubuntu_application_ui_query_vertical_resolution(ubuntu_application_ui_physical_display_info info)
+{
+    MirDisplayInfo display_info;
+    
+    assert(global_connection);
+
+    mir_connection_get_display_info(global_connection, &display_info);
+    return static_cast<int32_t>(display_info.height);
+}
+
+float
+ubuntu_application_ui_query_horizontal_dpi(ubuntu_application_ui_physical_display_info info)
+{
+    // TODO: Implement ~racarr
+    return (float)0.0;
+}
+
+float
+ubuntu_application_ui_query_vertical_dpi(ubuntu_application_ui_physical_display_info info)
+{
+    // TODO: Implement ~racarr
+    return (float)0.0;
+}
+
+namespace
+{
+static void ubuntu_application_ui_mir_handle_event(MirSurface* mir_surface, MirEvent const* mir_ev, void* context)
+{
+    ubuntu_application_ui_mir_surface *surface = static_cast<ubuntu_application_ui_mir_surface*>(context);
+    Event ubuntu_ev;
+    mir_event_to_ubuntu_event(mir_ev, ubuntu_ev);
+    surface->ubuntu_input_cb(surface->input_ctx, &ubuntu_ev);
+}
+}
+
+void
+ubuntu_application_ui_create_surface(ubuntu_application_ui_surface* out_surface,
+                                     const char* title,
+                                     int width,
+                                     int height,
+                                     SurfaceRole role,
+                                     uint32_t flags,
+                                     input_event_cb cb,
+                                     void* ctx)
+{
+    assert(global_connection);
+    MirDisplayInfo display_info;
+    mir_connection_get_display_info(global_connection, &display_info);
+    MirSurfaceParameters params = { title, width, height, display_info.supported_pixel_format[0], mir_buffer_usage_hardware};
+    ubuntu_application_ui_mir_surface *surface = new ubuntu_application_ui_mir_surface;
+    surface->ubuntu_input_cb = cb;
+    surface->input_ctx = ctx;
+    MirEventDelegate event_delegate = { ubuntu_application_ui_mir_handle_event, surface };
+    surface->mir_surface = mir_connection_create_surface_sync(global_connection, &params);
+    mir_surface_set_event_handler(surface->mir_surface, &event_delegate);
+    assert(surface);
+    *out_surface = static_cast<ubuntu_application_ui_surface>(surface);
+}
+
+void
+ubuntu_application_ui_request_fullscreen_for_surface(ubuntu_application_ui_surface surface)
+{
+    // TODO: Implement ~racarr
+}
+
+void
+ubuntu_application_ui_destroy_surface(ubuntu_application_ui_surface s)
+{
+    ubuntu_application_ui_mir_surface *surface = static_cast<ubuntu_application_ui_mir_surface*>(s);
+    mir_surface_release_sync(surface->mir_surface);
+    delete surface;
+}
+
+EGLNativeWindowType
+ubuntu_application_ui_surface_to_native_window_type(ubuntu_application_ui_surface s)
+{
+    ubuntu_application_ui_mir_surface *surface = static_cast<ubuntu_application_ui_mir_surface*>(s);
+    return reinterpret_cast<EGLNativeWindowType>(mir_surface_get_egl_native_window(surface->mir_surface));
+}
+
+void
+ubuntu_application_ui_show_surface(ubuntu_application_ui_surface surface)
+{
+    // TODO: Implement ~racarr
+}
+
+void
+ubuntu_application_ui_hide_surface(ubuntu_application_ui_surface surface)
+{
+    // TODO: Implement ~racarr
+}
+
+void
+ubuntu_application_ui_move_surface_to(ubuntu_application_ui_surface surface,
+                                      int x, int y)
+{
+    // TODO: Implement ~racarr
+}
+
+void
+ubuntu_application_ui_resize_surface_to(ubuntu_application_ui_surface surface,
+                                        int w, int h)
+{
+    // TODO: Implement ~racarr
+}

=== 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-05-13 21:03:28 +0000
@@ -0,0 +1,19 @@
+set(SOURCES ubuntu_application_api_mircommon.cpp)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
+
+include_directories(
+  ${MIR_COMMON_INCLUDE_DIRS}
+)
+
+add_library(
+	ubuntu_application_api_mircommon STATIC
+	${SOURCES}
+)
+
+target_link_libraries(
+	ubuntu_application_api_mircommon
+        ${MIR_COMMON_LDFLAGS} ${MIR_COMMON_LIBRARIES}
+)
+
+

=== added file 'src/mircommon/ubuntu_application_api_mircommon.cpp'
--- src/mircommon/ubuntu_application_api_mircommon.cpp	1970-01-01 00:00:00 +0000
+++ src/mircommon/ubuntu_application_api_mircommon.cpp	2013-05-13 21:03:28 +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 "ubuntu_application_api_mircommon.h"
+
+void
+mir_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/ubuntu_application_api_mircommon.h'
--- src/mircommon/ubuntu_application_api_mircommon.h	1970-01-01 00:00:00 +0000
+++ src/mircommon/ubuntu_application_api_mircommon.h	2013-05-13 21:03:28 +0000
@@ -0,0 +1,35 @@
+/*
+ * 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_MIR_COMMON_H_
+#define UBUNTU_APPLICATION_API_MIR_COMMON_H_
+
+#include <ubuntu/application/ui/input/event.h>
+#include <mir_toolkit/event.h>
+
+#ifndef __cplusplus
+extern "C" {
+#endif
+
+void mir_event_to_ubuntu_event(MirEvent const* mir_event, Event& ubuntu_ev);
+
+#ifndef __cplusplus
+}
+#endif
+
+#endif // UBUNTU_APPLICATION_API_MIR_COMMON_H_