Merge lp:~robertcarr/mir/enable-and-demonstrate-inprocess-input into lp:~mir-team/mir/trunk

[Robert Carr]

Enable usage of in-process input (i.e. reorganize headers), and demonstrate usage in examples/.

Enable usage of in-process input (i.e. reorganize headers), and demonstrate usage in examples/.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:651
http://jenkins.qa.ubuntu.com/job/mir-ci/574/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/676
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/559/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/306

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

overall, looks ok... a few needs fixings though

should we have mir::client::input in shared/ ? I'd rather just have mir::input in shared, usable on both the server side and client side

106/107: reinterpret_cast not needed here

review: Needs Fixing

[Kevin DuBois (kdub)]

I think we're quickly converging on an interface for our internal clients that makes sense. I also think we're suffering from name overloading, specifically on what we want to call the interfaces that provide internal renderloops to the shell. put another way, me::InprocessEGLClient::InprocessEGLClient is quickly converging on something elegant, but I think if I had not wrestled with that code last week, it would be a strange abstraction.
maybe i'll send out a mail or something to discuss

[Kevin DuBois (kdub)]

> I think we're quickly converging on an interface for our internal clients that
> makes sense. I also think we're suffering from name overloading, specifically
> on what we want to call the interfaces that provide internal renderloops to
> the shell. put another way, me::InprocessEGLClient::InprocessEGLClient is
> quickly converging on something elegant, but I think if I had not wrestled
> with that code last week, it would be a strange abstraction.
> maybe i'll send out a mail or something to discuss

oh, and this branch can land without having that interface, just want to make sure we get to that clean naming and interface for this part of mir :)

[Robert Carr (robertcarr)]

After discussion on IRC moved the machinery to mir::input::receiver.

Removed reinterpret cast.

r652 and 653

[Kevin DuBois (kdub)]

seems ok, pending the decision on the rename for 'not over ipc clients'

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:654
http://jenkins.qa.ubuntu.com/job/mir-ci/575/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/677
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/560/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/307

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:655
http://jenkins.qa.ubuntu.com/job/mir-ci/576/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/678
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/561
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/308

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

review: Approve (continuous-integration)

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2013-05-07 20:24:11 +0000
+++ examples/CMakeLists.txt	2013-05-14 00:10:31 +0000
@@ -120,7 +120,7 @@
   mir_eglplasma
 )
 
-add_subdirectory(demo-inprocess-egl)
+add_subdirectory(demo-inprocess-surface-client)
 add_subdirectory(demo-shell)
 
 install(TARGETS ${DEMO_CLIENTS} RUNTIME DESTINATION bin)
 
=== renamed directory 'examples/demo-inprocess-egl' => 'examples/demo-inprocess-surface-client'
=== modified file 'examples/demo-inprocess-surface-client/CMakeLists.txt'
--- examples/demo-inprocess-egl/CMakeLists.txt	2013-04-24 05:22:20 +0000
+++ examples/demo-inprocess-surface-client/CMakeLists.txt	2013-05-14 00:10:31 +0000
@@ -1,7 +1,7 @@
 include_directories(..)
 
 add_executable(mir_demo_inprocess_egl
-  demo_inprocess_egl.cpp
+  demo_inprocess_surface_client.cpp
   inprocess_egl_client.cpp
   example_egl_helper.cpp
 )
 
=== renamed file 'examples/demo-inprocess-egl/demo_inprocess_egl.cpp' => 'examples/demo-inprocess-surface-client/demo_inprocess_surface_client.cpp'
--- examples/demo-inprocess-egl/demo_inprocess_egl.cpp	2013-05-09 01:17:23 +0000
+++ examples/demo-inprocess-surface-client/demo_inprocess_surface_client.cpp	2013-05-14 00:10:31 +0000
@@ -48,7 +48,7 @@
         client = std::make_shared<me::InprocessEGLClient>(
               config.the_main_loop(),
               config.the_graphics_platform(),
-              config.the_shell_surface_factory());
+              config.the_session_manager());
     });
     ///\internal [main_tag]
 
 
=== modified file 'examples/demo-inprocess-surface-client/inprocess_egl_client.cpp'
--- examples/demo-inprocess-egl/inprocess_egl_client.cpp	2013-05-09 01:17:23 +0000
+++ examples/demo-inprocess-surface-client/inprocess_egl_client.cpp	2013-05-14 00:10:31 +0000
@@ -20,18 +20,23 @@
 #include "example_egl_helper.h"
 
 #include "mir/main_loop.h"
-#include "mir/shell/surface_factory.h"
+#include "mir/shell/session_manager.h"
 #include "mir/shell/surface.h"
 #include "mir/frontend/surface_creation_parameters.h"
+#include "mir/frontend/session.h"
 #include "mir/geometry/size.h"
 #include "mir/compositor/buffer_properties.h"
 #include "mir/graphics/platform.h"
+#include "mir/input/input_receiver_thread.h"
+#include "mir/input/input_platform.h"
 #include "mir/graphics/internal_client.h"
 
 #include "graphics.h"
 
 #include <EGL/egl.h>
 
+#include <xkbcommon/xkbcommon-keysyms.h>
+
 #include <functional>
 
 #include <assert.h>
@@ -43,13 +48,16 @@
 namespace msh = mir::shell;
 namespace mg = mir::graphics;
 namespace me = mir::examples;
