Merge lp:~vanvugt/mir/disable-libinput-pointer-acceleration into lp:mir

[Daniel van Vugt]

First quick and dirty prototype illustrating a fix for the pointer
acceleration issues introduced by libinput in Mir 0.18:
LP: #1524145 and LP: #1522295

This proof-of-concept just uses the native kernel/device motion data,
like Mir 0.17 and prior did. So the mouse cursor is smooth and
consistent again.

This is not the final answer though, as we would like a solution where
the acceleration is configurable. But it does suffice in resolving the
regressions that libinput brought in Mir 0.18 right now. So the mouse
experience is exactly as it was in Mir 0.17 and earlier.

An alternative fix (which we should do next) would be to revert this two line change and set the default profile to no acceleration instead of disabling it. But that would appear to be more involved so will take more time.

[Daniel d'Andrada (dandrader)]

Will that remove pointer acceleration from Unity8?

review: Needs Information

[Andreas Pokorny (andreas-pokorny)]

> Will that remove pointer acceleration from Unity8?

yes..

[Andreas Pokorny (andreas-pokorny)]

this is the wrong approach.

review: Disapprove

[Daniel van Vugt (vanvugt)]

Correct. But it's proof the problem and solution are potentially simple.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3194
http://jenkins.qa.ubuntu.com/job/mir-ci/5838/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4205
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5248/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/166
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/166
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/166/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5248/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3194
http://jenkins.qa.ubuntu.com/job/mir-ci/5840/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5250
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/151/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/168
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/168
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5250
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5250/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7770
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26013
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/149
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/149/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/8/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26018

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

review: Approve (continuous-integration)

Unmerged revisions

3194. By Daniel van Vugt on 2015-12-14

First quick and dirty prototype illustrating a fix for the pointer
acceleration issues introduced by libinput in Mir 0.18:
LP: #1524145 and LP: #1522295

This proof-of-concept just uses the native kernel/device motion data,
like Mir 0.17 and prior did. So the mouse cursor is smooth and
consistent again.

This is not the final answer though, as we would like a solution where
the acceleration is configurable. But it does suffice in resolving the
regressions that libinput brought in Mir 0.18 right now. So the mouse
experience is exactly as it was in Mir 0.17 and earlier.

=== modified file 'src/platforms/evdev/libinput_device.cpp'
--- src/platforms/evdev/libinput_device.cpp	2015-12-07 01:13:18 +0000
+++ src/platforms/evdev/libinput_device.cpp	2015-12-14 08:54:29 +0000
@@ -168,8 +168,8 @@
     report->received_event_from_kernel(time.count(), EV_REL, 0, 0);
 
     mir::geometry::Displacement const movement{
-        libinput_event_pointer_get_dx(pointer),
-        libinput_event_pointer_get_dy(pointer)};
+        libinput_event_pointer_get_dx_unaccelerated(pointer),
+        libinput_event_pointer_get_dy_unaccelerated(pointer)};
 
     return builder->pointer_event(time, action, button_state, hscroll_value, vscroll_value, movement.dx.as_float(),
                                   movement.dy.as_float());

=== modified file 'tests/include/mir/test/doubles/mock_libinput.h'
--- tests/include/mir/test/doubles/mock_libinput.h	2015-12-07 01:13:18 +0000
+++ tests/include/mir/test/doubles/mock_libinput.h	2015-12-14 08:54:29 +0000
@@ -61,7 +61,9 @@
     MOCK_METHOD1(libinput_event_pointer_get_time, uint32_t(libinput_event_pointer*));
     MOCK_METHOD1(libinput_event_pointer_get_time_usec, uint64_t(libinput_event_pointer*));
     MOCK_METHOD1(libinput_event_pointer_get_dx, double(libinput_event_pointer*));
+    MOCK_METHOD1(libinput_event_pointer_get_dx_unaccelerated, double(libinput_event_pointer*));
     MOCK_METHOD1(libinput_event_pointer_get_dy, double(libinput_event_pointer*));
+    MOCK_METHOD1(libinput_event_pointer_get_dy_unaccelerated, double(libinput_event_pointer*));
     MOCK_METHOD1(libinput_event_pointer_get_absolute_x, double(libinput_event_pointer*));
     MOCK_METHOD1(libinput_event_pointer_get_absolute_y, double(libinput_event_pointer*));
     MOCK_METHOD2(libinput_event_pointer_get_absolute_x_transformed, double(libinput_event_pointer*, uint32_t));

=== modified file 'tests/mir_test_doubles/mock_libinput.cpp'
--- tests/mir_test_doubles/mock_libinput.cpp	2015-12-07 01:13:18 +0000
+++ tests/mir_test_doubles/mock_libinput.cpp	2015-12-14 08:54:29 +0000
@@ -152,11 +152,21 @@
     return global_libinput->libinput_event_pointer_get_dx(event);
 }
 
+double libinput_event_pointer_get_dx_unaccelerated(libinput_event_pointer* event)
+{
+    return global_libinput->libinput_event_pointer_get_dx_unaccelerated(event);
+}
+
 double libinput_event_pointer_get_dy(libinput_event_pointer* event)
 {
     return global_libinput->libinput_event_pointer_get_dy(event);
 }
 
+double libinput_event_pointer_get_dy_unaccelerated(libinput_event_pointer* event)
+{
+    return global_libinput->libinput_event_pointer_get_dy_unaccelerated(event);
+}
+
 double libinput_event_pointer_get_absolute_x(libinput_event_pointer* event)
 {
     return global_libinput->libinput_event_pointer_get_absolute_x(event);

=== modified file 'tests/unit-tests/input/evdev/test_libinput_device.cpp'
--- tests/unit-tests/input/evdev/test_libinput_device.cpp	2015-12-07 01:13:18 +0000
+++ tests/unit-tests/input/evdev/test_libinput_device.cpp	2015-12-14 08:54:29 +0000
@@ -292,8 +292,12 @@
             .WillByDefault(Return(event_time));
         ON_CALL(mock_libinput, libinput_event_pointer_get_dx(pointer_event))
             .WillByDefault(Return(relatve_x));
+        ON_CALL(mock_libinput, libinput_event_pointer_get_dx_unaccelerated(pointer_event))
+            .WillByDefault(Return(relatve_x));
         ON_CALL(mock_libinput, libinput_event_pointer_get_dy(pointer_event))
             .WillByDefault(Return(relatve_y));
+        ON_CALL(mock_libinput, libinput_event_pointer_get_dy_unaccelerated(pointer_event))
+            .WillByDefault(Return(relatve_y));
     }
 
     void setup_absolute_pointer_event(libinput_event* event, uint64_t event_time, float x, float y)