Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9626b14a authored by Jeff Brown's avatar Jeff Brown
Browse files

Fix off by one errors in touch motion ranges. (DO NOT MERGE) 

Report inclusive minimum and maximum ranges for all
axes including X and Y.

Set mouse pointer bounds to 0..width-1, 0..height-1.

Rotate touch and mouse positions more carefully, paying attention
to the maximum bounds when calculating the complement of an axis.

Simplified the InputReader somewhat and removed support for a
couple of poorly defined input device configuration parameters.
We now assume that the touch device provides useful absolute axis
ranges for the X and Y axes since the alternative does not actually
make sense.

Bug: 3413541
Change-Id: I121d28a125c4f9618cb283dc460d33ff1a907023
parent 924c4d47

core/java/android/view/MotionEvent.java

+2 −0
Original line number Diff line number Diff line
@@ -2157,6 +2157,8 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * MotionEvent. For touch events, clients can use this to determine if the

     * user's finger was touching the edge of the display.

     *

     * This property is only set for {@link #ACTION_DOWN} events.

     *

     * @see #EDGE_LEFT

     * @see #EDGE_TOP

     * @see #EDGE_RIGHT

services/input/EventHub.h

+0 −2
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ struct RawAbsoluteAxisInfo { 
    int32_t flat;      // center flat position, eg. flat == 8 means center is between -8 and 8

    int32_t fuzz;      // error tolerance, eg. fuzz == 4 means value is +/- 4 due to noise



    inline int32_t getRange() const { return maxValue - minValue; }



    inline void clear() {

        valid = false;

        minValue = 0;

services/input/InputReader.cpp

+138 −130

File changed.

Preview size limit exceeded, changes collapsed.

services/input/InputReader.h

+0 −12
Original line number Diff line number Diff line
@@ -650,16 +650,6 @@ protected: 


    // Immutable calibration parameters in parsed form.

    struct Calibration {

        // Position

        bool haveXOrigin;

        int32_t xOrigin;

        bool haveYOrigin;

        int32_t yOrigin;

        bool haveXScale;

        float xScale;

        bool haveYScale;

        float yScale;



        // Touch Size

        enum TouchSizeCalibration {

            TOUCH_SIZE_CALIBRATION_DEFAULT,
@@ -756,11 +746,9 @@ protected: 
        int32_t surfaceWidth, surfaceHeight;



        // Translation and scaling factors, orientation-independent.

        int32_t xOrigin;

        float xScale;

        float xPrecision;



        int32_t yOrigin;

        float yScale;

        float yPrecision;

services/input/PointerController.cpp

+33 −28
Original line number Diff line number Diff line
@@ -109,12 +109,12 @@ bool PointerController::getBoundsLocked(float* outMinX, float* outMinY, 
    switch (mLocked.displayOrientation) {

    case DISPLAY_ORIENTATION_90:

    case DISPLAY_ORIENTATION_270:

        *outMaxX = mLocked.displayHeight;

        *outMaxY = mLocked.displayWidth;

        *outMaxX = mLocked.displayHeight - 1;

        *outMaxY = mLocked.displayWidth - 1;

        break;

    default:

        *outMaxX = mLocked.displayWidth;

        *outMaxY = mLocked.displayHeight;

        *outMaxX = mLocked.displayWidth - 1;

        *outMaxY = mLocked.displayHeight - 1;

        break;

    }

    return true;
@@ -309,48 +309,53 @@ void PointerController::setDisplayOrientation(int32_t orientation) { 
    AutoMutex _l(mLock);



    if (mLocked.displayOrientation != orientation) {

        float absoluteX, absoluteY;



        // Map from oriented display coordinates to absolute display coordinates.

        // Apply offsets to convert from the pixel top-left corner position to the pixel center.

        // This creates an invariant frame of reference that we can easily rotate when

        // taking into account that the pointer may be located at fractional pixel offsets.

        float x = mLocked.pointerX + 0.5f;

        float y = mLocked.pointerY + 0.5f;

        float temp;



        // Undo the previous rotation.

        switch (mLocked.displayOrientation) {

        case DISPLAY_ORIENTATION_90:

            absoluteX = mLocked.displayWidth - mLocked.pointerY;

            absoluteY = mLocked.pointerX;

            temp = x;

            x = mLocked.displayWidth - y;

            y = temp;

            break;

        case DISPLAY_ORIENTATION_180:

            absoluteX = mLocked.displayWidth - mLocked.pointerX;

            absoluteY = mLocked.displayHeight - mLocked.pointerY;

            x = mLocked.displayWidth - x;

            y = mLocked.displayHeight - y;

            break;

        case DISPLAY_ORIENTATION_270:

            absoluteX = mLocked.pointerY;

            absoluteY = mLocked.displayHeight - mLocked.pointerX;

            break;

        default:

            absoluteX = mLocked.pointerX;

            absoluteY = mLocked.pointerY;

            temp = x;

            x = y;

            y = mLocked.displayHeight - temp;

            break;

        }



        // Map from absolute display coordinates to oriented display coordinates.

        // Perform the new rotation.

        switch (orientation) {

        case DISPLAY_ORIENTATION_90:

            mLocked.pointerX = absoluteY;

            mLocked.pointerY = mLocked.displayWidth - absoluteX;

            temp = x;

            x = y;

            y = mLocked.displayWidth - x;

            break;

        case DISPLAY_ORIENTATION_180:

            mLocked.pointerX = mLocked.displayWidth - absoluteX;

            mLocked.pointerY = mLocked.displayHeight - absoluteY;

            x = mLocked.displayWidth - x;

            y = mLocked.displayHeight - y;

            break;

        case DISPLAY_ORIENTATION_270:

            mLocked.pointerX = mLocked.displayHeight - absoluteY;

            mLocked.pointerY = absoluteX;

            break;

        default:

            mLocked.pointerX = absoluteX;

            mLocked.pointerY = absoluteY;

            temp = x;

            x = mLocked.displayHeight - y;

            y = temp;

            break;

        }



        // Apply offsets to convert from the pixel center to the pixel top-left corner position

        // and save the results.

        mLocked.pointerX = x - 0.5f;

        mLocked.pointerY = y - 0.5f;

        mLocked.displayOrientation = orientation;



        updateLocked();