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

[Andreas Pokorny]

Fix missing relative cursor movement information for touchpads

Since touchpads emit multi touch events that have to be translated to get to relative cursor movement they are handled by a different InputMapper than mice. To enable unity8 cursors on touchpads too, this change extends the various branches of touchpad gesture interpretation to also emit the relative change.

This is hopefully the last fix inside the android input stack. As soon as we turn libinput into the default input backend (which may or may not happen with 0.17) this is no longer needed. I am proposing this change so that any qtmir work on top of lp:mir can happen with a touchpad..

[Alan Griffiths (alan-griffiths)]

No tests?

The code looks plausible but I don't have the kit to check or tests to review.

Approving on the basis that we're not expecting to support for long and it is at worst harmless.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2942
http://jenkins.qa.ubuntu.com/job/mir-ci/4957/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4043
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2950
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3985
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1107
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3986
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3986/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6694
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23463

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

lgtm, would be better with tests of course... but like Alan notes, hopefully going away soon anyways.

review: Approve

[Andreas Pokorny (andreas-pokorny)]

Yes.. testing exactly that behaviour means recording a touchpad ioctl and evdev events with each code path case: one finger hovering, one finger down, multiple finger hovering and or down... My assumption was that this code wont be executed for long... yes there is still a lot of bad conscience to deal with left.

[Daniel van Vugt (vanvugt)]

Cool

review: Approve

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp	2015-08-20 23:33:42 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp	2015-09-18 09:41:00 +0000
@@ -4583,13 +4583,15 @@
             }
         }
 
+        float deltaX = 0.0f;
+        float deltaY = 0.0f;
         if (activeTouchId >= 0 && mLastFingerIds.contains(activeTouchId)) {
             const RawPointerData::Pointer& currentPointer =
                     mCurrentRawPointerData.pointerForId(activeTouchId);
             const RawPointerData::Pointer& lastPointer =
                     mLastRawPointerData.pointerForId(activeTouchId);
-            float deltaX = (currentPointer.x - lastPointer.x) * mPointerXMovementScale;
-            float deltaY = (currentPointer.y - lastPointer.y) * mPointerYMovementScale;
+            deltaX = (currentPointer.x - lastPointer.x) * mPointerXMovementScale;
+            deltaY = (currentPointer.y - lastPointer.y) * mPointerYMovementScale;
 
             rotateDelta(mSurfaceOrientation, &deltaX, &deltaY);
             mPointerVelocityControl.move(when, &deltaX, &deltaY);
@@ -4614,6 +4616,8 @@
         mPointerGesture.currentGestureCoords[0].clear();
         mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_X, x);
         mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_Y, y);
+        mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_RX, deltaX);
+        mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_RY, deltaY);
         mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_PRESSURE, 1.0f);
     } else if (currentFingerCount == 0) {
         // Case 3. No fingers down and button is not pressed. (NEUTRAL)
@@ -4716,14 +4720,17 @@
             mPointerGesture.currentGestureMode = PointerGesture::TAP_DRAG;
         }
 
+        float deltaX = 0.0f;
+        float deltaY = 0.0f;
+
         if (mLastFingerIds.contains(activeTouchId)) {
             const RawPointerData::Pointer& currentPointer =
                     mCurrentRawPointerData.pointerForId(activeTouchId);
             const RawPointerData::Pointer& lastPointer =
                     mLastRawPointerData.pointerForId(activeTouchId);
-            float deltaX = (currentPointer.x - lastPointer.x)
+            deltaX = (currentPointer.x - lastPointer.x)
                     * mPointerXMovementScale;
-            float deltaY = (currentPointer.y - lastPointer.y)
+            deltaY = (currentPointer.y - lastPointer.y)
                     * mPointerYMovementScale;
 
             rotateDelta(mSurfaceOrientation, &deltaX, &deltaY);
@@ -4765,6 +4772,8 @@
         mPointerGesture.currentGestureCoords[0].clear();
         mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_X, x);
         mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_Y, y);
+        mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_RX, deltaX);
+        mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_RY, deltaY);
         mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_PRESSURE,
                 down ? 1.0f : 0.0f);
 
@@ -5011,6 +5020,8 @@
                     mPointerGesture.referenceGestureX);
             mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_Y,
                     mPointerGesture.referenceGestureY);
+            mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_RX, commonDeltaX);
+            mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_RY, commonDeltaY);
             mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_PRESSURE, 1.0f);
         } else if (mPointerGesture.currentGestureMode == PointerGesture::FREEFORM) {
             // FREEFORM mode.
@@ -5108,6 +5119,10 @@
                 mPointerGesture.currentGestureCoords[i].setAxisValue(
                         AMOTION_EVENT_AXIS_Y, mPointerGesture.referenceGestureY + deltaY);
                 mPointerGesture.currentGestureCoords[i].setAxisValue(
+                        AMOTION_EVENT_AXIS_RX, deltaX);
+                mPointerGesture.currentGestureCoords[i].setAxisValue(
+                        AMOTION_EVENT_AXIS_RY, deltaY);
+                mPointerGesture.currentGestureCoords[i].setAxisValue(
                         AMOTION_EVENT_AXIS_PRESSURE, 1.0f);
 
                 ++i;