Merge lp:~alan-griffiths/mir/missing-links-to-wire-up-input into lp:~mir-team/mir/trunk

[Alan Griffiths]

input: Connect nested input relay to input dispatch

input: Connect nested input relay to input dispatch

Gets input working (at least on the non-crashing android stack)

[Alan Griffiths (alan-griffiths)]

Try it:

./mir_demo_server_basic -f /tmp/mir_host &
./mir_demo_server_basic --nested-mode /tmp/mir_host &
./mir_demo_client_fingerpaint

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1063
http://jenkins.qa.ubuntu.com/job/mir-ci/1465/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1979
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1864
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/703
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/703/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1465/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

looks good

review: Approve

=== modified file 'include/server/mir/input/android/default_android_input_configuration.h'
--- include/server/mir/input/android/default_android_input_configuration.h	2013-09-06 09:29:18 +0000
+++ include/server/mir/input/android/default_android_input_configuration.h	2013-09-10 16:44:32 +0000
@@ -47,12 +47,14 @@
     virtual droidinput::sp<droidinput::InputReaderPolicyInterface> the_reader_policy();
 
 private:
+    droidinput::sp<droidinput::InputDispatcherInterface> the_dispatcher() override;
 
     CachedPtr<InputThread> reader_thread;
 
     CachedAndroidPtr<droidinput::EventHubInterface> event_hub;
     CachedAndroidPtr<droidinput::InputReaderPolicyInterface> reader_policy;
     CachedAndroidPtr<droidinput::InputReaderInterface> reader;
+    CachedAndroidPtr<droidinput::InputDispatcherInterface> dispatcher;
 };
 }
 }

=== modified file 'include/server/mir/input/android/dispatcher_input_configuration.h'
--- include/server/mir/input/android/dispatcher_input_configuration.h	2013-09-06 09:29:18 +0000
+++ include/server/mir/input/android/dispatcher_input_configuration.h	2013-09-10 16:44:32 +0000
@@ -99,7 +99,7 @@
     virtual bool is_key_repeat_enabled();
 
 protected:
-    virtual droidinput::sp<droidinput::InputDispatcherInterface> the_dispatcher();
+    virtual droidinput::sp<droidinput::InputDispatcherInterface> the_dispatcher() = 0;
 
     virtual std::shared_ptr<InputThread> the_dispatcher_thread();
 
@@ -113,6 +113,7 @@
     std::shared_ptr<input::InputReport> const input_report;
 
     CachedPtr<input::InputManager> input_manager;
+
 private:
     CachedPtr<InputThread> dispatcher_thread;
     CachedPtr<InputRegistrar> input_registrar;
@@ -120,7 +121,6 @@
     CachedPtr<shell::InputTargeter> input_targeter;
 
     CachedAndroidPtr<droidinput::InputDispatcherPolicyInterface> dispatcher_policy;
-    CachedAndroidPtr<droidinput::InputDispatcherInterface> dispatcher;
 };
 }
 }

=== modified file 'include/server/mir/input/nested_input_configuration.h'
--- include/server/mir/input/nested_input_configuration.h	2013-09-06 16:46:38 +0000
+++ include/server/mir/input/nested_input_configuration.h	2013-09-10 16:44:32 +0000
@@ -39,7 +39,11 @@
     virtual ~NestedInputConfiguration();
 
 private:
+    droidinput::sp<droidinput::InputDispatcherInterface> the_dispatcher() override;
+
     std::shared_ptr<NestedInputRelay> const input_relay;
+
+    android::CachedAndroidPtr<droidinput::InputDispatcherInterface> dispatcher;
 };
 }
 }

=== modified file 'src/server/input/android/default_android_input_configuration.cpp'
--- src/server/input/android/default_android_input_configuration.cpp	2013-09-06 09:29:18 +0000
+++ src/server/input/android/default_android_input_configuration.cpp	2013-09-10 16:44:32 +0000
@@ -87,6 +87,15 @@
 {
 }
 
+droidinput::sp<droidinput::InputDispatcherInterface> mia::DefaultInputConfiguration::the_dispatcher()
+{
+    return dispatcher(
+        [this]() -> droidinput::sp<droidinput::InputDispatcherInterface>
+        {
+            return new droidinput::InputDispatcher(the_dispatcher_policy(), input_report);
+        });
+}
+
 droidinput::sp<droidinput::EventHubInterface> mia::DefaultInputConfiguration::the_event_hub()
 {
     return event_hub(

=== modified file 'src/server/input/android/dispatcher_input_configuration.cpp'
--- src/server/input/android/dispatcher_input_configuration.cpp	2013-09-06 10:06:15 +0000
+++ src/server/input/android/dispatcher_input_configuration.cpp	2013-09-10 16:44:32 +0000
@@ -98,15 +98,6 @@
         });
 }
 
-droidinput::sp<droidinput::InputDispatcherInterface> mia::DispatcherInputConfiguration::the_dispatcher()
-{
-    return dispatcher(
-        [this]() -> droidinput::sp<droidinput::InputDispatcherInterface>
-        {
-            return new droidinput::InputDispatcher(the_dispatcher_policy(), input_report);
-        });
-}
-
 std::shared_ptr<mia::InputThread> mia::DispatcherInputConfiguration::the_dispatcher_thread()
 {
     return dispatcher_thread(

=== modified file 'src/server/input/nested_input_configuration.cpp'
--- src/server/input/nested_input_configuration.cpp	2013-09-06 16:46:38 +0000
+++ src/server/input/nested_input_configuration.cpp	2013-09-10 16:44:32 +0000
@@ -19,8 +19,7 @@
 #include "mir/input/nested_input_configuration.h"
 #include "mir/input/nested_input_relay.h"
 
-#include <boost/exception/all.hpp>
-#include <stdexcept>
+#include <InputDispatcher.h>
 
 namespace mi = mir::input;
 
@@ -38,3 +37,15 @@
 mi::NestedInputConfiguration::~NestedInputConfiguration()
 {
 }
+
+droidinput::sp<droidinput::InputDispatcherInterface> mi::NestedInputConfiguration::the_dispatcher()
+{
+    return dispatcher(
+        [this]()
+        {
+            auto const result = new droidinput::InputDispatcher(the_dispatcher_policy(), input_report);
+            input_relay->set_dispatcher(result);
+
+            return result;
+        });
+}