Merge lp:~alan-griffiths/mir/spike-nested-input into lp:~mir-team/mir/trunk

[Alan Griffiths]

graphics: Hook up nested surfaces events to input

graphics: Hook up nested surfaces events to input

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1057
http://jenkins.qa.ubuntu.com/job/mir-ci/1445/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1950
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1835
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/683/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1057
http://jenkins.qa.ubuntu.com/job/mir-ci/1447/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1954
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1839
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/685
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/685/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1059
http://jenkins.qa.ubuntu.com/job/mir-ci/1450/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1958
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1843
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/688/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1059
http://jenkins.qa.ubuntu.com/job/mir-ci/1451/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1959
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1844
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/689
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/689/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

291 + std::shared_ptr<input::EventFilter> const& event_handler) :
event_filter vs. event_handler (pre-existing, and is common naming problem in the code elsewhere)

517 + // TODO can reviewers look carefully at these?
my best guess is security reasons, although i'm not very sure either

all in all, looks good

review: Approve

[Daniel van Vugt (vanvugt)]

1. I'm concerned about this:
337 + case mir_event_type_surface:
338 + // TODO Surface attributes shouldn't be changing. So what do we do if they do?
339 + break;
Not sure of the context though. Seems strange and dangerous to drop a whole family of event types. And if it's only that we want to translate motion events, why do we handle mir_event_type_key still?

2. mi::NestedInputRelay::handle() has a scary degree of coupling. Can we not copy the event data more atomically?

[Alan Griffiths (alan-griffiths)]

> 2. mi::NestedInputRelay::handle() has a scary degree of coupling. Can we not
> copy the event data more atomically?

I wish! The types we adopted from the android input stack are difficult to work with (there's similar code doing the converse transformation) - hopefully we can do some refactoring once we are feature complete.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1061
http://jenkins.qa.ubuntu.com/job/mir-ci/1462/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1974
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1859
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/700
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/700/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

524 + static auto const policy_flags = ::android::POLICY_FLAG_INJECTED || ::android::POLICY_FLAG_TRUSTED;

We should be using bitwise OR (|).

::android::POLICY_FLAG_INJECTED is automatically added by injectInputEvent(), so there is no need to add it.

::android::POLICY_FLAG_TRUSTED is also added by injectInputEvent() because uid == 0, but I guess it's better to be explicit about it.

I am not sure if we also need to use ::android::POLICY_FLAG_PASS_TO_USER.

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> 524 + static auto const policy_flags = ::android::POLICY_FLAG_INJECTED ||
> ::android::POLICY_FLAG_TRUSTED;
>
> We should be using bitwise OR (|).

Good catch, thanks!

> I am not sure if we also need to use ::android::POLICY_FLAG_PASS_TO_USER.

I think that is correctly done by mia::EventFilterDispatcherPolicy

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1062
http://jenkins.qa.ubuntu.com/job/mir-ci/1464/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1977
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1862
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/702
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/702/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Top approving.

This code can't be tested on GBM at the moment. (We end up crashing egl when we try for a nested configuration - Alexandros is working on it.)

On android, it doesn't work (but doesn't crash). I'm continuing to work on this.

But I think the code is better off living on trunk while these problems are resolved.

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2013-08-30 09:01:48 +0000
+++ include/server/mir/default_server_configuration.h	2013-09-10 11:30:39 +0000
@@ -102,6 +102,7 @@
 class InputConfiguration;
 class CursorListener;
 class InputRegion;
+class NestedInputRelay;
 }
 
 namespace logging
@@ -134,6 +135,7 @@
     virtual std::shared_ptr<compositor::RendererFactory>   the_renderer_factory();
     virtual std::shared_ptr<graphics::DisplayConfigurationPolicy> the_display_configuration_policy();
     virtual std::shared_ptr<graphics::nested::HostConnection> the_host_connection();