+namespace mircv = mir::input::receiver;
 namespace geom = mir::geometry;
 
+
 me::InprocessEGLClient::InprocessEGLClient(std::shared_ptr<mir::MainLoop> const& main_loop,
                                            std::shared_ptr<mg::Platform> const& graphics_platform,
-                                           std::shared_ptr<msh::SurfaceFactory> const& surface_factory)
+                                           std::shared_ptr<msh::SessionManager> const& session_manager)
   : graphics_platform(graphics_platform),
-    surface_factory(surface_factory),
+
+    session_manager(session_manager),
     client_thread(std::mem_fn(&InprocessEGLClient::thread_loop), this),
     terminate(false)
 {
@@ -72,7 +80,17 @@
         .of_size(surface_size)
         .of_buffer_usage(mc::BufferUsage::hardware)
         .of_pixel_format(geom::PixelFormat::argb_8888);
-    auto surface = surface_factory->create_surface(params, mf::SurfaceId(), std::shared_ptr<events::EventSink>());
+    auto session = session_manager->open_session("Inprocess client",
+                                                 std::shared_ptr<mir::events::EventSink>());
+    // TODO: Why do we get an ID? ~racarr
+    auto surface = session->get_surface(session_manager->create_surface_for(session, params));
+    
+    auto input_platform = mircv::InputPlatform::create();
+    input_thread = input_platform->create_input_thread(
+        surface->client_input_fd(), 
+            std::bind(std::mem_fn(&me::InprocessEGLClient::handle_event), this, std::placeholders::_1));
+    input_thread->start();
+
     auto internal_client = graphics_platform->create_internal_client(surface);
     me::EGLHelper helper(internal_client->egl_native_display(), internal_client->egl_native_window());
 
@@ -92,5 +110,18 @@
 
         gl_animation.step();
     }
+
+    input_thread->stop();
     ///\internal [loop_tag]
 }
+
+void me::InprocessEGLClient::handle_event(MirEvent *event)
+{
+    if (event->type != mir_event_type_key)
+        return;
+    if (event->key.action != mir_key_action_down)
+        return;
+    if (event->key.key_code != XKB_KEY_Escape)
+        return;
+    terminate = true;
+}
 
=== modified file 'examples/demo-inprocess-surface-client/inprocess_egl_client.h'
--- examples/demo-inprocess-egl/inprocess_egl_client.h	2013-05-09 01:17:23 +0000
+++ examples/demo-inprocess-surface-client/inprocess_egl_client.h	2013-05-14 00:10:31 +0000
@@ -19,19 +19,29 @@
 #ifndef MIR_EXAMPLES_INPROCESS_EGL_CLIENT_H_
 #define MIR_EXAMPLES_INPROCESS_EGL_CLIENT_H_
 
+#include "mir_toolkit/event.h"
+
 #include <thread>
 #include <memory>
+#include <atomic>
 
 namespace mir
 {
 class MainLoop;
+namespace input
+{
+namespace receiver
+{
+class InputReceiverThread;
+}
+}
 namespace graphics
 {
 class Platform;
 }
 namespace shell
 {
-class SurfaceFactory;
+class SessionManager;
 }
 
 namespace examples
@@ -43,7 +53,7 @@
 public:
     InprocessEGLClient(std::shared_ptr<mir::MainLoop> const& main_loop,
                        std::shared_ptr<graphics::Platform> const& graphics_platform,
-                       std::shared_ptr<shell::SurfaceFactory> const& surface_factory);
+                       std::shared_ptr<shell::SessionManager> const& session_manager);
 
 protected:
     InprocessEGLClient(InprocessEGLClient const&) = delete;
@@ -51,11 +61,16 @@
 
 private:
     std::shared_ptr<graphics::Platform> const graphics_platform;
-    std::shared_ptr<shell::SurfaceFactory> const surface_factory;
+    std::shared_ptr<shell::SessionManager> const session_manager;
 
     std::thread client_thread;
+    
+    std::shared_ptr<input::receiver::InputReceiverThread> input_thread;
+    
     void thread_loop();
-    bool terminate;
+    void handle_event(MirEvent *event);
+
+    std::atomic<bool> terminate;
 };
 
 }
 
=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2013-05-09 14:54:22 +0000
+++ include/server/mir/default_server_configuration.h	2013-05-14 00:10:31 +0000
@@ -197,6 +197,8 @@
     virtual std::shared_ptr<graphics::Platform>  the_graphics_platform();
     virtual std::shared_ptr<time::TimeSource>    the_time_source();
 
+    virtual std::shared_ptr<shell::SessionManager> the_session_manager();
+
 protected:
     // add_options() allows configuration specializations to add their
     // own options. This MUST be called before the first invocation of
@@ -205,7 +207,6 @@
     virtual std::shared_ptr<options::Option> the_options() const;
 
     virtual std::shared_ptr<input::InputChannelFactory> the_input_channel_factory();
-    virtual std::shared_ptr<shell::SessionManager> the_session_manager();
 
     CachedPtr<frontend::Communicator> communicator;
     CachedPtr<shell::SessionManager> session_manager;
 
