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

Commit 842500e1 authored by Michael Wright's avatar Michael Wright
Browse files

Fuse stylus and touch screen data. 

TODO: Ensure we dispatch new pressure and button data when stylus
is stationary.

Change-Id: I10a665a9b81ff4b9acd01bf72f0fc2e0c2abc203
parent e5364c8c

services/inputflinger/EventHub.cpp

+17 −0
Original line number Diff line number Diff line
@@ -131,6 +131,13 @@ uint32_t getAbsAxisUsage(int32_t axis, uint32_t deviceClasses) { 
        }

    }



    // External stylus gets the pressure axis

    if (deviceClasses & INPUT_DEVICE_CLASS_EXTERNAL_STYLUS) {

        if (axis == ABS_PRESSURE) {

            return INPUT_DEVICE_CLASS_EXTERNAL_STYLUS;

        }

    }



    // Joystick devices get the rest.

    return deviceClasses & INPUT_DEVICE_CLASS_JOYSTICK;

}
@@ -1185,6 +1192,16 @@ status_t EventHub::openDeviceLocked(const char *devicePath) { 
            && test_bit(ABS_X, device->absBitmask)

            && test_bit(ABS_Y, device->absBitmask)) {

        device->classes |= INPUT_DEVICE_CLASS_TOUCH;

    // Is this a BT stylus?

    } else if ((test_bit(ABS_PRESSURE, device->absBitmask) ||

                test_bit(BTN_TOUCH, device->keyBitmask))

            && !test_bit(ABS_X, device->absBitmask)

            && !test_bit(ABS_Y, device->absBitmask)) {

        device->classes |= INPUT_DEVICE_CLASS_EXTERNAL_STYLUS;

        // Keyboard will try to claim some of the buttons but we really want to reserve those so we

        // can fuse it with the touch screen data, so just take them back. Note this means an

        // external stylus cannot also be a keyboard device.

        device->classes &= ~INPUT_DEVICE_CLASS_KEYBOARD;

    }



    // See if this device is a joystick.

services/inputflinger/EventHub.h

+3 −0
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ enum { 
    /* The input device has a microphone. */

    INPUT_DEVICE_CLASS_MIC           = 0x00000400,



    /* The input device is an external stylus (has data we want to fuse with touch data). */

    INPUT_DEVICE_CLASS_EXTERNAL_STYLUS = 0x00000800,



    /* The input device is virtual (not a real device, not part of UI configuration). */

    INPUT_DEVICE_CLASS_VIRTUAL       = 0x40000000,