+    virtual std::shared_ptr<input::NestedInputRelay> the_nested_input_relay();
     /** @} */
 
     /** @name graphics configuration - dependencies
@@ -285,6 +287,7 @@
     CachedPtr<MainLoop> main_loop;
     CachedPtr<graphics::DisplayConfigurationPolicy> display_configuration_policy;
     CachedPtr<graphics::nested::HostConnection> host_connection;
+    CachedPtr<input::NestedInputRelay> nested_input_relay;
     CachedPtr<shell::MediatingDisplayChanger> mediating_display_changer;
     CachedPtr<shell::BroadcastingSessionEventSink> broadcasting_session_event_sink;
 

=== modified file 'include/server/mir/graphics/nested/nested_platform.h'
--- include/server/mir/graphics/nested/nested_platform.h	2013-08-30 09:01:48 +0000
+++ include/server/mir/graphics/nested/nested_platform.h	2013-09-10 11:30:39 +0000
@@ -25,6 +25,7 @@
 
 namespace mir
 {
+namespace input { class EventFilter; }
 namespace graphics
 {
 namespace nested
@@ -33,9 +34,11 @@
 class NestedPlatform : public Platform
 {
 public:
-    NestedPlatform(std::shared_ptr<HostConnection> const& connection,
-                   std::shared_ptr<DisplayReport> const& display_report,
-                   std::shared_ptr<NativePlatform> const& native_platform);
+    NestedPlatform(
+        std::shared_ptr<HostConnection> const& connection,
+        std::shared_ptr<input::EventFilter> const& event_handler,
+        std::shared_ptr<DisplayReport> const& display_report,
+        std::shared_ptr<NativePlatform> const& native_platform);
 
     ~NestedPlatform() noexcept;
     std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator(
@@ -49,6 +52,7 @@
 
 private:
     std::shared_ptr<NativePlatform> const native_platform;
+    std::shared_ptr<input::EventFilter> const event_handler;
     std::shared_ptr<DisplayReport> const display_report;
     std::shared_ptr<HostConnection> const connection;
 };

=== modified file 'include/server/mir/input/nested_input_configuration.h'
--- include/server/mir/input/nested_input_configuration.h	2013-08-29 16:18:41 +0000
+++ include/server/mir/input/nested_input_configuration.h	2013-09-10 11:30:39 +0000
@@ -19,40 +19,27 @@
 #ifndef MIR_INPUT_NESTED_INPUT_CONFIGURATION_H_
 #define MIR_INPUT_NESTED_INPUT_CONFIGURATION_H_
 
-#include "mir/input/input_configuration.h"
+#include "mir/input/android/dispatcher_input_configuration.h"
 
 namespace mir
 {
-namespace graphics { namespace nested { class HostConnection; }}
 namespace input
 {
-class EventFilter;
-class CursorListener;
-class InputReport;
-class InputRegion;
+class NestedInputRelay;
 
-class NestedInputConfiguration : public InputConfiguration
+class NestedInputConfiguration : public android::DispatcherInputConfiguration
 {
 public:
     NestedInputConfiguration(
-        std::shared_ptr<graphics::nested::HostConnection> const& connection,
+        std::shared_ptr<NestedInputRelay> const& input_relay,
         std::shared_ptr<EventFilter> const& event_filter,
         std::shared_ptr<InputRegion> const& input_region,
         std::shared_ptr<CursorListener> const& cursor_listener,
         std::shared_ptr<InputReport> const& input_report);
     virtual ~NestedInputConfiguration();
 
-    std::shared_ptr<surfaces::InputRegistrar> the_input_registrar();
-    std::shared_ptr<shell::InputTargeter> the_input_targeter();
-    std::shared_ptr<InputManager> the_input_manager();
-    void set_input_targets(std::shared_ptr<InputTargets> const& targets);
-
 private:
-    std::shared_ptr<graphics::nested::HostConnection> const connection;
-    std::shared_ptr<EventFilter> const event_filter;
-    std::shared_ptr<InputRegion> const input_region;
-    std::shared_ptr<CursorListener> const cursor_listener;
-    std::shared_ptr<InputReport> const input_report;
+    std::shared_ptr<NestedInputRelay> const input_relay;
 };
 }
 }

=== added file 'include/server/mir/input/nested_input_relay.h'
--- include/server/mir/input/nested_input_relay.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/input/nested_input_relay.h	2013-09-10 11:30:39 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_NESTED_INPUT_RELAY_H_
+#define MIR_INPUT_NESTED_INPUT_RELAY_H_
+
+#include "mir/input/event_filter.h"
+
+#include <utils/StrongPointer.h>
+
+namespace android { class InputDispatcher; }
+
+namespace mir
+{
+namespace input
+{
+class NestedInputRelay : public EventFilter
+{
+public:
+    NestedInputRelay();
+    ~NestedInputRelay() noexcept;
+
+    void set_dispatcher(::android::sp<::android::InputDispatcher> const& dispatcher);
+
+private:
+    bool handle(MirEvent const& event);
+
+    ::android::sp<::android::InputDispatcher> dispatcher;
+};
+}
+}
+
+
+#endif /* MIR_INPUT_NESTED_INPUT_RELAY_H_ */

