Merge lp:~andreas-pokorny/mir/cleanup-event-input-transport-conversion into lp:mir

[Andreas Pokorny]

android-input-sender Ensure tool type and source properties are correctly set when transferred to InputTransport

With the tooltype set to mouse, InputConsumer will not try to interpolate batched pointer movements.
Additionally this removes some more uses of event_private.h.

This MP is motivated by an attempt to match expectations built into InputConsumer. mir::input::android::InputSender passes MirEvent over to InputTransport. This change ensures that the android representation contains additional fields tested by InputConsumer like the tooltype and source id. With that InputConsumer will not interpolate mouse coordinates.

Additionally to this MP follows the boy scout rule and removes ugly parts from InputSender.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3187
http://jenkins.qa.ubuntu.com/job/mir-ci/5804/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5248
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4154/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5197/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/132/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/132/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5197/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

(1) Wrong stanza. New functions should go in MIR_CLIENT_unreleased.

54 +++ src/client/symbols.map 2015-12-09 20:53:14 +0000
55 @@ -66,6 +66,7 @@
56 mir_input_event_get_device_id;
57 mir_input_event_get_event_time;
58 mir_input_event_get_keyboard_event;
59 + mir_input_event_get_mac;

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3189
http://jenkins.qa.ubuntu.com/job/mir-ci/5812/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4170
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5213/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/140/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/140/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5213/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3189
http://jenkins.qa.ubuntu.com/job/mir-ci/5813/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4171
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5214/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/141/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/141/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5214/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3189
http://jenkins.qa.ubuntu.com/job/mir-ci/5811/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5262
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4168
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5211/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/139/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/139/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5211/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3190
http://jenkins.qa.ubuntu.com/job/mir-ci/5814/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4172
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5215/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/142/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/142/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5215
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5215/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7737/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25938

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

review: Needs Fixing (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

hmm fd leaks.. this needs more fixing..

[Daniel van Vugt (vanvugt)]

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3192
http://jenkins.qa.ubuntu.com/job/mir-ci/5820/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5278
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4184
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5227/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/148
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/148
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5227
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5227/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7749/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25980

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3192
http://jenkins.qa.ubuntu.com/job/mir-ci/5823/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5230
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/140/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/151
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/151/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/151
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/151/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5230
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5230/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7752
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25987
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/138/console

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

review: Approve (continuous-integration)

[Alberto Aguirre (albaguirre)]

Comments inline.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3193
http://jenkins.qa.ubuntu.com/job/mir-ci/5829/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5289/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4195
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5238/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/157
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/157/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/157
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/157/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5238/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3194
http://jenkins.qa.ubuntu.com/job/mir-ci/5830/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5239
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/145/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/158
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/158/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/158
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/158/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5239
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5239/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7760
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25998
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/143/console

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Is this related to either of the remaining bugs?
https://bugs.launchpad.net/mir/+bugs?field.tag=pointer-events

[Andreas Pokorny (andreas-pokorny)]

No that mp does not extend the udev hwdb with antother high frequency/high dpi mouse. But it will make sure that InputConsumer sees that the coordinates are generated from a pointing/mouse device.

[Alan Griffiths (alan-griffiths)]

+typedef uint64_t MirInputEventMac;

Why is this being introduced? (I thought the MAC is going to be larger than uint64_t when surfaced in the client API.)

review: Needs Information

[Andreas Pokorny (andreas-pokorny)]

> +typedef uint64_t MirInputEventMac;
>
> Why is this being introduced? (I thought the MAC is going to be larger than
> uint64_t when surfaced in the client API.)

Right this is not needed. I removed the code that used that from the MP after talking to bschaefer.. but missed that part

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3195
http://jenkins.qa.ubuntu.com/job/mir-ci/5841/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5302
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5251
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/152/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/169
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/169/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/169
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/169/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5251
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5251/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7771
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26015
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/150
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/150/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/9/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26019

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

It sounds theoretically like the right thing to do.

Is there any manual test case where one could notice any difference in behaviour yet?

The description seems to suggest that this should change the behaviour observed with mice? I see no change yet when testing it...

review: Needs Information

[Alan Griffiths (alan-griffiths)]

Looks sensible, but I've always been nervous about touching this code as it has very poor test coverage. How easy would it be to land some tests first to prove nothing breaks?

review: Needs Information

[Andreas Pokorny (andreas-pokorny)]

> It sounds theoretically like the right thing to do.
>
> Is there any manual test case where one could notice any difference in
> behaviour yet?
>
> The description seems to suggest that this should change the behaviour
> observed with mice? I see no change yet when testing it...

There is a slight behaviour change.. when acceleration is on and input rate is limited. There is no linear interpolation between two samples.. But that is not easy to spot. Yes resampling / batching lacks tests..

[Andreas Pokorny (andreas-pokorny)]

> Looks sensible, but I've always been nervous about touching this code as it
> has very poor test coverage. How easy would it be to land some tests first to
> prove nothing breaks?

I guess the ones we would care about here, would be tests that include the client side input receiver? I will see what I can do..

[Daniel van Vugt (vanvugt)]

I was guessing it should be possible to spot a difference in fingerpaint, but could not see any.

review: Abstain

[Alberto Aguirre (albaguirre)]

Ok, comments have been addressed.

LGTM.

review: Approve

[Daniel van Vugt (vanvugt)]

Wait, no, resampling and batching already has tests. I remember writing them.

review: Approve

=== modified file 'src/client/symbols.map'
--- src/client/symbols.map	2015-12-02 19:59:55 +0000
+++ src/client/symbols.map	2015-12-14 10:36:23 +0000
@@ -250,6 +250,7 @@
       mir::events::set_modifier*;
       mir::events::set_cursor_position*;
       mir::events::set_button_state*;
+      mir::input::android::android_pointer_action_from_mir*;
     };
 } MIR_CLIENT_DETAIL_9;
 

