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

Commit 8e6fb254 authored by Arpit Singh's avatar Arpit Singh
Browse files

InputMapper refactor: Modify InputMapper constructor for configuration 

We are refactoring Input-mapper(s) to ensure they are configured at the
time of initialisation.

In this CL we are changing InputMapper's constructor to accept the
reader configuration to facilitate initialisation.

Test: build, inputflinger_tests, presubmit checks
Bug: 256009910
Change-Id: I710b892f51268a001d076f387163ac3274f5b0d1
parent ed6c3def

services/inputflinger/reader/InputDevice.cpp

+95 −84
Original line number Diff line number Diff line
@@ -146,98 +146,23 @@ void InputDevice::dump(std::string& dump, const std::string& eventHubDevStr) { 
    }

}



void InputDevice::addEventHubDevice(int32_t eventHubId, bool populateMappers) {

void InputDevice::addEmptyEventHubDevice(int32_t eventHubId) {

    if (mDevices.find(eventHubId) != mDevices.end()) {

        return;

    }

    std::unique_ptr<InputDeviceContext> contextPtr(new InputDeviceContext(*this, eventHubId));

    ftl::Flags<InputDeviceClass> classes = contextPtr->getDeviceClasses();

    std::vector<std::unique_ptr<InputMapper>> mappers;



    // Check if we should skip population

    if (!populateMappers) {

    mDevices.insert({eventHubId, std::make_pair(std::move(contextPtr), std::move(mappers))});

        return;

    }



    // Switch-like devices.

    if (classes.test(InputDeviceClass::SWITCH)) {

        mappers.push_back(std::make_unique<SwitchInputMapper>(*contextPtr));

    }



    // Scroll wheel-like devices.

    if (classes.test(InputDeviceClass::ROTARY_ENCODER)) {

        mappers.push_back(std::make_unique<RotaryEncoderInputMapper>(*contextPtr));

    }



    // Vibrator-like devices.

    if (classes.test(InputDeviceClass::VIBRATOR)) {

        mappers.push_back(std::make_unique<VibratorInputMapper>(*contextPtr));

    }



    // Battery-like devices or light-containing devices.

    // PeripheralController will be created with associated EventHub device.

    if (classes.test(InputDeviceClass::BATTERY) || classes.test(InputDeviceClass::LIGHT)) {

        mController = std::make_unique<PeripheralController>(*contextPtr);

    }



    // Keyboard-like devices.

    uint32_t keyboardSource = 0;

    int32_t keyboardType = AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC;

    if (classes.test(InputDeviceClass::KEYBOARD)) {

        keyboardSource |= AINPUT_SOURCE_KEYBOARD;

    }

    if (classes.test(InputDeviceClass::ALPHAKEY)) {

        keyboardType = AINPUT_KEYBOARD_TYPE_ALPHABETIC;

    }

    if (classes.test(InputDeviceClass::DPAD)) {

        keyboardSource |= AINPUT_SOURCE_DPAD;

    }

    if (classes.test(InputDeviceClass::GAMEPAD)) {

        keyboardSource |= AINPUT_SOURCE_GAMEPAD;

}



    if (keyboardSource != 0) {

        mappers.push_back(

                std::make_unique<KeyboardInputMapper>(*contextPtr, keyboardSource, keyboardType));

    }



    // Cursor-like devices.

    if (classes.test(InputDeviceClass::CURSOR)) {

        mappers.push_back(std::make_unique<CursorInputMapper>(*contextPtr));

    }



    // Touchscreens and touchpad devices.

    static const bool ENABLE_TOUCHPAD_GESTURES_LIBRARY =

            sysprop::InputProperties::enable_touchpad_gestures_library().value_or(true);

    // TODO(b/272518665): Fix the new touchpad stack for Sony DualShock 4 (5c4, 9cc) touchpads, or

    // at least load this setting from the IDC file.

    const InputDeviceIdentifier identifier = contextPtr->getDeviceIdentifier();

    const bool isSonyDualShock4Touchpad = identifier.vendor == 0x054c &&

            (identifier.product == 0x05c4 || identifier.product == 0x09cc);

    if (ENABLE_TOUCHPAD_GESTURES_LIBRARY && classes.test(InputDeviceClass::TOUCHPAD) &&

        classes.test(InputDeviceClass::TOUCH_MT) && !isSonyDualShock4Touchpad) {

        mappers.push_back(std::make_unique<TouchpadInputMapper>(*contextPtr));

    } else if (classes.test(InputDeviceClass::TOUCH_MT)) {

        mappers.push_back(std::make_unique<MultiTouchInputMapper>(*contextPtr));

    } else if (classes.test(InputDeviceClass::TOUCH)) {

        mappers.push_back(std::make_unique<SingleTouchInputMapper>(*contextPtr));

    }



    // Joystick-like devices.

    if (classes.test(InputDeviceClass::JOYSTICK)) {

        mappers.push_back(std::make_unique<JoystickInputMapper>(*contextPtr));

    }



    // Motion sensor enabled devices.

    if (classes.test(InputDeviceClass::SENSOR)) {

        mappers.push_back(std::make_unique<SensorInputMapper>(*contextPtr));

    }



    // External stylus-like devices.

    if (classes.test(InputDeviceClass::EXTERNAL_STYLUS)) {

        mappers.push_back(std::make_unique<ExternalStylusInputMapper>(*contextPtr));

void InputDevice::addEventHubDevice(int32_t eventHubId,

                                    const InputReaderConfiguration& readerConfig) {

    if (mDevices.find(eventHubId) != mDevices.end()) {

        return;

    }

    std::unique_ptr<InputDeviceContext> contextPtr(new InputDeviceContext(*this, eventHubId));

    std::vector<std::unique_ptr<InputMapper>> mappers = createMappers(*contextPtr, readerConfig);



    // insert the context into the devices set

    mDevices.insert({eventHubId, std::make_pair(std::move(contextPtr), std::move(mappers))});
@@ -512,6 +437,92 @@ int32_t InputDevice::getState(uint32_t sourceMask, int32_t code, GetStateFunc ge 
    return result;

}



std::vector<std::unique_ptr<InputMapper>> InputDevice::createMappers(

        InputDeviceContext& contextPtr, const InputReaderConfiguration& readerConfig) {

    ftl::Flags<InputDeviceClass> classes = contextPtr.getDeviceClasses();

    std::vector<std::unique_ptr<InputMapper>> mappers;



    // Switch-like devices.

    if (classes.test(InputDeviceClass::SWITCH)) {

        mappers.push_back(std::make_unique<SwitchInputMapper>(contextPtr, readerConfig));

    }



    // Scroll wheel-like devices.

    if (classes.test(InputDeviceClass::ROTARY_ENCODER)) {

        mappers.push_back(std::make_unique<RotaryEncoderInputMapper>(contextPtr, readerConfig));

    }



    // Vibrator-like devices.

    if (classes.test(InputDeviceClass::VIBRATOR)) {

        mappers.push_back(std::make_unique<VibratorInputMapper>(contextPtr, readerConfig));

    }



    // Battery-like devices or light-containing devices.

    // PeripheralController will be created with associated EventHub device.

    if (classes.test(InputDeviceClass::BATTERY) || classes.test(InputDeviceClass::LIGHT)) {

        mController = std::make_unique<PeripheralController>(contextPtr);

    }



    // Keyboard-like devices.

    uint32_t keyboardSource = 0;

    int32_t keyboardType = AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC;

    if (classes.test(InputDeviceClass::KEYBOARD)) {

        keyboardSource |= AINPUT_SOURCE_KEYBOARD;

    }

    if (classes.test(InputDeviceClass::ALPHAKEY)) {

        keyboardType = AINPUT_KEYBOARD_TYPE_ALPHABETIC;

    }

    if (classes.test(InputDeviceClass::DPAD)) {

        keyboardSource |= AINPUT_SOURCE_DPAD;

    }

    if (classes.test(InputDeviceClass::GAMEPAD)) {

        keyboardSource |= AINPUT_SOURCE_GAMEPAD;

    }



    if (keyboardSource != 0) {

        mappers.push_back(std::make_unique<KeyboardInputMapper>(contextPtr, readerConfig,

                                                                keyboardSource, keyboardType));

    }



    // Cursor-like devices.

    if (classes.test(InputDeviceClass::CURSOR)) {

        mappers.push_back(std::make_unique<CursorInputMapper>(contextPtr, readerConfig));

    }



    // Touchscreens and touchpad devices.

    static const bool ENABLE_TOUCHPAD_GESTURES_LIBRARY =

            sysprop::InputProperties::enable_touchpad_gestures_library().value_or(true);

    // TODO(b/272518665): Fix the new touchpad stack for Sony DualShock 4 (5c4, 9cc) touchpads, or

    // at least load this setting from the IDC file.

    const InputDeviceIdentifier identifier = contextPtr.getDeviceIdentifier();

    const bool isSonyDualShock4Touchpad = identifier.vendor == 0x054c &&

            (identifier.product == 0x05c4 || identifier.product == 0x09cc);

    if (ENABLE_TOUCHPAD_GESTURES_LIBRARY && classes.test(InputDeviceClass::TOUCHPAD) &&

        classes.test(InputDeviceClass::TOUCH_MT) && !isSonyDualShock4Touchpad) {

        mappers.push_back(std::make_unique<TouchpadInputMapper>(contextPtr, readerConfig));

    } else if (classes.test(InputDeviceClass::TOUCH_MT)) {

        mappers.push_back(std::make_unique<MultiTouchInputMapper>(contextPtr, readerConfig));

    } else if (classes.test(InputDeviceClass::TOUCH)) {

        mappers.push_back(std::make_unique<SingleTouchInputMapper>(contextPtr, readerConfig));

    }



    // Joystick-like devices.

    if (classes.test(InputDeviceClass::JOYSTICK)) {

        mappers.push_back(std::make_unique<JoystickInputMapper>(contextPtr, readerConfig));

    }



    // Motion sensor enabled devices.

    if (classes.test(InputDeviceClass::SENSOR)) {

        mappers.push_back(std::make_unique<SensorInputMapper>(contextPtr, readerConfig));

    }



    // External stylus-like devices.

    if (classes.test(InputDeviceClass::EXTERNAL_STYLUS)) {

        mappers.push_back(std::make_unique<ExternalStylusInputMapper>(contextPtr, readerConfig));

    }

    return mappers;

}



bool InputDevice::markSupportedKeyCodes(uint32_t sourceMask, const std::vector<int32_t>& keyCodes,

                                        uint8_t* outFlags) {

    bool result = false;

services/inputflinger/reader/InputReader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ std::shared_ptr<InputDevice> InputReader::createDeviceLocked( 
        device = std::make_shared<InputDevice>(&mContext, deviceId, bumpGenerationLocked(),

                                               identifier);

    }

    device->addEventHubDevice(eventHubId);

    device->addEventHubDevice(eventHubId, mConfig);

    return device;

}

services/inputflinger/reader/include/InputDevice.h

+7 −3
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ public: 
    [[nodiscard]] std::list<NotifyArgs> setEnabled(bool enabled, nsecs_t when);



    void dump(std::string& dump, const std::string& eventHubDevStr);

    void addEventHubDevice(int32_t eventHubId, bool populateMappers = true);

    void addEmptyEventHubDevice(int32_t eventHubId);

    void addEventHubDevice(int32_t eventHubId, const InputReaderConfiguration& readerConfig);

    void removeEventHubDevice(int32_t eventHubId);

    [[nodiscard]] std::list<NotifyArgs> configure(nsecs_t when,

                                                  const InputReaderConfiguration& readerConfig,
@@ -137,7 +138,7 @@ public: 
    template <class T, typename... Args>

    T& addMapper(int32_t eventHubId, Args... args) {

        // ensure a device entry exists for this eventHubId

        addEventHubDevice(eventHubId, false);

        addEmptyEventHubDevice(eventHubId);



        // create mapper

        auto& devicePair = mDevices[eventHubId];
@@ -152,7 +153,7 @@ public: 
    template <class T>

    T& addController(int32_t eventHubId) {

        // ensure a device entry exists for this eventHubId

        addEventHubDevice(eventHubId, false);

        addEmptyEventHubDevice(eventHubId);



        // create controller

        auto& devicePair = mDevices[eventHubId];
@@ -191,6 +192,9 @@ private: 
    typedef int32_t (InputMapper::*GetStateFunc)(uint32_t sourceMask, int32_t code);

    int32_t getState(uint32_t sourceMask, int32_t code, GetStateFunc getStateFunc);



    std::vector<std::unique_ptr<InputMapper>> createMappers(

            InputDeviceContext& contextPtr, const InputReaderConfiguration& readerConfig);



    PropertyMap mConfiguration;



    // helpers to interate over the devices collection

services/inputflinger/reader/mapper/CursorInputMapper.cpp

+4 −2
Original line number Diff line number Diff line
@@ -68,8 +68,10 @@ void CursorMotionAccumulator::finishSync() { 


// --- CursorInputMapper ---



CursorInputMapper::CursorInputMapper(InputDeviceContext& deviceContext)

      : InputMapper(deviceContext), mLastEventTime(std::numeric_limits<nsecs_t>::min()) {}

CursorInputMapper::CursorInputMapper(InputDeviceContext& deviceContext,

                                     const InputReaderConfiguration& readerConfig)

      : InputMapper(deviceContext, readerConfig),

        mLastEventTime(std::numeric_limits<nsecs_t>::min()) {}



CursorInputMapper::~CursorInputMapper() {

    if (mPointerController != nullptr) {

services/inputflinger/reader/mapper/CursorInputMapper.h

+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ private: 


class CursorInputMapper : public InputMapper {

public:

    explicit CursorInputMapper(InputDeviceContext& deviceContext);

    explicit CursorInputMapper(InputDeviceContext& deviceContext,

                               const InputReaderConfiguration& readerConfig);

    virtual ~CursorInputMapper();



    virtual uint32_t getSources() const override;