=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-08-30 10:04:48 +0000
+++ src/server/default_server_configuration.cpp	2013-09-10 11:30:39 +0000
@@ -63,6 +63,7 @@
 #include "mir/input/null_input_report.h"
 #include "mir/input/display_input_region.h"
 #include "mir/input/event_filter_chain.h"
+#include "mir/input/nested_input_relay.h"
 #include "mir/input/vt_filter.h"
 #include "mir/input/android/default_android_input_configuration.h"
 #include "mir/input/input_manager.h"
@@ -345,7 +346,11 @@
 
             auto create_native_platform = graphics_lib->load_function<mg::CreateNativePlatform>("create_native_platform");
 
-            return std::make_shared<mir::graphics::nested::NestedPlatform>(the_host_connection(), the_display_report(), create_native_platform());
+            return std::make_shared<mir::graphics::nested::NestedPlatform>(
+                the_host_connection(),
+                the_nested_input_relay(),
+                the_display_report(),
+                create_native_platform());
         });
 }
 
@@ -593,7 +598,7 @@
         else if (options->is_set(nested_mode_opt))
         {
             return std::make_shared<mi::NestedInputConfiguration>(
-                the_host_connection(),
+                the_nested_input_relay(),
                 the_composite_event_filter(),
                 the_input_region(),
                 the_cursor_listener(),
@@ -959,6 +964,12 @@
         });
 }
 
+auto mir::DefaultServerConfiguration::the_nested_input_relay()
+-> std::shared_ptr<mi::NestedInputRelay>
+{
+    return nested_input_relay([]{ return std::make_shared<mi::NestedInputRelay>(); });
+}
+
 
 std::shared_ptr<msh::BroadcastingSessionEventSink>
 mir::DefaultServerConfiguration::the_broadcasting_session_event_sink()

=== modified file 'src/server/graphics/nested/nested_display.cpp'
--- src/server/graphics/nested/nested_display.cpp	2013-09-09 19:06:30 +0000
+++ src/server/graphics/nested/nested_display.cpp	2013-09-10 11:30:39 +0000
@@ -94,8 +94,12 @@
     eglTerminate(egl_display);
 }
 
-mgn::NestedDisplay::NestedDisplay(std::shared_ptr<HostConnection> const& connection, std::shared_ptr<mg::DisplayReport> const& display_report) :
+mgn::NestedDisplay::NestedDisplay(
+    std::shared_ptr<HostConnection> const& connection,
+    std::shared_ptr<input::EventFilter> const& event_handler,
+    std::shared_ptr<mg::DisplayReport> const& display_report) :
     connection{connection},
+    event_handler{event_handler},
     display_report{display_report},
     egl_display{*connection},
     outputs{}
@@ -151,7 +155,11 @@
                 if (!mir_surface_is_valid(mir_surface))
                     BOOST_THROW_EXCEPTION(std::runtime_error(mir_surface_get_error_message(mir_surface)));
 
-                result[output.id] = std::make_shared<mgn::detail::NestedOutput>(egl_display, mir_surface, area);
+                result[output.id] = std::make_shared<mgn::detail::NestedOutput>(
+                    egl_display,
+                    mir_surface,
+                    area,
+                    event_handler);
             }
         });
 

