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

Commit 470a1e57 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unused variable outKey"

parents 7df48ba2 cef0eb8e

include/input/KeyCharacterMap.h

+1 −2
Original line number Diff line number Diff line
@@ -240,8 +240,7 @@ private: 
    KeyCharacterMap(const std::string& filename);



    bool getKey(int32_t keyCode, const Key** outKey) const;

    bool getKeyBehavior(int32_t keyCode, int32_t metaState,

            const Key** outKey, const Behavior** outBehavior) const;

    bool getKeyBehavior(int32_t keyCode, int32_t metaState, const Behavior** outBehavior) const;

    static bool matchesMetaState(int32_t eventMetaState, int32_t behaviorMetaState);



    bool findKey(char16_t ch, int32_t* outKeyCode, int32_t* outMetaState) const;

libs/input/KeyCharacterMap.cpp

+4 −8
Original line number Diff line number Diff line
@@ -304,9 +304,8 @@ char16_t KeyCharacterMap::getNumber(int32_t keyCode) const { 


char16_t KeyCharacterMap::getCharacter(int32_t keyCode, int32_t metaState) const {

    char16_t result = 0;

    const Key* key;

    const Behavior* behavior;

    if (getKeyBehavior(keyCode, metaState, &key, &behavior)) {

    if (getKeyBehavior(keyCode, metaState, &behavior)) {

        result = behavior->character;

    }

#if DEBUG_MAPPING
@@ -321,9 +320,8 @@ bool KeyCharacterMap::getFallbackAction(int32_t keyCode, int32_t metaState, 
    outFallbackAction->metaState = 0;



    bool result = false;

    const Key* key;

    const Behavior* behavior;

    if (getKeyBehavior(keyCode, metaState, &key, &behavior)) {

    if (getKeyBehavior(keyCode, metaState, &behavior)) {

        if (behavior->fallbackKeyCode) {

            outFallbackAction->keyCode = behavior->fallbackKeyCode;

            outFallbackAction->metaState = metaState & ~behavior->metaState;
@@ -438,9 +436,8 @@ void KeyCharacterMap::tryRemapKey(int32_t keyCode, int32_t metaState, 
    *outKeyCode = keyCode;

    *outMetaState = metaState;



    const Key* key;

    const Behavior* behavior;

    if (getKeyBehavior(keyCode, metaState, &key, &behavior)) {

    if (getKeyBehavior(keyCode, metaState, &behavior)) {

        if (behavior->replacementKeyCode) {

            *outKeyCode = behavior->replacementKeyCode;

            int32_t newMetaState = metaState & ~behavior->metaState;
@@ -485,13 +482,12 @@ bool KeyCharacterMap::getKey(int32_t keyCode, const Key** outKey) const { 
}



bool KeyCharacterMap::getKeyBehavior(int32_t keyCode, int32_t metaState,

        const Key** outKey, const Behavior** outBehavior) const {

                                     const Behavior** outBehavior) const {

    const Key* key;

    if (getKey(keyCode, &key)) {

        const Behavior* behavior = key->firstBehavior;

        while (behavior) {

            if (matchesMetaState(metaState, behavior->metaState)) {

                *outKey = key;

                *outBehavior = behavior;

                return true;

            }