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

Commit 30abbd9c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use std::unordered_map in KeyCharacterMap" into udc-dev am: 73fb43b6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22679936



Change-Id: Ide194019bab334c42518f744fadf7b59945428aa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4e010385 73fb43b6

include/input/KeyCharacterMap.h

+10 −14
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ 
#include <android-base/result.h>

#include <input/Input.h>

#include <utils/Errors.h>

#include <utils/KeyedVector.h>

#include <utils/Tokenizer.h>

#include <utils/Unicode.h>

#include <map>



// Maximum number of keys supported by KeyCharacterMaps

#define MAX_KEYS 8192
@@ -152,13 +152,9 @@ public: 
    void writeToParcel(Parcel* parcel) const;

#endif



    bool operator==(const KeyCharacterMap& other) const;

    bool operator==(const KeyCharacterMap& other) const = default;



    bool operator!=(const KeyCharacterMap& other) const;



    KeyCharacterMap(const KeyCharacterMap& other);



    virtual ~KeyCharacterMap();

    KeyCharacterMap(const KeyCharacterMap& other) = default;



private:

    struct Behavior {
@@ -173,17 +169,18 @@ private: 


        /* The replacement keycode if the key has to be replaced outright. */

        int32_t replacementKeyCode = 0;



        bool operator==(const Behavior&) const = default;

    };



    struct Key {

        Key();

        Key(const Key& other);

        bool operator==(const Key&) const = default;



        /* The single character label printed on the key, or 0 if none. */

        char16_t label;

        char16_t label = 0;



        /* The number or symbol character generated by the key, or 0 if none. */

        char16_t number;

        char16_t number = 0;



        /* The list of key behaviors sorted from most specific to least specific

         * meta key binding. */
@@ -218,7 +215,6 @@ private: 


    public:

        Parser(KeyCharacterMap* map, Tokenizer* tokenizer, Format format);

        ~Parser();

        status_t parse();



    private:
@@ -232,8 +228,8 @@ private: 
        status_t parseCharacterLiteral(char16_t* outCharacter);

    };



    KeyedVector<int32_t, Key*> mKeys;

    KeyboardType mType;

    std::map<int32_t, Key> mKeys;

    KeyboardType mType = KeyboardType::UNKNOWN;

    std::string mLoadFileName;

    bool mLayoutOverlayApplied = false;

libs/input/KeyCharacterMap.cpp