=== modified file 'src/server/graphics/nested/nested_display.h'
--- src/server/graphics/nested/nested_display.h	2013-09-09 19:06:30 +0000
+++ src/server/graphics/nested/nested_display.h	2013-09-10 11:30:39 +0000
@@ -32,6 +32,7 @@
 
 namespace mir
 {
+namespace input { class EventFilter; }
 namespace geometry
 {
 struct Rectangle;
@@ -88,6 +89,7 @@
 public:
     NestedDisplay(
         std::shared_ptr<HostConnection> const& connection,
+        std::shared_ptr<input::EventFilter> const& event_handler,
         std::shared_ptr<DisplayReport> const& display_report);
 
     ~NestedDisplay() noexcept;
@@ -114,6 +116,7 @@
 
 private:
     std::shared_ptr<HostConnection> const connection;
+    std::shared_ptr<input::EventFilter> const event_handler;
     std::shared_ptr<DisplayReport> const display_report;
     detail::EGLDisplayHandle const egl_display;
 

=== modified file 'src/server/graphics/nested/nested_output.cpp'
--- src/server/graphics/nested/nested_output.cpp	2013-09-09 19:06:30 +0000
+++ src/server/graphics/nested/nested_output.cpp	2013-09-10 11:30:39 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "nested_output.h"
+#include "mir/input/event_filter.h"
 
 #include "mir_toolkit/mir_client_library.h"
 
@@ -54,14 +55,18 @@
 mgn::detail::NestedOutput::NestedOutput(
     EGLDisplayHandle const& egl_display,
     MirSurface* mir_surface,
-    geometry::Rectangle const& area) :
+    geometry::Rectangle const& area,
+    std::shared_ptr<input::EventFilter> const& event_handler) :
     egl_display(egl_display),
     mir_surface{mir_surface},
     egl_config{egl_display.choose_config(egl_attribs)},
     egl_context{egl_display, eglCreateContext(egl_display, egl_config, EGL_NO_CONTEXT, egl_context_attribs)},
     area{area.top_left, area.size},
+    event_handler{event_handler},
     display_egl_surface{egl_display.create_egl_surface(egl_config, mir_surface)}
 {
+    MirEventDelegate ed = {event_thunk, this};
+    mir_surface_set_event_handler(mir_surface, &ed);
 }
 
 geom::Rectangle mgn::detail::NestedOutput::view_area() const
@@ -90,3 +95,35 @@
     // TODO we really should return "true" - but we need to support bypass properly then
     return false;
 }
+
+mgn::detail::NestedOutput::~NestedOutput() noexcept
+{
+}
+
+void mgn::detail::NestedOutput::event_thunk(
+    MirSurface* /*surface*/,
+    MirEvent const* event,
+    void* context)
+try
+{
+    static_cast<mgn::detail::NestedOutput*>(context)->mir_event(*event);
+}
+catch (std::exception const&)
+{
+    // Just in case: do not allow exceptions to propagate.
+}
+
+void mgn::detail::NestedOutput::mir_event(MirEvent const& event)
+{
+    if (event.type == mir_event_type_motion)
+    {
+        auto my_event = event;
+        my_event.motion.x_offset += area.top_left.x.as_float();
+        my_event.motion.y_offset += area.top_left.y.as_float();
+        event_handler->handle(my_event);
+    }
+    else
+    {
+        event_handler->handle(event);
+    }
+}

=== modified file 'src/server/graphics/nested/nested_output.h'
--- src/server/graphics/nested/nested_output.h	2013-09-09 18:47:13 +0000
+++ src/server/graphics/nested/nested_output.h	2013-09-10 11:30:39 +0000
@@ -53,9 +53,10 @@
     NestedOutput(
         EGLDisplayHandle const& egl_display,
         MirSurface* mir_surface,
-        geometry::Rectangle const& area);
+        geometry::Rectangle const& area,
+        std::shared_ptr<input::EventFilter> const& event_handler);
 
-    ~NestedOutput() = default;
+    ~NestedOutput() noexcept;
 
     geometry::Rectangle view_area() const override;
     void make_current() override;
@@ -71,8 +72,11 @@
     EGLConfig const egl_config;
     EGLContextStore const egl_context;
     geometry::Rectangle const area;
-
+    std::shared_ptr<input::EventFilter> const event_handler;
     std::shared_ptr<EGLSurfaceHandle> const display_egl_surface;
+
+    static void event_thunk(MirSurface* surface, MirEvent const* event, void* context);
+    void mir_event(MirEvent const& event);
 };
 
 extern EGLint const egl_attribs[];

=== modified file 'src/server/graphics/nested/nested_platform.cpp'
--- src/server/graphics/nested/nested_platform.cpp	2013-09-03 09:00:53 +0000
+++ src/server/graphics/nested/nested_platform.cpp	2013-09-10 11:30:39 +0000
@@ -31,9 +31,11 @@
 
 mgn::NestedPlatform::NestedPlatform(
     std::shared_ptr<HostConnection> const& connection,
+    std::shared_ptr<input::EventFilter> const& event_handler,
     std::shared_ptr<mg::DisplayReport> const& display_report,
     std::shared_ptr<mg::NativePlatform> const& native_platform) :
 native_platform{native_platform},