=== modified file 'src/server/input/android/input_send_entry.h'
--- src/server/input/android/input_send_entry.h	2015-08-14 14:51:26 +0000
+++ src/server/input/android/input_send_entry.h	2015-12-14 10:36:23 +0000
@@ -20,7 +20,6 @@
 #define MIR_INPUT_ANDROID_INPUT_SEND_ENTRY_H_
 
 #include "mir_toolkit/event.h"
-#include "mir/events/event_private.h"
 
 #include <memory>
 
@@ -38,10 +37,11 @@
 struct InputSendEntry
 {
     uint32_t sequence_id;
-    MirEvent event;
+    using EventPtr = std::unique_ptr<MirEvent const, void(*)(MirEvent const*)>;
+    EventPtr event;
     std::shared_ptr<InputChannel> channel;
-    InputSendEntry(uint32_t id, MirEvent ev, std::shared_ptr<InputChannel> const& channel)
-        : sequence_id(id), event(ev), channel(channel)
+    InputSendEntry(uint32_t id, MirEvent const& ev, std::shared_ptr<InputChannel> const& channel)
+        : sequence_id(id), event(mir_event_ref(&ev), mir_event_unref), channel(channel)
     {
     }
 };

=== modified file 'src/server/input/android/input_sender.cpp'
--- src/server/input/android/input_sender.cpp	2015-12-11 03:18:13 +0000
+++ src/server/input/android/input_sender.cpp	2015-12-14 10:36:23 +0000
@@ -27,6 +27,7 @@
 #include "mir/scene/surface.h"
 #include "mir/compositor/scene.h"
 #include "mir/main_loop.h"
+#include "mir/events/event_private.h"
 
 #include <boost/exception/errinfo_errno.hpp>
 #include <boost/throw_exception.hpp>
