Merge lp:~andreas-pokorny/mir/fix-1489522 into lp:mir

[Andreas Pokorny]

input-evev: use 'transformed' variant of the coordinate access functions

This fixes the kvm input problem introduced in wily for the libinput stack.

Background: the simulated input devices from kvm currently only emit absolute coordinates. In the past they used to at least have one device node that behaves like a regular mouse.

This change fixes a problem inside the libinput handling code - it scales the coordinates to the actual size of the output

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3024
http://jenkins.qa.ubuntu.com/job/mir-ci/5445/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4709
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3616
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4651/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/609/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1599
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1599/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/609
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/609/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4652
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4652/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7270/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24713
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/610/console

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

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3024
http://jenkins.qa.ubuntu.com/job/mir-ci/5502/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3691
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4726
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/684/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1656
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1656/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/684
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/684/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4727
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4727/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7333
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24890
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/685/console

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

review: Approve (continuous-integration)

=== modified file 'src/platforms/evdev/libinput_device.cpp'
--- src/platforms/evdev/libinput_device.cpp	2015-10-29 16:21:10 +0000
+++ src/platforms/evdev/libinput_device.cpp	2015-10-29 21:52:55 +0000
@@ -194,12 +194,15 @@
     auto const action = mir_pointer_action_motion;
     auto const hscroll_value = 0.0f;
     auto const vscroll_value = 0.0f;
+    auto const screen = sink->bounding_rectangle();
+    uint32_t const width = screen.size.width.as_int();
+    uint32_t const height = screen.size.height.as_int();
 
     report->received_event_from_kernel(time.count(), EV_ABS, 0, 0);
     auto const old_pointer_pos = pointer_pos;
     pointer_pos = mir::geometry::Point{
-        libinput_event_pointer_get_absolute_x(pointer),
-        libinput_event_pointer_get_absolute_y(pointer)};
+        libinput_event_pointer_get_absolute_x_transformed(pointer, width),
+        libinput_event_pointer_get_absolute_y_transformed(pointer, height)};
     auto const movement = pointer_pos - old_pointer_pos;
 
     sink->confine_pointer(pointer_pos);

=== modified file 'tests/unit-tests/input/evdev/test_libinput_device.cpp'
--- tests/unit-tests/input/evdev/test_libinput_device.cpp	2015-10-29 16:21:10 +0000
+++ tests/unit-tests/input/evdev/test_libinput_device.cpp	2015-10-29 21:52:55 +0000
@@ -293,6 +293,22 @@
             .WillByDefault(Return(relatve_y));
     }
 
+    void setup_absolute_pointer_event(libinput_event* event, uint64_t event_time, float x, float y)
+    {
+        auto pointer_event = reinterpret_cast<libinput_event_pointer*>(event);
+
+        ON_CALL(mock_libinput, libinput_event_get_type(event))
+            .WillByDefault(Return(LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE));
+        ON_CALL(mock_libinput, libinput_event_get_pointer_event(event))
+            .WillByDefault(Return(pointer_event));
+        ON_CALL(mock_libinput, libinput_event_pointer_get_time_usec(pointer_event))
+            .WillByDefault(Return(event_time));
+        ON_CALL(mock_libinput, libinput_event_pointer_get_absolute_x_transformed(pointer_event, _))
+            .WillByDefault(Return(x));
+        ON_CALL(mock_libinput, libinput_event_pointer_get_absolute_y_transformed(pointer_event, _))
+            .WillByDefault(Return(y));
+    }
+
     void setup_button_event(libinput_event* event, uint64_t event_time, int button, libinput_button_state state)
     {
         auto pointer_event = reinterpret_cast<libinput_event_pointer*>(event);
@@ -509,14 +525,37 @@
 
 TEST_F(LibInputDeviceOnMouse, process_event_converts_pointer_event)
 {
-    float x = 15;
-    float y = 17;
-    setup_pointer_event(fake_event_1, event_time_1, x, y);
-
-    EXPECT_CALL(mock_sink, handle_input(mt::PointerEventWithPosition(x,y)));
-
-    mouse.start(&mock_sink, &mock_builder);
-    mouse.process_event(fake_event_1);
+    float x_movement_1 = 15;
+    float y_movement_1 = 17;
+    float x_movement_2 = 20;
+    float y_movement_2 = 40;
+    setup_pointer_event(fake_event_1, event_time_1, x_movement_1, y_movement_1);
+    setup_pointer_event(fake_event_2, event_time_2, x_movement_2, y_movement_2);
+
+    EXPECT_CALL(mock_sink, handle_input(mt::PointerEventWithDiff(x_movement_1,y_movement_1)));
+    EXPECT_CALL(mock_sink, handle_input(mt::PointerEventWithDiff(x_movement_2,y_movement_2)));
+
+    mouse.start(&mock_sink, &mock_builder);
+    mouse.process_event(fake_event_1);
+    mouse.process_event(fake_event_2);
+}
+
+TEST_F(LibInputDeviceOnMouse, process_event_handles_absolute_pointer_events)
+{
+    float x1 = 15;
+    float y1 = 17;
+    float x2 = 40;
+    float y2 = 10;
+    setup_absolute_pointer_event(fake_event_1, event_time_1, x1, y1);
+    setup_absolute_pointer_event(fake_event_2, event_time_2, x2, y2);
+
+    EXPECT_CALL(mock_sink, handle_input(mt::PointerEventWithPosition(x1, y1)));
+    EXPECT_CALL(mock_sink,
+                handle_input(AllOf(mt::PointerEventWithPosition(x2, y2), mt::PointerEventWithDiff(x2 - x1, y2 - y1))));
+
+    mouse.start(&mock_sink, &mock_builder);
+    mouse.process_event(fake_event_1);
+    mouse.process_event(fake_event_2);
 }
 
 TEST_F(LibInputDeviceOnMouse, process_event_provides_relative_coordinates)