+event_handler{event_handler},
 display_report{display_report},
 connection{connection}
 {
@@ -59,7 +61,7 @@
 
 std::shared_ptr<mg::Display> mgn::NestedPlatform::create_display(std::shared_ptr<mg::DisplayConfigurationPolicy> const& /*initial_conf_policy*/)
 {
-    return std::make_shared<mgn::NestedDisplay>(connection, display_report);
+    return std::make_shared<mgn::NestedDisplay>(connection, event_handler, display_report);
 }
 
 std::shared_ptr<mg::PlatformIPCPackage> mgn::NestedPlatform::get_ipc_package()

=== modified file 'src/server/input/CMakeLists.txt'
--- src/server/input/CMakeLists.txt	2013-08-30 07:47:16 +0000
+++ src/server/input/CMakeLists.txt	2013-09-10 11:30:39 +0000
@@ -6,6 +6,7 @@
   null_input_configuration.cpp
   null_input_report.cpp
   nested_input_configuration.cpp
+  nested_input_relay.cpp
   display_input_region.cpp
   vt_filter.cpp
 )

=== modified file 'src/server/input/nested_input_configuration.cpp'
--- src/server/input/nested_input_configuration.cpp	2013-08-29 16:18:41 +0000
+++ src/server/input/nested_input_configuration.cpp	2013-09-10 11:30:39 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "mir/input/nested_input_configuration.h"
+#include "mir/input/nested_input_relay.h"
 
 #include <boost/exception/all.hpp>
 #include <stdexcept>
@@ -24,42 +25,16 @@
 namespace mi = mir::input;
 
 mi::NestedInputConfiguration::NestedInputConfiguration(
-    std::shared_ptr<graphics::nested::HostConnection> const& connection,
+    std::shared_ptr<NestedInputRelay> const& input_relay,
     std::shared_ptr<EventFilter> const& event_filter,
     std::shared_ptr<InputRegion> const& input_region,
     std::shared_ptr<CursorListener> const& cursor_listener,
     std::shared_ptr<InputReport> const& input_report) :
-connection(connection),
-event_filter(event_filter),
-input_region(input_region),
-cursor_listener(cursor_listener),
-input_report(input_report)
+    android::DispatcherInputConfiguration(event_filter, input_region, cursor_listener, input_report),
+    input_relay(input_relay)
 {
 }
 
 mi::NestedInputConfiguration::~NestedInputConfiguration()
 {
 }
-
-auto mi::NestedInputConfiguration::the_input_registrar()
-->     std::shared_ptr<surfaces::InputRegistrar>
-{
-    BOOST_THROW_EXCEPTION(std::runtime_error("Nested mode input not implemented"));
-}
-
-auto mi::NestedInputConfiguration::the_input_targeter()
--> std::shared_ptr<shell::InputTargeter>
-{
-    BOOST_THROW_EXCEPTION(std::runtime_error("Nested mode input not implemented"));
-}
-
-auto mi::NestedInputConfiguration::the_input_manager()
--> std::shared_ptr<InputManager>
-{
-    BOOST_THROW_EXCEPTION(std::runtime_error("Nested mode input not implemented"));
-}
-
-void mi::NestedInputConfiguration::set_input_targets(std::shared_ptr<InputTargets> const& /*targets*/)
-{
-    BOOST_THROW_EXCEPTION(std::runtime_error("Nested mode input not implemented"));
-}