@@ -174,22 +175,29 @@
 
 void mia::InputSender::ActiveTransfer::send(InputSendEntry && event)
 {
-    if (event.event.type != mir_event_type_key &&
-        event.event.type != mir_event_type_motion)
+    if (mir_event_get_type(event.event.get()) != mir_event_type_input)
         return;
 
     droidinput::status_t error_status;
 
-    auto event_time = mir_input_event_get_event_time(mir_event_get_input_event(&event.event));
-    if (event.event.type == mir_event_type_key)
+    auto event_time = mir_input_event_get_event_time(mir_event_get_input_event(event.event.get()));
+    auto input_event = mir_event_get_input_event(event.event.get());
+    switch(mir_input_event_get_type(input_event))
     {
-        error_status = send_key_event(event.sequence_id, event.event.key);
+    case mir_input_event_type_key:
+        error_status = send_key_event(event.sequence_id, *event.event);
         state.report->published_key_event(event.channel->server_fd(), event.sequence_id, event_time);
-    }
-    else
-    {
-        error_status = send_motion_event(event.sequence_id, event.event.motion);
-        state.report->published_motion_event(event.channel->server_fd(), event.sequence_id, event_time);
+        break;
+    case mir_input_event_type_touch:
+        error_status = send_touch_event(event.sequence_id, *event.event);
+        state.report->published_motion_event(event.channel->server_fd(), event.sequence_id, event_time);
+        break;
+    case mir_input_event_type_pointer:
+        error_status = send_pointer_event(event.sequence_id, *event.event);
+        state.report->published_motion_event(event.channel->server_fd(), event.sequence_id, event_time);
+        break;
+    default:
+        BOOST_THROW_EXCEPTION(std::runtime_error("unknown input event type"));
     }
 
     if (error_status == droidinput::OK)
@@ -202,11 +210,11 @@
     {
     case droidinput::WOULD_BLOCK:
         if (state.observer)
-            state.observer->client_blocked(event.event, surface);
+            state.observer->client_blocked(*event.event, surface);
         break;
     case droidinput::DEAD_OBJECT:
         if (state.observer)
-            state.observer->send_failed(event.event, surface, InputSendObserver::socket_error);
+            state.observer->send_failed(*event.event, surface, InputSendObserver::socket_error);
         break;
     default:
         BOOST_THROW_EXCEPTION(boost::enable_error_info(std::runtime_error("Failure sending input event : ")) << boost::errinfo_errno(errno));
@@ -238,73 +246,97 @@
             });
 }
 
-droidinput::status_t mia::InputSender::ActiveTransfer::send_key_event(uint32_t seq, MirKeyboardEvent const& event)
+droidinput::status_t mia::InputSender::ActiveTransfer::send_key_event(uint32_t seq, MirEvent const& event)
 {
     int32_t repeat_count = 0;
-    auto android_action = mia::android_keyboard_action_from_mir(repeat_count, event.action);
-    return publisher.publishKeyEvent(
-        seq,
-        event.device_id,
-        event.source_id,
-        android_action,
-        0, /* Flags */
-        event.key_code,
-        event.scan_code,
-        mia::android_modifiers_from_mir(event.modifiers),
-        repeat_count,
-        event.mac,
-        event.event_time,
-        event.event_time
-        );
+    auto input_event = mir_event_get_input_event(&event);
+    auto key_event = mir_input_event_get_keyboard_event(input_event);
+    auto const android_action = mia::android_keyboard_action_from_mir(repeat_count, mir_keyboard_event_action(key_event));
+    std::chrono::nanoseconds const event_time{mir_input_event_get_event_time(input_event)};
+    auto const flags = 0;
+    return publisher.publishKeyEvent(seq,
+                                     mir_input_event_get_device_id(input_event),
+                                     AINPUT_SOURCE_KEYBOARD,
+                                     android_action,
+                                     flags,
+                                     mir_keyboard_event_key_code(key_event),
+                                     mir_keyboard_event_scan_code(key_event),
+                                     mia::android_modifiers_from_mir(mir_keyboard_event_modifiers(key_event)),
+                                     repeat_count,
+                                     event.key.mac,
+                                     event_time,
+                                     event_time);
 }
 
