Merge lp:~robertcarr/platform-api/add-input-injection into lp:platform-api

[Robert Carr]

Add input injection API on mirserver

I am told for the Unity 8 gesture recognizer as it is written now to work we need to be able to send all events to a surface. Mir has support abstractly for interfering with the input stream, but not for "monitor surfaces". This API provides a backdoor where the shell can implement an mi::EventFilter and use it to inject in to Qt.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

It seems this may not be enough due to a misunderstanding on my part.

Unmerged revisions

98. By Robert Carr on 2013-07-22

Add private input injection API to mirserver

=== modified file 'src/mirserver/ubuntu_application_api_mirserver.cpp'
--- src/mirserver/ubuntu_application_api_mirserver.cpp	2013-06-17 22:51:21 +0000
+++ src/mirserver/ubuntu_application_api_mirserver.cpp	2013-07-22 23:24:25 +0000
@@ -97,6 +97,13 @@
     context->input_platform.reset();
     context->egl_client.reset();
 }
+
+void ua_ui_window_mirserver_inject_input(UAUiWindow* u_window, MirEvent *ev)
+{
+    auto window = uams::Window::from_u_window(u_window);
+    window->inject_input(ev);
+}
+
 }
 
 }
 
=== modified file 'src/mirserver/ubuntu_application_api_mirserver_priv.h'
--- src/mirserver/ubuntu_application_api_mirserver_priv.h	2013-06-07 17:54:25 +0000
+++ src/mirserver/ubuntu_application_api_mirserver_priv.h	2013-07-22 23:24:25 +0000
@@ -19,6 +19,9 @@
 #ifndef UBUNTU_APPLICATION_API_MIRSERVER_PRIV_H_
 #define UBUNTU_APPLICATION_API_MIRSERVER_PRIV_H_
 
+#include <ubuntu/application/ui/window.h>
+#include <mir_toolkit/event.h>
+
 namespace mir
 {
 class DefaultServerConfiguration;
@@ -35,6 +38,8 @@
 
 // Release platform-api ownership of Mir server objects to allow for clean shutdown.
 void ua_ui_mirserver_finish();
+
+void ua_ui_window_mirserver_inject_input(UAUiWindow* window, MirEvent* ev);
 }
 
 #endif // UBUNTU_APPLICATION_API_MIRSERVER_PRIV_H_
 
=== modified file 'src/mirserver/window_mirserver.cpp'
--- src/mirserver/window_mirserver.cpp	2013-06-09 23:54:39 +0000
+++ src/mirserver/window_mirserver.cpp	2013-07-22 23:24:25 +0000
@@ -54,8 +54,8 @@
       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));
+    handle_input_callback = std::bind(ua_ui_window_handle_event, properties->input_cb(), properties->input_context(), std::placeholders::_1);
+    input_thread = input_platform->create_input_thread(surface->client_input_fd(), handle_input_callback);
     input_thread->start();
 }
 
@@ -79,3 +79,8 @@
 {
     return internal_client->egl_native_window(surface);
 }
+
+void uams::Window::inject_input(MirEvent *ev)
+{
+    handle_input_callback(ev);
+}
 
=== modified file 'src/mirserver/window_mirserver_priv.h'
--- src/mirserver/window_mirserver_priv.h	2013-06-09 23:54:51 +0000
+++ src/mirserver/window_mirserver_priv.h	2013-07-22 23:24:25 +0000
@@ -21,6 +21,8 @@
 
 #include <ubuntu/application/ui/window.h>
 
+#include <mir_toolkit/event.h>
+
 #include <EGL/egl.h>
 
 #include <stddef.h>
@@ -72,6 +74,8 @@
     static Window* from_u_window(UAUiWindow* u_window);
     
     EGLNativeWindowType get_native_type();
+    
+    void inject_input(MirEvent *ev);
 
 protected:
     Window(Window const&) = delete;
@@ -82,6 +86,8 @@
     std::shared_ptr< ::mir::shell::Surface> surface;
     std::shared_ptr< ::mir::input::receiver::InputReceiverThread> input_thread;
     std::shared_ptr< ::mir::graphics::InternalClient> internal_client;
+    
+    std::function<void(MirEvent*)> handle_input_callback;
 };
     
 }