+44 −135
Original line number Diff line number Diff line
@@ -85,63 +85,7 @@ static String8 toString(const char16_t* chars, size_t numChars) { 


// --- KeyCharacterMap ---



KeyCharacterMap::KeyCharacterMap(const std::string& filename)

      : mType(KeyboardType::UNKNOWN), mLoadFileName(filename) {}



KeyCharacterMap::KeyCharacterMap(const KeyCharacterMap& other)

      : mType(other.mType),

        mLoadFileName(other.mLoadFileName),

        mLayoutOverlayApplied(other.mLayoutOverlayApplied),

        mKeyRemapping(other.mKeyRemapping),

        mKeysByScanCode(other.mKeysByScanCode),

        mKeysByUsageCode(other.mKeysByUsageCode) {

    for (size_t i = 0; i < other.mKeys.size(); i++) {

        mKeys.add(other.mKeys.keyAt(i), new Key(*other.mKeys.valueAt(i)));

    }

}



KeyCharacterMap::~KeyCharacterMap() {

    clear();

}



bool KeyCharacterMap::operator==(const KeyCharacterMap& other) const {

    if (mType != other.mType) {

        return false;

    }

    if (mLoadFileName != other.mLoadFileName) {

        return false;

    }

    if (mLayoutOverlayApplied != other.mLayoutOverlayApplied) {

        return false;

    }

    if (mKeys.size() != other.mKeys.size() || mKeyRemapping.size() != other.mKeyRemapping.size() ||

        mKeysByScanCode.size() != other.mKeysByScanCode.size() ||

        mKeysByUsageCode.size() != other.mKeysByUsageCode.size()) {

        return false;

    }



    for (size_t i = 0; i < mKeys.size(); i++) {

        if (mKeys.keyAt(i) != other.mKeys.keyAt(i)) {

            return false;

        }

        const Key* key = mKeys.valueAt(i);

        const Key* otherKey = other.mKeys.valueAt(i);

        if (key->label != otherKey->label || key->number != otherKey->number) {

            return false;

        }

    }



    if (mKeyRemapping != other.mKeyRemapping || mKeysByScanCode != other.mKeysByScanCode ||

        mKeysByUsageCode != other.mKeysByUsageCode) {

        return false;

    }



    return true;

}



bool KeyCharacterMap::operator!=(const KeyCharacterMap& other) const {

    return !(*this == other);

}

KeyCharacterMap::KeyCharacterMap(const std::string& filename) : mLoadFileName(filename) {}



base::Result<std::shared_ptr<KeyCharacterMap>> KeyCharacterMap::load(const std::string& filename,

                                                                     Format format) {
@@ -207,10 +151,6 @@ status_t KeyCharacterMap::load(Tokenizer* tokenizer, Format format) { 
void KeyCharacterMap::clear() {

    mKeysByScanCode.clear();

    mKeysByUsageCode.clear();

    for (size_t i = 0; i < mKeys.size(); i++) {

        Key* key = mKeys.editValueAt(i);

        delete key;

    }

    mKeys.clear();

    mLayoutOverlayApplied = false;

    mType = KeyboardType::UNKNOWN;
@@ -233,24 +173,16 @@ void KeyCharacterMap::combine(const KeyCharacterMap& overlay) { 
    if (mLayoutOverlayApplied) {

        reloadBaseFromFile();

    }

    for (size_t i = 0; i < overlay.mKeys.size(); i++) {

        int32_t keyCode = overlay.mKeys.keyAt(i);

        Key* key = overlay.mKeys.valueAt(i);

        ssize_t oldIndex = mKeys.indexOfKey(keyCode);

        if (oldIndex >= 0) {

            delete mKeys.valueAt(oldIndex);

            mKeys.editValueAt(oldIndex) = new Key(*key);

        } else {

            mKeys.add(keyCode, new Key(*key));

        }

    for (const auto& [keyCode, key] : overlay.mKeys) {

        mKeys.insert_or_assign(keyCode, key);

    }



    for (auto const& it : overlay.mKeysByScanCode) {

        mKeysByScanCode.insert_or_assign(it.first, it.second);

    for (const auto& [fromScanCode, toAndroidKeyCode] : overlay.mKeysByScanCode) {

        mKeysByScanCode.insert_or_assign(fromScanCode, toAndroidKeyCode);

    }



    for (auto const& it : overlay.mKeysByUsageCode) {

        mKeysByUsageCode.insert_or_assign(it.first, it.second);

    for (const auto& [fromHidUsageCode, toAndroidKeyCode] : overlay.mKeysByUsageCode) {

        mKeysByUsageCode.insert_or_assign(fromHidUsageCode, toAndroidKeyCode);

    }

    mLayoutOverlayApplied = true;

}
@@ -343,19 +275,15 @@ char16_t KeyCharacterMap::getMatch(int32_t keyCode, const char16_t* chars, size_ 
                    if (behavior.character == chars[i]) {

                        result = behavior.character;

                        if ((behavior.metaState & metaState) == behavior.metaState) {

                            goto ExactMatch;

                            // Found exact match!

                            return result;

                        }

                        break;

                    }

                }

            }

        }

    ExactMatch: ;

    }

#if DEBUG_MAPPING

    ALOGD("getMatch: keyCode=%d, chars=[%s], metaState=0x%08x ~ Result %d.",

            keyCode, toString(chars, numChars).string(), metaState, result);

#endif

    return result;

}
@@ -494,9 +422,9 @@ std::pair<int32_t, int32_t> KeyCharacterMap::applyKeyBehavior(int32_t fromKeyCod 
}



const KeyCharacterMap::Key* KeyCharacterMap::getKey(int32_t keyCode) const {

    ssize_t index = mKeys.indexOfKey(keyCode);

    if (index >= 0) {

        return mKeys.valueAt(index);

    auto it = mKeys.find(keyCode);

    if (it != mKeys.end()) {

        return &it->second;

    }

    return nullptr;

}
@@ -550,19 +478,17 @@ bool KeyCharacterMap::findKey(char16_t ch, int32_t* outKeyCode, int32_t* outMeta 
        return false;

    }



    for (size_t i = 0; i < mKeys.size(); i++) {

        const Key* key = mKeys.valueAt(i);



    for (const auto& [keyCode, key] : mKeys) {

        // Try to find the most general behavior that maps to this character.

        // For example, the base key behavior will usually be last in the list.

        const Behavior* found = nullptr;

        for (const Behavior& behavior : key->behaviors) {

        for (const Behavior& behavior : key.behaviors) {

            if (behavior.character == ch) {

                found = &behavior;

            }

        }

        if (found != nullptr) {

            *outKeyCode = mKeys.keyAt(i);

            *outKeyCode = keyCode;

            *outMetaState = found->metaState;

            return true;

        }
@@ -714,11 +640,7 @@ std::shared_ptr<KeyCharacterMap> KeyCharacterMap::readFromParcel(Parcel* parcel) 
            return nullptr;

        }



        Key* key = new Key();

        key->label = label;

        key->number = number;

        map->mKeys.add(keyCode, key);



        Key key{.label = label, .number = number};

        while (parcel->readInt32()) {

            int32_t metaState = parcel->readInt32();

            char16_t character = parcel->readInt32();
@@ -728,13 +650,14 @@ std::shared_ptr<KeyCharacterMap> KeyCharacterMap::readFromParcel(Parcel* parcel) 
                return nullptr;

            }



            key->behaviors.push_back({

            key.behaviors.push_back({

                    .metaState = metaState,

                    .character = character,

                    .fallbackKeyCode = fallbackKeyCode,

                    .replacementKeyCode = replacementKeyCode,

            });

        }

        map->mKeys.emplace(keyCode, std::move(key));



        if (parcel->errorCheck()) {

            return nullptr;
@@ -790,13 +713,11 @@ void KeyCharacterMap::writeToParcel(Parcel* parcel) const { 


    size_t numKeys = mKeys.size();

    parcel->writeInt32(numKeys);

    for (size_t i = 0; i < numKeys; i++) {

        int32_t keyCode = mKeys.keyAt(i);

        const Key* key = mKeys.valueAt(i);

    for (const auto& [keyCode, key] : mKeys) {

        parcel->writeInt32(keyCode);

        parcel->writeInt32(key->label);

        parcel->writeInt32(key->number);

        for (const Behavior& behavior : key->behaviors) {

        parcel->writeInt32(key.label);

        parcel->writeInt32(key.number);

        for (const Behavior& behavior : key.behaviors) {

            parcel->writeInt32(1);

            parcel->writeInt32(behavior.metaState);

            parcel->writeInt32(behavior.character);
@@ -826,22 +747,12 @@ void KeyCharacterMap::writeToParcel(Parcel* parcel) const { 
}

#endif // __linux__



// --- KeyCharacterMap::Key ---



KeyCharacterMap::Key::Key() : label(0), number(0) {}



KeyCharacterMap::Key::Key(const Key& other)

      : label(other.label), number(other.number), behaviors(other.behaviors) {}



// --- KeyCharacterMap::Parser ---



KeyCharacterMap::Parser::Parser(KeyCharacterMap* map, Tokenizer* tokenizer, Format format) :

        mMap(map), mTokenizer(tokenizer), mFormat(format), mState(STATE_TOP) {

}



KeyCharacterMap::Parser::~Parser() {

}



status_t KeyCharacterMap::Parser::parse() {

    while (!mTokenizer->isEof()) {

#if DEBUG_PARSER
@@ -1021,7 +932,7 @@ status_t KeyCharacterMap::Parser::parseKey() { 
                keyCodeToken.string());

        return BAD_VALUE;

    }

    if (mMap->mKeys.indexOfKey(*keyCode) >= 0) {

    if (mMap->mKeys.find(*keyCode) != mMap->mKeys.end()) {

        ALOGE("%s: Duplicate entry for key code '%s'.", mTokenizer->getLocation().string(),

                keyCodeToken.string());

        return BAD_VALUE;
@@ -1037,17 +948,17 @@ status_t KeyCharacterMap::Parser::parseKey() { 


    ALOGD_IF(DEBUG_PARSER, "Parsed beginning of key: keyCode=%d.", *keyCode);

    mKeyCode = *keyCode;

    mMap->mKeys.add(*keyCode, new Key());

    mMap->mKeys.emplace(*keyCode, Key{});

    mState = STATE_KEY;

    return NO_ERROR;

}



status_t KeyCharacterMap::Parser::parseKeyProperty() {

    Key* key = mMap->mKeys.valueFor(mKeyCode);

    Key& key = mMap->mKeys[mKeyCode];

    String8 token = mTokenizer->nextToken(WHITESPACE_OR_PROPERTY_DELIMITER);

    if (token == "}") {

        mState = STATE_TOP;

        return finishKey(*key);

        return finishKey(key);

    }



    std::vector<Property> properties;
@@ -1184,29 +1095,27 @@ status_t KeyCharacterMap::Parser::parseKeyProperty() { 
    for (const Property& property : properties) {

        switch (property.property) {

        case PROPERTY_LABEL:

            if (key->label) {

                ALOGE("%s: Duplicate label for key.",

                        mTokenizer->getLocation().string());

                if (key.label) {

                    ALOGE("%s: Duplicate label for key.", mTokenizer->getLocation().string());

                    return BAD_VALUE;

                }

            key->label = behavior.character;

                key.label = behavior.character;

#if DEBUG_PARSER

            ALOGD("Parsed key label: keyCode=%d, label=%d.", mKeyCode, key->label);

                ALOGD("Parsed key label: keyCode=%d, label=%d.", mKeyCode, key.label);

#endif

            break;

        case PROPERTY_NUMBER:

            if (key->number) {

                ALOGE("%s: Duplicate number for key.",

                        mTokenizer->getLocation().string());

            if (key.number) {

                    ALOGE("%s: Duplicate number for key.", mTokenizer->getLocation().string());

                    return BAD_VALUE;

            }

            key->number = behavior.character;

            key.number = behavior.character;

#if DEBUG_PARSER

            ALOGD("Parsed key number: keyCode=%d, number=%d.", mKeyCode, key->number);

            ALOGD("Parsed key number: keyCode=%d, number=%d.", mKeyCode, key.number);

#endif

            break;

        case PROPERTY_META: {

            for (const Behavior& b : key->behaviors) {

            for (const Behavior& b : key.behaviors) {

                    if (b.metaState == property.metaState) {

                    ALOGE("%s: Duplicate key behavior for modifier.",

                            mTokenizer->getLocation().string());
@@ -1215,12 +1124,12 @@ status_t KeyCharacterMap::Parser::parseKeyProperty() { 
            }

            Behavior newBehavior = behavior;

            newBehavior.metaState = property.metaState;

            key->behaviors.push_front(newBehavior);

            key.behaviors.push_front(newBehavior);

            ALOGD_IF(DEBUG_PARSER,

                     "Parsed key meta: keyCode=%d, meta=0x%x, char=%d, fallback=%d replace=%d.",

                     mKeyCode, key->behaviors.front().metaState, key->behaviors.front().character,

                     key->behaviors.front().fallbackKeyCode,

                     key->behaviors.front().replacementKeyCode);

                     mKeyCode, key.behaviors.front().metaState, key.behaviors.front().character,

                     key.behaviors.front().fallbackKeyCode,

                     key.behaviors.front().replacementKeyCode);

            break;

        }

        }

services/inputflinger/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -224,6 +224,9 @@ phony { 
        "libinputservice_test",

        "Bug-115739809",

        "StructLayout_test",

        // currently unused, but still must build correctly

        "inputflinger",

        "libinputflingerhost",



        // native fuzzers

        "inputflinger_latencytracker_fuzzer",

services/inputflinger/host/Android.bp

+6 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ package { 


cc_library_shared {

    name: "libinputflingerhost",



    cpp_std: "c++20",

    srcs: [

        "InputFlinger.cpp",

        "InputDriver.cpp",
@@ -64,14 +64,17 @@ cc_binary { 


    srcs: ["main.cpp"],



    cflags: ["-Wall", "-Werror"],

    cflags: [

        "-Wall",

        "-Werror",

    ],



    shared_libs: [

        "libbase",

        "libbinder",

        "libinputflingerhost",

        "libutils",

        "libinput"

        "libinput",

    ],

    static_libs: [

        "libarect",