-droidinput::status_t mia::InputSender::ActiveTransfer::send_motion_event(uint32_t seq, MirMotionEvent const& event)
+droidinput::status_t mia::InputSender::ActiveTransfer::send_touch_event(uint32_t seq, MirEvent const& event)
 {
     droidinput::PointerCoords coords[MIR_INPUT_EVENT_MAX_POINTER_COUNT];
     droidinput::PointerProperties properties[MIR_INPUT_EVENT_MAX_POINTER_COUNT];
-    // no default constructor:
-    std::memset(coords, 0, sizeof(coords));
-    std::memset(properties, 0, sizeof(properties));
+    std::memset(&coords, 0, sizeof(coords));
+    std::memset(&properties, 0, sizeof(properties));
 
-    for (size_t i = 0; i < event.pointer_count; ++i)
+    auto input_event = mir_event_get_input_event(&event);
+    auto touch = mir_input_event_get_touch_event(input_event);
+    for (size_t i = 0, e = mir_touch_event_point_count(touch); i != e; ++i)
     {
         // Note: this assumes that: x == raw_x + x_offset;
         // here x, y is used instead of the raw co-ordinates and offset is set to zero
-        coords[i].setAxisValue(AMOTION_EVENT_AXIS_X, event.pointer_coordinates[i].x);
-        coords[i].setAxisValue(AMOTION_EVENT_AXIS_Y, event.pointer_coordinates[i].y);
-        coords[i].setAxisValue(AMOTION_EVENT_AXIS_RX, event.pointer_coordinates[i].dx);
-        coords[i].setAxisValue(AMOTION_EVENT_AXIS_RY, event.pointer_coordinates[i].dy);
-
-        coords[i].setAxisValue(AMOTION_EVENT_AXIS_TOUCH_MAJOR, event.pointer_coordinates[i].touch_major);
-        coords[i].setAxisValue(AMOTION_EVENT_AXIS_TOUCH_MINOR, event.pointer_coordinates[i].touch_minor);
-        coords[i].setAxisValue(AMOTION_EVENT_AXIS_SIZE, event.pointer_coordinates[i].size);
-        coords[i].setAxisValue(AMOTION_EVENT_AXIS_PRESSURE, event.pointer_coordinates[i].pressure);
-        coords[i].setAxisValue(AMOTION_EVENT_AXIS_ORIENTATION, event.pointer_coordinates[i].orientation);
-        coords[i].setAxisValue(AMOTION_EVENT_AXIS_VSCROLL, event.pointer_coordinates[i].vscroll);
-        coords[i].setAxisValue(AMOTION_EVENT_AXIS_HSCROLL, event.pointer_coordinates[i].hscroll);
-        properties[i].toolType = mia::android_tool_type_from_mir(event.pointer_coordinates[i].tool_type);
-        properties[i].id = event.pointer_coordinates[i].id;
+        coords[i].setAxisValue(AMOTION_EVENT_AXIS_X, mir_touch_event_axis_value(touch, i, mir_touch_axis_x));
+        coords[i].setAxisValue(AMOTION_EVENT_AXIS_Y, mir_touch_event_axis_value(touch, i, mir_touch_axis_y));
+        coords[i].setAxisValue(AMOTION_EVENT_AXIS_TOUCH_MAJOR, mir_touch_event_axis_value(touch, i, mir_touch_axis_touch_major));
+        coords[i].setAxisValue(AMOTION_EVENT_AXIS_TOUCH_MINOR, mir_touch_event_axis_value(touch, i, mir_touch_axis_touch_minor));
+        coords[i].setAxisValue(AMOTION_EVENT_AXIS_SIZE, mir_touch_event_axis_value(touch, i, mir_touch_axis_size));
+        coords[i].setAxisValue(AMOTION_EVENT_AXIS_PRESSURE, mir_touch_event_axis_value(touch, i, mir_touch_axis_pressure));
+        properties[i].toolType = mia::android_tool_type_from_mir(mir_touch_event_tooltype(touch, i));
+        properties[i].id = mir_touch_event_id(touch, i);
     }
 
+    std::chrono::nanoseconds const event_time{mir_input_event_get_event_time(input_event)};
+    auto const x_offset = 0.0f;
+    auto const y_offset = 0.0f;
+    auto const x_precision = 0;
+    auto const y_precision = 0;
+    auto const flags = 0;
+    auto const edge_flags = 0;
+    auto const button_state = 0;
+    return publisher.publishMotionEvent(seq, mir_input_event_get_device_id(input_event), AINPUT_SOURCE_TOUCHSCREEN,
+                                        mia::extract_android_action_from(event), flags, edge_flags,
+                                        mia::android_modifiers_from_mir(mir_touch_event_modifiers(touch)), button_state,
+                                        x_offset, y_offset, x_precision, y_precision, event.motion.mac, event_time,
+                                        event_time, mir_touch_event_point_count(touch), properties, coords);
+}
+
+droidinput::status_t mia::InputSender::ActiveTransfer::send_pointer_event(uint32_t seq, MirEvent const& event)
+{
+    droidinput::PointerCoords pointer_coord;
+    droidinput::PointerProperties pointer_properties;
+    std::memset(&pointer_coord, 0, sizeof(pointer_coord));
+    std::memset(&pointer_properties, 0, sizeof(pointer_properties));
+
+    auto input_event = mir_event_get_input_event(&event);
+    auto pointer = mir_input_event_get_pointer_event(input_event);
+    pointer_coord.setAxisValue(AMOTION_EVENT_AXIS_X, mir_pointer_event_axis_value(pointer, mir_pointer_axis_x));
+    pointer_coord.setAxisValue(AMOTION_EVENT_AXIS_Y, mir_pointer_event_axis_value(pointer, mir_pointer_axis_y));
+    pointer_coord.setAxisValue(AMOTION_EVENT_AXIS_HSCROLL, mir_pointer_event_axis_value(pointer, mir_pointer_axis_hscroll));
+    pointer_coord.setAxisValue(AMOTION_EVENT_AXIS_VSCROLL, mir_pointer_event_axis_value(pointer, mir_pointer_axis_vscroll));
+    pointer_coord.setAxisValue(AMOTION_EVENT_AXIS_RX, mir_pointer_event_axis_value(pointer, mir_pointer_axis_relative_x));
+    pointer_coord.setAxisValue(AMOTION_EVENT_AXIS_RY, mir_pointer_event_axis_value(pointer, mir_pointer_axis_relative_y));
+    pointer_properties.toolType = AMOTION_EVENT_TOOL_TYPE_MOUSE;
+    pointer_properties.id = 0;
+
+    std::chrono::nanoseconds const event_time{mir_input_event_get_event_time(input_event)};
+    auto const x_offset = 0.0f;
+    auto const y_offset = 0.0f;
+    auto const x_precision = 0;
+    auto const y_precision = 0;
+    auto const flags = 0;
+    auto const edge_flags = 0;
     return publisher.publishMotionEvent(
-        seq,
-        event.device_id,
-        event.source_id,
-        mia::extract_android_action_from(reinterpret_cast<MirEvent const&>(event)),
-        0, /* flags */
-        0, /* edge flags */
-        mia::android_modifiers_from_mir(event.modifiers),
-        mia::android_pointer_buttons_from_mir(event.buttons),
-        0.0f,  // event.x_offset,
-        0.0f,  // event.y_offset,
-        0, 0, /* unused x/y precision */
-        event.mac,
-        event.event_time,
-        event.event_time,
-        event.pointer_count,
-        properties,
-        coords
-        );
+        seq, mir_input_event_get_device_id(input_event), AINPUT_SOURCE_MOUSE,
+        mia::android_pointer_action_from_mir(mir_pointer_event_action(pointer), mir_pointer_event_buttons(pointer)),
+        flags, edge_flags, mia::android_modifiers_from_mir(mir_pointer_event_modifiers(pointer)),
+        mia::android_pointer_buttons_from_mir(mir_pointer_event_buttons(pointer)), x_offset, y_offset, x_precision,
+        y_precision, event.motion.mac, event_time, event_time, 1, &pointer_properties, &pointer_coord);
 }
 
 void mia::InputSender::ActiveTransfer::on_surface_disappeared()
