Merge lp:~andreas-pokorny/mir/evdev-input-platform into lp:mir

[Andreas Pokorny]

Adds the first pieces of the evdev input platform.

Those include platform interfaces for dealing with added and removed devices, and sending input events into the system. Evdev device detection to decide which code base should be used for handling the event stream. The decision is made between the android input code already existing in mir and libinput. Many of the added tests make use of recorded umockdev files. This commit fixes empty ioctl return values from the recorded synaptic touch pad and adds a multi touch screen and a joystick to the devices.

The evdev input platform is not installed until the input parts of libmirserver are changed to make use of it.

This change adds the basic interfaces for having input platforms, and implements the framework for an evdev input platform. Several parts are still left out, and the input platform is not yet loaded by the DefaultServerConfiguration. See Follow up steps below.

Relevant Interfaces:
 * mir::input::Plaform - the entry point for the server to deal with a input platform
 * mir::input::Multiplexer an interface for the platform to enqeue actions and get triggered because of readable data in fds
 * mir::input::InputDeviceRegistry an interface to be used by the platforms to inform the server about existing or recently plugged in or removed devices..
 * mir::input::InputDevice an interface for the server to connect (and disconnect) input devices with the input handling
 * mir::input::EventSink interface for input devices to provide input events to the server..
   Those three interfaces above are part of the input mocking/stubbing story for acceptance testing the server or possible shells.

Follow up steps:
 * libinput integration through the LibInputDeviceProvider, which in this MP still provides empty shared_ptrs (still wip at:
   lp:~andreas-pokorny/mir/libinput-integration)
 * similar integration of the EventHub/InputReader code of the android input stack through the AndroidDeviceProvider and input platform loaded inside the server
 * Smaller cleanup of EventHub and InputReader

[Kevin DuBois (kdub)]

64 +++ include/platform/mir/input/event_sink.h
this is the same interface as
src/client/event_sink.h

