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

Commit 5cd7497f authored by Arpit Singh's avatar Arpit Singh
Browse files

Refactor processing of relative pointer movements 

Refactor to extract common code that controls cursor movement of a
relative mouse in processing of motion events in PointerChoreographer.

Bug: 367660694
Test: atest inputflinger_tests
Flag: EXEMPT refactor
Change-Id: I7f8683f7cda7de6c7bcaf82ceb02dc54b70c71ee
parent 7918c825

services/inputflinger/PointerChoreographer.cpp

+18 −24
Original line number Diff line number Diff line
@@ -243,14 +243,7 @@ NotifyMotionArgs PointerChoreographer::processMouseEventLocked(const NotifyMotio 
        pc.setPosition(args.xCursorPosition, args.yCursorPosition);

    } else {

        // This is a relative mouse, so move the cursor by the specified amount.

        const float deltaX = args.pointerCoords[0].getAxisValue(AMOTION_EVENT_AXIS_RELATIVE_X);

        const float deltaY = args.pointerCoords[0].getAxisValue(AMOTION_EVENT_AXIS_RELATIVE_Y);

        pc.move(deltaX, deltaY);

        const auto [x, y] = pc.getPosition();

        newArgs.pointerCoords[0].setAxisValue(AMOTION_EVENT_AXIS_X, x);

        newArgs.pointerCoords[0].setAxisValue(AMOTION_EVENT_AXIS_Y, y);

        newArgs.xCursorPosition = x;

        newArgs.yCursorPosition = y;

        processPointerDeviceMotionEventLocked(/*byref*/ newArgs, /*byref*/ pc);

    }

    if (canUnfadeOnDisplay(displayId)) {

        pc.unfade(PointerControllerInterface::Transition::IMMEDIATE);
@@ -266,24 +259,9 @@ NotifyMotionArgs PointerChoreographer::processTouchpadEventLocked(const NotifyMo 
    newArgs.displayId = displayId;

    if (args.getPointerCount() == 1 && args.classification == MotionClassification::NONE) {

        // This is a movement of the mouse pointer.

        const float deltaX = args.pointerCoords[0].getAxisValue(AMOTION_EVENT_AXIS_RELATIVE_X);

        const float deltaY = args.pointerCoords[0].getAxisValue(AMOTION_EVENT_AXIS_RELATIVE_Y);

        pc.move(deltaX, deltaY);

        if (canUnfadeOnDisplay(displayId)) {

            pc.unfade(PointerControllerInterface::Transition::IMMEDIATE);

        }



        const auto [x, y] = pc.getPosition();

        newArgs.pointerCoords[0].setAxisValue(AMOTION_EVENT_AXIS_X, x);

        newArgs.pointerCoords[0].setAxisValue(AMOTION_EVENT_AXIS_Y, y);

        newArgs.xCursorPosition = x;

        newArgs.yCursorPosition = y;

        processPointerDeviceMotionEventLocked(/*byref*/ newArgs, /*byref*/ pc);

    } else {

        // This is a trackpad gesture with fake finger(s) that should not move the mouse pointer.

        if (canUnfadeOnDisplay(displayId)) {

            pc.unfade(PointerControllerInterface::Transition::IMMEDIATE);

        }



        const auto [x, y] = pc.getPosition();

        for (uint32_t i = 0; i < newArgs.getPointerCount(); i++) {

            newArgs.pointerCoords[i].setAxisValue(AMOTION_EVENT_AXIS_X,
@@ -294,9 +272,25 @@ NotifyMotionArgs PointerChoreographer::processTouchpadEventLocked(const NotifyMo 
        newArgs.xCursorPosition = x;

        newArgs.yCursorPosition = y;

    }

    if (canUnfadeOnDisplay(displayId)) {

        pc.unfade(PointerControllerInterface::Transition::IMMEDIATE);

    }

    return newArgs;

}



void PointerChoreographer::processPointerDeviceMotionEventLocked(NotifyMotionArgs& newArgs,

                                                                 PointerControllerInterface& pc) {

    const float deltaX = newArgs.pointerCoords[0].getAxisValue(AMOTION_EVENT_AXIS_RELATIVE_X);

    const float deltaY = newArgs.pointerCoords[0].getAxisValue(AMOTION_EVENT_AXIS_RELATIVE_Y);



    pc.move(deltaX, deltaY);

    const auto [x, y] = pc.getPosition();

    newArgs.pointerCoords[0].setAxisValue(AMOTION_EVENT_AXIS_X, x);

    newArgs.pointerCoords[0].setAxisValue(AMOTION_EVENT_AXIS_Y, y);

    newArgs.xCursorPosition = x;

    newArgs.yCursorPosition = y;

}



void PointerChoreographer::processDrawingTabletEventLocked(const android::NotifyMotionArgs& args) {

    if (args.displayId == ui::LogicalDisplayId::INVALID) {

        return;

services/inputflinger/PointerChoreographer.h

+2 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ private: 
    void processDrawingTabletEventLocked(const NotifyMotionArgs& args) REQUIRES(getLock());

    void processTouchscreenAndStylusEventLocked(const NotifyMotionArgs& args) REQUIRES(getLock());

    void processStylusHoverEventLocked(const NotifyMotionArgs& args) REQUIRES(getLock());

    void processPointerDeviceMotionEventLocked(NotifyMotionArgs& newArgs,

                                               PointerControllerInterface& pc) REQUIRES(getLock());

    void processDeviceReset(const NotifyDeviceResetArgs& args);

    void onControllerAddedOrRemovedLocked() REQUIRES(getLock());

    void onPrivacySensitiveDisplaysChangedLocked(