@@ -323,7 +355,7 @@
                       release_pending_responses.rend(),
                       [observer,this](InputSendEntry const& entry)
                       {
-                          observer->send_failed(entry.event, surface, InputSendObserver::surface_disappeared);
+                          observer->send_failed(*entry.event, surface, InputSendObserver::surface_disappeared);
                       });
     }
 }
@@ -340,13 +372,16 @@
         if (status == droidinput::OK)
         {
             state.report->received_event_finished_signal(publisher.getChannel()->getFd(), sequence);
-            InputSendEntry entry = unqueue_entry(sequence);
-            auto observer = state.observer;
-
-            if (entry.sequence_id == sequence && observer)
-                observer->send_suceeded(entry.event,
-                                        surface,
-                                        handled ? InputSendObserver::consumed : InputSendObserver::not_consumed);
+            unqueue_entry(
+                sequence,
+                [observer = state.observer,this,handled](InputSendEntry const& entry)
+                {
+                    if(observer)
+                        observer->send_suceeded(
+                            *entry.event,
+                            surface,
+                            handled ? InputSendObserver::consumed : InputSendObserver::not_consumed);
+                });
         }
         else
         {
@@ -367,10 +402,12 @@
         top_sequence_id = pending_responses.front().sequence_id;
     }
 