364 +extern "C" typedef std::unique_ptr<Platform>(*CreatePlatofrm)(
153 + // add devie info here..
typos

264 + std::initializer_list<int> fds,
Fds should be mir::Fd to better manage the lifetime of the FD.

145 +class InputDevice
class name doesnt make sense to me for what the group of functions is doing, but this might be a side effect of the "Multiplexer" naming comment.

349 + * The \a input_device_registry should be informed about input device changes using the MainLoop \a loop.
350 + */
351 + virtual void start_monitor_devices(Multiplexer& loop, std::shared_ptr<InputDeviceRegistry> const& input_device_registry) = 0;
Does the comment need updating? MainLoop doesn't seem related

review: Needs Fixing

[lp:~andreas-pokorny/mir/evdev-input-platform]

2106. By Andreas Pokorny on 2014-12-06

typos

2107. By Andreas Pokorny on 2014-12-06

typo

2108. By Andreas Pokorny on 2014-12-07

renamed Multiplexer to InputEventHandlerRegister

2109. By Andreas Pokorny on 2014-12-07

last round of method renamings

[Andreas Pokorny (andreas-pokorny)]

>
> 364 +extern "C" typedef std::unique_ptr<Platform>(*CreatePlatofrm)(
> 153 + // add devie info here..
> typos
>
> 264 + std::initializer_list<int> fds,
> Fds should be mir::Fd to better manage the lifetime of the FD.
>
> 145 +class InputDevice
> class name doesnt make sense to me for what the group of functions is doing,
> but this might be a side effect of the "Multiplexer" naming comment.
>
> 349 + * The \a input_device_registry should be informed about input device
> changes using the MainLoop \a loop.
> 350 + */
> 351 + virtual void start_monitor_devices(Multiplexer& loop,
> std::shared_ptr<InputDeviceRegistry> const& input_device_registry) = 0;
> Does the comment need updating? MainLoop doesn't seem related

done - is the new naming good enough?

[Cemil Azizoglu (cemil-azizoglu)]

Here's a preliminary review. I'll have to re-review at some point more thoroughly.

33 +enum class DeviceClass : uint32_t
34 +{
35 + unknown = 0,
36 + cursor = 1<<1,
37 + keyboard = 1<<2,
38 + touchpad = 1<<3,
39 + touchscreen = 1<<4,
40 + gamepad = 1<<5,
41 + joystick = 1<<6,
42 + switch_ = 1<<7, // better name needed
43 + multitouch = 1<<8, // multitouch capable
44 + alpha_numeric = 1<<9 // enough keys for text entry
45 +};

This class is a bit strange in the sense that it includes both device class (keyboard, joystick, etc) and capability (multitouch, alpha_numeric, etc) entries. Not sure if it might cause problems later.
-----------------------------------------
161 + virtual void stop(InputEventHandlerRegister& registry) = 0;

Does this implicitly unregister the sink?
-----------------------------------------
279 + * \param owner a distinct value to identify the caller

perhaps s/distinct/unique? There are other instances.
-----------------------------------------
368 + * openning new device and register them at the servers InputDeviceRegistry.

s/openning/opening, s/servers/server's
-----------------------------------------
569 + return Priority::supported;

Do we really support all the devices except touchpad under Android, or is this supposed to be "Priority::unsupported"?

-----------------------------------------
754 +
755 +

superfluous blank line.
-----------------------------------------
1123 + return Priority::supported;

Ditto for libinput. According to the code we support everything but joystick, touchscreen and gamepad.
-----------------------------------------
1318 +void mie::Platform::device_changed(mu::Device const& /*dev*/)
1319 +{
1320 +}

Should we at least print a warning?
-----------------------------------------
1459 +
1460 +

superfluous blank lines.

review: Needs Fixing

[Kevin DuBois (kdub)]

Typos/names look addressed, still these though:
>
> 64 +++ include/platform/mir/input/event_sink.h
> this is the same interface as
> src/client/event_sink.h
>
> 264 + std::initializer_list<int> fds,
> Fds should be mir::Fd to better manage the lifetime of the FD.

[Andreas Pokorny (andreas-pokorny)]

> Typos/names look addressed, still these though:
> >
> > 64 +++ include/platform/mir/input/event_sink.h
> > this is the same interface as
> > src/client/event_sink.h

We paused our discussion with unifying both interfaces to a single mir::EventSink vs mir::input::EventSink.

> >
> > 264 + std::initializer_list<int> fds,
> > Fds should be mir::Fd to better manage the lifetime of the FD.

I would like to do that, but I implement that interface with our glib MainLoop implementation which currently does not use mir::Fd. On the caller/libinput side I could just keep the mir::Fd to not close the fd before the libinput context falls out of scope, but on the callee side I would need to do additional tracking to fulfill that interface.

Can we settle with doing that in a separate MP?

[lp:~andreas-pokorny/mir/evdev-input-platform]

2110. By Andreas Pokorny on 2014-12-09

reverted some additional white space noise. Adopted the naming and ABI settings from lp:~raof/mir/server-platfrom-probing.
Because of that the integration test now also loads the library from file system instead of statically linked

[Andreas Pokorny (andreas-pokorny)]

> Here's a preliminary review. I'll have to re-review at some point more
> thoroughly.
>
> 33 +enum class DeviceClass : uint32_t
> 34 +{
> 35 + unknown = 0,
> 36 + cursor = 1<<1,
> 37 + keyboard = 1<<2,
> 38 + touchpad = 1<<3,
> 39 + touchscreen = 1<<4,
> 40 + gamepad = 1<<5,
> 41 + joystick = 1<<6,
> 42 + switch_ = 1<<7, // better name needed
> 43 + multitouch = 1<<8, // multitouch capable
> 44 + alpha_numeric = 1<<9 // enough keys for text entry
> 45 +};
>
> This class is a bit strange in the sense that it includes both device class
> (keyboard, joystick, etc) and capability (multitouch, alpha_numeric, etc)
> entries. Not sure if it might cause problems later.

I took those value from android, they are supposed to replace the device detection code that currently lives inside eventhub.cpp. Maybe splitting those entries makes them more reasonable?

> -----------------------------------------
> 161 + virtual void stop(InputEventHandlerRegister& registry) = 0;
>
> Does this implicitly unregister the sink?

it expects the callee to no longer use the sink.

> -----------------------------------------
> 279 + * \param owner a distinct value to identify the caller
>
> perhaps s/distinct/unique? There are other instances.
> -----------------------------------------
> 368 + * openning new device and register them at the servers
> InputDeviceRegistry.
>
> s/openning/opening, s/servers/server's
> -----------------------------------------
> 569 + return Priority::supported;
>
> Do we really support all the devices except touchpad under Android, or is this
> supposed to be "Priority::unsupported"?

Thats the impression i took from the input mappers. MirEvent on the other hand isnt that complete, which MirEvent-2 hopefully resolves.

> -----------------------------------------
> 754 +
> 755 +
>
> superfluous blank line.
> -----------------------------------------
> 1123 + return Priority::supported;
>
> Ditto for libinput. According to the code we support everything but joystick,
> touchscreen and gamepad.

After you pointed that out I reconsidered and took a more conservative approach. The event model inside libinput only supports those cursor/keyboard/touchpad and x-y joysticks and touch screens in a restricted form.

> -----------------------------------------
> 1318 +void mie::Platform::device_changed(mu::Device const& /*dev*/)
> 1319 +{
> 1320 +}
>
> Should we at least print a warning?

I am not sure yet about the semantics of that udev event.

[Kevin DuBois (kdub)]

> > Typos/names look addressed, still these though:
> > >
> > > 64 +++ include/platform/mir/input/event_sink.h
> > > this is the same interface as
> > > src/client/event_sink.h
>
> We paused our discussion with unifying both interfaces to a single
> mir::EventSink vs mir::input::EventSink.

Abstaining until we figure out why we need the 3rd interface named EventSink in the codebase :)

> > > 264 + std::initializer_list<int> fds,
> > > Fds should be mir::Fd to better manage the lifetime of the FD.
>
> I would like to do that, but I implement that interface with our glib MainLoop
> implementation which currently does not use mir::Fd. On the caller/libinput
> side I could just keep the mir::Fd to not close the fd before the libinput
> context falls out of scope, but on the callee side I would need to do
> additional tracking to fulfill that interface.
>
> Can we settle with doing that in a separate MP?

sure, although a comment or wishlist-bug would help us remember to do it later

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2110
http://jenkins.qa.ubuntu.com/job/mir-ci/2340/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/447
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/447
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/421/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/337/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/421/console

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

review: Needs Fixing (continuous-integration)

[Robert Carr (robertcarr)]

InputEventHandlerRegistrar is hard to understand as a parameter to InputDevice::start, what is an event sink vs. an event handler? perhaps PollProvider or something would be a better name.

I'm a little surprised by InputDevice::start(sink) and Platform::start(sink) since afaict we mostly use the opposite pattern. How did you arrive at this design?

review: Needs Information

[Andreas Pokorny (andreas-pokorny)]

> InputEventHandlerRegistrar is hard to understand as a parameter to
> InputDevice::start, what is an event sink vs. an event handler? perhaps
> PollProvider or something would be a better name.

But does it provide polling just because there might be epoll underneath?
It is an interface to register handlers for specific events - those events are currently: there is something to read at fd, and I just woke up (because you requested it)

> I'm a little surprised by InputDevice::start(sink) and Platform::start(sink)
> since afaict we mostly use the opposite pattern. How did you arrive at this
> design?

Passing that via the contructor and that means through the creation method of the factory would have worked too. I found the approach presented here works similar and is more explicit since now the expectations of what an implementation should behave and use are connected to its interface. That is : use that interface to handle wakeups, provide the events through that interface...

[lp:~andreas-pokorny/mir/evdev-input-platform]

2111. By Andreas Pokorny on 2014-12-15

merged lp:mir

2112. By Andreas Pokorny on 2014-12-16

Add input_ to the platform ABI

Otherwise it collides with the graphics platform symbols. Additional this change extracts a find_best algorithm and adds two reports.

2113. By Andreas Pokorny on 2014-12-16

* New upstream release 0.10.0 (https://launchpad.net/mir/+milestone/0.10.0)
  - Enhancements:
    . Added support for Android HWC 1.3 devices.
    . Reduced build dependencies.
    . Client API: Added version macros.
    . demo-shell: Added desktop zoom feature (Super + mouse wheel).
    . TODO - more
  - ABI summary: Servers need rebuilding, but clients do not;
    . Mirclient ABI unchanged at 8
    . Mircommon ABI unchanged at 3
    . Mirplatform ABI bumped to 5
    . Mirserver ABI bumped to 28
  - Bug fixes:
    . TODO - fill this in just before release

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2113
http://jenkins.qa.ubuntu.com/job/mir-ci/2439/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/550
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/550/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/524/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/436
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/436/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/524
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/524/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3684/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16614

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

review: Needs Fixing (continuous-integration)

[Robert Carr (robertcarr)]

I'm having trouble reviewing this since as it stands the bits aren't wired together...it would be nice if there were some minimum feature that could be come up with to make a test...or if we could come up with a testing input platform to replace usage of FakeEventHub...the requirements on such a platform may be able to prove the interfaces are sound.

Nonetheless mental model is starting to come together and ill try and finish review tomorrow.

[lp:~andreas-pokorny/mir/evdev-input-platform]

2114. By Andreas Pokorny on 2014-12-18

merge lp:mir

2115. By Andreas Pokorny on 2014-12-18

moved evdev platform to platforms

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2114
http://jenkins.qa.ubuntu.com/job/mir-ci/2497/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/621
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/621/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/595/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/494
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/494/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/595
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/595/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3746/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16700

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2115
http://jenkins.qa.ubuntu.com/job/mir-ci/2501/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/625
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/625
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/599/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/498
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/498/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/599
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/599/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3750/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16704

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

review: Needs Fixing (continuous-integration)

[lp:~andreas-pokorny/mir/evdev-input-platform]

2116. By Andreas Pokorny on 2015-01-12

[ Daniel van Vugt ]
. Plumbing/preparation to support external displays on Android devices.
. Began work on automatic driver probing, to intelligently choose the
best driver for you.
. Demo shell (mir_proving_server): Added desktop zoom feature using
Supermouse wheel.
. Demo renamed: mir_demo_server_shell -> mir_proving_server
. Other demo servers merged into -> mir_demo_server
. Wider support for display buffer pixel formats in the mesa driver, for
wider hardware support.
. Performance: On mesa/desktop at least; only hold compositor buffers
for the duration of the render, instead of the duration of the frame.
Following this change the compositor report can now finally report
render time instead of frame time.
. Mir now starts reliably when a TV is connected by HDMI, and up to
4K resolution (2160p) is known to work.
. Plenty more enhancements logged in the bugs list below.
. [regression] Mir servers (since 0.9) randomly crash in malloc due to
heap corruption (LP: #1401488)
. USCmouse cursor on AMD graphics is drawing incorrectly
(LP: #1391975)
. Mir fails to start when a TV is connected by HDMI
[std::exception::what: Invalid or inconsistent display configuration]
(LP: #1395405)
. Input/event driven clients may freeze indefinitely (LP: #1396006)
. Mir server crashes with "std::exception::what: Failed to get front
buffer object" when trying to fullscreen a surface (LP: #1398296)
. Switching windows with a Trusted Prompt Session active loses the
trusted prompt session (LP: #1355173)
. CI test failure in multiple tests (LP: #1401364)
. dh_install: usr/bin/mir_demo_server exists in debian/tmp but is not
installed to anywhere (LP: #1401365)
. [regression] demo-shell: Instead of moving surfaces they now fly
off-screen (LP: #1403702)
. [regression] Binaries are no longer runnable on other machines (or in
other directories) (LP: #1406073)
. [i865] unity-system-compositor fails to start: Failed to choose ARGB
EGL config (LP: #1212753)
. Mir's compositor holds buffers (blocking clients) for the duration of
the frame, even when not necessary. (LP: #1264934)
. Screen goes blank (black) briefly during display config changes which
don't affect the display mode (LP: #1274359)
. [enhancement] There should be a quit signal sent to sessions instead
of killing them directly (LP: #1304257)
. MirMotionEvent.action needs stronger typing (to MirMotionAction etc)
(LP: #1311699)
. CompositorReport as used by DefaultDisplayBufferCompositor can't
measure render time (LP: #1350716)
. Full screen (bypassed) surfaces (e.g. GLMark2Test) are missing frames
and appear to freeze or judder with swap interval 0 (LP: #1379685)
. Trusted prompts need to be part of the lifecycle (LP: #1384950)
. [testfail] BasicThreadPool.recycles_threads in CI (LP: #1391488)
. acceptance_tests are too chatty (LP: #1394221)
. mir_connection_create_surface callback is sometimes called twice on
error (LP: #1394873)
. File descriptor leaks in tests using UsingStubClientPlatform
(LP: #1395762)
. DisplayLayout resizes a surface to 1x1 if you ask it to fullscreen a
surface that's partially offscreen (LP: #1398294)
. Surfaces can consume input events before they're visible.
(LP: #1400218)
. dpkg-shlibdeps: Lots of warnings about libmirplatformstub.so
(LP: #1401373)
. Leaks in death tests can cause subsequent tests in the same process to
fail (LP: #1402160)
. [regression] lintian: E: mir-demos: binary-or-shlib-defines-rpath ...
(LP: #1406098)
. [regression] Mir utils can't run from the build tree any more
(LP: #1407557)
. fd reception code is not exeception-safe when unexpected numbers of
fds are received (LP: #1394362)
. Mir reports vertical refresh rates slightly inaccurately (LP: #1407558)
. [Enhancement] Add an API to lock surface orientation (LP: #1382209)
. Bootloop with system language Turkish on the Nexus 4 (LP: #1398984)
. Remove the implicit assumption that there every surface can be mapped
to an input handle. (LP: #1216727)
. When revealing hidden surfaces wait for them to become exposed before
sending events which we expect them to receive (LP: #1407783)
[ Ubuntu daily release ]
New rebuild forced

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2116
http://jenkins.qa.ubuntu.com/job/mir-ci/2619/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/803
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/803
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/765/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/616
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/616/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/765
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/765/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3893/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17004

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

review: Needs Fixing (continuous-integration)

[lp:~andreas-pokorny/mir/evdev-input-platform]

2117. By Andreas Pokorny on 2015-01-16

* New upstream release 0.11.0 (https://launchpad.net/mir/+milestone/0.11.0)
  - Enhancements:
    . Lots more major plumbing in the Android code, on the path to supporting
      external displays.
    . Performance: Use optimally efficient fragment shading when possible.
    . Performance: (Desktop) Composite using double buffering instead of
      triple to reduce visible lag.
    . TODO fill me in more
  - ABI summary: Servers (will?) need rebuilding, but clients do not;
    . Mirclient ABI unchanged at 8
    . Mircommon ABI unchanged at 3
    . Mirplatform ABI bumped to 6
    . Mirserver ABI unchanged at 28 (expect 29 before release)
  - Bug fixes:
    . TODO fill me in at release

2118. By Andreas Pokorny on 2015-01-16

borrowed path resolution functions from lp:server-platform-probing.
input-evdev is as an intermediate step only installed with mir-test-tools

2119. By Andreas Pokorny on 2015-01-16

deactivating keyboard support for now - in later mps this would interfere
with cross-device modifier handling, which is currently burried inside EventHub
and needs lifting to a more central location.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2119
http://jenkins.qa.ubuntu.com/job/mir-ci/2679/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/892
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/892
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/854/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/676
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/676/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/854
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/854/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3967/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17150

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

review: Needs Fixing (continuous-integration)

[lp:~andreas-pokorny/mir/evdev-input-platform]

2120. By Andreas Pokorny on 2015-01-18

install evdev recordings for integration tests

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2120
http://jenkins.qa.ubuntu.com/job/mir-ci/2688/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/902
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/902
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/864/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/685/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/864/console

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

review: Needs Fixing (continuous-integration)

[lp:~andreas-pokorny/mir/evdev-input-platform]

2121. By Andreas Pokorny on 2015-01-19

install to install

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2121
http://jenkins.qa.ubuntu.com/job/mir-ci/2693/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/910
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/910
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/872/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/690
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/690/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/872
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/872/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3983/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17182

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

review: Needs Fixing (continuous-integration)

[lp:~andreas-pokorny/mir/evdev-input-platform]

2122. By Andreas Pokorny on 2015-01-19

reame EventSink to the more specific InputSink

2123. By Andreas Pokorny on 2015-01-19

add flags template and rename DeviceClass enumeration

2124. By Andreas Pokorny on 2015-01-19

merge lp:mir

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2124
http://jenkins.qa.ubuntu.com/job/mir-ci/2699/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/917
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/917
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/879/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/696
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/696/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/879
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/879/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3986/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17189

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

review: Needs Fixing (continuous-integration)

[lp:~andreas-pokorny/mir/evdev-input-platform]

2125. By Andreas Pokorny on 2015-01-20

Temporary move the evdev platform test to unit-tests until we have a better solution for running umockdev tests

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2125
http://jenkins.qa.ubuntu.com/job/mir-ci/2713/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/934
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/934
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/896/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/710/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/896/console

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

review: Needs Fixing (continuous-integration)

[lp:~andreas-pokorny/mir/evdev-input-platform]

2126. By Andreas Pokorny on 2015-01-21

do not install evdev platform yet

2127. By Andreas Pokorny on 2015-01-21

merge sha1sums conflicts

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2127
http://jenkins.qa.ubuntu.com/job/mir-ci/2742/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/967
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/967
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/929
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/739
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/739/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/929
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/929/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4025
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17280

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

I am having a bit of a problem since this branch is not called from anywhere.

It'd be much less overwhelming to understand and review if some plumbing were introduced
first with a stub/fake input platform/devices, along with some acceptance tests, separating out
the android and libinput bits to subsequent followup branches.

The organization of the files/directories is very sensible and I think it'd be quite simple
to do that at this point since not very many people have reviewed it yet.

review: Needs Resubmitting

[Daniel van Vugt (vanvugt)]

Please kill mir::Flags :)

It will confuse debuggers and developers alike if you force invalid enum values into a variable. A set of bits is just an int. For a better example see:
http://bazaar.launchpad.net/~mir-team/mir/development-branch/revision/2235#include/common/mir_toolkit/events/input/input_event.h

review: Needs Fixing

[Andreas Pokorny (andreas-pokorny)]

> Please kill mir::Flags :)
>
> It will confuse debuggers and developers alike if you force invalid enum
> values into a variable. A set of bits is just an int. For a better example
> see:
> http://bazaar.launchpad.net/~mir-team/mir/development-
> branch/revision/2235#include/common/mir_toolkit/events/input/input_event.h

There is no force involved an no invalid enums.

[Chris Halse Rogers (raof)]

I like the idea of mir::Flags; a set of flags is *not* just an int, because an int will be able to represent lots of invalid values (unless you have 32 separate flags, I guess).

I'm not sure if mir::Flags, as it currently stands, is worth it. I tried using it in add-dispatchable, and it doesn't handle some common idioms. It's also not clear to me how to improve it to support that, other than going the whole hog and doing class generation with a MIR_DEFINE_FLAGS() macro (which I'd gladly use, but am not volunteering to write ☺).

[Daniel van Vugt (vanvugt)]

Oh I see you're using std::underlying_type. That should provide you with some kind of integer and allow you to remove the casts. If it doesn't then you can still change value_type to "unsigned int" and remove the casts.

[Daniel van Vugt (vanvugt)]

It might also help to remove "uint32_t":
36 +enum class DeviceCapability : uint32_t

A simple "enum DeviceCapability" will work.

[Andreas Pokorny (andreas-pokorny)]

> Oh I see you're using std::underlying_type. That should provide you with some
> kind of integer and allow you to remove the casts. If it doesn't then you can
> still change value_type to "unsigned int" and remove the casts.

The casts inside Flags iteself are needed because it has to support both scoped and non-scoped enums. For scoped those are absolutely necessary and behave as intended. With c++11 enums can be forward declared since the standard now defines the underlying type to default to int32_t (iirc) - and allows manual specification in forward declaration (only for scoped..). Additionally the trait was added to resolve manually specified underlying types. I am sorry there is nothing to fix there.... just to add but more on that on monday i guess.

Unmerged revisions

2127. By Andreas Pokorny on 2015-01-21

merge sha1sums conflicts

2126. By Andreas Pokorny on 2015-01-21

do not install evdev platform yet

2125. By Andreas Pokorny on 2015-01-20

Temporary move the evdev platform test to unit-tests until we have a better solution for running umockdev tests

2124. By Andreas Pokorny on 2015-01-19

merge lp:mir

2123. By Andreas Pokorny on 2015-01-19

add flags template and rename DeviceClass enumeration

2122. By Andreas Pokorny on 2015-01-19

reame EventSink to the more specific InputSink

2121. By Andreas Pokorny on 2015-01-19

install to install

2120. By Andreas Pokorny on 2015-01-18

install evdev recordings for integration tests

2119. By Andreas Pokorny on 2015-01-16

deactivating keyboard support for now - in later mps this would interfere
with cross-device modifier handling, which is currently burried inside EventHub
and needs lifting to a more central location.

2118. By Andreas Pokorny on 2015-01-16

borrowed path resolution functions from lp:server-platform-probing.
input-evdev is as an intermediate step only installed with mir-test-tools

=== added directory 'include/platform/mir/input'
=== added file 'include/platform/mir/input/device_capability.h'
--- include/platform/mir/input/device_capability.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/input/device_capability.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_DEVICE_CAPABILITY_H_
+#define MIR_INPUT_DEVICE_CAPABILITY_H_
+
+#include "mir/flags.h"
+
+#include <cstdint>
+
+namespace mir
+{
+namespace input
+{
+
+enum class DeviceCapability : uint32_t
+{
+    unknown     = 0,
+    pointer     = 1<<1,
+    keyboard    = 1<<2,
+    touchpad    = 1<<3,
+    touchscreen = 1<<4,
+    gamepad     = 1<<5,
+    joystick    = 1<<6,
+    switch_     = 1<<7,
+    multitouch  = 1<<8,   // multitouch capable
+    alpha_numeric = 1<<9 // enough keys for text entry
+};
+
+using DeviceCapabilities = mir::Flags<DeviceCapability>;
+
+}
+}
+
+#endif

=== added file 'include/platform/mir/input/input_device.h'
--- include/platform/mir/input/input_device.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/input/input_device.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2014 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:
+ *   Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_INPUT_DEVICE_H_
+#define MIR_INPUT_INPUT_DEVICE_H_
+
+#include <memory>
+
+namespace mir
+{
+namespace input
+{
+class InputEventHandlerRegister;
+class InputSink;
+
+/**
+ * Represents an input device.
+ */
+class InputDevice
+{
+public:
+    InputDevice() = default;
+    virtual ~InputDevice() = default;
+
+    /*!
+     * Allow the input device to provide its input events to the given InputSink
+     */
+    virtual void start(InputEventHandlerRegister& registry, InputSink& destination) = 0;
+    /*!
+     * Stop the input device from sending input events, to the InputSink.
+     */
+    virtual void stop(InputEventHandlerRegister& registry) = 0;
+
+    // TODO methods to query device description
+protected:
+    InputDevice(InputDevice const&) = delete;
+    InputDevice& operator=(InputDevice const&) = delete;
+};
+
+}
+}
+
+#endif
+

=== added file 'include/platform/mir/input/input_device_registry.h'
--- include/platform/mir/input/input_device_registry.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/input/input_device_registry.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2014 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:
+ *   Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_INPUT_DEVICE_REGISTRY_H_
+#define MIR_INPUT_INPUT_DEVICE_REGISTRY_H_
+
+#include <memory>
+
+namespace mir
+{
+namespace input
+{
+class InputDevice;
+
+class InputDeviceRegistry
+{
+public:
+    InputDeviceRegistry() = default;
+    virtual ~InputDeviceRegistry() = default;
+
+    virtual void add_device(std::shared_ptr<InputDevice> const& device) = 0;
+    virtual void remove_device(std::shared_ptr<InputDevice> const& device) = 0;
+protected:
+    InputDeviceRegistry(InputDeviceRegistry const&) = delete;
+    InputDeviceRegistry& operator=(InputDeviceRegistry const&) = delete;
+
+};
+
+}
+}
+
+#endif
+

=== added file 'include/platform/mir/input/input_event_handler_register.h'
--- include/platform/mir/input/input_event_handler_register.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/input/input_event_handler_register.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2014 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:
+ *   Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_INPUT_EVENT_HANDLER_REGISTER_H_
+#define MIR_INPUT_INPUT_EVENT_HANDLER_REGISTER_H_
+
+#include <functional>
+#include <initializer_list>
+
+namespace mir
+{
+namespace input
+{
+
+/**
+ * InputEventHandler Register shall be used register handlers for different
+ * input event or input device sources. All handlers are guaranteed to be executed in the same
+ * thread.
+ */
+class InputEventHandlerRegister
+{
+public:
+    InputEventHandlerRegister() = default;
+
+    /**
+     * Registers a read handler for the given set of fds.
+     *
+     * This call does not transfer ownership of the file descriptors
+     * in \a fds. The caller is still responsible to close when necessary.
+     *
+     * \param owner a distinct value to identify the caller
+     */
+    virtual void register_fd_handler(
+        std::initializer_list<int> fds,
+        void const* owner,
+        std::function<void(int)> const&& handler) = 0;
+
+    /**
+     * Unregisters the file descriptors and read handlers associated with \a
+     * owner.
+     *
+     * \param owner a distinct value to identify the caller
+     */
+    virtual void unregister_fd_handler(void const* owner) = 0;
+
+    /**
+     * Wakes the thread to execute the given \a handler once.
+     *
+     * This method should be used when no file descriptor is available to
+     * indicate available input events or device changes.
+     */
+    virtual void register_handler(std::function<void()> const&& handler) = 0;
+
+protected:
+    virtual ~InputEventHandlerRegister() = default;
+    InputEventHandlerRegister(InputEventHandlerRegister const&) = delete;
+    InputEventHandlerRegister& operator=(InputEventHandlerRegister const&) = delete;
+
+};
+}
+}
+
+#endif
+

=== renamed file 'src/include/server/mir/input/input_report.h' => 'include/platform/mir/input/input_report.h'
--- src/include/server/mir/input/input_report.h	2015-01-14 06:39:13 +0000
+++ include/platform/mir/input/input_report.h	2015-01-21 10:33:12 +0000
@@ -1,16 +1,16 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2014 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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: Alan Griffiths <[e-mail]>
@@ -32,6 +32,10 @@
 public:
     virtual ~InputReport() = default;
 
+    virtual void open_input_device(char const* device_node) = 0;
+
+    virtual void failure_opening_input_device(char const* device_node) = 0;
+
     virtual void received_event_from_kernel(int64_t when, int type, int code, int value) = 0;
 
     virtual void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time) = 0;

=== added file 'include/platform/mir/input/input_sink.h'
--- include/platform/mir/input/input_sink.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/input/input_sink.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2014 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:
+ *   Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_INPUT_SINK_H_
+#define MIR_INPUT_INPUT_SINK_H_
+
+#include "mir_toolkit/event.h"
+
+namespace mir
+{
+namespace input
+{
+class InputSink
+{
+public:
+    InputSink() = default;
+    virtual ~InputSink() = default;
+    // TODO change to the new mir input event
+    virtual void handle_input(MirEvent const& event) = 0;
+private:
+    InputSink(InputSink const&) = delete;
+    InputSink& operator=(InputSink const&) = delete;
+};
+}
+}
+
+#endif

=== added file 'include/platform/mir/input/platform.h'
--- include/platform/mir/input/platform.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/input/platform.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,128 @@
+/*
+ * Copyright © 2014 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:
+ *   Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_PLATFORM_H_
+#define MIR_INPUT_PLATFORM_H_
+
+#include <mir/options/option.h>
+
+#include <boost/program_options/options_description.hpp>
+
+#include <memory>
+
+namespace mir
+{
+class EmergencyCleanupRegistry;
+
+namespace input
+{
+class InputEventHandlerRegister;
+class InputDevice;
+class InputReport;
+class InputDeviceRegistry;
+
+enum class PlatformPriority : uint32_t
+{
+    unsupported = 0,
+    supported = 128,
+    best = 256,
+};
+
+/**
+ * Input Platform is used to discover and access available input devices.
+ *
+ * A platform implementation is supposed to handle device occurance events by
+ * opening new device and register them at the server's InputDeviceRegistry.
+ * Likewise the InputDeviceRegistry shall be informed about removed input devices.
+ *
+ * The actual processing of events is controlled through the mir::input::InputDevice interface.
+ */
+class Platform
+{
+public:
+    Platform() = default;
+    virtual ~Platform() = default;
+
+    /*!
+     * Request the platform to start monitoring for devices.
+     *
+     * \param input_device_registry should be informed about available input devices
+     * \param trigger_registry should be used to register event sources that may indicate a changes of the available devices
+     */
+    virtual void start(InputEventHandlerRegister& trigger_registry, std::shared_ptr<InputDeviceRegistry> const& input_device_registry) = 0;
+    /*!
+     * Request the platform to stop monitoring for devices.
+     */
+    virtual void stop(InputEventHandlerRegister& trigger_registry) = 0;
+
+private:
+    Platform(Platform const&) = delete;
+    Platform& operator=(Platform const&) = delete;
+};
+
+extern "C" typedef std::unique_ptr<Platform>(*CreatePlatform)(
+    std::shared_ptr<options::Option> const& options,
+    std::shared_ptr<EmergencyCleanupRegistry> const& emergency_cleanup_registry,
+    std::shared_ptr<InputReport> const& report);
+/**
+ * Function used to initialize an input platform.
+ *
+ * \param [in] options options to use for this platform
+ * \param [in] emergency_cleanup_registry object to register emergency shutdown handlers with
+ * \param [in] report the object to use to report interesting events from the input subsystem
+ *
+ * This factory function needs to be implemented by each platform.
+ *
+ * \ingroup platform_enablement
+ */
+extern "C" std::unique_ptr<Platform> create_input_platform(
+    std::shared_ptr<options::Option> const& options,
+    std::shared_ptr<EmergencyCleanupRegistry> const& emergency_cleanup_registry,
+    std::shared_ptr<InputReport> const& report);
+extern "C" typedef void(*AddPlatformOptions)(
+    boost::program_options::options_description& config);
+/**
+ * Function used to add additional configuration options
+ *
+ * \param [in] config program option description that the platform may extend
+ *
+ * This function needs to be implemented by each platform.
+ *
+ * \ingroup platform_enablement
+ */
+extern "C" void add_input_platform_options(
+    boost::program_options::options_description& config);
+extern "C" typedef PlatformPriority(*ProbePlatform)(
+    options::Option const& options);
+/**
+ * probe_platform should indicate whether the platform is able to work within
+ * the current environment.
+ *
+ * \param [in] options program options of the mir server
+ *
+ * This function needs to be implemented by each platform.
+ *
+ * \ingroup platform_enablement
+ */
+extern "C" PlatformPriority probe_input_platform(
+    options::Option const& options);
+}
+}
+
+#endif // MIR_INPUT_PLATFORM_H_

=== modified file 'platform-ABI-sha1sums'
--- platform-ABI-sha1sums	2015-01-20 03:21:20 +0000
+++ platform-ABI-sha1sums	2015-01-21 10:33:12 +0000
@@ -54,4 +54,11 @@
 1b77fb3290af00dc7d1c11dcc5388972dacb9ec3  include/platform/mir/graphics/platform_ipc_package.h
 f0db0484b8ccc9091e73c80a2a200cb436b48bfb  include/platform/mir/graphics/platform_operation_message.h
 f18876766861e5d4f5ca999dbd176fe1fc520594  include/platform/mir/graphics/renderable.h
+ab9801389eba1c35fcfb021fca667279244c26ac  include/platform/mir/input/device_capability.h
+12ff36cfe9fd3e99614e9e315845a63156d2798a  include/platform/mir/input/input_device.h
+4f17d5e7b69448ececbc07dee3653a1f0f4dfc89  include/platform/mir/input/input_device_registry.h
+b59d7132b9f4360ef4cf5af4ed0255c00f897dc7  include/platform/mir/input/input_event_handler_register.h
+4e502d4a5fdff4ed1a65ba1f0183113f787285ab  include/platform/mir/input/input_report.h
+00a7d63dcd22107590497b57877c1893eed24d32  include/platform/mir/input/input_sink.h
+897648fdf3531bd57830454f8e9c775a6b53aa0d  include/platform/mir/input/platform.h
 b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h

=== modified file 'server-ABI-sha1sums'
--- server-ABI-sha1sums	2015-01-21 08:38:18 +0000
+++ server-ABI-sha1sums	2015-01-21 10:33:12 +0000
@@ -54,6 +54,13 @@
 1b77fb3290af00dc7d1c11dcc5388972dacb9ec3  include/platform/mir/graphics/platform_ipc_package.h
 f0db0484b8ccc9091e73c80a2a200cb436b48bfb  include/platform/mir/graphics/platform_operation_message.h
 f18876766861e5d4f5ca999dbd176fe1fc520594  include/platform/mir/graphics/renderable.h
+ab9801389eba1c35fcfb021fca667279244c26ac  include/platform/mir/input/device_capability.h
+12ff36cfe9fd3e99614e9e315845a63156d2798a  include/platform/mir/input/input_device.h
+4f17d5e7b69448ececbc07dee3653a1f0f4dfc89  include/platform/mir/input/input_device_registry.h
+b59d7132b9f4360ef4cf5af4ed0255c00f897dc7  include/platform/mir/input/input_event_handler_register.h
+4e502d4a5fdff4ed1a65ba1f0183113f787285ab  include/platform/mir/input/input_report.h
+00a7d63dcd22107590497b57877c1893eed24d32  include/platform/mir/input/input_sink.h
+897648fdf3531bd57830454f8e9c775a6b53aa0d  include/platform/mir/input/platform.h
 b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
 f4030e400baf8baa9c38e7c6ec6b4a5ad7134aeb  include/server/mir/compositor/compositor.h
 a9f284ba4b05d58fd3eeb628d1f56fe4ac188526  include/server/mir/compositor/compositor_id.h

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-01-14 06:39:13 +0000
+++ src/CMakeLists.txt	2015-01-21 10:33:12 +0000
@@ -2,6 +2,8 @@
 # and the platform implementations.
 set(MIRPLATFORM_ABI 6)
 
+set(MIR_SERVER_INPUT_PLATFORM_VERSION "MIR_INPUT_PLATFORM_1")
+
 set(PLATFORM_DRIVER platform${MIRPLATFORM_ABI}driver)
 set(MIR_PLATFORM_DRIVER mir${PLATFORM_DRIVER})
 set(MIR_PLATFORM_DRIVER_BINARY lib${MIR_PLATFORM_DRIVER}.so
@@ -40,4 +42,6 @@
 set(MIR_PLATFORM_REFERENCES ${MIR_PLATFORM_REFERENCES} PARENT_SCOPE)
 set(MIR_COMMON_OBJECTS ${MIR_COMMON_OBJECTS} PARENT_SCOPE)
 set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)
+set(MIR_SERVER_INPUT_PLATFORM_VERSION ${MIR_SERVER_INPUT_PLATFORM_VERSION} PARENT_SCOPE)
 set(MIR_CLIENT_PLATFORM_PATH ${MIR_CLIENT_PLATFORM_PATH} PARENT_SCOPE)
+set(MIR_SERVER_PLATFORM_PATH ${MIR_SERVER_PLATFORM_PATH} PARENT_SCOPE)

=== added file 'src/include/common/mir/find_best.h'
--- src/include/common/mir/find_best.h	1970-01-01 00:00:00 +0000
+++ src/include/common/mir/find_best.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2014 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: Andeas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_FIND_BEST_H_
+#define MIR_FIND_BEST_H_
+
+#include <functional>
+
+namespace mir
+{
+
+struct Greater // replace in favor of std::greater<> when we switch to c++14
+{
+    template<typename T>
+    bool operator()(T const& l, T const& r) const
+    {
+        return l > r;
+    }
+};
+
+/**
+ * \brief Range based algorithm to find the best suited item.
+ *
+ * Use this instead of std::max_element or std::min_element, when
+ * the comparision involves a costly test, as it caches the test result
+ * of the individual best candidate. To acchieve that the predicate is
+ * split in a predicate and a transformation.
+ */
+template<typename Container, typename Transform, typename Predicate = Greater>
+auto find_best(Container const& items, Transform const& transform,
+               decltype(transform(*items.begin())) const& initial_best,
+               Predicate const& pred = Greater{})
+-> decltype(begin(items))
+{
+    auto current_best_it = end(items);
+    auto current_best = initial_best;
+    for (auto it = begin(items), e = end(items);
+         it != e; ++it)
+    {
+        auto item_transformed = transform(*it);
+
+        if (pred(item_transformed, current_best))
+        {
+            current_best = item_transformed;
+            current_best_it = it;
+        }
+    }
+    return current_best_it;
+}
+}
+
+#endif

=== added file 'src/include/common/mir/flags.h'
--- src/include/common/mir/flags.h	1970-01-01 00:00:00 +0000
+++ src/include/common/mir/flags.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,118 @@
+/*
+ * Copyright © 2015 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: Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_FLAGS_H_
+#define MIR_FLAGS_H_
+
+#include <type_traits>
+
+namespace mir
+{
+
+/*!
+ * Treat an enumeration, scoped and unscoped, like a set of flags
+ */
+template<typename Enum>
+struct Flags
+{
+    using value_type = typename std::underlying_type<Enum>::type;
+    value_type value;
+
+    explicit constexpr Flags(value_type value = 0) noexcept
+        : value{value} {}
+    constexpr Flags(Enum value) noexcept
+        : value{static_cast<value_type>(value)} {}
+
+    constexpr Flags<Enum> operator|(Flags<Enum> other) const noexcept
+    {
+        return Flags<Enum>(value|other.value);
+    }
+
+    constexpr Flags<Enum> operator&(Flags<Enum> other) const noexcept
+    {
+        return Flags<Enum>(value & other.value);
+    }
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wconstexpr-not-const"
+#endif
+    constexpr Flags<Enum>& operator|=(Flags<Enum> other) noexcept
+    {
+        return value |= other.value, *this;
+    }
+
+    constexpr Flags<Enum> operator&=(Flags<Enum> other) noexcept
+    {
+        return value &= other.value, *this;
+    }
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+    constexpr bool operator==(Flags<Enum> other) const noexcept
+    {
+        return value == other.value;
+    }
+};
+
+template<typename Enum>
+constexpr Flags<Enum> operator|(Flags<Enum> flags, Enum e) noexcept
+{
+    return Flags<Enum>(flags.value | static_cast<decltype(flags.value)>(e));
+}
+
+template<typename Enum>
+constexpr Flags<Enum> operator|(Enum e, Flags<Enum> flags) noexcept
+{
+    return Flags<Enum>(flags.value | static_cast<decltype(flags.value)>(e));
+}
+
+template<typename Enum>
+constexpr Enum operator&(Enum e, Flags<Enum> flags) noexcept
+{
+    return static_cast<Enum>(flags.value & static_cast<decltype(flags.value)>(e));
+}
+
+template<typename Enum>
+constexpr Enum operator&(Flags<Enum> flags, Enum e) noexcept
+{
+    return static_cast<Enum>(flags.value & static_cast<decltype(flags.value)>(e));
+}
+
+template<typename Enum>
+constexpr bool operator==(Flags<Enum> flags, Enum e) noexcept
+{
+    return e == static_cast<Enum>(flags.value);
+}
+
+template<typename Enum>
+constexpr bool operator==(Enum e, Flags<Enum> flags) noexcept
+{
+    return e == static_cast<Enum>(flags.value);
+}
+
+template<typename Enum>
+constexpr bool contains(Flags<Enum> flags, Enum e) noexcept
+{
+    return e == static_cast<Enum>(flags.value & static_cast<decltype(flags.value)>(e));
+}
+
+}
+
+#endif

=== modified file 'src/platform/CMakeLists.txt'
--- src/platform/CMakeLists.txt	2015-01-14 06:39:13 +0000
+++ src/platform/CMakeLists.txt	2015-01-21 10:33:12 +0000
@@ -44,6 +44,8 @@
 
 install(TARGETS mirplatform LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
+add_definitions(-DMIR_SERVER_INPUT_PLATFORM_VERSION="${MIR_SERVER_INPUT_PLATFORM_VERSION}")
+
 add_subdirectory(graphics/)
 add_subdirectory(options)
 add_subdirectory(fatal)

=== modified file 'src/platforms/CMakeLists.txt'
--- src/platforms/CMakeLists.txt	2014-12-12 17:56:20 +0000
+++ src/platforms/CMakeLists.txt	2015-01-21 10:33:12 +0000
@@ -1,3 +1,11 @@
+set(MIR_SERVER_PLATFORM_PATH
+  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/mir/server-platform
+)
+set(MIR_SERVER_PLATFORM_PATH
+  ${MIR_SERVER_PLATFORM_PATH}
+  PARENT_SCOPE
+)
+
 include_directories(
   ${PROJECT_SOURCE_DIR}/include/platform
 )
@@ -9,6 +17,7 @@
 )
 
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
+set(input_platform_symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/input-platform-symbols.map)
 
 if (MIR_BUILD_PLATFORM_MESA)
     add_subdirectory(mesa/)
@@ -17,3 +26,7 @@
 if (MIR_BUILD_PLATFORM_ANDROID)
   add_subdirectory(android/)
 endif()
+
+add_definitions(-DMIR_SERVER_INPUT_PLATFORM_VERSION="${MIR_SERVER_INPUT_PLATFORM_VERSION}")
+
+add_subdirectory(evdev/)

=== added directory 'src/platforms/evdev'
=== added file 'src/platforms/evdev/CMakeLists.txt'
--- src/platforms/evdev/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/platforms/evdev/CMakeLists.txt	2015-01-21 10:33:12 +0000
@@ -0,0 +1,24 @@
+add_library(mirplatforminputevdevobjects OBJECT
+    android_device_provider.cpp
+    evdev_device_detection.cpp
+    evdev_input_device_factory.cpp
+    libinput_device_provider.cpp
+    )
+
+add_library(mirplatforminputevdev SHARED
+  platform.cpp
+  $<TARGET_OBJECTS:mirplatforminputevdevobjects>
+)
+
+set_target_properties(
+  mirplatforminputevdev PROPERTIES
+  OUTPUT_NAME input-evdev
+  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/server-modules
+  PREFIX ""
+  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${input_platform_symbol_map}"
+)
+
+target_link_libraries(mirplatforminputevdev
+  mirplatform
+  ${Boost_PROGRAM_OPTIONS_LIBRARY}
+)

=== added file 'src/platforms/evdev/android_device_provider.cpp'
--- src/platforms/evdev/android_device_provider.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/evdev/android_device_provider.cpp	2015-01-21 10:33:12 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#include "android_device_provider.h"
+#include "evdev_device_detection.h"
+
+#include "mir/input/device_capability.h"
+#include "mir/input/input_device.h"
+
+namespace mi = mir::input;
+namespace mie = mi::evdev;
+
+mie::Priority mie::AndroidDeviceProvider::probe_device(char const* device) const
+{
+    auto device_caps = detect_device_capabilities(device);
+
+    if (contains(device_caps, DeviceCapability::touchscreen))
+        return Priority::best;
+
+    if (contains(device_caps, DeviceCapability::touchpad))
+        return Priority::unsupported;
+
+    if (device_caps == DeviceCapability::unknown)
+        return Priority::unsupported;
+
+    return Priority::supported;
+}
+
+std::unique_ptr<mi::InputDevice> mie::AndroidDeviceProvider::create_device(char const* /*device*/) const
+{
+    return std::unique_ptr<mi::InputDevice>();
+}
+

=== added file 'src/platforms/evdev/android_device_provider.h'
--- src/platforms/evdev/android_device_provider.h	1970-01-01 00:00:00 +0000
+++ src/platforms/evdev/android_device_provider.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_EVDEV_ANDROID_DEVICE_PROVIDER_H_
+#define MIR_INPUT_EVDEV_ANDROID_DEVICE_PROVIDER_H_
+
+#include "input_device_provider.h"
+
+namespace mir
+{
+namespace input
+{
+namespace evdev
+{
+
+class AndroidDeviceProvider : public InputDeviceProvider
+{
+public:
+    Priority probe_device(char const* path) const override;
+    std::unique_ptr<InputDevice> create_device(char const* path) const override;
+};
+
+}
+}
+}
+
+#endif // MIR_INPUT_EVDEV_ANDROID_DEVICE_PROVIDER_H_

=== added file 'src/platforms/evdev/evdev_device_detection.cpp'
--- src/platforms/evdev/evdev_device_detection.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/evdev/evdev_device_detection.cpp	2015-01-21 10:33:12 +0000
@@ -0,0 +1,163 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#include "evdev_device_detection.h"
+#include "mir/fd.h"
+
+#include <boost/exception/errinfo_errno.hpp>
+#include <boost/exception/errinfo_file_name.hpp>
+#include <boost/throw_exception.hpp>
+
+#include <linux/input.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <cstring>
+#include <system_error>
+
+namespace mi = mir::input;
+namespace mie = mi::evdev;
+
+namespace
+{
+
+struct DeviceInfo
+{
+    uint8_t key_bit_mask[(KEY_MAX+1)/8];
+    uint8_t abs_bit_mask[(ABS_MAX+1)/8];
+    uint8_t rel_bit_mask[(REL_MAX+1)/8];
+    uint8_t sw_bit_mask[(SW_MAX+1)/8];
+    uint8_t property_bit_mask[(INPUT_PROP_MAX+1)/8];
+};
+
+void fill_device_info(DeviceInfo& info, int fd)
+{
+    std::memset(&info, 0, sizeof info);
+
+    auto const get_bitmask = [&](int bit, size_t size, uint8_t* buf) -> void
+    {
+        if(ioctl(fd, EVIOCGBIT(bit, size), buf) < 1)
+            BOOST_THROW_EXCEPTION(
+                std::system_error(std::error_code(errno, std::system_category()),
+                                  "Failed to query input device"));
+    };
+    get_bitmask(EV_KEY, sizeof info.key_bit_mask, info.key_bit_mask);
+    get_bitmask(EV_REL, sizeof info.rel_bit_mask, info.rel_bit_mask);
+    get_bitmask(EV_ABS, sizeof info.abs_bit_mask, info.abs_bit_mask);
+    get_bitmask(EV_SW, sizeof info.sw_bit_mask, info.sw_bit_mask);
+
+    if (ioctl(fd, EVIOCGPROP(sizeof info.property_bit_mask), info.property_bit_mask) < 1)
+            BOOST_THROW_EXCEPTION(
+                std::system_error(std::error_code(errno, std::system_category()),
+                                  "Failed to query devices properties"));
+
+}
+
+constexpr size_t index_of_bit(size_t bit)
+{
+    return (bit + 7) / 8;
+}
+inline bool get_bit(uint8_t const* array, size_t bit)
+{
+    return array[bit/8] & (1<<(bit%8));
+}
+
+inline size_t get_num_bits(uint8_t const* array, std::initializer_list<size_t> bits)
+{
+    size_t ret = 0;
+    for( auto const bit : bits)
+        ret += get_bit(array, bit);
+    return ret;
+}
+
+mi::DeviceCapabilities evaluate_device_capabilities(DeviceInfo const& info)
+{
+    mi::DeviceCapabilities caps;
+
+    auto const contains_non_zero = [](uint8_t const* array, int first, int last) -> bool
+    {
+        return std::any_of(array + first, array + last, [](uint8_t item) { return item!=0;});
+    };
+
+    bool const has_keys = contains_non_zero(info.key_bit_mask, 0, index_of_bit(BTN_MISC))
+        || contains_non_zero(info.key_bit_mask, index_of_bit(KEY_OK), sizeof info.key_bit_mask);
+
+    bool const has_gamepad_buttons =
+        contains_non_zero(info.key_bit_mask, index_of_bit(BTN_MISC), index_of_bit(BTN_MOUSE))
+        || contains_non_zero(info.key_bit_mask, index_of_bit(BTN_JOYSTICK), index_of_bit(BTN_DIGI));
+
+    bool const has_coordinates = get_bit(info.abs_bit_mask, ABS_X) &&
+        get_bit(info.abs_bit_mask, ABS_Y);
+
+    bool const has_mt_coordinates = get_bit(info.abs_bit_mask, ABS_MT_POSITION_X) &&
+        get_bit(info.abs_bit_mask, ABS_MT_POSITION_Y);
+
+    bool const is_direct = get_bit(info.property_bit_mask, INPUT_PROP_DIRECT);
+
+    bool const finger_but_no_pen = get_bit(info.key_bit_mask, BTN_TOOL_FINGER)
+        && !get_bit(info.key_bit_mask, BTN_TOOL_PEN);
+
+    bool const has_touch = get_bit(info.key_bit_mask, BTN_TOUCH);
+
+    bool const has_joystick_axis = 0 < get_num_bits(
+        info.abs_bit_mask, {ABS_Z,
+        ABS_RX, ABS_RY, ABS_RZ,
+        ABS_THROTTLE, ABS_RUDDER, ABS_WHEEL, ABS_GAS, ABS_BRAKE,
+        ABS_HAT0X, ABS_HAT0Y, ABS_HAT1X, ABS_HAT1Y, ABS_HAT2X, ABS_HAT2Y, ABS_HAT3X, ABS_HAT3Y,
+        ABS_TILT_X, ABS_TILT_Y
+        });
+
+    if (has_keys || has_gamepad_buttons)
+        caps = caps | mi::DeviceCapability::keyboard;
+
+    if (get_bit(info.key_bit_mask, BTN_MOUSE) && get_bit(info.rel_bit_mask, REL_X) && get_bit(info.rel_bit_mask, REL_Y))
+        caps = caps | mi::DeviceCapability::pointer;
+
+    if (finger_but_no_pen && !is_direct && (has_coordinates|| has_mt_coordinates))
+        caps = caps | mi::DeviceCapability::touchpad;
+    else if (has_touch && ((has_mt_coordinates && !has_gamepad_buttons)
+                           || has_coordinates))
+        caps = caps | mi::DeviceCapability::touchscreen;
+
+    if (has_joystick_axis || (!has_touch && has_coordinates))
+        caps = caps | mi::DeviceCapability::joystick;
+
+    if (has_gamepad_buttons)
+        caps = caps | mi::DeviceCapability::gamepad;
+
+    return caps;
+}
+
+}
+
+mi::DeviceCapabilities mie::detect_device_capabilities(char const* device)
+{
+    mir::Fd input_device(::open(device, O_RDONLY|O_NONBLOCK));
+    if (input_device < 0)
+        BOOST_THROW_EXCEPTION(
+            std::system_error(std::error_code(errno, std::system_category()),
+                              "Failed to open input device"));
+
+    DeviceInfo info;
+
+    fill_device_info(info, input_device);
+    return evaluate_device_capabilities(info);
+}
+

=== added file 'src/platforms/evdev/evdev_device_detection.h'
--- src/platforms/evdev/evdev_device_detection.h	1970-01-01 00:00:00 +0000
+++ src/platforms/evdev/evdev_device_detection.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_EVDEV_DEVICE_DETECTION_H_
+#define MIR_INPUT_EVDEV_DEVICE_DETECTION_H_
+
+#include "mir/input/device_capability.h"
+
+namespace mir
+{
+namespace input
+{
+namespace evdev
+{
+input::DeviceCapabilities detect_device_capabilities(char const* device);
+}
+}
+}
+
+#endif

=== added file 'src/platforms/evdev/evdev_input_device_factory.cpp'
--- src/platforms/evdev/evdev_input_device_factory.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/evdev/evdev_input_device_factory.cpp	2015-01-21 10:33:12 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2013-2014 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: Christopher Halse Rogers <[e-mail]>
+ *              Andreas Pokorny <[e-mail]>
+ */
+
+#include "evdev_input_device_factory.h"
+#include "input_device_provider.h"
+
+#include "mir/find_best.h"
+#include "mir/input/input_device.h"
+
+#include <stdexcept>
+
+namespace mi = mir::input;
+namespace mie = mi::evdev;
+
+mie::EvdevInputDeviceFactory::EvdevInputDeviceFactory(std::initializer_list<std::shared_ptr<mie::InputDeviceProvider>> providers)
+    : providers(providers)
+{
+}
+
+std::unique_ptr<mi::InputDevice> mie::EvdevInputDeviceFactory::create_device(char const* device)
+{
+    auto best_provider = find_best(
+        providers,
+        [device](std::shared_ptr<InputDeviceProvider> const& provider) -> Priority
+        {
+            try
+            {
+                return provider->probe_device(device);
+            }
+            catch(...)
+            {
+                return Priority::unsupported;
+            }
+        },
+        Priority::unsupported
+        );
+
+    if (best_provider != end(providers))
+	return std::move((*best_provider)->create_device(device));
+
+    throw std::runtime_error("Failed to open input device");
+}

=== added file 'src/platforms/evdev/evdev_input_device_factory.h'
--- src/platforms/evdev/evdev_input_device_factory.h	1970-01-01 00:00:00 +0000
+++ src/platforms/evdev/evdev_input_device_factory.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2013-2014 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: Christopher Halse Rogers <[e-mail]>
+ *              Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_EVDEV_EVDEV_INPUT_DEVICE_FACTORY_H_
+#define MIR_INPUT_EVDEV_EVDEV_INPUT_DEVICE_FACTORY_H_
+
+#include "input_device_factory.h"
+
+#include <memory>
+#include <vector>
+#include <initializer_list>
+
+namespace mir
+{
+namespace input
+{
+namespace evdev
+{
+class InputDeviceProvider;
+
+class EvdevInputDeviceFactory : public InputDeviceFactory
+{
+public:
+    EvdevInputDeviceFactory(std::initializer_list<std::shared_ptr<InputDeviceProvider>> providers);
+
+    std::unique_ptr<InputDevice> create_device(char const* devcie_node) override;
+
+private:
+    std::vector<std::shared_ptr<InputDeviceProvider>> providers;
+};
+
+}
+}
+} // namespace mir
+
+#endif // MIR_INPUT_EVDEV_INPUT_DEVICE_FACTORY_H_

=== added file 'src/platforms/evdev/input_device_factory.h'
--- src/platforms/evdev/input_device_factory.h	1970-01-01 00:00:00 +0000
+++ src/platforms/evdev/input_device_factory.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2013-2014 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: Christopher Halse Rogers <[e-mail]>
+ *              Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_INPUT_DEVICE_FACTORY_H_
+#define MIR_INPUT_INPUT_DEVICE_FACTORY_H_
+
+#include <memory>
+
+namespace mir
+{
+namespace input
+{
+class InputDevice;
+namespace evdev
+{
+
+class InputDeviceFactory
+{
+public:
+    InputDeviceFactory() = default;
+    virtual ~InputDeviceFactory() = default;
+
+    virtual std::unique_ptr<InputDevice> create_device(char const* device_node) = 0;
+
+protected:
+    InputDeviceFactory(InputDeviceFactory const&) = delete;
+    InputDeviceFactory& operator=(InputDeviceFactory const&) = delete;
+};
+
+}
+}
+} // namespace mir
+
+#endif // MIR_INPUT_INPUT_DEVICE_FACTORY_H_

=== added file 'src/platforms/evdev/input_device_provider.h'
--- src/platforms/evdev/input_device_provider.h	1970-01-01 00:00:00 +0000
+++ src/platforms/evdev/input_device_provider.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2013-2014 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: Christopher Halse Rogers <[e-mail]>
+ *              Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_EVDEV_INPUT_DEVICE_PROVIDER_H_
+#define MIR_INPUT_EVDEV_INPUT_DEVICE_PROVIDER_H_
+
+#include <memory>
+
+namespace mir
+{
+namespace input
+{
+class InputDevice;
+
+namespace evdev
+{
+
+enum class Priority : uint32_t
+{
+    unsupported = 0,
+    supported = 100,
+    best = 255,
+};
+
+class InputDeviceProvider
+{
+public:
+    InputDeviceProvider() = default;
+    virtual ~InputDeviceProvider() = default;
+
+    virtual Priority probe_device(char const* node) const = 0;
+    virtual std::unique_ptr<InputDevice> create_device(char const* node) const = 0;
+
+protected:
+    InputDeviceProvider(InputDeviceProvider const& cp) = delete;
+    InputDeviceProvider& operator=(InputDeviceProvider const& cp) = delete;
+};
+
+}
+}
+} // namespace mir
+
+#endif // MIR_INPUT_EVDEV_INPUT_DEVICE_PROVIDER_H_

=== added file 'src/platforms/evdev/libinput_device_provider.cpp'
--- src/platforms/evdev/libinput_device_provider.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/evdev/libinput_device_provider.cpp	2015-01-21 10:33:12 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#include "libinput_device_provider.h"
+#include "evdev_device_detection.h"
+
+#include "mir/input/input_device.h"
+#include "mir/input/device_capability.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdexcept>
+
+namespace mi = mir::input;
+namespace mie = mi::evdev;
+
+mie::Priority mie::LibInputDeviceProvider::probe_device(char const* device) const
+{
+    auto device_caps = detect_device_capabilities(device);
+
+    if (contains(device_caps, DeviceCapability::joystick))
+        return Priority::unsupported;
+
+    if (contains(device_caps, DeviceCapability::gamepad))
+        return Priority::unsupported;
+
+    if (contains(device_caps, DeviceCapability::touchscreen))
+        return Priority::unsupported;
+
+    if (contains(device_caps, DeviceCapability::touchpad))
+        return Priority::best;
+
+    if (device_caps == DeviceCapability::unknown)
+        return Priority::unsupported;
+
+    if (contains(device_caps, DeviceCapability::pointer))
+        return Priority::supported;
+
+    if (contains(device_caps, DeviceCapability::keyboard))
+        return Priority::unsupported;
+
+    return Priority::unsupported;
+}
+
+std::unique_ptr<mi::InputDevice> mie::LibInputDeviceProvider::create_device(char const* device) const
+{
+    (void)device;
+    return std::unique_ptr<mi::InputDevice>();
+}
+

=== added file 'src/platforms/evdev/libinput_device_provider.h'
--- src/platforms/evdev/libinput_device_provider.h	1970-01-01 00:00:00 +0000
+++ src/platforms/evdev/libinput_device_provider.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_EVDEV_LIBINPUT_DEVICE_PROVIDER_H_
+#define MIR_INPUT_EVDEV_LIBINPUT_DEVICE_PROVIDER_H_
+
+#include "input_device_provider.h"
+
+namespace mir
+{
+namespace input
+{
+namespace evdev
+{
+
+class LibInputDeviceProvider : public InputDeviceProvider
+{
+public:
+    Priority probe_device(char const* device) const override;
+    std::unique_ptr<InputDevice> create_device(char const* device) const override;
+};
+
+}
+}
+}
+
+#endif // MIR_INPUT_LIBINPUT_INPUT_DEVICE_PROVIDER_H_

=== added file 'src/platforms/evdev/platform.cpp'
--- src/platforms/evdev/platform.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/evdev/platform.cpp	2015-01-21 10:33:12 +0000
@@ -0,0 +1,179 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#include "platform.h"
+#include "evdev_input_device_factory.h"
+#include "android_device_provider.h"
+#include "libinput_device_provider.h"
+#include "mir/udev/wrapper.h"
+
+#include "mir/input/input_event_handler_register.h"
+#include "mir/input/input_device_registry.h"
+#include "mir/input/input_device.h"
+#include "mir/input/input_report.h"
+
+namespace mi = mir::input;
+namespace mo = mir::options;
+namespace mu = mir::udev;
+namespace mie = mi::evdev;
+
+namespace
+{
+char const* const host_socket_opt = "host-socket";
+}
+
+mie::Platform::Platform(std::shared_ptr<InputReport> const& report,
+                        std::unique_ptr<udev::Context> udev_context,
+                        std::unique_ptr<udev::Monitor> monitor,
+                        std::shared_ptr<mie::InputDeviceFactory> const& factory) :
+    report(report),
+    udev_context(std::move(udev_context)),
+    monitor(std::move(monitor)),
+    input_device_factory(factory)
+{
+    this->monitor->filter_by_subsystem("input");
+    this->monitor->enable();
+}
+
+void mie::Platform::start(mi::InputEventHandlerRegister& execution, std::shared_ptr<InputDeviceRegistry> const& input_device_registry)
+{
+    this->input_device_registry = input_device_registry;
+
+    execution.register_fd_handler(
+        {monitor->fd()},
+        this,
+        [this](int /*fd*/)
+        {
+            monitor->process_events(
+                [this](mu::Monitor::EventType event, mu::Device const& dev)
+                {
+                    if (!dev.devnode())
+                        return;
+                    if (event == mu::Monitor::ADDED)
+                        device_added(dev);
+                    if (event == mu::Monitor::REMOVED)
+                        device_removed(dev);
+                    if (event == mu::Monitor::CHANGED)
+                        device_changed(dev);
+                }
+                );
+        });
+
+    execution.register_handler([this](){ scan_for_devices();});
+}
+
+void mie::Platform::scan_for_devices()
+{
+    mu::Enumerator input_enumerator{udev_context};
+    input_enumerator.match_subsystem("input");
+    input_enumerator.scan_devices();
+
+    for (auto& device : input_enumerator)
+    {
+        if (device.devnode() != nullptr)
+            device_added(device);
+    }
+}
+
+void mie::Platform::device_added(mu::Device const& dev)
+{
+    if (end(devices) != find_device(dev.devnode()))
+        return;
+
+    std::shared_ptr<mi::InputDevice> input_dev;
+
+    try
+    {
+        input_dev = input_device_factory->create_device(dev.devnode());
+        report->open_input_device(dev.devnode());
+        input_device_registry->add_device(input_dev);
+        devices.emplace_back(dev.devnode(), input_dev);
+    } catch(...)
+    {
+        report->failure_opening_input_device(dev.devnode());
+    }
+
+}
+
+void mie::Platform::device_removed(mu::Device const& dev)
+{
+    auto known_device_pos = find_device(dev.devnode());
+
+    if (known_device_pos == end(devices))
+        return;
+
+    input_device_registry->remove_device(known_device_pos->second);
+    devices.erase(known_device_pos);
+}
+
+
+auto mie::Platform::find_device(char const* devnode) -> decltype(devices)::iterator
+{
+    return std::find_if(
+        begin(devices),
+        end(devices),
+        [devnode](decltype(devices)::value_type const& item)
+        {
+            return devnode == item.first;
+        }
+        );
+}
+
+void mie::Platform::device_changed(mu::Device const& /*dev*/)
+{
+}
+
+void mie::Platform::stop(mi::InputEventHandlerRegister& execution)
+{
+    execution.unregister_fd_handler(this);
+}
+
+extern "C" std::unique_ptr<mi::Platform> create_input_platform(
+    std::shared_ptr<mo::Option> const& /*options*/,
+    std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
+    std::shared_ptr<mi::InputReport> const& report)
+{
+    std::unique_ptr<mu::Context> ctx{new mu::Context};
+    std::unique_ptr<mu::Monitor> monitor{new mu::Monitor(*ctx.get())};
+    std::initializer_list<std::shared_ptr<mie::InputDeviceProvider>> providers =
+        {std::make_shared<mie::AndroidDeviceProvider>(), std::make_shared<mie::LibInputDeviceProvider>()};
+    return std::unique_ptr<mie::Platform>(
+        new mie::Platform(
+            report,
+            std::move(ctx),
+            std::move(monitor),
+            std::make_shared<mie::EvdevInputDeviceFactory>(providers))
+        );
+}
+
+
+extern "C" void add_input_platform_options(
+    boost::program_options::options_description& /*config*/)
+{
+    // no options to add yet
+}
+
+extern "C" mi::PlatformPriority probe_input_platform(
+    mo::Option const& options)
+{
+    if (options.is_set(host_socket_opt))
+    {
+        return mi::PlatformPriority::unsupported;
+    }
+    return mi::PlatformPriority::supported;
+}

=== added file 'src/platforms/evdev/platform.h'
--- src/platforms/evdev/platform.h	1970-01-01 00:00:00 +0000
+++ src/platforms/evdev/platform.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_EVDEV_PLATFORM_H_
+#define MIR_INPUT_EVDEV_PLATFORM_H_
+
+#include "mir/input/platform.h"
+#include <vector>
+
+namespace mir
+{
+namespace udev
+{
+class Device;
+class Monitor;
+class Context;
+}
+namespace input
+{
+class InputDeviceInfo;
+namespace evdev
+{
+class InputDeviceFactory;
+
+class Platform : public input::Platform
+{
+public:
+    Platform(std::shared_ptr<InputReport> const& report,
+             std::unique_ptr<udev::Context> udev_context,
+             std::unique_ptr<udev::Monitor> monitor,
+             std::shared_ptr<InputDeviceFactory> const& factory);
+    void start(InputEventHandlerRegister& loop, std::shared_ptr<InputDeviceRegistry> const& input_device_registry) override;
+    void stop(InputEventHandlerRegister& loop) override;
+
+private:
+    void scan_for_devices();
+    void device_added(udev::Device const& dev);
+    void device_removed(udev::Device const& dev);
+    void device_changed(udev::Device const& dev);
+    std::shared_ptr<InputReport> const report;
+    std::shared_ptr<udev::Context> udev_context;
+    std::unique_ptr<udev::Monitor> monitor;
+    std::shared_ptr<InputDeviceRegistry> input_device_registry;
+    std::shared_ptr<InputDeviceFactory> input_device_factory;
+
+    std::vector<std::pair<std::string,std::shared_ptr<InputDevice>>> devices;
+    auto find_device(char const* devnode) -> decltype(devices)::iterator;
+};
+
+}
+}
+}
+
+#endif

=== added file 'src/platforms/input-platform-symbols.map'
--- src/platforms/input-platform-symbols.map	1970-01-01 00:00:00 +0000
+++ src/platforms/input-platform-symbols.map	2015-01-21 10:33:12 +0000
@@ -0,0 +1,7 @@
+MIR_INPUT_PLATFORM_1 {
+  global: 
+   add_input_platform_options;
+   create_input_platform;
+   probe_input_platform;
+  local: *;
+};

=== modified file 'src/server/report/logging/input_report.cpp'
--- src/server/report/logging/input_report.cpp	2015-01-14 06:39:13 +0000
+++ src/server/report/logging/input_report.cpp	2015-01-21 10:33:12 +0000
@@ -107,6 +107,24 @@
     return s;
 }
 
+void mrl::InputReport::open_input_device(char const* device)
+{
+    std::stringstream ss;
+
+    ss << "Opened input device: " << device;
+
+    logger->log(ml::Severity::informational, ss.str(), component());
+}
+
+void mrl::InputReport::failure_opening_input_device(char const* device)
+{
+    std::stringstream ss;
+
+    ss << "Failed to open input device: " << device;
+
+    logger->log(ml::Severity::error, ss.str(), component());
+}
+
 void mrl::InputReport::received_event_from_kernel(int64_t when, int type, int code, int value)
 {
     std::stringstream ss;

=== modified file 'src/server/report/logging/input_report.h'
--- src/server/report/logging/input_report.h	2014-03-06 06:05:17 +0000
+++ src/server/report/logging/input_report.h	2015-01-21 10:33:12 +0000
@@ -40,6 +40,10 @@
     InputReport(std::shared_ptr<mir::logging::Logger> const& logger);
     virtual ~InputReport() noexcept(true) = default;
 
+    void open_input_device(char const* device_node) override;
+
+    void failure_opening_input_device(char const* device_node) override;
+
     void received_event_from_kernel(int64_t when, int type, int code, int value);
 
     void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time);

=== modified file 'src/server/report/lttng/input_report.cpp'
--- src/server/report/lttng/input_report.cpp	2014-03-06 06:05:17 +0000
+++ src/server/report/lttng/input_report.cpp	2015-01-21 10:33:12 +0000
@@ -24,6 +24,16 @@
 #define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
 #include "input_report_tp.h"
 
+void mir::report::lttng::InputReport::open_input_device(char const* device)
+{
+    mir_tracepoint(mir_server_input, opened_input_device, device);
+}
+
+void mir::report::lttng::InputReport::failure_opening_input_device(char const* device)
+{
+    mir_tracepoint(mir_server_input, failure_opening_input_device, device);
+}
+
 void mir::report::lttng::InputReport::received_event_from_kernel(int64_t when, int type, int code, int value)
 {
     mir_tracepoint(mir_server_input, received_event_from_kernel, when, type, code, value);

=== modified file 'src/server/report/lttng/input_report.h'
--- src/server/report/lttng/input_report.h	2014-03-06 06:05:17 +0000
+++ src/server/report/lttng/input_report.h	2015-01-21 10:33:12 +0000
@@ -36,6 +36,9 @@
     InputReport() = default;
     virtual ~InputReport() noexcept(true) = default;
 
+    void open_input_device(char const* device_node) override;
+    void failure_opening_input_device(char const* device_node) override;
+
     void received_event_from_kernel(int64_t when, int type, int code, int value) override;
 
     void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time) override;

=== modified file 'src/server/report/lttng/input_report_tp.h'
--- src/server/report/lttng/input_report_tp.h	2015-01-14 06:39:13 +0000
+++ src/server/report/lttng/input_report_tp.h	2015-01-21 10:33:12 +0000
@@ -71,6 +71,24 @@
     )
 )
 
-#endif /* MIR_LTTNG_DISPLAY_REPORT_TP_H_ */
+TRACEPOINT_EVENT(
+    mir_server_input,
+    opened_input_device,
+    TP_ARGS(char const*, device),
+    TP_FIELDS(
+        ctf_string(device, device)
+    )
+)
+
+TRACEPOINT_EVENT(
+    mir_server_input,
+    failure_opening_input_device,
+    TP_ARGS(char const*, device),
+    TP_FIELDS(
+        ctf_string(device, device)
+    )
+)
+
+#endif /* MIR_LTTNG_INPUT_REPORT_TP_H_ */
 
 #include <lttng/tracepoint-event.h>

=== modified file 'src/server/report/null/input_report.cpp'
--- src/server/report/null/input_report.cpp	2014-03-06 06:05:17 +0000
+++ src/server/report/null/input_report.cpp	2015-01-21 10:33:12 +0000
@@ -20,6 +20,14 @@
 
 namespace mrn = mir::report::null;
 
+void mrn::InputReport::open_input_device(char const* /* device */)
+{
+}
+
+void mrn::InputReport::failure_opening_input_device(char const* /* device */)
+{
+}
+
 void mrn::InputReport::received_event_from_kernel(int64_t /* when */, int /* type */, int /* code */, int /* value */)
 {
 }

=== modified file 'src/server/report/null/input_report.h'
--- src/server/report/null/input_report.h	2014-03-06 06:05:17 +0000
+++ src/server/report/null/input_report.h	2015-01-21 10:33:12 +0000
@@ -35,6 +35,9 @@
     InputReport() = default;
     virtual ~InputReport() noexcept(true) = default;
 
+    void open_input_device(char const* device_node) override;
+    void failure_opening_input_device(char const* device_node) override;
+
     void received_event_from_kernel(int64_t when, int type, int code, int value);
 
     void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time);

=== added file 'tests/include/mir_test_doubles/mock_input_device_registry.h'
--- tests/include/mir_test_doubles/mock_input_device_registry.h	1970-01-01 00:00:00 +0000
+++ tests/include/mir_test_doubles/mock_input_device_registry.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2014 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:
+ *   Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_MOCK_INPUT_DEVICE_REGISTRY_H_
+#define MIR_INPUT_MOCK_INPUT_DEVICE_REGISTRY_H_
+
+#include "mir/input/input_device_registry.h"
+
+#include <gmock/gmock.h>
+
+namespace mir
+{
+namespace test
+{
+namespace doubles
+{
+
+class MockInputDeviceRegistry : public input::InputDeviceRegistry
+{
+public:
+    MOCK_METHOD1(add_device, void(std::shared_ptr<input::InputDevice> const& device));
+    MOCK_METHOD1(remove_device, void(std::shared_ptr<input::InputDevice> const& device));
+};
+
+}
+}
+}
+
+#endif
+

=== added file 'tests/include/mir_test_doubles/mock_input_event_handler_register.h'
--- tests/include/mir_test_doubles/mock_input_event_handler_register.h	1970-01-01 00:00:00 +0000
+++ tests/include/mir_test_doubles/mock_input_event_handler_register.h	2015-01-21 10:33:12 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2014 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:
+ *   Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_TEST_DOUBLES_MOCK_INPUT_MULTIPLEXER_H_
+#define MIR_TEST_DOUBLES_MOCK_INPUT_MULTIPLEXER_H_
+
+#include "mir/input/input_event_handler_register.h"
+
+#include <gmock/gmock.h>
+
+namespace mir
+{
+namespace test
+{
+namespace doubles
+{
+
+class MockInputEventHandlerRegister : public input::InputEventHandlerRegister
+{
+public:
+    void register_fd_handler(
+            std::initializer_list<int> fds,
+            void const* owner,
+            std::function<void(int)> const&& handler) override
+    {
+        register_fd_handler_(fds, owner, handler);
+    }
+    MOCK_METHOD3(register_fd_handler_, void(
+            std::initializer_list<int> fds,
+            void const* owner,
+            std::function<void(int)> const& handler));
+
+    MOCK_METHOD1(unregister_fd_handler, void(void const* owner));
+    void register_handler(std::function<void()> const&& handler) override
+    {
+        register_handler_(handler);
+    }
+    MOCK_METHOD1(register_handler_, void(std::function<void()> const& handler));
+};
+
+}
+}
+}
+
+#endif
+

=== modified file 'tests/include/mir_test_framework/executable_path.h'
--- tests/include/mir_test_framework/executable_path.h	2015-01-14 06:39:13 +0000
+++ tests/include/mir_test_framework/executable_path.h	2015-01-21 10:33:12 +0000
@@ -26,5 +26,7 @@
 std::string executable_path();
 
 std::string library_path();
+std::string server_platform(std::string const& name);
+std::string client_platform(std::string const& name);
 }
 #endif /* MIR_TEST_FRAMEWORK_EXECUTABLE_PATH_H_ */

=== modified file 'tests/mir_test_framework/CMakeLists.txt'
--- tests/mir_test_framework/CMakeLists.txt	2015-01-14 06:39:13 +0000
+++ tests/mir_test_framework/CMakeLists.txt	2015-01-21 10:33:12 +0000
@@ -11,6 +11,11 @@
   ${ANDROID_HEADERS_INCLUDE_DIRS}
 )
 
+add_definitions(
+    -DMIR_CLIENT_PLATFORM_PATH="${MIR_CLIENT_PLATFORM_PATH}"
+    -DMIR_SERVER_PLATFORM_PATH="${MIR_SERVER_PLATFORM_PATH}"
+    )
+
 set(
   TEST_FRAMEWORK_SRCS
 
@@ -99,6 +104,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/udev_recordings ${CMAKE_BINARY_DIR}/bin/udev_recordings
   COMMENT "Copying umockdev recordings to build dir..."
 )
+
 add_custom_command(TARGET mir-test-framework POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy_directory
   ${CMAKE_CURRENT_SOURCE_DIR}/testing-cursor-theme ${CMAKE_BINARY_DIR}/bin/testing-cursor-theme

=== modified file 'tests/mir_test_framework/executable_path.cpp'
--- tests/mir_test_framework/executable_path.cpp	2015-01-14 06:39:13 +0000
+++ tests/mir_test_framework/executable_path.cpp	2015-01-21 10:33:12 +0000
@@ -24,6 +24,7 @@
 #include <stdexcept>
 #include <boost/throw_exception.hpp>
 #include <boost/exception/errinfo_errno.hpp>
+#include <boost/filesystem.hpp>
 
 std::string mir_test_framework::executable_path()
 {
@@ -43,3 +44,29 @@
 {
     return executable_path() + "/../lib";
 }
+
+std::string mir_test_framework::server_platform(std::string const& name)
+{
+    for (auto const& option :
+         {library_path() + "/server-modules/", library_path() + "/server-platform/", std::string(MIR_SERVER_PLATFORM_PATH) + '/'})
+    {
+        auto path_to_test = option + name;
+        if (boost::filesystem::exists(path_to_test))
+            return path_to_test;
+    }
+
+    BOOST_THROW_EXCEPTION(std::runtime_error("Failed to find server platform in standard search locations"));
+}
+
+std::string mir_test_framework::client_platform(std::string const& name)
+{
+    for (auto const& option :
+         {library_path() + "/client-modules/", library_path() + "/client-platform/", std::string(MIR_CLIENT_PLATFORM_PATH) + '/'})
+    {
+        auto path_to_test = option + name;
+        if (boost::filesystem::exists(path_to_test))
+            return path_to_test;
+    }
+
+    BOOST_THROW_EXCEPTION(std::runtime_error("Failed to find server platform in standard search locations"));
+}

=== added file 'tests/mir_test_framework/udev_recordings/joystick-detection.ioctl'
--- tests/mir_test_framework/udev_recordings/joystick-detection.ioctl	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/udev_recordings/joystick-detection.ioctl	2015-01-21 10:33:12 +0000
@@ -0,0 +1,25 @@
+@DEV /dev/input/event13
+EVIOCGBIT(1) 96 000000000000000000000000000000000000000000000000000000000000000000000000FF0F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+EVIOCGBIT(2) 2 0000
+EVIOCGBIT(3) 8 6300030000000000
+EVIOCGBIT(5) 2 0000
+EVIOCGBIT(17) 2 0000
+EVIOCGBIT(21) 16 00000000000000000000000000000000
+EVIOCGPROP(0) 4 00000000
+EVIOCGBIT(0) 8 0B00000000000000
+EVIOCGNAME(0) 29 4C6F676974656368204C6F6769746563682045787472656D65203344000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+EVIOCGPHYS(0) 26 7573622D303030303A30303A31342E302D322F696E70757430000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+EVIOCGUNIQ(0) 1 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+EVIOCGID 0 03006D0415C21001
+EVIOCGVERSION 0 01000100
+EVIOCGBIT(4) 8 1000000000000000
+EVIOCGBIT(18) 8 0000000000000000
+EVIOCGKEY(0) 96 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+EVIOCGLED(0) 8 0000000000000000
+EVIOCGSW(0) 8 0000000000000000
+EVIOCGABS 0 FC01000000000000FF030000030000003F00000000000000
+EVIOCGABS(1) 0 FC01000000000000FF030000030000003F00000000000000
+EVIOCGABS(5) 0 8000000000000000FF000000000000000F00000000000000
+EVIOCGABS(6) 0 0000000000000000FF000000000000000F00000000000000
+EVIOCGABS(16) 0 00000000FFFFFFFF01000000000000000000000000000000
+EVIOCGABS(17) 0 00000000FFFFFFFF01000000000000000000000000000000

=== added file 'tests/mir_test_framework/udev_recordings/joystick-detection.umockdev'
--- tests/mir_test_framework/udev_recordings/joystick-detection.umockdev	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/udev_recordings/joystick-detection.umockdev	2015-01-21 10:33:12 +0000
@@ -0,0 +1,351 @@
+P: /devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.0/0003:046D:C215.0016/input/input258/event13
+N: input/event13
+S: input/by-id/usb-Logitech_Logitech_Extreme_3D-event-joystick
+S: input/by-path/pci-0000:00:14.0-usb-0:2:1.0-event-joystick
+E: DEVLINKS=/dev/input/by-id/usb-Logitech_Logitech_Extreme_3D-event-joystick /dev/input/by-path/pci-0000:00:14.0-usb-0:2:1.0-event-joystick
+E: DEVNAME=/dev/input/event13
+E: ID_BUS=usb
+E: ID_FOR_SEAT=input-pci-0000_00_14_0-usb-0_2_1_0
+E: ID_INPUT=1
+E: ID_INPUT_JOYSTICK=1
+E: ID_MODEL=Logitech_Extreme_3D
+E: ID_MODEL_ENC=Logitech\x20Extreme\x203D
+E: ID_MODEL_ID=c215
+E: ID_PATH=pci-0000:00:14.0-usb-0:2:1.0
+E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_2_1_0
+E: ID_REVISION=0204
+E: ID_SERIAL=Logitech_Logitech_Extreme_3D
+E: ID_TYPE=hid
+E: ID_USB_DRIVER=usbhid
+E: ID_USB_INTERFACES=:030000:
+E: ID_USB_INTERFACE_NUM=00
+E: ID_VENDOR=Logitech
+E: ID_VENDOR_ENC=Logitech
+E: ID_VENDOR_ID=046d
+E: MAJOR=13
+E: MINOR=77
+E: SUBSYSTEM=input
+E: TAGS=:seat:uaccess:
+A: dev=13:77
+L: device=../../input258
+A: power/async=disabled
+A: power/control=auto
+A: power/runtime_active_kids=0
+A: power/runtime_active_time=0
+A: power/runtime_enabled=disabled
+A: power/runtime_status=unsupported
+A: power/runtime_suspended_time=0
+A: power/runtime_usage=0
+
+P: /devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.0/0003:046D:C215.0016/input/input258
+E: ABS=30063
+E: EV=1b
+E: ID_BUS=usb
+E: ID_FOR_SEAT=input-pci-0000_00_14_0-usb-0_2_1_0
+E: ID_INPUT=1
+E: ID_INPUT_JOYSTICK=1
+E: ID_MODEL=Logitech_Extreme_3D
+E: ID_MODEL_ENC=Logitech\x20Extreme\x203D
+E: ID_MODEL_ID=c215
+E: ID_PATH=pci-0000:00:14.0-usb-0:2:1.0
+E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_2_1_0
+E: ID_REVISION=0204
+E: ID_SERIAL=Logitech_Logitech_Extreme_3D
+E: ID_TYPE=hid
+E: ID_USB_DRIVER=usbhid
+E: ID_USB_INTERFACES=:030000:
+E: ID_USB_INTERFACE_NUM=00
+E: ID_VENDOR=Logitech
+E: ID_VENDOR_ENC=Logitech
+E: ID_VENDOR_ID=046d
+E: KEY=fff00000000 0 0 0 0
+E: MODALIAS=input:b0003v046DpC215e0110-e0,1,3,4,k120,121,122,123,124,125,126,127,128,129,12A,12B,ra0,1,5,6,10,11,m4,lsfw
+E: MSC=10
+E: NAME="Logitech Logitech Extreme 3D"
+E: PHYS="usb-0000:00:14.0-2/input0"
+E: PRODUCT=3/46d/c215/110
+E: PROP=0
+E: SUBSYSTEM=input
+E: TAGS=:seat:
+E: UNIQ=""
+A: capabilities/abs=30063
+A: capabilities/ev=1b
+A: capabilities/ff=0
+A: capabilities/key=fff00000000 0 0 0 0
+A: capabilities/led=0
+A: capabilities/msc=10
+A: capabilities/rel=0
+A: capabilities/snd=0
+A: capabilities/sw=0
+L: device=../../../0003:046D:C215.0016
+A: id/bustype=0003
+A: id/product=c215
+A: id/vendor=046d
+A: id/version=0110
+A: modalias=input:b0003v046DpC215e0110-e0,1,3,4,k120,121,122,123,124,125,126,127,128,129,12A,12B,ra0,1,5,6,10,11,m4,lsfw
+A: name=Logitech Logitech Extreme 3D
+A: phys=usb-0000:00:14.0-2/input0
+A: power/async=disabled
+A: power/control=auto
+A: power/runtime_active_kids=0
+A: power/runtime_active_time=0
+A: power/runtime_enabled=disabled
+A: power/runtime_status=unsupported
+A: power/runtime_suspended_time=0
+A: power/runtime_usage=0
+A: properties=0
+A: uniq=
+
+P: /devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.0/0003:046D:C215.0016
+E: DRIVER=logitech
+E: HID_ID=0003:0000046D:0000C215
+E: HID_NAME=Logitech Logitech Extreme 3D
+E: HID_PHYS=usb-0000:00:14.0-2/input0
+E: MODALIAS=hid:b0003g0000v0000046Dp0000C215
+E: SUBSYSTEM=hid
+E: UPOWER_VENDOR=Logitech, Inc.
+L: driver=../../../../../../../bus/hid/drivers/logitech
+A: modalias=hid:b0003g0000v0000046Dp0000C215
+A: power/async=disabled
+A: power/control=auto
+A: power/runtime_active_kids=0
+A: power/runtime_active_time=0
+A: power/runtime_enabled=disabled
+A: power/runtime_status=unsupported
+A: power/runtime_suspended_time=0
+A: power/runtime_usage=0
+H: report_descriptor=05010904A101A1029502750A150026FF03350046FF03093009318102750495012507463B01661400093981426500750826FF0046FF0009358102A495087501250145010509190129088102B409368102950475012501450105091909290C810295048101C0A1029504750826FF0046FF000600FF0901B102C0C0
+
+P: /devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.0
+E: DEVTYPE=usb_interface
+E: DRIVER=usbhid
+E: ID_MODEL_FROM_DATABASE=Extreme 3D Pro
+E: ID_VENDOR_FROM_DATABASE=Logitech, Inc.
+E: INTERFACE=3/0/0
+E: MODALIAS=usb:v046DpC215d0204dc00dsc00dp00ic03isc00ip00in00
+E: PRODUCT=46d/c215/204
+E: SUBSYSTEM=usb
+E: TYPE=0/0/0
+A: bAlternateSetting= 0
+A: bInterfaceClass=03
+A: bInterfaceNumber=00
+A: bInterfaceProtocol=00
+A: bInterfaceSubClass=00
+A: bNumEndpoints=01
+L: driver=../../../../../../bus/usb/drivers/usbhid
+A: modalias=usb:v046DpC215d0204dc00dsc00dp00ic03isc00ip00in00
+A: power/async=enabled
+A: power/runtime_active_kids=0
+A: power/runtime_enabled=enabled
+A: power/runtime_status=suspended
+A: power/runtime_usage=0
+A: supports_autosuspend=1
+
+P: /devices/pci0000:00/0000:00:14.0/usb3/3-2
+N: bus/usb/003/043=12011001000000086D0415C204020102000109022200010100800F090400000103000000092110012101227A000705810307000A
+E: BUSNUM=003
+E: DEVNAME=/dev/bus/usb/003/043
+E: DEVNUM=043
+E: DEVTYPE=usb_device
+E: DRIVER=usb
+E: ID_BUS=usb
+E: ID_MODEL=Logitech_Extreme_3D
+E: ID_MODEL_ENC=Logitech\x20Extreme\x203D
+E: ID_MODEL_FROM_DATABASE=Extreme 3D Pro
+E: ID_MODEL_ID=c215
+E: ID_REVISION=0204
+E: ID_SERIAL=Logitech_Logitech_Extreme_3D
+E: ID_USB_INTERFACES=:030000:
+E: ID_VENDOR=Logitech
+E: ID_VENDOR_ENC=Logitech
+E: ID_VENDOR_FROM_DATABASE=Logitech, Inc.
+E: ID_VENDOR_ID=046d
+E: MAJOR=189
+E: MINOR=298
+E: PRODUCT=46d/c215/204
+E: SUBSYSTEM=usb
+E: TYPE=0/0/0
+E: UPOWER_VENDOR=Logitech, Inc.
+A: authorized=1
+A: avoid_reset_quirk=0
+A: bConfigurationValue=1
+A: bDeviceClass=00
+A: bDeviceProtocol=00
+A: bDeviceSubClass=00
+A: bMaxPacketSize0=8
+A: bMaxPower=30mA
+A: bNumConfigurations=1
+A: bNumInterfaces= 1
+A: bcdDevice=0204
+A: bmAttributes=80
+A: busnum=3
+A: configuration=
+H: descriptors=12011001000000086D0415C204020102000109022200010100800F090400000103000000092110012101227A000705810307000A
+A: dev=189:298
+A: devnum=43
+A: devpath=2
+L: driver=../../../../../bus/usb/drivers/usb
+A: idProduct=c215
+A: idVendor=046d
+A: ltm_capable=no
+A: manufacturer=Logitech
+A: maxchild=0
+L: port=../3-0:1.0/usb3-port2
+A: power/active_duration=1287064
+A: power/async=enabled
+A: power/autosuspend=2
+A: power/autosuspend_delay_ms=2000
+A: power/connected_duration=1287064
+A: power/control=on
+A: power/level=on
+A: power/persist=1
+A: power/runtime_active_kids=0
+A: power/runtime_active_time=1286764
+A: power/runtime_enabled=forbidden
+A: power/runtime_status=active
+A: power/runtime_suspended_time=0
+A: power/runtime_usage=1
+A: product=Logitech Extreme 3D
+A: quirks=0x0
+A: removable=unknown
+A: speed=1.5
+A: urbnum=24
+A: version= 1.10
+
+P: /devices/pci0000:00/0000:00:14.0/usb3
+N: bus/usb/003/001=12010002090001406B1D020016030302010109021900010100E0000904000001090000000705810304000C
+E: BUSNUM=003
+E: DEVNAME=/dev/bus/usb/003/001
+E: DEVNUM=001
+E: DEVTYPE=usb_device
+E: DRIVER=usb
+E: ID_BUS=usb
+E: ID_FOR_SEAT=usb-pci-0000_00_14_0
+E: ID_MODEL=xHCI_Host_Controller
+E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
+E: ID_MODEL_FROM_DATABASE=2.0 root hub
+E: ID_MODEL_ID=0002
+E: ID_PATH=pci-0000:00:14.0
+E: ID_PATH_TAG=pci-0000_00_14_0
+E: ID_REVISION=0316
+E: ID_SERIAL=Linux_3.16.0-24-generic_xhci_hcd_xHCI_Host_Controller_0000:00:14.0
+E: ID_SERIAL_SHORT=0000:00:14.0
+E: ID_USB_INTERFACES=:090000:
+E: ID_VENDOR=Linux_3.16.0-24-generic_xhci_hcd
+E: ID_VENDOR_ENC=Linux\x203.16.0-24-generic\x20xhci_hcd
+E: ID_VENDOR_FROM_DATABASE=Linux Foundation
+E: ID_VENDOR_ID=1d6b
+E: MAJOR=189
+E: MINOR=256
+E: PRODUCT=1d6b/2/316
+E: SUBSYSTEM=usb
+E: TAGS=:seat:
+E: TYPE=9/0/1
+A: authorized=1
+A: authorized_default=1
+A: avoid_reset_quirk=0
+A: bConfigurationValue=1
+A: bDeviceClass=09
+A: bDeviceProtocol=01
+A: bDeviceSubClass=00
+A: bMaxPacketSize0=64
+A: bMaxPower=0mA
+A: bNumConfigurations=1
+A: bNumInterfaces= 1
+A: bcdDevice=0316
+A: bmAttributes=e0
+A: busnum=3
+A: configuration=
+H: descriptors=12010002090001406B1D020016030302010109021900010100E0000904000001090000000705810304000C
+A: dev=189:256
+A: devnum=1
+A: devpath=0
+L: driver=../../../../bus/usb/drivers/usb
+A: idProduct=0002
+A: idVendor=1d6b
+A: ltm_capable=no
+A: manufacturer=Linux 3.16.0-24-generic xhci_hcd
+A: maxchild=14
+A: power/active_duration=471394472
+A: power/async=enabled
+A: power/autosuspend=0
+A: power/autosuspend_delay_ms=0
+A: power/connected_duration=493735372
+A: power/control=auto
+A: power/level=auto
+A: power/runtime_active_kids=3
+A: power/runtime_active_time=466119148
+A: power/runtime_enabled=enabled
+A: power/runtime_status=active
+A: power/runtime_suspended_time=22335316
+A: power/runtime_usage=0
+A: power/wakeup=disabled
+A: power/wakeup_abort_count=
+A: power/wakeup_active=
+A: power/wakeup_active_count=
+A: power/wakeup_count=
+A: power/wakeup_expire_count=
+A: power/wakeup_last_time_ms=
+A: power/wakeup_max_time_ms=
+A: power/wakeup_total_time_ms=
+A: product=xHCI Host Controller
+A: quirks=0x0
+A: removable=unknown
+A: serial=0000:00:14.0
+A: speed=480
+A: urbnum=1514
+A: version= 2.00
+
+P: /devices/pci0000:00/0000:00:14.0
+E: DRIVER=xhci_hcd
+E: ID_MODEL_FROM_DATABASE=8 Series/C220 Series Chipset Family USB xHCI
+E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
+E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
+E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
+E: ID_VENDOR_FROM_DATABASE=Intel Corporation
+E: MODALIAS=pci:v00008086d00008C31sv00001558sd00007410bc0Csc03i30
+E: PCI_CLASS=C0330
+E: PCI_ID=8086:8C31
+E: PCI_SLOT_NAME=0000:00:14.0
+E: PCI_SUBSYS_ID=1558:7410
+E: SUBSYSTEM=pci
+A: broken_parity_status=0
+A: class=0x0c0330
+H: config=8680318C060490020530030C000000000400E2F7000000000000000000000000000000000000000000000000581510740000000070000000000000000B010000FD01368089C60F8000000000000000009F6E8807000000000000000000000000302000000000000000000000000000000180C2C108000000000000000000000005008700F802E0FE000000000000000000000000000000000000000000000000400100000000000000000000000000000F000100000000000000000000000000030420C0030C3000030C300000000000FF3F0000FF3F00003F0000003F000000A0000000D03C000000000000D8D8D8080000000000000000B10F060800000000
+A: consistent_dma_mask_bits=64
+A: d3cold_allowed=1
+A: device=0x8c31
+A: dma_mask_bits=64
+L: driver=../../../bus/pci/drivers/xhci_hcd
+A: driver_override=(null)
+A: enabled=1
+A: irq=42
+A: local_cpulist=0-7
+A: local_cpus=00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
+A: modalias=pci:v00008086d00008C31sv00001558sd00007410bc0Csc03i30
+A: msi_bus=
+A: msi_irqs/42=msi
+A: numa_node=-1
+A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts    7   11 2112 11\nxHCI ring segments   82  152 1024 38\nbuffer-2048         0   38 2048 19\nbuffer-512          0   16  512  2\nbuffer-128          3   32  128  1\nbuffer-32           0    0   32  0
+A: power/async=enabled
+A: power/control=on
+A: power/runtime_active_kids=1
+A: power/runtime_active_time=493735800
+A: power/runtime_enabled=forbidden
+A: power/runtime_status=active
+A: power/runtime_suspended_time=0
+A: power/runtime_usage=1
+A: power/wakeup=enabled
+A: power/wakeup_abort_count=0
+A: power/wakeup_active=0
+A: power/wakeup_active_count=0
+A: power/wakeup_count=0
+A: power/wakeup_expire_count=0
+A: power/wakeup_last_time_ms=1534
+A: power/wakeup_max_time_ms=0
+A: power/wakeup_total_time_ms=0
+A: resource=0x00000000f7e20000 0x00000000f7e2ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000
+A: subsystem_device=0x7410
+A: subsystem_vendor=0x1558
+A: vendor=0x8086
+

=== added file 'tests/mir_test_framework/udev_recordings/mt-screen-detection.ioctl'
--- tests/mir_test_framework/udev_recordings/mt-screen-detection.ioctl	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/udev_recordings/mt-screen-detection.ioctl	2015-01-21 10:33:12 +0000
@@ -0,0 +1,28 @@
+@DEV /dev/input/event4
+EVIOCGBIT(1) 96 000000000000000000000000000010000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+EVIOCGBIT(2) 2 0000
+EVIOCGBIT(3) 8 0300000100006306
+EVIOCGBIT(5) 2 0000
+EVIOCGBIT(17) 2 0000
+EVIOCGBIT(21) 16 00000000000000000000000000000000
+EVIOCGPROP(0) 8 02000000
+EVIOCGBIT(0) 8 0B00000000000000
+EVIOCGNAME(0) 8 6D746B2D747064000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+EVIOCGID 0 0000000000000000
+EVIOCGPHYS(0) 0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+EVIOCGUNIQ(0) 0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+EVIOCGVERSION 0 01000100
+EVIOCGBIT(4) 8  0000000000000000
+EVIOCGBIT(18) 8 0000000000000000
+EVIOCGKEY(0) 96 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+EVIOCGLED(0) 4 00000000
+EVIOCGSW(0) 4  00000000
+EVIOCGABS 0 00000000000000001C02000000000000000000001C020000
+EVIOCGABS(1) 0 0000000000000000C00300000000000000000000C0030000
+EVIOCGABS(24) 0 0000000000000000FF000000000000000000000000000000
+EVIOCGABS(48) 0 000000000000000064000000000000000000000000000000
+EVIOCGABS(49) 0 000000000000000064000000000000000000000000000000
+EVIOCGABS(53) 0 00000000000000001C020000000000000000000000000000
+EVIOCGABS(54) 0 0000000000000000C0030000000000000000000000000000
+EVIOCGABS(57) 0 000000000000000000000000000000000000000000000000
+EVIOCGABS(58) 0 0000000000000000FF000000000000000000000000000000

=== added file 'tests/mir_test_framework/udev_recordings/mt-screen-detection.umockdev'
--- tests/mir_test_framework/udev_recordings/mt-screen-detection.umockdev	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/udev_recordings/mt-screen-detection.umockdev	2015-01-21 10:33:12 +0000
@@ -0,0 +1,44 @@
+P: /devices/virtual/input/input4/event4
+N: input/event4
+E: DEVNAME=/dev/input/event4
+E: ID_INPUT=1
+E: ID_INPUT_KEY=1
+E: ID_INPUT_TOUCHSCREEN=1
+E: MAJOR=13
+E: MINOR=68
+E: SUBSYSTEM=input
+A: dev=13:68
+L: device=../../input4
+
+P: /devices/virtual/input/input4
+E: ABS=6630000 1000003
+E: EV=b
+E: ID_INPUT=1
+E: ID_INPUT_KEY=1
+E: ID_INPUT_TOUCHSCREEN=1
+E: KEY=400 0 0 0 0 0 0 100000 0 0 0
+E: MODALIAS=input:b0000v0000p0000e0000-e0,1,3,k74,14A,ra0,1,18,30,31,35,36,39,3A,mlsfw
+E: NAME="mtk-tpd"
+E: PRODUCT=0/0/0/0
+E: PROP=2
+E: SUBSYSTEM=input
+E: TAGS=:seat:
+A: capabilities/abs=6630000 1000003
+A: capabilities/ev=b
+A: capabilities/ff=0
+A: capabilities/key=400 0 0 0 0 0 0 100000 0 0 0
+A: capabilities/led=0
+A: capabilities/msc=0
+A: capabilities/rel=0
+A: capabilities/snd=0
+A: capabilities/sw=0
+A: id/bustype=0000
+A: id/product=0000
+A: id/vendor=0000
+A: id/version=0000
+A: modalias=input:b0000v0000p0000e0000-e0,1,3,k74,14A,ra0,1,18,30,31,35,36,39,3A,mlsfw
+A: name=mtk-tpd
+A: phys=
+A: properties=2
+A: uniq=
+

=== modified file 'tests/mir_test_framework/udev_recordings/synaptics-touchpad.ioctl'
--- tests/mir_test_framework/udev_recordings/synaptics-touchpad.ioctl	2014-02-17 03:46:06 +0000
+++ tests/mir_test_framework/udev_recordings/synaptics-touchpad.ioctl	2015-01-21 10:33:12 +0000
@@ -19,11 +19,4 @@
 EVIOCGNAME(0) 27 53796E50532F322053796E61707469637320546F756368506164000000000000200B00A8A37F0000C8A59DC6A37F0000C00800A8A37F0000C00407B8A37F0000F0DF950100000000F53326C8A37F00
 EVIOCGPHYS(0) 22 697361303036302F736572696F322F696E707574300068506164000000000000200B00A8A37F0000C8A59DC6A37F0000C00800A8A37F0000C00407B8A37F0000F0DF950100000000F53326C8A37F00
 EVIOCGNAME(0) 18 48444120496E74656C20504348204D6963007574300068506164000000000000200B00CC1C7F0000C81563E91C7F0000C00800CC1C7F0000C074CCDA1C7F0000307F170200000000F5A3EBEA1C7F00
-EVIOCGID 0 0000000000000000
 EVIOCGPHYS(0) 5 414C5341006E74656C20504348204D6963007574300068506164000000000000200B00CC1C7F0000C81563E91C7F0000C00800CC1C7F0000C074CCDA1C7F0000307F170200000000F5A3EBEA1C7F00
-EVIOCGBIT(1) 96 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-EVIOCGBIT(3) 8 0000000000000000
-EVIOCGBIT(5) 2 1000
-EVIOCGPROP(0) 4 00000000
-EVIOCGNAME(0) 27 53796E50532F322053796E61707469637320546F756368506164000000000000200B00E8217F0000C885F704227F0000C00800E8217F0000C0E460F6217F0000303FF40100000000F5138006227F00
-EVIOCGPHYS(0) 22 697361303036302F736572696F322F696E707574300068506164000000000000200B00E8217F0000C885F704227F0000C00800E8217F0000C0E460F6217F0000303FF40100000000F5138006227F00

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2015-01-14 06:39:13 +0000
+++ tests/unit-tests/CMakeLists.txt	2015-01-21 10:33:12 +0000
@@ -12,6 +12,7 @@
 add_definitions(
   -DTEST_RECORDINGS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/input_recordings/"
   -DMIR_CLIENT_DRIVER_BINARY="${MIR_CLIENT_DRIVER_BINARY}"
+  -DMIR_SERVER_INPUT_PLATFORM_VERSION="${MIR_SERVER_INPUT_PLATFORM_VERSION}"
 )
 
 include_directories(${DRM_INCLUDE_DIRS} ${GBM_INCLUDE_DIRS} ${UMOCKDEV_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
@@ -36,6 +37,7 @@
   test_thread_safe_list.cpp
   test_fatal.cpp
   test_fd.cpp
+  test_find_best.cpp
   test_shared_library_prober.cpp
 )
 

=== modified file 'tests/unit-tests/input/CMakeLists.txt'
--- tests/unit-tests/input/CMakeLists.txt	2015-01-14 06:39:13 +0000
+++ tests/unit-tests/input/CMakeLists.txt	2015-01-21 10:33:12 +0000
@@ -1,4 +1,5 @@
 add_subdirectory(android)
+add_subdirectory(evdev)
 
 list(APPEND UNIT_TEST_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/test_event_filter_chain.cpp

=== added directory 'tests/unit-tests/input/evdev'
=== added file 'tests/unit-tests/input/evdev/CMakeLists.txt'
--- tests/unit-tests/input/evdev/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/input/evdev/CMakeLists.txt	2015-01-21 10:33:12 +0000
@@ -0,0 +1,13 @@
+list(APPEND UNIT_TEST_SOURCES
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_android_device_provider.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_evdev_device_detection.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_evdev_input_device_factory.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_libinput_device_provider.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_platform.cpp
+  $<TARGET_OBJECTS:mirplatforminputevdevobjects>
+)
+
+set(
+  UNIT_TEST_SOURCES
+  ${UNIT_TEST_SOURCES}
+  PARENT_SCOPE)

=== added file 'tests/unit-tests/input/evdev/test_android_device_provider.cpp'
--- tests/unit-tests/input/evdev/test_android_device_provider.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/input/evdev/test_android_device_provider.cpp	2015-01-21 10:33:12 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#include "src/platforms/evdev/android_device_provider.h"
+#include "mir_test_framework/udev_environment.h"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+namespace mi = mir::input;
+namespace mie = mi::evdev;
+namespace mtf = mir_test_framework;
+
+struct AndroidStack : public ::testing::TestWithParam<std::tuple<char const*, char const*, mie::Priority>>
+{
+    mtf::UdevEnvironment env;
+};
+
+TEST_P(AndroidStack, device_probing_yields_expected_priority)
+{
+    using namespace testing;
+    auto const& param = GetParam();
+    env.add_standard_device(std::get<0>(param));
+    mie::AndroidDeviceProvider provider;
+
+    EXPECT_THAT(provider.probe_device(std::get<1>(param)), Eq(std::get<2>(param)));
+}
+
+INSTANTIATE_TEST_CASE_P(InputDeviceProviderTest,
+                        AndroidStack,
+                        ::testing::Values(
+                            std::make_tuple(
+                                "synaptics-touchpad",
+                                "/dev/input/event12",
+                                mie::Priority::unsupported
+                                ),
+                            std::make_tuple(
+                                "bluetooth-magic-trackpad",
+                                "/dev/input/event13",
+                                mie::Priority::unsupported
+                                ),
+                            std::make_tuple(
+                                "mt-screen-detection",
+                                "/dev/input/event4",
+                                mie::Priority::best
+                                ),
+                            std::make_tuple(
+                                "joystick-detection",
+                                "/dev/input/event13",
+                                mie::Priority::supported
+                                ),
+                            std::make_tuple(
+                                "usb-mouse",
+                                "/dev/input/event13",
+                                mie::Priority::supported
+                                ),
+                            std::make_tuple(
+                                "usb-keyboard",
+                                "/dev/input/event14",
+                                mie::Priority::supported
+                                ),
+                            std::make_tuple(
+                                "laptop-keyboard",
+                                "/dev/input/event4",
+                                mie::Priority::supported
+                                )
+                            ));
+

=== added file 'tests/unit-tests/input/evdev/test_evdev_device_detection.cpp'
--- tests/unit-tests/input/evdev/test_evdev_device_detection.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/input/evdev/test_evdev_device_detection.cpp	2015-01-21 10:33:12 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#include "src/platforms/evdev/evdev_device_detection.h"
+#include "mir/input/device_capability.h"
+
+#include "mir_test_framework/udev_environment.h"
+
+#include <gtest/gtest.h>
+#include <tuple>
+
+namespace mtf = mir_test_framework;
+namespace mi = mir::input;
+namespace mie = mi::evdev;
+
+struct EvdevDeviceDetection : public ::testing::TestWithParam<std::tuple<char const*, char const*, mi::DeviceCapabilities>>
+{
+    mtf::UdevEnvironment env;
+};
+
+TEST_P(EvdevDeviceDetection, evaluates_expected_input_class)
+{
+    using namespace testing;
+    auto const& param = GetParam();
+    env.add_standard_device(std::get<0>(param));
+    EXPECT_THAT(mie::detect_device_capabilities((std::get<1>(param))),Eq(std::get<2>(param)));
+}
+
+INSTANTIATE_TEST_CASE_P(InputDeviceCapabilityDetection,
+                        EvdevDeviceDetection,
+                        ::testing::Values(
+                            std::make_tuple(
+                                "synaptics-touchpad",
+                                "/dev/input/event12",
+                                mi::DeviceCapability::touchpad
+                                ),
+                            std::make_tuple(
+                                "laptop-keyboard",
+                                "/dev/input/event4",
+                                mi::DeviceCapability::keyboard
+                                ),
+                            std::make_tuple(
+                                "usb-keyboard",
+                                "/dev/input/event14",
+                                mi::DeviceCapability::keyboard
+                                ),
+                            std::make_tuple(
+                                "usb-mouse",
+                                "/dev/input/event13",
+                                mi::DeviceCapability::pointer
+                                ),
+                            std::make_tuple(
+                                "bluetooth-magic-trackpad",
+                                "/dev/input/event13",
+                                mi::DeviceCapability::touchpad
+                                ),
+                            std::make_tuple(
+                                "mt-screen-detection", // device also reports available keys..
+                                "/dev/input/event4",
+                                mi::DeviceCapabilities{mi::DeviceCapability::touchscreen}|
+                                    mi::DeviceCapability::keyboard
+                                ),
+                            std::make_tuple(
+                                "joystick-detection",
+                                "/dev/input/event13",
+                                mi::DeviceCapabilities{mi::DeviceCapability::joystick}|
+                                    mi::DeviceCapability::gamepad|
+                                    mi::DeviceCapability::keyboard
+                                )
+                            ));
+

=== added file 'tests/unit-tests/input/evdev/test_evdev_input_device_factory.cpp'
--- tests/unit-tests/input/evdev/test_evdev_input_device_factory.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/input/evdev/test_evdev_input_device_factory.cpp	2015-01-21 10:33:12 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright © 2014 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: Christopher Halse Rogers <[e-mail]>
+ *              Andreas Pokorny <[e-mail]>
+ */
+
+#include "src/platforms/evdev/evdev_input_device_factory.h"
+#include "src/platforms/evdev/input_device_provider.h"
+
+#include "mir/input/input_device.h"
+
+#include <mir_test/gmock_fixes.h>
+#include <gtest/gtest.h>
+
+#include <stdexcept>
+
+namespace mi = mir::input;
+namespace mie = mi::evdev;
+
+namespace
+{
+
+class MockInputDeviceProvider : public mie::InputDeviceProvider
+{
+public:
+    MOCK_CONST_METHOD1(probe_device, mie::Priority(const char* node));
+    MOCK_CONST_METHOD1(create_device, std::unique_ptr<mi::InputDevice>(const char* node));
+};
+
+}
+
+TEST(EvdevInputDeviceFactory, probes_all_providers)
+{
+    using namespace testing;
+    auto a = std::make_shared<MockInputDeviceProvider>();
+    auto b = std::make_shared<MockInputDeviceProvider>();
+
+    EXPECT_CALL(*a, probe_device(_))
+	.WillOnce(Return(mie::Priority::unsupported));
+    EXPECT_CALL(*b, probe_device(_))
+        .WillOnce(Return(mie::Priority::unsupported));
+
+    mie::EvdevInputDeviceFactory factory({a, b});
+
+    EXPECT_THROW(
+        {
+            factory.create_device("stub_dev");
+        }, std::runtime_error);
+}
+
+TEST(EvdevInputDeviceFactory, creates_device_on_supported_provider)
+{
+    using namespace testing;
+    auto a = std::make_shared<MockInputDeviceProvider>();
+    auto b = std::make_shared<MockInputDeviceProvider>();
+
+    EXPECT_CALL(*a, probe_device(_))
+	.WillOnce(Return(mie::Priority::unsupported));
+    EXPECT_CALL(*b, probe_device(_))
+        .WillOnce(Return(mie::Priority::supported));
+    EXPECT_CALL(*b, create_device(_));
+    EXPECT_CALL(*a, create_device(_))
+        .Times(0);
+
+    mie::EvdevInputDeviceFactory factory({a, b});
+
+    factory.create_device("stub_dev");
+}
+
+TEST(EvdevInputDeviceFactory, preferes_creating_on_better_provider)
+{
+    using namespace testing;
+    auto a = std::make_shared<MockInputDeviceProvider>();
+    auto b = std::make_shared<MockInputDeviceProvider>();
+
+    EXPECT_CALL(*a, probe_device(_))
+	.Times(2)
+	.WillRepeatedly(Return(mie::Priority::best));
+    EXPECT_CALL(*b, probe_device(_))
+	.Times(2)
+        .WillRepeatedly(Return(mie::Priority::supported));
+    EXPECT_CALL(*a, create_device(_))
+	.Times(2);
+    EXPECT_CALL(*b, create_device(_))
+        .Times(0);
+
+    mie::EvdevInputDeviceFactory factory_one({a, b});
+    mie::EvdevInputDeviceFactory factory_two({b, a});
+
+    factory_one.create_device("stub_dev1");
+    factory_two.create_device("stub_dev2");
+}
+

=== added file 'tests/unit-tests/input/evdev/test_libinput_device_provider.cpp'
--- tests/unit-tests/input/evdev/test_libinput_device_provider.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/input/evdev/test_libinput_device_provider.cpp	2015-01-21 10:33:12 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#include "src/platforms/evdev/libinput_device_provider.h"
+#include "mir_test_framework/udev_environment.h"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+namespace mi = mir::input;
+namespace mie = mi::evdev;
+namespace mtf = mir_test_framework;
+
+struct LibInput : public ::testing::TestWithParam<std::tuple<char const*, char const*, mie::Priority>>
+{
+    mtf::UdevEnvironment env;
+};
+
+TEST_P(LibInput, device_probing_yields_expected_priority)
+{
+    using namespace testing;
+    auto const& param = GetParam();
+    env.add_standard_device(std::get<0>(param));
+    mie::LibInputDeviceProvider provider;
+
+    EXPECT_THAT(provider.probe_device(std::get<1>(param)), Eq(std::get<2>(param)));
+}
+
+INSTANTIATE_TEST_CASE_P(InputDeviceProviderTest,
+                        LibInput,
+                        ::testing::Values(
+                            std::make_tuple(
+                                "synaptics-touchpad",
+                                "/dev/input/event12",
+                                mie::Priority::best
+                                ),
+                            std::make_tuple(
+                                "bluetooth-magic-trackpad",
+                                "/dev/input/event13",
+                                mie::Priority::best
+                                ),
+                            std::make_tuple(
+                                "mt-screen-detection",
+                                "/dev/input/event4",
+                                mie::Priority::unsupported
+                                ),
+                            std::make_tuple(
+                                "joystick-detection",
+                                "/dev/input/event13",
+                                mie::Priority::unsupported
+                                ),
+                            std::make_tuple(
+                                "usb-mouse",
+                                "/dev/input/event13",
+                                mie::Priority::supported
+                                ),
+                            std::make_tuple(
+                                "usb-keyboard",
+                                "/dev/input/event14",
+                                mie::Priority::unsupported
+                                ),
+                            std::make_tuple(
+                                "laptop-keyboard",
+                                "/dev/input/event4",
+                                mie::Priority::unsupported
+                                )
+                            ));

=== added file 'tests/unit-tests/input/evdev/test_platform.cpp'
--- tests/unit-tests/input/evdev/test_platform.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/input/evdev/test_platform.cpp	2015-01-21 10:33:12 +0000
@@ -0,0 +1,207 @@
+/*
+ * Copyright © 2014 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: Andreas Pokorny <[e-mail]>
+ */
+
+#include "src/platforms/evdev/platform.h"
+#include "src/server/report/null_report_factory.h"
+#include "src/platforms/evdev/input_device_factory.h"
+
+#include "mir/input/input_device.h"
+#include "mir/udev/wrapper.h"
+#include "mir/shared_library.h"
+
+#include "mir_test_doubles/mock_main_loop.h"
+#include "mir_test_doubles/mock_input_device_registry.h"
+#include "mir_test_doubles/mock_input_event_handler_register.h"
+#include "mir_test_framework/udev_environment.h"
+#include "mir_test_framework/executable_path.h"
+
+#include <thread>
+#include <chrono>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include <gmock/gmock.h>
+
+namespace mi = mir::input;
+namespace mie = mi::evdev;
+namespace mr = mir::report;
+namespace mtd = mir::test::doubles;
+namespace mtf = mir_test_framework;
+
+namespace
+{
+
+struct EvdevPlatformBase
+{
+public:
+    EvdevPlatformBase()
+        : platform_lib(mtf::server_platform("input-evdev.so")),
+        platform(platform_lib.load_function<mi::CreatePlatform>("create_input_platform", MIR_SERVER_INPUT_PLATFORM_VERSION)
+            (
+                std::shared_ptr<mir::options::Option>(),
+                std::shared_ptr<mir::EmergencyCleanupRegistry>(),
+                mr::null_input_report()
+            ))
+    {
+    }
+    mir::SharedLibrary platform_lib;
+    mtf::UdevEnvironment env; // has to be created before platform
+    std::unique_ptr<mi::Platform> platform;
+    ::testing::NiceMock<mtd::MockInputEventHandlerRegister> mock_event_handler_register;
+    std::shared_ptr<::testing::NiceMock<mtd::MockInputDeviceRegistry>> mock_registry =
+        std::make_shared<::testing::NiceMock<mtd::MockInputDeviceRegistry>>();
+};
+
+struct EvdevPlatform : ::testing::Test, EvdevPlatformBase
+{
+};
+
+struct EvdevPlatformDeviceEvents : ::testing::TestWithParam<char const*>, EvdevPlatformBase
+{
+    EvdevPlatformDeviceEvents()
+        : ::testing::TestWithParam<char const*>(), EvdevPlatformBase()
+    {
+        using namespace ::testing;
+        ON_CALL(mock_event_handler_register, register_fd_handler_(_,_,_))
+            .WillByDefault(Invoke(
+                    [this](std::initializer_list<int> fd_list, void const*, std::function<void(int)> const& handler)
+                    {
+                        int fd = *fd_list.begin();
+                        fd_callbacks.push_back([=]() { handler(fd); });
+                    }));
+        ON_CALL(mock_event_handler_register, register_handler_(_))
+            .WillByDefault(Invoke(
+                    [this](std::function<void()> const& action)
+                    {
+                        actions.push_back(action);
+                    }));
+    }
+
+    void remove_device()
+    {
+        mir::udev::Enumerator devices{std::make_shared<mir::udev::Context>()};
+        devices.scan_devices();
+
+        for (auto& device : devices)
+        {
+            /*
+             * Remove just the device providing dev/input/event*
+             * If we remove more, it's possible that we'll remove the parent of the
+             * /dev/input device, and umockdev will not generate a remove event
+             * in that case.
+             */
+            if (device.devnode() && (std::string(device.devnode()).find("input/event") != std::string::npos))
+            {
+                env.remove_device((std::string("/sys") + device.devpath()).c_str());
+            }
+        }
+    }
+
+    void process_pending_actions()
+    {
+        decltype(actions) actions_to_execute;
+        std::swap(actions, actions_to_execute);
+
+        for(auto const& action : actions_to_execute)
+            action();
+    }
+
+    void process_pending_fd_callbacks()
+    {
+        decltype(actions) actions_to_execute;
+
+        actions_to_execute = fd_callbacks;
+
+        for(auto const& action : actions_to_execute)
+            action();
+    }
+
+    void process_pending()
+    {
+        process_pending_actions();
+        process_pending_fd_callbacks();
+    }
+
+    std::vector<std::function<void()>> fd_callbacks;
+    std::vector<std::function<void()>> actions;
+};
+
+}
+
+TEST_F(EvdevPlatform, registers_to_event_handler_register_on_start)
+{
+    using namespace ::testing;
+    EXPECT_CALL(mock_event_handler_register, register_fd_handler_(_,_,_));
+    platform->start(mock_event_handler_register, mock_registry);
+}
+
+TEST_F(EvdevPlatform, unregisters_to_event_handler_register_on_stop)
+{
+    using namespace ::testing;
+    EXPECT_CALL(mock_event_handler_register, unregister_fd_handler(_));
+    platform->stop(mock_event_handler_register);
+}
+
+TEST_P(EvdevPlatformDeviceEvents, finds_device_on_start)
+{
+    using namespace ::testing;
+    env.add_standard_device(GetParam());
+
+    EXPECT_CALL(*mock_registry, add_device(_)).Times(1);
+    platform->start(mock_event_handler_register, mock_registry);
+
+    process_pending();
+}
+
+TEST_P(EvdevPlatformDeviceEvents, adds_device_on_hotplug)
+{
+    using namespace ::testing;
+    EXPECT_CALL(*mock_registry, add_device(_)).Times(1);
+    platform->start(mock_event_handler_register, mock_registry);
+    process_pending();
+
+    env.add_standard_device(GetParam());
+
+    process_pending();
+}
+
+TEST_P(EvdevPlatformDeviceEvents, removes_device_on_hotplug)
+{
+    using namespace ::testing;
+    EXPECT_CALL(*mock_registry, add_device(_)).Times(1);
+    EXPECT_CALL(*mock_registry, remove_device(_)).Times(1);
+    platform->start(mock_event_handler_register, mock_registry);
+    env.add_standard_device(GetParam());
+
+    process_pending();
+
+    remove_device();
+
+    process_pending();
+}
+
+INSTANTIATE_TEST_CASE_P(EvdevPlatformHotplugging,
+                        EvdevPlatformDeviceEvents,
+                        ::testing::Values("synaptics-touchpad",
+                                          "usb-keyboard",
+                                          "usb-mouse",
+                                          "laptop-keyboard",
+                                          "bluetooth-magic-trackpad",
+                                          "joystick-detection",
+                                          "mt-screen-detection"
+                                          ));

=== added file 'tests/unit-tests/test_find_best.cpp'
--- tests/unit-tests/test_find_best.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/test_find_best.cpp	2015-01-21 10:33:12 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright © 2014 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 AStructure 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: Andreas Pokorny <[e-mail]>
+ */
+
+#include "mir/find_best.h"
+#include <gtest/gtest.h>
+
+#include <initializer_list>
+
+namespace
+{
+struct AStructure
+{
+    int value;
+};
+
+int trivial_transform(AStructure const& a)
+{
+    return a.value;
+}
+}
+
+TEST(FindBest, returns_end_iterator_on_empty)
+{
+    using namespace testing;
+    std::initializer_list<::AStructure> empty{};
+    EXPECT_THAT(mir::find_best(empty, trivial_transform, 0), Eq(end(empty)));
+}
+
+TEST(FindBest, returns_best_element)
+{
+    using namespace testing;
+    std::vector<::AStructure> values{{123}, {23}, {500}, {42}};
+    EXPECT_THAT(mir::find_best(values, trivial_transform, 0)->value, Eq(500));
+}
+
+TEST(FindBest, returns_end_when_initial_is_best)
+{
+    using namespace testing;
+    std::vector<::AStructure> values{{123}, {23}, {500}, {42}};
+    EXPECT_THAT(mir::find_best(values, trivial_transform, 501), Eq(end(values)));
+}
+
+TEST(FindBest, calls_transformation_only_n_times)
+{
+    using namespace testing;
+    std::vector<::AStructure> values{{123}, {23}, {500}, {42}};
+    int transform_count = 0;
+    mir::find_best(values, [&transform_count](::AStructure const& item) { ++transform_count; return item.value; }, 0);
+    EXPECT_THAT(transform_count, Eq(values.size()));
+}
+
+TEST(FindBest, different_predicates_can_be_used)
+{
+    using namespace testing;
+    std::vector<::AStructure> values{{123}, {23}, {500}, {42}};
+    EXPECT_THAT(mir::find_best(values, trivial_transform, 500, std::less<int>())->value, Eq(23));
+}