=== added file 'src/server/input/nested_input_relay.cpp'
--- src/server/input/nested_input_relay.cpp	1970-01-01 00:00:00 +0000
+++ src/server/input/nested_input_relay.cpp	2013-09-10 11:30:39 +0000
@@ -0,0 +1,142 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#include "mir/input/nested_input_relay.h"
+
+#include <InputDispatcher.h>
+
+#include <boost/exception/all.hpp>
+#include <stdexcept>
+
+namespace mi = mir::input;
+
+mi::NestedInputRelay::NestedInputRelay()
+{
+}
+
+mi::NestedInputRelay::~NestedInputRelay() noexcept
+{
+}
+
+void mi::NestedInputRelay::set_dispatcher(::android::sp<::android::InputDispatcher> const& dispatcher)
+{
+    this->dispatcher = dispatcher;
+}
+
+bool mi::NestedInputRelay::handle(MirEvent const& event)
+{
+    if (dispatcher == nullptr)
+    {
+        return false;
+    }
+
+    // TODO it isn't obvious what to pass to injectInputEvent()
+    // TODO can reviewers look carefully at these?
+    static auto const injector_pid = 0;
+    static auto const injector_uid = 0;
+    static auto const sync_mode = ::android::INPUT_EVENT_INJECTION_SYNC_NONE;
+    static auto const timeout_millis = 0;
+    static auto const policy_flags = ::android::POLICY_FLAG_INJECTED | ::android::POLICY_FLAG_TRUSTED;
+
+    switch (event.type)
+    {
+    case mir_event_type_key:
+    {
+        ::android::KeyEvent input_event;
+
+        input_event.initialize(
+            event.key.device_id,    //int32_t deviceId,
+            event.key.source_id,    //int32_t source,
+            event.key.action,       //int32_t action,
+            event.key.flags,        //int32_t flags,
+            event.key.key_code,     //int32_t keyCode,
+            event.key.scan_code,    //int32_t scanCode,
+            event.key.modifiers,    //int32_t metaState,
+            event.key.repeat_count, //int32_t repeatCount,
+            event.key.down_time,    //nsecs_t downTime,
+            event.key.event_time);  //nsecs_t eventTime
+
+        dispatcher->injectInputEvent(
+            &input_event,   //const InputEvent* event,
+            injector_pid,   //int32_t injectorPid,
+            injector_uid,   //int32_t injectorUid,
+            sync_mode,      //int32_t syncMode,
+            timeout_millis, //int32_t timeoutMillis,
+            policy_flags);  //uint32_t policyFlags
+        break;
+    }
+
+    case mir_event_type_motion:
+    {
+        ::android::MotionEvent input_event;
+
+        std::vector<::android::PointerProperties> pointer_properties(event.motion.pointer_count);
+        std::vector<::android::PointerCoords> pointer_coords(event.motion.pointer_count);
+
+        for(auto i = 0U; i != event.motion.pointer_count; ++i)
+        {
+            pointer_properties[i].id = event.motion.pointer_coordinates[i].id;
+            pointer_properties[i].toolType = 0;
+
+            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_X, event.motion.pointer_coordinates[i].x);
+            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_Y, event.motion.pointer_coordinates[i].y);
+            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_PRESSURE, event.motion.pointer_coordinates[i].pressure);
+            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_SIZE, event.motion.pointer_coordinates[i].size);
+            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_TOUCH_MAJOR, event.motion.pointer_coordinates[i].touch_major);
+            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_TOUCH_MINOR, event.motion.pointer_coordinates[i].touch_minor);
+            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_ORIENTATION, event.motion.pointer_coordinates[i].orientation);
+        }
+
+        input_event.initialize(
+            event.motion.device_id,     //int32_t deviceId,
+            event.motion.source_id,     //int32_t source,
+            event.motion.action,        //int32_t action,
+            event.motion.flags,         //int32_t flags,
+            event.motion.edge_flags,    //int32_t edgeFlags,
+            event.motion.modifiers,     //int32_t metaState,
+            event.motion.button_state,  //int32_t buttonState,
+            event.motion.x_offset,      //float xOffset,
+            event.motion.y_offset,      //float yOffset,
+            event.motion.x_precision,   //float xPrecision,
+            event.motion.y_precision,   //float yPrecision,
+            event.motion.down_time,     //nsecs_t downTime,
+            event.motion.event_time,    //nsecs_t eventTime,
+            event.motion.pointer_count, //size_t pointerCount,
+            pointer_properties.data(),  //const PointerProperties* pointerProperties,
+            pointer_coords.data());     //const PointerCoords* pointerCoords);
+
+        dispatcher->injectInputEvent(
+            &input_event,   //const InputEvent* event,
+            injector_pid,   //int32_t injectorPid,
+            injector_uid,   //int32_t injectorUid,
+            sync_mode,      //int32_t syncMode,
+            timeout_millis, //int32_t timeoutMillis,
+            policy_flags);  //uint32_t policyFlags
+        break;
+    }
+
+    case mir_event_type_surface:
+        // Just ignore these events: it doesn't make sense to pass them on.
+        break;
+
+    default:
+        BOOST_THROW_EXCEPTION(std::logic_error("Unhandled event type"));
+    }
+
+    return true;
+}