-    mia::InputSendEntry timedout_entry{unqueue_entry(top_sequence_id)};
-
-    if (state.observer)
-        state.observer->send_failed(timedout_entry.event, surface, InputSendObserver::no_response_received);
+    unqueue_entry(top_sequence_id,
+                 [observer = state.observer, this](InputSendEntry const& entry)
+                 {
+                     if(observer)
+                         observer->send_failed(*entry.event, surface, InputSendObserver::no_response_received);
+                 });
 }
 
 void mia::InputSender::ActiveTransfer::enqueue_entry(mia::InputSendEntry && entry)
@@ -383,21 +420,21 @@
         update_timer();
     }
 
-    pending_responses.push_back(entry);
+    pending_responses.emplace_back(std::move(entry));
 }
 
-mia::InputSendEntry mia::InputSender::ActiveTransfer::unqueue_entry(uint32_t sequence_id)
+void mia::InputSender::ActiveTransfer::unqueue_entry(uint32_t sequence_id, std::function<void(InputSendEntry const&)> const& execute_on_entry)
 {
-    std::lock_guard<std::mutex> lock(transfer_mutex);
+    std::unique_lock<std::mutex> lock(transfer_mutex);
     auto pos = std::find_if(pending_responses.begin(),
                             pending_responses.end(),
                             [sequence_id](mia::InputSendEntry const& entry)
                             { return entry.sequence_id == sequence_id; });
 
     if (pos == end(pending_responses))
-        return {0, MirEvent{}, std::shared_ptr<mi::InputChannel>()};
+        return;
 
-    mia::InputSendEntry result = *pos;
+    mia::InputSendEntry result = std::move(*pos);
     pending_responses.erase(pos);
     if (pending_responses.empty())
     {
@@ -408,7 +445,9 @@
         update_timer();
     }
 
-    return result;
+    lock.unlock();
+
+    execute_on_entry(result);
 }
 
 void mia::InputSender::ActiveTransfer::update_timer()

=== modified file 'src/server/input/android/input_sender.h'
--- src/server/input/android/input_sender.h	2015-12-11 03:18:13 +0000
+++ src/server/input/android/input_sender.h	2015-12-14 10:36:23 +0000
@@ -100,9 +100,10 @@
         void on_response_timeout();
         void update_timer();
         void cancel_timer();
-        droidinput::status_t send_key_event(uint32_t sequence_id, MirKeyboardEvent const& event);
-        droidinput::status_t send_motion_event(uint32_t sequence_id, MirMotionEvent const& event);
-        InputSendEntry unqueue_entry(uint32_t sequence_id);
+        droidinput::status_t send_key_event(uint32_t sequence_id, MirEvent const& event);
+        droidinput::status_t send_touch_event(uint32_t sequence_id, MirEvent const& event);
+        droidinput::status_t send_pointer_event(uint32_t sequence_id, MirEvent const& event);
+        void unqueue_entry(uint32_t sequence_id, std::function<void(InputSendEntry const&)> const& do_with_unqued);
         void enqueue_entry(InputSendEntry && entry);
 
         InputSenderState & state;