=== renamed file 'src/client/input/input_platform.h' => 'include/shared/mir/input/input_platform.h'
--- src/client/input/input_platform.h	2013-04-24 05:22:20 +0000
+++ include/shared/mir/input/input_platform.h	2013-05-14 00:10:31 +0000
@@ -16,8 +16,8 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#ifndef MIR_CLIENT_INPUT_PLATFORM_H_
-#define MIR_CLIENT_INPUT_PLATFORM_H_
+#ifndef MIR_INPUT_RECEIVER_PLATFORM_H_
+#define MIR_INPUT_RECEIVER_PLATFORM_H_
 
 #include "mir_toolkit/event.h"
 
@@ -26,10 +26,10 @@
 
 namespace mir
 {
-namespace client
-{
 namespace input
 {
+namespace receiver
+{
 class InputReceiverThread;
 
 // Interface for MirSurface to construct input dispatcher threads.
@@ -52,4 +52,4 @@
 }
 } // namespace mir
 
-#endif // MIR_CLIENT_INPUT_PLATFORM_H_
+#endif // MIR_INPUT_RECEIVER_PLATFORM_H_
 
=== renamed file 'src/client/input/input_receiver_thread.h' => 'include/shared/mir/input/input_receiver_thread.h'
--- src/client/input/input_receiver_thread.h	2013-04-24 05:22:20 +0000
+++ include/shared/mir/input/input_receiver_thread.h	2013-05-14 00:10:31 +0000
@@ -16,15 +16,15 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#ifndef MIR_CLIENT_INPUT_RECEIVER_THREAD_H_
-#define MIR_CLIENT_INPUT_RECEIVER_THREAD_H_
+#ifndef MIR_INPUT_RECEIVER_RECEIVER_THREAD_H_
+#define MIR_INPUT_RECEIVER_RECEIVER_THREAD_H_
 
 namespace mir
 {
-namespace client
-{
 namespace input
 {
+namespace receiver
+{
 
 class InputReceiverThread
 {
@@ -45,4 +45,4 @@
 }
 } // namespace mir
 
-#endif // MIR_CLIENT_INPUT_RECEIVER_THREAD_H_
+#endif // MIR_INPUT_RECEIVER_RECEIVER_THREAD_H_
 
=== renamed file 'src/client/input/xkb_mapper.h' => 'include/shared/mir/input/xkb_mapper.h'
--- src/client/input/xkb_mapper.h	2013-04-12 17:33:05 +0000
+++ include/shared/mir/input/xkb_mapper.h	2013-05-14 00:10:31 +0000
@@ -16,8 +16,8 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#ifndef MIR_CLIENT_INPUT_XKB_MAPPER_H_
-#define MIR_CLIENT_INPUT_XKB_MAPPER_H_
+#ifndef MIR_INPUT_RECEIVER_XKB_MAPPER_H_
+#define MIR_INPUT_RECEIVER_XKB_MAPPER_H_
 
 #include <xkbcommon/xkbcommon.h>
 
@@ -25,10 +25,10 @@
 
 namespace mir
 {
-namespace client
-{
 namespace input
 {
+namespace receiver
+{
 
 class XKBMapper
 {
@@ -53,4 +53,4 @@
 }
 }
 
-#endif // MIR_CLIENT_INPUT_XKB_MAPPER_H_
+#endif // MIR_INPUT_RECEIVER_XKB_MAPPER_H_
 
=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2013-04-24 05:22:20 +0000
+++ src/client/CMakeLists.txt	2013-05-14 00:10:31 +0000
@@ -35,7 +35,6 @@
   mir_basic_rpc_channel.cpp
   ${PROTO_SRCS}
 )
-add_subdirectory(input)
 
 list(APPEND CLIENT_SOURCES
   mir_socket_rpc_channel.cpp
 
=== removed directory 'src/client/input'
=== removed file 'src/client/input/CMakeLists.txt'
--- src/client/input/CMakeLists.txt	2013-04-24 05:22:20 +0000
+++ src/client/input/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-list(
-  APPEND CLIENT_SOURCES
-  ${CMAKE_CURRENT_SOURCE_DIR}/android_input_receiver.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/android_input_receiver_thread.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/android_input_platform.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/xkb_mapper.cpp
-)
-
-set(
-  CLIENT_SOURCES
-  ${CLIENT_SOURCES}
-  PARENT_SCOPE
-)
 
=== modified file 'src/client/mir_connection.cpp'
--- src/client/mir_connection.cpp	2013-04-29 23:21:58 +0000
+++ src/client/mir_connection.cpp	2013-05-14 00:10:31 +0000
@@ -25,13 +25,13 @@
 #include "client_buffer_depository.h"
 #include "make_rpc_channel.h"
 
-#include "input/input_platform.h"
+#include "mir/input/input_platform.h"
 
 #include <thread>
 #include <cstddef>
 
 namespace mcl = mir::client;
-namespace mcli = mcl::input;
+namespace mircv = mir::input::receiver;
 namespace mp = mir::protobuf;
 namespace gp = google::protobuf;
 
@@ -50,7 +50,7 @@
         server(channel.get(), ::google::protobuf::Service::STUB_DOESNT_OWN_CHANNEL),
         log(log),
         client_platform_factory(client_platform_factory),
-        input_platform(mcli::InputPlatform::create())
+        input_platform(mircv::InputPlatform::create())
 {
     channel->set_event_handler(this);
     {
 
=== modified file 'src/client/mir_connection.h'
--- src/client/mir_connection.h	2013-04-29 23:21:58 +0000
+++ src/client/mir_connection.h	2013-05-14 00:10:31 +0000
@@ -45,9 +45,12 @@
 class ClientBufferDepository;
 class ClientPlatformFactory;
 class MirBasicRpcChannel;
+}
 
 namespace input
 {
+namespace receiver
+{
 class InputPlatform;
 }
 }
@@ -117,7 +120,7 @@
     std::shared_ptr<mir::client::ClientPlatform> platform;
     std::shared_ptr<EGLNativeDisplayType> native_display;
 
-    std::shared_ptr<mir::client::input::InputPlatform> const input_platform;
+    std::shared_ptr<mir::input::receiver::InputPlatform> const input_platform;
 
     std::string error_message;
 
 
=== modified file 'src/client/mir_surface.cpp'
--- src/client/mir_surface.cpp	2013-05-03 18:39:57 +0000
+++ src/client/mir_surface.cpp	2013-05-14 00:10:31 +0000
@@ -22,14 +22,14 @@
 #include "client_buffer.h"
 #include "mir_surface.h"
 #include "mir_connection.h"
-#include "input/input_receiver_thread.h"
-#include "input/input_platform.h"
+#include "mir/input/input_receiver_thread.h"
+#include "mir/input/input_platform.h"
 
 #include <cassert>
 
 namespace geom = mir::geometry;
 namespace mcl = mir::client;
-namespace mcli = mir::client::input;
+namespace mircv = mir::input::receiver;
 namespace mp = mir::protobuf;
 namespace gp = google::protobuf;
 
@@ -38,7 +38,7 @@
     mp::DisplayServer::Stub & server,
     std::shared_ptr<mir::client::Logger> const& logger,
     std::shared_ptr<mcl::ClientBufferFactory> const& factory,
-    std::shared_ptr<mcli::InputPlatform> const& input_platform,
+    std::shared_ptr<mircv::InputPlatform> const& input_platform,
     MirSurfaceParameters const & params,
     mir_surface_lifecycle_callback callback, void * context)
     : server(server),
 
=== modified file 'src/client/mir_surface.h'
--- src/client/mir_surface.h	2013-05-03 22:53:42 +0000
+++ src/client/mir_surface.h	2013-05-14 00:10:31 +0000
@@ -35,14 +35,17 @@
 
 namespace mir
 {
-namespace client
-{
-class ClientBuffer;
 namespace input
 {
+namespace receiver
+{
 class InputPlatform;
 class InputReceiverThread;
 }
+}
+namespace client
+{
+class ClientBuffer;
 
 struct MemoryRegion;
 }
@@ -59,7 +62,7 @@
         mir::protobuf::DisplayServer::Stub & server,
         std::shared_ptr<mir::client::Logger> const& logger,
         std::shared_ptr<mir::client::ClientBufferFactory> const& buffer_factory,
-        std::shared_ptr<mir::client::input::InputPlatform> const& input_platform,
+        std::shared_ptr<mir::input::receiver::InputPlatform> const& input_platform,
         MirSurfaceParameters const& params,
         mir_surface_lifecycle_callback callback, void * context);
 
@@ -110,7 +113,7 @@
 
     std::shared_ptr<mir::client::MemoryRegion> secured_region;
     std::shared_ptr<mir::client::ClientBufferDepository> buffer_depository;
-    std::shared_ptr<mir::client::input::InputPlatform> const input_platform;
+    std::shared_ptr<mir::input::receiver::InputPlatform> const input_platform;
 
     std::shared_ptr<mir::client::Logger> logger;
     std::shared_ptr<EGLNativeWindowType> accelerated_window;
@@ -121,7 +124,7 @@
     int attrib_cache[mir_surface_attrib_arraysize_];
 
     std::function<void(MirEvent const*)> handle_event_callback;
-    std::shared_ptr<mir::client::input::InputReceiverThread> input_thread;
+    std::shared_ptr<mir::input::receiver::InputReceiverThread> input_thread;
 };
 
 #endif /* MIR_CLIENT_PRIVATE_MIR_WAIT_HANDLE_H_ */
 
=== modified file 'src/shared/input/CMakeLists.txt'
--- src/shared/input/CMakeLists.txt	2013-04-24 05:22:20 +0000
+++ src/shared/input/CMakeLists.txt	2013-05-14 00:10:31 +0000
@@ -16,9 +16,11 @@
 
 set(
   ANDROID_SHARED_INPUT_SOURCES
-  ${CMAKE_CURRENT_SOURCE_DIR}/android_input_lexicon.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/xkb_mapper.cpp
 )
 
+add_subdirectory(android)
+
 add_library(
   mirsharedinput STATIC
   ${ANDROID_SHARED_INPUT_SOURCES}
@@ -28,4 +30,5 @@
   mirsharedinput
   
   android-input
+  ${XKBCOMMON_LIBRARIES}
 )
 
=== added directory 'src/shared/input/android'
=== added file 'src/shared/input/android/CMakeLists.txt'
--- src/shared/input/android/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/shared/input/android/CMakeLists.txt	2013-05-14 00:10:31 +0000
@@ -0,0 +1,29 @@
+# Copyright © 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: Robert Carr <[e-mail]>
+
+list(
+  APPEND ANDROID_SHARED_INPUT_SOURCES
+  ${CMAKE_CURRENT_SOURCE_DIR}/android_input_lexicon.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/android_input_receiver.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/android_input_receiver_thread.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/android_input_platform.cpp
+)
+
+set(
+  ANDROID_SHARED_INPUT_SOURCES
+  ${ANDROID_SHARED_INPUT_SOURCES}
+  PARENT_SCOPE
+)
 
=== renamed file 'src/shared/input/android_input_lexicon.cpp' => 'src/shared/input/android/android_input_lexicon.cpp'
=== renamed file 'src/client/input/android_input_platform.cpp' => 'src/shared/input/android/android_input_platform.cpp'
--- src/client/input/android_input_platform.cpp	2013-04-24 05:22:20 +0000
+++ src/shared/input/android/android_input_platform.cpp	2013-05-14 00:10:31 +0000
@@ -20,25 +20,25 @@
 #include "android_input_receiver.h"
 #include "android_input_receiver_thread.h"
 
-namespace mcli = mir::client::input;
-namespace mclia = mcli::android;
-
-mclia::AndroidInputPlatform::AndroidInputPlatform()
-{
-}
-
-mclia::AndroidInputPlatform::~AndroidInputPlatform()
-{
-}
-
-std::shared_ptr<mcli::InputReceiverThread> mclia::AndroidInputPlatform::create_input_thread(
+namespace mircv = mir::input::receiver;
+namespace mircva = mircv::android;
+
+mircva::AndroidInputPlatform::AndroidInputPlatform()
+{
+}
+
+mircva::AndroidInputPlatform::~AndroidInputPlatform()
+{
+}
+
+std::shared_ptr<mircv::InputReceiverThread> mircva::AndroidInputPlatform::create_input_thread(
     int fd, std::function<void(MirEvent*)> const& callback)
 {
-    auto receiver = std::make_shared<mclia::InputReceiver>(fd);
-    return std::make_shared<mclia::InputReceiverThread>(receiver, callback);
+    auto receiver = std::make_shared<mircva::InputReceiver>(fd);
+    return std::make_shared<mircva::InputReceiverThread>(receiver, callback);
 }
 
-std::shared_ptr<mcli::InputPlatform> mcli::InputPlatform::create()
+std::shared_ptr<mircv::InputPlatform> mircv::InputPlatform::create()
 {
-    return std::make_shared<mclia::AndroidInputPlatform>();
+    return std::make_shared<mircva::AndroidInputPlatform>();
 }
 
=== renamed file 'src/client/input/android_input_platform.h' => 'src/shared/input/android/android_input_platform.h'
--- src/client/input/android_input_platform.h	2013-04-24 05:22:20 +0000
+++ src/shared/input/android/android_input_platform.h	2013-05-14 00:10:31 +0000
@@ -19,14 +19,14 @@
 #ifndef MIR_CLIENT_ANDROID_INPUT_PLATFORM_H_
 #define MIR_CLIENT_ANDROID_INPUT_PLATFORM_H_
 
-#include "input_platform.h"
+#include "mir/input/input_platform.h"
 
 namespace mir
 {
-namespace client
-{
 namespace input
 {
+namespace receiver
+{
 namespace android
 {
 
 
=== renamed file 'src/client/input/android_input_receiver.cpp' => 'src/shared/input/android/android_input_receiver.cpp'
--- src/client/input/android_input_receiver.cpp	2013-04-24 05:22:20 +0000
+++ src/shared/input/android/android_input_receiver.cpp	2013-05-14 00:10:31 +0000
@@ -17,41 +17,41 @@
  */
 
 #include "android_input_receiver.h"
-#include "xkb_mapper.h"
 
+#include "mir/input/xkb_mapper.h"
 #include "mir/input/android/android_input_lexicon.h"
 
 #include <androidfw/InputTransport.h>
 #include <utils/Looper.h>
 
-namespace mcli = mir::client::input;
-namespace mclia = mcli::android;
+namespace mircv = mir::input::receiver;
+namespace mircva = mircv::android;
 
 namespace mia = mir::input::android;
 
-mclia::InputReceiver::InputReceiver(droidinput::sp<droidinput::InputChannel> const& input_channel)
+mircva::InputReceiver::InputReceiver(droidinput::sp<droidinput::InputChannel> const& input_channel)
   : input_channel(input_channel),
     input_consumer(std::make_shared<droidinput::InputConsumer>(input_channel)),
     looper(new droidinput::Looper(true)),
     fd_added(false),
-    xkb_mapper(std::make_shared<mcli::XKBMapper>())
+    xkb_mapper(std::make_shared<mircv::XKBMapper>())
 {
 }
 
-mclia::InputReceiver::InputReceiver(int fd)
+mircva::InputReceiver::InputReceiver(int fd)
   : input_channel(new droidinput::InputChannel(droidinput::String8(""), fd)), 
     input_consumer(std::make_shared<droidinput::InputConsumer>(input_channel)),
     looper(new droidinput::Looper(true)),
     fd_added(false),
-    xkb_mapper(std::make_shared<mcli::XKBMapper>())
-{
-}
-
-mclia::InputReceiver::~InputReceiver()
-{
-}
-
-int mclia::InputReceiver::fd() const
+    xkb_mapper(std::make_shared<mircv::XKBMapper>())
+{
+}
+
+mircva::InputReceiver::~InputReceiver()
+{
+}
+
+int mircva::InputReceiver::fd() const
 {
     return input_channel->getFd();
 }
@@ -59,7 +59,7 @@
 namespace
 {
 
-static void map_key_event(std::shared_ptr<mcli::XKBMapper> const& xkb_mapper, MirEvent &ev)
+static void map_key_event(std::shared_ptr<mircv::XKBMapper> const& xkb_mapper, MirEvent &ev)
 {
     // TODO: As XKBMapper is used to track modifier state we need to use a seperate instance
     // of XKBMapper per device id (or modify XKBMapper semantics)
@@ -77,7 +77,7 @@
 
 // TODO: We use a droidinput::Looper here for polling functionality but it might be nice to integrate
 // with the existing client io_service ~racarr ~tvoss
-bool mclia::InputReceiver::next_event(std::chrono::milliseconds const& timeout, MirEvent &ev)
+bool mircva::InputReceiver::next_event(std::chrono::milliseconds const& timeout, MirEvent &ev)
 {
     droidinput::InputEvent *android_event;
     uint32_t event_sequence_id;
@@ -113,7 +113,7 @@
     return handled_event;
 }
 
-void mclia::InputReceiver::wake()
+void mircva::InputReceiver::wake()
 {
     looper->wake();
 }
 
=== renamed file 'src/client/input/android_input_receiver.h' => 'src/shared/input/android/android_input_receiver.h'
--- src/client/input/android_input_receiver.h	2013-04-24 05:22:20 +0000
+++ src/shared/input/android/android_input_receiver.h	2013-05-14 00:10:31 +0000
@@ -16,8 +16,8 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#ifndef MIR_INPUT_ANDROID_INPUT_RECEIVER_H_
-#define MIR_INPUT_ANDROID_INPUT_RECEIVER_H_
+#ifndef MIR_INPUT_RECEIVER_ANDROID_INPUT_RECEIVER_H_
+#define MIR_INPUT_RECEIVER_ANDROID_INPUT_RECEIVER_H_
 
 #include "mir_toolkit/event.h"
 
@@ -38,10 +38,10 @@
 
 namespace mir
 {
-namespace client
-{
 namespace input
 {
+namespace receiver
+{
 class XKBMapper;
 
 namespace android
@@ -85,4 +85,4 @@
 }
 } // namespace mir
 
-#endif // MIR_INPUT_ANDROID_INPUT_RECEIVER_H_
+#endif // MIR_INPUT_RECEIVER_ANDROID_INPUT_RECEIVER_H_
 
=== renamed file 'src/client/input/android_input_receiver_thread.cpp' => 'src/shared/input/android/android_input_receiver_thread.cpp'
--- src/client/input/android_input_receiver_thread.cpp	2013-04-24 05:22:20 +0000
+++ src/shared/input/android/android_input_receiver_thread.cpp	2013-05-14 00:10:31 +0000
@@ -21,9 +21,9 @@
 
 #include <thread>
 
-namespace mclia = mir::client::input::android;
+namespace mircva = mir::input::receiver::android;
 
-mclia::InputReceiverThread::InputReceiverThread(std::shared_ptr<mclia::InputReceiver> const& receiver,
+mircva::InputReceiverThread::InputReceiverThread(std::shared_ptr<mircva::InputReceiver> const& receiver,
                                                 std::function<void(MirEvent*)> const& event_handling_callback)
   : receiver(receiver),
     handler(event_handling_callback),
@@ -31,7 +31,7 @@
 {
 }
 
-mclia::InputReceiverThread::~InputReceiverThread()
+mircva::InputReceiverThread::~InputReceiverThread()
 {
     if (running)
         stop();
@@ -39,24 +39,24 @@
         join();
 }
 
-void mclia::InputReceiverThread::start()
+void mircva::InputReceiverThread::start()
 {
     running = true;
-    thread = std::thread(std::mem_fn(&mclia::InputReceiverThread::thread_loop), this);
+    thread = std::thread(std::mem_fn(&mircva::InputReceiverThread::thread_loop), this);
 }
 
-void mclia::InputReceiverThread::stop()
+void mircva::InputReceiverThread::stop()
 {
     running = false;
     receiver->wake();
 }
 
-void mclia::InputReceiverThread::join()
+void mircva::InputReceiverThread::join()
 {
     thread.join();
 }
 
-void mclia::InputReceiverThread::thread_loop()
+void mircva::InputReceiverThread::thread_loop()
 {
     while (running)
     {
 
=== renamed file 'src/client/input/android_input_receiver_thread.h' => 'src/shared/input/android/android_input_receiver_thread.h'
--- src/client/input/android_input_receiver_thread.h	2013-04-24 05:22:20 +0000
+++ src/shared/input/android/android_input_receiver_thread.h	2013-05-14 00:10:31 +0000
@@ -16,10 +16,10 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#ifndef MIR_INPUT_ANDROID_INPUT_RECEIVER_THREAD_H_
-#define MIR_INPUT_ANDROID_INPUT_RECEIVER_THREAD_H_
+#ifndef MIR_INPUT_RECEIVER_ANDROID_INPUT_RECEIVER_THREAD_H_
+#define MIR_INPUT_RECEIVER_ANDROID_INPUT_RECEIVER_THREAD_H_
 
-#include "input_receiver_thread.h"
+#include "mir/input/input_receiver_thread.h"
 
 #include "mir_toolkit/event.h"
 
@@ -30,16 +30,16 @@
 
 namespace mir
 {
-namespace client
-{
 namespace input
 {
+namespace receiver
+{
 namespace android
 {
 class InputReceiver;
 
 /// Responsible for polling an InputReceiver to read and dispatch events when appropriate.
-class InputReceiverThread : public input::InputReceiverThread
+class InputReceiverThread : public receiver::InputReceiverThread
 {
 public:
     InputReceiverThread(std::shared_ptr<InputReceiver> const& receiver, 
@@ -68,4 +68,4 @@
 }
 } // namespace mir
 
-#endif // MIR_INPUT_ANDROID_INPUT_RECEIVER_THREAD_H_
+#endif // MIR_INPUT_RECEIVER_ANDROID_INPUT_RECEIVER_THREAD_H_
 
=== renamed file 'src/client/input/xkb_mapper.cpp' => 'src/shared/input/xkb_mapper.cpp'
--- src/client/input/xkb_mapper.cpp	2013-04-15 14:47:44 +0000
+++ src/shared/input/xkb_mapper.cpp	2013-05-14 00:10:31 +0000
@@ -16,11 +16,11 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "xkb_mapper.h"
+#include "mir/input/xkb_mapper.h"
 
 #include <string.h>
 
-namespace mcli = mir::client::input;
+namespace mircv = mir::input::receiver;
 
 namespace
 {
@@ -47,7 +47,7 @@
 };
 }
 
-mcli::XKBMapper::XKBMapper()
+mircv::XKBMapper::XKBMapper()
 {
     xkb_rule_names names;
     names.rules = "evdev";
@@ -85,7 +85,7 @@
 
 }
 
-xkb_keysym_t mcli::XKBMapper::press_and_map_key(int scan_code)
+xkb_keysym_t mircv::XKBMapper::press_and_map_key(int scan_code)
 {
     uint32_t xkb_scan_code = to_xkb_scan_code(scan_code);
     xkb_state_update_key(state.get(), xkb_scan_code, XKB_KEY_DOWN);
@@ -93,7 +93,7 @@
     return keysym_for_scan_code(state.get(), xkb_scan_code);
 }
 
-xkb_keysym_t mcli::XKBMapper::release_and_map_key(int scan_code)
+xkb_keysym_t mircv::XKBMapper::release_and_map_key(int scan_code)
 {
     uint32_t xkb_scan_code = to_xkb_scan_code(scan_code);
     xkb_state_update_key(state.get(), xkb_scan_code, XKB_KEY_UP);
 
=== modified file 'tests/unit-tests/client/input/test_android_input_receiver.cpp'
--- tests/unit-tests/client/input/test_android_input_receiver.cpp	2013-04-24 05:22:20 +0000
+++ tests/unit-tests/client/input/test_android_input_receiver.cpp	2013-05-14 00:10:31 +0000
@@ -16,7 +16,7 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "src/client/input/android_input_receiver.h"
+#include "src/shared/input/android/android_input_receiver.h"
 #include "mir_toolkit/event.h"
 
 #include <androidfw/InputTransport.h>
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <memory>
 
-namespace mclia = mir::client::input::android;
+namespace mircva = mir::input::receiver::android;
 
 namespace droidinput = android;
 
@@ -141,14 +141,14 @@
 
 TEST_F(AndroidInputReceiverSetup, receiever_takes_channel_fd)
 {
-    mclia::InputReceiver receiver(android_client_channel);
+    mircva::InputReceiver receiver(android_client_channel);
     
     EXPECT_EQ(android_client_channel->getFd(), receiver.fd());
 }
 
 TEST_F(AndroidInputReceiverSetup, receiver_receives_key_events)
 {
-    mclia::InputReceiver receiver(android_client_channel);
+    mircva::InputReceiver receiver(android_client_channel);
     TestingInputProducer producer(android_server_channel);
     
     producer.produce_a_key_event();
@@ -164,7 +164,7 @@
 
 TEST_F(AndroidInputReceiverSetup, receiver_handles_events)
 {
-    mclia::InputReceiver receiver(android_client_channel);
+    mircva::InputReceiver receiver(android_client_channel);
     TestingInputProducer producer(android_server_channel);
     
     producer.produce_a_key_event();
@@ -180,7 +180,7 @@
 
 TEST_F(AndroidInputReceiverSetup, receiver_consumes_batched_motion_events)
 {
-    mclia::InputReceiver receiver(android_client_channel);
+    mircva::InputReceiver receiver(android_client_channel);
     TestingInputProducer producer(android_server_channel);
     
     // Produce 3 motion events before client handles any.
 
=== modified file 'tests/unit-tests/client/input/test_android_input_receiver_thread.cpp'
--- tests/unit-tests/client/input/test_android_input_receiver_thread.cpp	2013-04-24 05:22:20 +0000
+++ tests/unit-tests/client/input/test_android_input_receiver_thread.cpp	2013-05-14 00:10:31 +0000
@@ -16,8 +16,8 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "src/client/input/android_input_receiver_thread.h"
-#include "src/client/input/android_input_receiver.h"
+#include "src/shared/input/android/android_input_receiver_thread.h"
+#include "src/shared/input/android/android_input_receiver.h"
 
 #include "mir_toolkit/mir_client_library.h"
 
@@ -30,7 +30,7 @@
 
 #include <fcntl.h>
 
-namespace mclia = mir::client::input::android;
+namespace mircva = mir::input::receiver::android;
 
 namespace
 {
@@ -40,7 +40,7 @@
     MOCK_METHOD1(handle_event, void(MirEvent*));
 };
 
-struct MockInputReceiver : public mclia::InputReceiver
+struct MockInputReceiver : public mircva::InputReceiver
 {
     MockInputReceiver(int fd)
       : InputReceiver(fd)
@@ -77,7 +77,7 @@
 {
     using namespace ::testing;
 
-    mclia::InputReceiverThread input_thread(input_receiver, 
+    mircva::InputReceiverThread input_thread(input_receiver, 
         std::function<void(MirEvent*)>());    
     {
         InSequence seq;
@@ -105,7 +105,7 @@
         MockEventHandler &handler;
     } input_delegate(mock_handler);
 
-    mclia::InputReceiverThread input_thread(input_receiver, input_delegate);
+    mircva::InputReceiverThread input_thread(input_receiver, input_delegate);
     {
         InSequence seq;
 
@@ -138,7 +138,7 @@
         std::atomic<bool> &handled;
     } input_delegate(handled);
 
-    mclia::InputReceiverThread input_thread(input_receiver, input_delegate);
+    mircva::InputReceiverThread input_thread(input_receiver, input_delegate);
     {
         InSequence seq;
 
 
=== modified file 'tests/unit-tests/client/input/test_xkb_mapper.cpp'
--- tests/unit-tests/client/input/test_xkb_mapper.cpp	2013-04-08 22:50:00 +0000
+++ tests/unit-tests/client/input/test_xkb_mapper.cpp	2013-05-14 00:10:31 +0000
@@ -16,7 +16,7 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "src/client/input/xkb_mapper.h"
+#include "mir/input/xkb_mapper.h"
 
 #include <xkbcommon/xkbcommon-keysyms.h>
 #include <xkbcommon/xkbcommon.h>
@@ -25,11 +25,11 @@
 
 #include <gtest/gtest.h>
 
-namespace mcli = mir::client::input;
+namespace mircv = mir::input::receiver;
 
 TEST(XKBMapper, maps_generic_us_english_keys)
 {
-    mcli::XKBMapper mapper;
+    mircv::XKBMapper mapper;
 
     EXPECT_EQ(static_cast<xkb_keysym_t>(XKB_KEY_4), mapper.press_and_map_key(KEY_4));
     EXPECT_EQ(static_cast<xkb_keysym_t>(XKB_KEY_Shift_L), mapper.press_and_map_key(KEY_LEFTSHIFT));
 
=== modified file 'tests/unit-tests/client/test_client_mir_surface.cpp'
--- tests/unit-tests/client/test_client_mir_surface.cpp	2013-05-09 15:23:09 +0000
+++ tests/unit-tests/client/test_client_mir_surface.cpp	2013-05-14 00:10:31 +0000
@@ -25,9 +25,10 @@
 #include "src/client/client_platform_factory.h"
 #include "src/client/mir_surface.h"
 #include "src/client/mir_connection.h"
-#include "src/client/input/input_platform.h"
-#include "src/client/input/input_receiver_thread.h"
+
 #include "mir/frontend/resource_cache.h"
+#include "mir/input/input_platform.h"
+#include "mir/input/input_receiver_thread.h"
 
 #include "mir_test/test_protobuf_server.h"
 #include "mir_test/stub_server_tool.h"
@@ -43,7 +44,7 @@
 #include <fcntl.h>
 
 namespace mcl = mir::client;
-namespace mcli = mcl::input;
+namespace mircv = mir::input::receiver;
 namespace mp = mir::protobuf;
 namespace geom = mir::geometry;
 
@@ -230,20 +231,20 @@
     }
 };
 
-struct StubClientInputPlatform : public mcli::InputPlatform
+struct StubClientInputPlatform : public mircv::InputPlatform
 {
-    std::shared_ptr<mcli::InputReceiverThread> create_input_thread(int /* fd */, std::function<void(MirEvent*)> const& /* callback */)
+    std::shared_ptr<mircv::InputReceiverThread> create_input_thread(int /* fd */, std::function<void(MirEvent*)> const& /* callback */)
     {
-        return std::shared_ptr<mcli::InputReceiverThread>();
+        return std::shared_ptr<mircv::InputReceiverThread>();
     }
 };
 
-struct MockClientInputPlatform : public mcli::InputPlatform
+struct MockClientInputPlatform : public mircv::InputPlatform
 {
-    MOCK_METHOD2(create_input_thread, std::shared_ptr<mcli::InputReceiverThread>(int, std::function<void(MirEvent*)> const&));
+    MOCK_METHOD2(create_input_thread, std::shared_ptr<mircv::InputReceiverThread>(int, std::function<void(MirEvent*)> const&));
 };
 
-struct MockInputReceiverThread : public mcli::InputReceiverThread
+struct MockInputReceiverThread : public mircv::InputReceiverThread
 {
     MOCK_METHOD0(start, void());
     MOCK_METHOD0(stop, void());