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

Commit c968c3a9 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Implement virtual button support. 

The kernel can now publish a property describing the layout of virtual
hardware buttons on the touchscreen.  These outside of the display
area (outside of the absolute x and y controller range the driver
reports), and when the user presses on them a key event will be
generated rather than a touch event.

This also includes a number of tweaks to the absolute controller
processing to make things work better on the new screens.  For
example, we now reject down events outside of the display area.

Still left to be done is the ability to cancel a key down event,
so the user can slide up from the virtual keys to the touch screen
without causing a virtual key to execute.
parent 512bac1a

include/ui/EventHub.h

+4 −1
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ public: 
    int getKeycodeState(int key) const;

    int getKeycodeState(int32_t deviceId, int key) const;

    

    status_t scancodeToKeycode(int32_t deviceId, int scancode,

            int32_t* outKeycode, uint32_t* outFlags) const;

    

    // special type codes when devices are added/removed.

    enum {

        DEVICE_ADDED = 0x10000000,
@@ -121,7 +124,7 @@ private: 
    mutable Mutex   mLock;

    

    bool            mHaveFirstKeyboard;

    int32_t         mFirstKeyboardId; // the API is that the build in keyboard is id 0, so map it

    int32_t         mFirstKeyboardId; // the API is that the built-in keyboard is id 0, so map it

    

    struct device_ent {

        device_t* device;

libs/ui/EventHub.cpp

+29 −0
Original line number Diff line number Diff line
@@ -240,6 +240,35 @@ int EventHub::getKeycodeState(int32_t deviceId, int code) const 
    return 0;

}



status_t EventHub::scancodeToKeycode(int32_t deviceId, int scancode,

        int32_t* outKeycode, uint32_t* outFlags) const

{

    AutoMutex _l(mLock);

    device_t* device = getDevice(deviceId);

    

    if (device != NULL && device->layoutMap != NULL) {

        status_t err = device->layoutMap->map(scancode, outKeycode, outFlags);

        if (err == NO_ERROR) {

            return NO_ERROR;

        }

    }

    

    if (mHaveFirstKeyboard) {

        device = getDevice(mFirstKeyboardId);

        

        if (device != NULL && device->layoutMap != NULL) {

            status_t err = device->layoutMap->map(scancode, outKeycode, outFlags);

            if (err == NO_ERROR) {

                return NO_ERROR;

            }

        }

    }

    

    *outKeycode = 0;

    *outFlags = 0;

    return NAME_NOT_FOUND;

}



EventHub::device_t* EventHub::getDevice(int32_t deviceId) const

{

    if (deviceId == 0) deviceId = mFirstKeyboardId;