=== modified file 'tests/unit-tests/input/android/test_android_input_sender.cpp'
--- tests/unit-tests/input/android/test_android_input_sender.cpp	2015-12-11 03:18:13 +0000
+++ tests/unit-tests/input/android/test_android_input_sender.cpp	2015-12-14 10:36:23 +0000
@@ -99,13 +99,21 @@
 public:
     int const test_scan_code = 32;
     size_t const test_pointer_count = 2;
-    float test_x_coord[2] = {12, 23};
-    float test_y_coord[2] = {17, 9};
-    
+    float const test_x_coord[2] = {12, 23};
+    float const test_y_coord[2] = {17, 9};
+    mir::geometry::Point const pos{100, 100};
+    mir::geometry::Displacement const movement{10, -10};
+
     AndroidInputSender()
-       : key_event(mev::make_event(MirInputDeviceId(), std::chrono::nanoseconds(1), 0, mir_keyboard_action_down,
-                                    7, test_scan_code, mir_input_event_modifier_none)),
-          motion_event(mev::make_event(MirInputDeviceId(), std::chrono::nanoseconds(-1), 0, mir_input_event_modifier_none))
+        : key_event(mev::make_event(MirInputDeviceId(), std::chrono::nanoseconds(1), 0, mir_keyboard_action_down, 7,
+                                    test_scan_code, mir_input_event_modifier_none)),
+          motion_event(
+              mev::make_event(MirInputDeviceId(), std::chrono::nanoseconds(-1), 0, mir_input_event_modifier_none)),
+          pointer_event(mev::make_event(MirInputDeviceId(), std::chrono::nanoseconds(123), 0,
+                                        mir_input_event_modifier_none, mir_pointer_action_motion,
+                                        mir_pointer_button_primary, pos.x.as_float(), pos.y.as_float(), 0.0f, 0.0f,
+                                        movement.dx.as_float(), movement.dy.as_float()))
+
     {
         using namespace ::testing;
 
@@ -139,6 +147,7 @@
 
     mir::EventUPtr key_event;
     mir::EventUPtr motion_event;
+    mir::EventUPtr pointer_event;
 
     droidinput::MotionEvent client_motion_event;
     droidinput::KeyEvent client_key_event;
@@ -260,7 +269,28 @@
         EXPECT_EQ(test_x_coord[i], client_motion_event.getX(i)) << "When i=" << i;
         EXPECT_EQ(test_y_coord[i], client_motion_event.getRawY(i)) << "When i=" << i;
         EXPECT_EQ(test_y_coord[i], client_motion_event.getY(i)) << "When i=" << i;
+        EXPECT_EQ(AMOTION_EVENT_TOOL_TYPE_FINGER, client_motion_event.getToolType(i)) << "When i=" << i;
     }
+    EXPECT_EQ(AINPUT_SOURCE_TOUCHSCREEN, client_motion_event.getSource());
+}
+
+TEST_F(AndroidInputSender, sends_pointer_events)
+{
+    using namespace ::testing;
+    register_surface();
+
+    sender.send_event(*pointer_event, channel);
+
+    EXPECT_EQ(droidinput::OK, consumer.consume(&event_factory, true, std::chrono::nanoseconds(-1), &seq, &event));
+
+    EXPECT_EQ(1, client_motion_event.getPointerCount());
+
+    EXPECT_EQ(pos.x.as_float(), client_motion_event.getX(0));
+    EXPECT_EQ(pos.y.as_float(), client_motion_event.getY(0));
+    EXPECT_EQ(movement.dx.as_float(), client_motion_event.getAxisValue(AMOTION_EVENT_AXIS_RX, 0));
+    EXPECT_EQ(movement.dy.as_float(), client_motion_event.getAxisValue(AMOTION_EVENT_AXIS_RY, 0));
+    EXPECT_EQ(AMOTION_EVENT_TOOL_TYPE_MOUSE, client_motion_event.getToolType(0));
+    EXPECT_EQ(AINPUT_SOURCE_MOUSE, client_motion_event.getSource());
 }
 
 TEST_F(AndroidInputSender, response_keeps_fd_registered)