OSDN Git Service

Optimize memory usage of InputEvent lookup.
authorChris Ye <lzye@google.com>
Thu, 20 Aug 2020 20:21:10 +0000 (13:21 -0700)
committerChris Ye <lzye@google.com>
Fri, 21 Aug 2020 15:43:49 +0000 (08:43 -0700)
Move the declaration of look up map to cpp file from header file to
avoid duplicate copies.

Bug: 165527068
Bug: 165398580
Bug: 165035349

Test: atest libinput_tests, atest inputflinger_tests
adb shell showmap <system_server pid> | grep input
Check libinput.so and libinput_reader.so size to be 300 and 372KB.

Change-Id: Ia80200b7889f16ce576637d746e64641f3f2a094

include/input/InputEventLabels.h
libs/input/Android.bp
libs/input/Input.cpp
libs/input/InputEventLabels.cpp [new file with mode: 0644]
libs/input/KeyCharacterMap.cpp
libs/input/KeyLayoutMap.cpp
services/inputflinger/reader/InputDevice.cpp
services/inputflinger/reader/mapper/JoystickInputMapper.cpp

index ec2de61..2a742f9 100644 (file)
 #include <android/keycodes.h>
 #include <unordered_map>
 
-#define DEFINE_KEYCODE(key) { #key, AKEYCODE_##key }
-#define DEFINE_AXIS(axis) { #axis, AMOTION_EVENT_AXIS_##axis }
-#define DEFINE_LED(led) { #led, ALED_##led }
-#define DEFINE_FLAG(flag) { #flag, POLICY_FLAG_##flag }
-
 namespace android {
 
 template<typename T, size_t N>
@@ -36,437 +31,41 @@ struct InputEventLabel {
     int value;
 };
 
-// NOTE: If you add a new keycode here you must also add it to several other files.
-//       Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.
-#define KEYCODES_SEQUENCE \
-    DEFINE_KEYCODE(UNKNOWN), \
-    DEFINE_KEYCODE(SOFT_LEFT), \
-    DEFINE_KEYCODE(SOFT_RIGHT), \
-    DEFINE_KEYCODE(HOME), \
-    DEFINE_KEYCODE(BACK), \
-    DEFINE_KEYCODE(CALL), \
-    DEFINE_KEYCODE(ENDCALL), \
-    DEFINE_KEYCODE(0), \
-    DEFINE_KEYCODE(1), \
-    DEFINE_KEYCODE(2), \
-    DEFINE_KEYCODE(3), \
-    DEFINE_KEYCODE(4), \
-    DEFINE_KEYCODE(5), \
-    DEFINE_KEYCODE(6), \
-    DEFINE_KEYCODE(7), \
-    DEFINE_KEYCODE(8), \
-    DEFINE_KEYCODE(9), \
-    DEFINE_KEYCODE(STAR), \
-    DEFINE_KEYCODE(POUND), \
-    DEFINE_KEYCODE(DPAD_UP), \
-    DEFINE_KEYCODE(DPAD_DOWN), \
-    DEFINE_KEYCODE(DPAD_LEFT), \
-    DEFINE_KEYCODE(DPAD_RIGHT), \
-    DEFINE_KEYCODE(DPAD_CENTER), \
-    DEFINE_KEYCODE(VOLUME_UP), \
-    DEFINE_KEYCODE(VOLUME_DOWN), \
-    DEFINE_KEYCODE(POWER), \
-    DEFINE_KEYCODE(CAMERA), \
-    DEFINE_KEYCODE(CLEAR), \
-    DEFINE_KEYCODE(A), \
-    DEFINE_KEYCODE(B), \
-    DEFINE_KEYCODE(C), \
-    DEFINE_KEYCODE(D), \
-    DEFINE_KEYCODE(E), \
-    DEFINE_KEYCODE(F), \
-    DEFINE_KEYCODE(G), \
-    DEFINE_KEYCODE(H), \
-    DEFINE_KEYCODE(I), \
-    DEFINE_KEYCODE(J), \
-    DEFINE_KEYCODE(K), \
-    DEFINE_KEYCODE(L), \
-    DEFINE_KEYCODE(M), \
-    DEFINE_KEYCODE(N), \
-    DEFINE_KEYCODE(O), \
-    DEFINE_KEYCODE(P), \
-    DEFINE_KEYCODE(Q), \
-    DEFINE_KEYCODE(R), \
-    DEFINE_KEYCODE(S), \
-    DEFINE_KEYCODE(T), \
-    DEFINE_KEYCODE(U), \
-    DEFINE_KEYCODE(V), \
-    DEFINE_KEYCODE(W), \
-    DEFINE_KEYCODE(X), \
-    DEFINE_KEYCODE(Y), \
-    DEFINE_KEYCODE(Z), \
-    DEFINE_KEYCODE(COMMA), \
-    DEFINE_KEYCODE(PERIOD), \
-    DEFINE_KEYCODE(ALT_LEFT), \
-    DEFINE_KEYCODE(ALT_RIGHT), \
-    DEFINE_KEYCODE(SHIFT_LEFT), \
-    DEFINE_KEYCODE(SHIFT_RIGHT), \
-    DEFINE_KEYCODE(TAB), \
-    DEFINE_KEYCODE(SPACE), \
-    DEFINE_KEYCODE(SYM), \
-    DEFINE_KEYCODE(EXPLORER), \
-    DEFINE_KEYCODE(ENVELOPE), \
-    DEFINE_KEYCODE(ENTER), \
-    DEFINE_KEYCODE(DEL), \
-    DEFINE_KEYCODE(GRAVE), \
-    DEFINE_KEYCODE(MINUS), \
-    DEFINE_KEYCODE(EQUALS), \
-    DEFINE_KEYCODE(LEFT_BRACKET), \
-    DEFINE_KEYCODE(RIGHT_BRACKET), \
-    DEFINE_KEYCODE(BACKSLASH), \
-    DEFINE_KEYCODE(SEMICOLON), \
-    DEFINE_KEYCODE(APOSTROPHE), \
-    DEFINE_KEYCODE(SLASH), \
-    DEFINE_KEYCODE(AT), \
-    DEFINE_KEYCODE(NUM), \
-    DEFINE_KEYCODE(HEADSETHOOK), \
-    DEFINE_KEYCODE(FOCUS), \
-    DEFINE_KEYCODE(PLUS), \
-    DEFINE_KEYCODE(MENU), \
-    DEFINE_KEYCODE(NOTIFICATION), \
-    DEFINE_KEYCODE(SEARCH), \
-    DEFINE_KEYCODE(MEDIA_PLAY_PAUSE), \
-    DEFINE_KEYCODE(MEDIA_STOP), \
-    DEFINE_KEYCODE(MEDIA_NEXT), \
-    DEFINE_KEYCODE(MEDIA_PREVIOUS), \
-    DEFINE_KEYCODE(MEDIA_REWIND), \
-    DEFINE_KEYCODE(MEDIA_FAST_FORWARD), \
-    DEFINE_KEYCODE(MUTE), \
-    DEFINE_KEYCODE(PAGE_UP), \
-    DEFINE_KEYCODE(PAGE_DOWN), \
-    DEFINE_KEYCODE(PICTSYMBOLS), \
-    DEFINE_KEYCODE(SWITCH_CHARSET), \
-    DEFINE_KEYCODE(BUTTON_A), \
-    DEFINE_KEYCODE(BUTTON_B), \
-    DEFINE_KEYCODE(BUTTON_C), \
-    DEFINE_KEYCODE(BUTTON_X), \
-    DEFINE_KEYCODE(BUTTON_Y), \
-    DEFINE_KEYCODE(BUTTON_Z), \
-    DEFINE_KEYCODE(BUTTON_L1), \
-    DEFINE_KEYCODE(BUTTON_R1), \
-    DEFINE_KEYCODE(BUTTON_L2), \
-    DEFINE_KEYCODE(BUTTON_R2), \
-    DEFINE_KEYCODE(BUTTON_THUMBL), \
-    DEFINE_KEYCODE(BUTTON_THUMBR), \
-    DEFINE_KEYCODE(BUTTON_START), \
-    DEFINE_KEYCODE(BUTTON_SELECT), \
-    DEFINE_KEYCODE(BUTTON_MODE), \
-    DEFINE_KEYCODE(ESCAPE), \
-    DEFINE_KEYCODE(FORWARD_DEL), \
-    DEFINE_KEYCODE(CTRL_LEFT), \
-    DEFINE_KEYCODE(CTRL_RIGHT), \
-    DEFINE_KEYCODE(CAPS_LOCK), \
-    DEFINE_KEYCODE(SCROLL_LOCK), \
-    DEFINE_KEYCODE(META_LEFT), \
-    DEFINE_KEYCODE(META_RIGHT), \
-    DEFINE_KEYCODE(FUNCTION), \
-    DEFINE_KEYCODE(SYSRQ), \
-    DEFINE_KEYCODE(BREAK), \
-    DEFINE_KEYCODE(MOVE_HOME), \
-    DEFINE_KEYCODE(MOVE_END), \
-    DEFINE_KEYCODE(INSERT), \
-    DEFINE_KEYCODE(FORWARD), \
-    DEFINE_KEYCODE(MEDIA_PLAY), \
-    DEFINE_KEYCODE(MEDIA_PAUSE), \
-    DEFINE_KEYCODE(MEDIA_CLOSE), \
-    DEFINE_KEYCODE(MEDIA_EJECT), \
-    DEFINE_KEYCODE(MEDIA_RECORD), \
-    DEFINE_KEYCODE(F1), \
-    DEFINE_KEYCODE(F2), \
-    DEFINE_KEYCODE(F3), \
-    DEFINE_KEYCODE(F4), \
-    DEFINE_KEYCODE(F5), \
-    DEFINE_KEYCODE(F6), \
-    DEFINE_KEYCODE(F7), \
-    DEFINE_KEYCODE(F8), \
-    DEFINE_KEYCODE(F9), \
-    DEFINE_KEYCODE(F10), \
-    DEFINE_KEYCODE(F11), \
-    DEFINE_KEYCODE(F12), \
-    DEFINE_KEYCODE(NUM_LOCK), \
-    DEFINE_KEYCODE(NUMPAD_0), \
-    DEFINE_KEYCODE(NUMPAD_1), \
-    DEFINE_KEYCODE(NUMPAD_2), \
-    DEFINE_KEYCODE(NUMPAD_3), \
-    DEFINE_KEYCODE(NUMPAD_4), \
-    DEFINE_KEYCODE(NUMPAD_5), \
-    DEFINE_KEYCODE(NUMPAD_6), \
-    DEFINE_KEYCODE(NUMPAD_7), \
-    DEFINE_KEYCODE(NUMPAD_8), \
-    DEFINE_KEYCODE(NUMPAD_9), \
-    DEFINE_KEYCODE(NUMPAD_DIVIDE), \
-    DEFINE_KEYCODE(NUMPAD_MULTIPLY), \
-    DEFINE_KEYCODE(NUMPAD_SUBTRACT), \
-    DEFINE_KEYCODE(NUMPAD_ADD), \
-    DEFINE_KEYCODE(NUMPAD_DOT), \
-    DEFINE_KEYCODE(NUMPAD_COMMA), \
-    DEFINE_KEYCODE(NUMPAD_ENTER), \
-    DEFINE_KEYCODE(NUMPAD_EQUALS), \
-    DEFINE_KEYCODE(NUMPAD_LEFT_PAREN), \
-    DEFINE_KEYCODE(NUMPAD_RIGHT_PAREN), \
-    DEFINE_KEYCODE(VOLUME_MUTE), \
-    DEFINE_KEYCODE(INFO), \
-    DEFINE_KEYCODE(CHANNEL_UP), \
-    DEFINE_KEYCODE(CHANNEL_DOWN), \
-    DEFINE_KEYCODE(ZOOM_IN), \
-    DEFINE_KEYCODE(ZOOM_OUT), \
-    DEFINE_KEYCODE(TV), \
-    DEFINE_KEYCODE(WINDOW), \
-    DEFINE_KEYCODE(GUIDE), \
-    DEFINE_KEYCODE(DVR), \
-    DEFINE_KEYCODE(BOOKMARK), \
-    DEFINE_KEYCODE(CAPTIONS), \
-    DEFINE_KEYCODE(SETTINGS), \
-    DEFINE_KEYCODE(TV_POWER), \
-    DEFINE_KEYCODE(TV_INPUT), \
-    DEFINE_KEYCODE(STB_POWER), \
-    DEFINE_KEYCODE(STB_INPUT), \
-    DEFINE_KEYCODE(AVR_POWER), \
-    DEFINE_KEYCODE(AVR_INPUT), \
-    DEFINE_KEYCODE(PROG_RED), \
-    DEFINE_KEYCODE(PROG_GREEN), \
-    DEFINE_KEYCODE(PROG_YELLOW), \
-    DEFINE_KEYCODE(PROG_BLUE), \
-    DEFINE_KEYCODE(APP_SWITCH), \
-    DEFINE_KEYCODE(BUTTON_1), \
-    DEFINE_KEYCODE(BUTTON_2), \
-    DEFINE_KEYCODE(BUTTON_3), \
-    DEFINE_KEYCODE(BUTTON_4), \
-    DEFINE_KEYCODE(BUTTON_5), \
-    DEFINE_KEYCODE(BUTTON_6), \
-    DEFINE_KEYCODE(BUTTON_7), \
-    DEFINE_KEYCODE(BUTTON_8), \
-    DEFINE_KEYCODE(BUTTON_9), \
-    DEFINE_KEYCODE(BUTTON_10), \
-    DEFINE_KEYCODE(BUTTON_11), \
-    DEFINE_KEYCODE(BUTTON_12), \
-    DEFINE_KEYCODE(BUTTON_13), \
-    DEFINE_KEYCODE(BUTTON_14), \
-    DEFINE_KEYCODE(BUTTON_15), \
-    DEFINE_KEYCODE(BUTTON_16), \
-    DEFINE_KEYCODE(LANGUAGE_SWITCH), \
-    DEFINE_KEYCODE(MANNER_MODE), \
-    DEFINE_KEYCODE(3D_MODE), \
-    DEFINE_KEYCODE(CONTACTS), \
-    DEFINE_KEYCODE(CALENDAR), \
-    DEFINE_KEYCODE(MUSIC), \
-    DEFINE_KEYCODE(CALCULATOR), \
-    DEFINE_KEYCODE(ZENKAKU_HANKAKU), \
-    DEFINE_KEYCODE(EISU), \
-    DEFINE_KEYCODE(MUHENKAN), \
-    DEFINE_KEYCODE(HENKAN), \
-    DEFINE_KEYCODE(KATAKANA_HIRAGANA), \
-    DEFINE_KEYCODE(YEN), \
-    DEFINE_KEYCODE(RO), \
-    DEFINE_KEYCODE(KANA), \
-    DEFINE_KEYCODE(ASSIST), \
-    DEFINE_KEYCODE(BRIGHTNESS_DOWN), \
-    DEFINE_KEYCODE(BRIGHTNESS_UP), \
-    DEFINE_KEYCODE(MEDIA_AUDIO_TRACK), \
-    DEFINE_KEYCODE(SLEEP), \
-    DEFINE_KEYCODE(WAKEUP), \
-    DEFINE_KEYCODE(PAIRING), \
-    DEFINE_KEYCODE(MEDIA_TOP_MENU), \
-    DEFINE_KEYCODE(11), \
-    DEFINE_KEYCODE(12), \
-    DEFINE_KEYCODE(LAST_CHANNEL), \
-    DEFINE_KEYCODE(TV_DATA_SERVICE), \
-    DEFINE_KEYCODE(VOICE_ASSIST), \
-    DEFINE_KEYCODE(TV_RADIO_SERVICE), \
-    DEFINE_KEYCODE(TV_TELETEXT), \
-    DEFINE_KEYCODE(TV_NUMBER_ENTRY), \
-    DEFINE_KEYCODE(TV_TERRESTRIAL_ANALOG), \
-    DEFINE_KEYCODE(TV_TERRESTRIAL_DIGITAL), \
-    DEFINE_KEYCODE(TV_SATELLITE), \
-    DEFINE_KEYCODE(TV_SATELLITE_BS), \
-    DEFINE_KEYCODE(TV_SATELLITE_CS), \
-    DEFINE_KEYCODE(TV_SATELLITE_SERVICE), \
-    DEFINE_KEYCODE(TV_NETWORK), \
-    DEFINE_KEYCODE(TV_ANTENNA_CABLE), \
-    DEFINE_KEYCODE(TV_INPUT_HDMI_1), \
-    DEFINE_KEYCODE(TV_INPUT_HDMI_2), \
-    DEFINE_KEYCODE(TV_INPUT_HDMI_3), \
-    DEFINE_KEYCODE(TV_INPUT_HDMI_4), \
-    DEFINE_KEYCODE(TV_INPUT_COMPOSITE_1), \
-    DEFINE_KEYCODE(TV_INPUT_COMPOSITE_2), \
-    DEFINE_KEYCODE(TV_INPUT_COMPONENT_1), \
-    DEFINE_KEYCODE(TV_INPUT_COMPONENT_2), \
-    DEFINE_KEYCODE(TV_INPUT_VGA_1), \
-    DEFINE_KEYCODE(TV_AUDIO_DESCRIPTION), \
-    DEFINE_KEYCODE(TV_AUDIO_DESCRIPTION_MIX_UP), \
-    DEFINE_KEYCODE(TV_AUDIO_DESCRIPTION_MIX_DOWN), \
-    DEFINE_KEYCODE(TV_ZOOM_MODE), \
-    DEFINE_KEYCODE(TV_CONTENTS_MENU), \
-    DEFINE_KEYCODE(TV_MEDIA_CONTEXT_MENU), \
-    DEFINE_KEYCODE(TV_TIMER_PROGRAMMING), \
-    DEFINE_KEYCODE(HELP), \
-    DEFINE_KEYCODE(NAVIGATE_PREVIOUS), \
-    DEFINE_KEYCODE(NAVIGATE_NEXT), \
-    DEFINE_KEYCODE(NAVIGATE_IN), \
-    DEFINE_KEYCODE(NAVIGATE_OUT), \
-    DEFINE_KEYCODE(STEM_PRIMARY), \
-    DEFINE_KEYCODE(STEM_1), \
-    DEFINE_KEYCODE(STEM_2), \
-    DEFINE_KEYCODE(STEM_3), \
-    DEFINE_KEYCODE(DPAD_UP_LEFT), \
-    DEFINE_KEYCODE(DPAD_DOWN_LEFT), \
-    DEFINE_KEYCODE(DPAD_UP_RIGHT), \
-    DEFINE_KEYCODE(DPAD_DOWN_RIGHT), \
-    DEFINE_KEYCODE(MEDIA_SKIP_FORWARD), \
-    DEFINE_KEYCODE(MEDIA_SKIP_BACKWARD), \
-    DEFINE_KEYCODE(MEDIA_STEP_FORWARD), \
-    DEFINE_KEYCODE(MEDIA_STEP_BACKWARD), \
-    DEFINE_KEYCODE(SOFT_SLEEP), \
-    DEFINE_KEYCODE(CUT), \
-    DEFINE_KEYCODE(COPY), \
-    DEFINE_KEYCODE(PASTE), \
-    DEFINE_KEYCODE(SYSTEM_NAVIGATION_UP), \
-    DEFINE_KEYCODE(SYSTEM_NAVIGATION_DOWN), \
-    DEFINE_KEYCODE(SYSTEM_NAVIGATION_LEFT), \
-    DEFINE_KEYCODE(SYSTEM_NAVIGATION_RIGHT), \
-    DEFINE_KEYCODE(ALL_APPS), \
-    DEFINE_KEYCODE(REFRESH), \
-    DEFINE_KEYCODE(THUMBS_UP), \
-    DEFINE_KEYCODE(THUMBS_DOWN), \
-    DEFINE_KEYCODE(PROFILE_SWITCH)
-
-static const std::unordered_map<std::string, int> KEYCODES = {
-    KEYCODES_SEQUENCE
-};
-
-static const std::vector<InputEventLabel> KEY_NAMES = {
-    KEYCODES_SEQUENCE
-};
-
-// NOTE: If you add a new axis here you must also add it to several other files.
-//       Refer to frameworks/base/core/java/android/view/MotionEvent.java for the full list.
-#define AXES_SEQUENCE \
-    DEFINE_AXIS(X), \
-    DEFINE_AXIS(Y), \
-    DEFINE_AXIS(PRESSURE), \
-    DEFINE_AXIS(SIZE), \
-    DEFINE_AXIS(TOUCH_MAJOR), \
-    DEFINE_AXIS(TOUCH_MINOR), \
-    DEFINE_AXIS(TOOL_MAJOR), \
-    DEFINE_AXIS(TOOL_MINOR), \
-    DEFINE_AXIS(ORIENTATION), \
-    DEFINE_AXIS(VSCROLL), \
-    DEFINE_AXIS(HSCROLL), \
-    DEFINE_AXIS(Z), \
-    DEFINE_AXIS(RX), \
-    DEFINE_AXIS(RY), \
-    DEFINE_AXIS(RZ), \
-    DEFINE_AXIS(HAT_X), \
-    DEFINE_AXIS(HAT_Y), \
-    DEFINE_AXIS(LTRIGGER), \
-    DEFINE_AXIS(RTRIGGER), \
-    DEFINE_AXIS(THROTTLE), \
-    DEFINE_AXIS(RUDDER), \
-    DEFINE_AXIS(WHEEL), \
-    DEFINE_AXIS(GAS), \
-    DEFINE_AXIS(BRAKE), \
-    DEFINE_AXIS(DISTANCE), \
-    DEFINE_AXIS(TILT), \
-    DEFINE_AXIS(SCROLL), \
-    DEFINE_AXIS(RELATIVE_X), \
-    DEFINE_AXIS(RELATIVE_Y), \
-    DEFINE_AXIS(GENERIC_1), \
-    DEFINE_AXIS(GENERIC_2), \
-    DEFINE_AXIS(GENERIC_3), \
-    DEFINE_AXIS(GENERIC_4), \
-    DEFINE_AXIS(GENERIC_5), \
-    DEFINE_AXIS(GENERIC_6), \
-    DEFINE_AXIS(GENERIC_7), \
-    DEFINE_AXIS(GENERIC_8), \
-    DEFINE_AXIS(GENERIC_9), \
-    DEFINE_AXIS(GENERIC_10), \
-    DEFINE_AXIS(GENERIC_11), \
-    DEFINE_AXIS(GENERIC_12), \
-    DEFINE_AXIS(GENERIC_13), \
-    DEFINE_AXIS(GENERIC_14), \
-    DEFINE_AXIS(GENERIC_15), \
-    DEFINE_AXIS(GENERIC_16)
+//   NOTE: If you want a new key code, axis code, led code or flag code in keylayout file,
+//   then you must add it to InputEventLabels.cpp.
 
-static const std::unordered_map<std::string, int> AXES = {
-    AXES_SEQUENCE
-};
-
-static const std::vector<InputEventLabel> AXES_NAMES = {
-    AXES_SEQUENCE
-};
+class InputEventLookup {
+public:
+    static int lookupValueByLabel(const std::unordered_map<std::string, int>& map,
+                                  const char* literal);
 
-// NOTE: If you add new LEDs here, you must also add them to Input.h
-#define LEDS_SEQUENCE \
-    DEFINE_LED(NUM_LOCK), \
-    DEFINE_LED(CAPS_LOCK), \
-    DEFINE_LED(SCROLL_LOCK), \
-    DEFINE_LED(COMPOSE), \
-    DEFINE_LED(KANA), \
-    DEFINE_LED(SLEEP), \
-    DEFINE_LED(SUSPEND), \
-    DEFINE_LED(MUTE), \
-    DEFINE_LED(MISC), \
-    DEFINE_LED(MAIL), \
-    DEFINE_LED(CHARGING), \
-    DEFINE_LED(CONTROLLER_1), \
-    DEFINE_LED(CONTROLLER_2), \
-    DEFINE_LED(CONTROLLER_3), \
-    DEFINE_LED(CONTROLLER_4)
+    static const char* lookupLabelByValue(const std::vector<InputEventLabel>& vec, int value);
 
-static const std::unordered_map<std::string, int> LEDS = {
-    LEDS_SEQUENCE
-};
+    static int32_t getKeyCodeByLabel(const char* label);
 
-#define FLAGS_SEQUENCE \
-    DEFINE_FLAG(VIRTUAL), \
-    DEFINE_FLAG(FUNCTION), \
-    DEFINE_FLAG(GESTURE), \
-    DEFINE_FLAG(WAKE)
+    static const char* getLabelByKeyCode(int32_t keyCode);
 
-static const std::unordered_map<std::string, int> FLAGS = {
-    FLAGS_SEQUENCE
-};
+    static uint32_t getKeyFlagByLabel(const char* label);
 
-static int lookupValueByLabel(const std::unordered_map<std::string, int> &map,
-        const char* literal) {
-    std::string str(literal);
-    auto it = map.find(str);
-    return it != map.end() ? it->second : 0;
-}
+    static int32_t getAxisByLabel(const char* label);
 
-static const char* lookupLabelByValue(const std::vector<InputEventLabel> &vec, int value) {
-    if (static_cast<size_t>(value) < vec.size()) {
-        return vec[value].literal;
-    }
-    return nullptr;
-}
+    static const char* getAxisLabel(int32_t axisId);
 
-static inline int32_t getKeyCodeByLabel(const char* label) {
-    return int32_t(lookupValueByLabel(KEYCODES, label));
-}
+    static int32_t getLedByLabel(const char* label);
 
-static inline const char* getLabelByKeyCode(int32_t keyCode) {
-    if (keyCode >= 0 && static_cast<size_t>(keyCode) < KEYCODES.size()) {
-        return lookupLabelByValue(KEY_NAMES, keyCode);
-    }
-    return nullptr;
-}
+private:
+    static const std::unordered_map<std::string, int> KEYCODES;
 
-static inline uint32_t getKeyFlagByLabel(const char* label) {
-    return uint32_t(lookupValueByLabel(FLAGS, label));
-}
+    static const std::vector<InputEventLabel> KEY_NAMES;
 
-static inline int32_t getAxisByLabel(const char* label) {
-    return int32_t(lookupValueByLabel(AXES, label));
-}
+    static const std::unordered_map<std::string, int> AXES;
 
-static inline const char* getAxisLabel(int32_t axisId) {
-    return lookupLabelByValue(AXES_NAMES, axisId);
-}
+    static const std::vector<InputEventLabel> AXES_NAMES;
 
-static inline int32_t getLedByLabel(const char* label) {
-    return int32_t(lookupValueByLabel(LEDS, label));
-}
+    static const std::unordered_map<std::string, int> LEDS;
 
+    static const std::unordered_map<std::string, int> FLAGS;
+};
 
 } // namespace android
 #endif // _LIBINPUT_INPUT_EVENT_LABELS_H
index 0c3c1f0..392d478 100644 (file)
@@ -32,6 +32,7 @@ cc_library {
     srcs: [
         "Input.cpp",
         "InputDevice.cpp",
+        "InputEventLabels.cpp",
         "Keyboard.cpp",
         "KeyCharacterMap.cpp",
         "KeyLayoutMap.cpp",
index fc73de3..51910fe 100644 (file)
@@ -135,11 +135,11 @@ int32_t InputEvent::nextId() {
 // --- KeyEvent ---
 
 const char* KeyEvent::getLabel(int32_t keyCode) {
-    return getLabelByKeyCode(keyCode);
+    return InputEventLookup::getLabelByKeyCode(keyCode);
 }
 
 int32_t KeyEvent::getKeyCodeFromLabel(const char* label) {
-    return getKeyCodeByLabel(label);
+    return InputEventLookup::getKeyCodeByLabel(label);
 }
 
 void KeyEvent::initialize(int32_t id, int32_t deviceId, uint32_t source, int32_t displayId,
@@ -692,11 +692,11 @@ bool MotionEvent::isTouchEvent(uint32_t source, int32_t action) {
 }
 
 const char* MotionEvent::getLabel(int32_t axis) {
-    return getAxisLabel(axis);
+    return InputEventLookup::getAxisLabel(axis);
 }
 
 int32_t MotionEvent::getAxisFromLabel(const char* label) {
-    return getAxisByLabel(label);
+    return InputEventLookup::getAxisByLabel(label);
 }
 
 const char* MotionEvent::actionToString(int32_t action) {
diff --git a/libs/input/InputEventLabels.cpp b/libs/input/InputEventLabels.cpp
new file mode 100644 (file)
index 0000000..dee240c
--- /dev/null
@@ -0,0 +1,448 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <input/InputEventLabels.h>
+
+#define DEFINE_KEYCODE(key) { #key, AKEYCODE_##key }
+#define DEFINE_AXIS(axis) { #axis, AMOTION_EVENT_AXIS_##axis }
+#define DEFINE_LED(led) { #led, ALED_##led }
+#define DEFINE_FLAG(flag) { #flag, POLICY_FLAG_##flag }
+
+namespace android {
+
+// NOTE: If you add a new keycode here you must also add it to several other files.
+//       Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.
+#define KEYCODES_SEQUENCE \
+    DEFINE_KEYCODE(UNKNOWN), \
+    DEFINE_KEYCODE(SOFT_LEFT), \
+    DEFINE_KEYCODE(SOFT_RIGHT), \
+    DEFINE_KEYCODE(HOME), \
+    DEFINE_KEYCODE(BACK), \
+    DEFINE_KEYCODE(CALL), \
+    DEFINE_KEYCODE(ENDCALL), \
+    DEFINE_KEYCODE(0), \
+    DEFINE_KEYCODE(1), \
+    DEFINE_KEYCODE(2), \
+    DEFINE_KEYCODE(3), \
+    DEFINE_KEYCODE(4), \
+    DEFINE_KEYCODE(5), \
+    DEFINE_KEYCODE(6), \
+    DEFINE_KEYCODE(7), \
+    DEFINE_KEYCODE(8), \
+    DEFINE_KEYCODE(9), \
+    DEFINE_KEYCODE(STAR), \
+    DEFINE_KEYCODE(POUND), \
+    DEFINE_KEYCODE(DPAD_UP), \
+    DEFINE_KEYCODE(DPAD_DOWN), \
+    DEFINE_KEYCODE(DPAD_LEFT), \
+    DEFINE_KEYCODE(DPAD_RIGHT), \
+    DEFINE_KEYCODE(DPAD_CENTER), \
+    DEFINE_KEYCODE(VOLUME_UP), \
+    DEFINE_KEYCODE(VOLUME_DOWN), \
+    DEFINE_KEYCODE(POWER), \
+    DEFINE_KEYCODE(CAMERA), \
+    DEFINE_KEYCODE(CLEAR), \
+    DEFINE_KEYCODE(A), \
+    DEFINE_KEYCODE(B), \
+    DEFINE_KEYCODE(C), \
+    DEFINE_KEYCODE(D), \
+    DEFINE_KEYCODE(E), \
+    DEFINE_KEYCODE(F), \
+    DEFINE_KEYCODE(G), \
+    DEFINE_KEYCODE(H), \
+    DEFINE_KEYCODE(I), \
+    DEFINE_KEYCODE(J), \
+    DEFINE_KEYCODE(K), \
+    DEFINE_KEYCODE(L), \
+    DEFINE_KEYCODE(M), \
+    DEFINE_KEYCODE(N), \
+    DEFINE_KEYCODE(O), \
+    DEFINE_KEYCODE(P), \
+    DEFINE_KEYCODE(Q), \
+    DEFINE_KEYCODE(R), \
+    DEFINE_KEYCODE(S), \
+    DEFINE_KEYCODE(T), \
+    DEFINE_KEYCODE(U), \
+    DEFINE_KEYCODE(V), \
+    DEFINE_KEYCODE(W), \
+    DEFINE_KEYCODE(X), \
+    DEFINE_KEYCODE(Y), \
+    DEFINE_KEYCODE(Z), \
+    DEFINE_KEYCODE(COMMA), \
+    DEFINE_KEYCODE(PERIOD), \
+    DEFINE_KEYCODE(ALT_LEFT), \
+    DEFINE_KEYCODE(ALT_RIGHT), \
+    DEFINE_KEYCODE(SHIFT_LEFT), \
+    DEFINE_KEYCODE(SHIFT_RIGHT), \
+    DEFINE_KEYCODE(TAB), \
+    DEFINE_KEYCODE(SPACE), \
+    DEFINE_KEYCODE(SYM), \
+    DEFINE_KEYCODE(EXPLORER), \
+    DEFINE_KEYCODE(ENVELOPE), \
+    DEFINE_KEYCODE(ENTER), \
+    DEFINE_KEYCODE(DEL), \
+    DEFINE_KEYCODE(GRAVE), \
+    DEFINE_KEYCODE(MINUS), \
+    DEFINE_KEYCODE(EQUALS), \
+    DEFINE_KEYCODE(LEFT_BRACKET), \
+    DEFINE_KEYCODE(RIGHT_BRACKET), \
+    DEFINE_KEYCODE(BACKSLASH), \
+    DEFINE_KEYCODE(SEMICOLON), \
+    DEFINE_KEYCODE(APOSTROPHE), \
+    DEFINE_KEYCODE(SLASH), \
+    DEFINE_KEYCODE(AT), \
+    DEFINE_KEYCODE(NUM), \
+    DEFINE_KEYCODE(HEADSETHOOK), \
+    DEFINE_KEYCODE(FOCUS), \
+    DEFINE_KEYCODE(PLUS), \
+    DEFINE_KEYCODE(MENU), \
+    DEFINE_KEYCODE(NOTIFICATION), \
+    DEFINE_KEYCODE(SEARCH), \
+    DEFINE_KEYCODE(MEDIA_PLAY_PAUSE), \
+    DEFINE_KEYCODE(MEDIA_STOP), \
+    DEFINE_KEYCODE(MEDIA_NEXT), \
+    DEFINE_KEYCODE(MEDIA_PREVIOUS), \
+    DEFINE_KEYCODE(MEDIA_REWIND), \
+    DEFINE_KEYCODE(MEDIA_FAST_FORWARD), \
+    DEFINE_KEYCODE(MUTE), \
+    DEFINE_KEYCODE(PAGE_UP), \
+    DEFINE_KEYCODE(PAGE_DOWN), \
+    DEFINE_KEYCODE(PICTSYMBOLS), \
+    DEFINE_KEYCODE(SWITCH_CHARSET), \
+    DEFINE_KEYCODE(BUTTON_A), \
+    DEFINE_KEYCODE(BUTTON_B), \
+    DEFINE_KEYCODE(BUTTON_C), \
+    DEFINE_KEYCODE(BUTTON_X), \
+    DEFINE_KEYCODE(BUTTON_Y), \
+    DEFINE_KEYCODE(BUTTON_Z), \
+    DEFINE_KEYCODE(BUTTON_L1), \
+    DEFINE_KEYCODE(BUTTON_R1), \
+    DEFINE_KEYCODE(BUTTON_L2), \
+    DEFINE_KEYCODE(BUTTON_R2), \
+    DEFINE_KEYCODE(BUTTON_THUMBL), \
+    DEFINE_KEYCODE(BUTTON_THUMBR), \
+    DEFINE_KEYCODE(BUTTON_START), \
+    DEFINE_KEYCODE(BUTTON_SELECT), \
+    DEFINE_KEYCODE(BUTTON_MODE), \
+    DEFINE_KEYCODE(ESCAPE), \
+    DEFINE_KEYCODE(FORWARD_DEL), \
+    DEFINE_KEYCODE(CTRL_LEFT), \
+    DEFINE_KEYCODE(CTRL_RIGHT), \
+    DEFINE_KEYCODE(CAPS_LOCK), \
+    DEFINE_KEYCODE(SCROLL_LOCK), \
+    DEFINE_KEYCODE(META_LEFT), \
+    DEFINE_KEYCODE(META_RIGHT), \
+    DEFINE_KEYCODE(FUNCTION), \
+    DEFINE_KEYCODE(SYSRQ), \
+    DEFINE_KEYCODE(BREAK), \
+    DEFINE_KEYCODE(MOVE_HOME), \
+    DEFINE_KEYCODE(MOVE_END), \
+    DEFINE_KEYCODE(INSERT), \
+    DEFINE_KEYCODE(FORWARD), \
+    DEFINE_KEYCODE(MEDIA_PLAY), \
+    DEFINE_KEYCODE(MEDIA_PAUSE), \
+    DEFINE_KEYCODE(MEDIA_CLOSE), \
+    DEFINE_KEYCODE(MEDIA_EJECT), \
+    DEFINE_KEYCODE(MEDIA_RECORD), \
+    DEFINE_KEYCODE(F1), \
+    DEFINE_KEYCODE(F2), \
+    DEFINE_KEYCODE(F3), \
+    DEFINE_KEYCODE(F4), \
+    DEFINE_KEYCODE(F5), \
+    DEFINE_KEYCODE(F6), \
+    DEFINE_KEYCODE(F7), \
+    DEFINE_KEYCODE(F8), \
+    DEFINE_KEYCODE(F9), \
+    DEFINE_KEYCODE(F10), \
+    DEFINE_KEYCODE(F11), \
+    DEFINE_KEYCODE(F12), \
+    DEFINE_KEYCODE(NUM_LOCK), \
+    DEFINE_KEYCODE(NUMPAD_0), \
+    DEFINE_KEYCODE(NUMPAD_1), \
+    DEFINE_KEYCODE(NUMPAD_2), \
+    DEFINE_KEYCODE(NUMPAD_3), \
+    DEFINE_KEYCODE(NUMPAD_4), \
+    DEFINE_KEYCODE(NUMPAD_5), \
+    DEFINE_KEYCODE(NUMPAD_6), \
+    DEFINE_KEYCODE(NUMPAD_7), \
+    DEFINE_KEYCODE(NUMPAD_8), \
+    DEFINE_KEYCODE(NUMPAD_9), \
+    DEFINE_KEYCODE(NUMPAD_DIVIDE), \
+    DEFINE_KEYCODE(NUMPAD_MULTIPLY), \
+    DEFINE_KEYCODE(NUMPAD_SUBTRACT), \
+    DEFINE_KEYCODE(NUMPAD_ADD), \
+    DEFINE_KEYCODE(NUMPAD_DOT), \
+    DEFINE_KEYCODE(NUMPAD_COMMA), \
+    DEFINE_KEYCODE(NUMPAD_ENTER), \
+    DEFINE_KEYCODE(NUMPAD_EQUALS), \
+    DEFINE_KEYCODE(NUMPAD_LEFT_PAREN), \
+    DEFINE_KEYCODE(NUMPAD_RIGHT_PAREN), \
+    DEFINE_KEYCODE(VOLUME_MUTE), \
+    DEFINE_KEYCODE(INFO), \
+    DEFINE_KEYCODE(CHANNEL_UP), \
+    DEFINE_KEYCODE(CHANNEL_DOWN), \
+    DEFINE_KEYCODE(ZOOM_IN), \
+    DEFINE_KEYCODE(ZOOM_OUT), \
+    DEFINE_KEYCODE(TV), \
+    DEFINE_KEYCODE(WINDOW), \
+    DEFINE_KEYCODE(GUIDE), \
+    DEFINE_KEYCODE(DVR), \
+    DEFINE_KEYCODE(BOOKMARK), \
+    DEFINE_KEYCODE(CAPTIONS), \
+    DEFINE_KEYCODE(SETTINGS), \
+    DEFINE_KEYCODE(TV_POWER), \
+    DEFINE_KEYCODE(TV_INPUT), \
+    DEFINE_KEYCODE(STB_POWER), \
+    DEFINE_KEYCODE(STB_INPUT), \
+    DEFINE_KEYCODE(AVR_POWER), \
+    DEFINE_KEYCODE(AVR_INPUT), \
+    DEFINE_KEYCODE(PROG_RED), \
+    DEFINE_KEYCODE(PROG_GREEN), \
+    DEFINE_KEYCODE(PROG_YELLOW), \
+    DEFINE_KEYCODE(PROG_BLUE), \
+    DEFINE_KEYCODE(APP_SWITCH), \
+    DEFINE_KEYCODE(BUTTON_1), \
+    DEFINE_KEYCODE(BUTTON_2), \
+    DEFINE_KEYCODE(BUTTON_3), \
+    DEFINE_KEYCODE(BUTTON_4), \
+    DEFINE_KEYCODE(BUTTON_5), \
+    DEFINE_KEYCODE(BUTTON_6), \
+    DEFINE_KEYCODE(BUTTON_7), \
+    DEFINE_KEYCODE(BUTTON_8), \
+    DEFINE_KEYCODE(BUTTON_9), \
+    DEFINE_KEYCODE(BUTTON_10), \
+    DEFINE_KEYCODE(BUTTON_11), \
+    DEFINE_KEYCODE(BUTTON_12), \
+    DEFINE_KEYCODE(BUTTON_13), \
+    DEFINE_KEYCODE(BUTTON_14), \
+    DEFINE_KEYCODE(BUTTON_15), \
+    DEFINE_KEYCODE(BUTTON_16), \
+    DEFINE_KEYCODE(LANGUAGE_SWITCH), \
+    DEFINE_KEYCODE(MANNER_MODE), \
+    DEFINE_KEYCODE(3D_MODE), \
+    DEFINE_KEYCODE(CONTACTS), \
+    DEFINE_KEYCODE(CALENDAR), \
+    DEFINE_KEYCODE(MUSIC), \
+    DEFINE_KEYCODE(CALCULATOR), \
+    DEFINE_KEYCODE(ZENKAKU_HANKAKU), \
+    DEFINE_KEYCODE(EISU), \
+    DEFINE_KEYCODE(MUHENKAN), \
+    DEFINE_KEYCODE(HENKAN), \
+    DEFINE_KEYCODE(KATAKANA_HIRAGANA), \
+    DEFINE_KEYCODE(YEN), \
+    DEFINE_KEYCODE(RO), \
+    DEFINE_KEYCODE(KANA), \
+    DEFINE_KEYCODE(ASSIST), \
+    DEFINE_KEYCODE(BRIGHTNESS_DOWN), \
+    DEFINE_KEYCODE(BRIGHTNESS_UP), \
+    DEFINE_KEYCODE(MEDIA_AUDIO_TRACK), \
+    DEFINE_KEYCODE(SLEEP), \
+    DEFINE_KEYCODE(WAKEUP), \
+    DEFINE_KEYCODE(PAIRING), \
+    DEFINE_KEYCODE(MEDIA_TOP_MENU), \
+    DEFINE_KEYCODE(11), \
+    DEFINE_KEYCODE(12), \
+    DEFINE_KEYCODE(LAST_CHANNEL), \
+    DEFINE_KEYCODE(TV_DATA_SERVICE), \
+    DEFINE_KEYCODE(VOICE_ASSIST), \
+    DEFINE_KEYCODE(TV_RADIO_SERVICE), \
+    DEFINE_KEYCODE(TV_TELETEXT), \
+    DEFINE_KEYCODE(TV_NUMBER_ENTRY), \
+    DEFINE_KEYCODE(TV_TERRESTRIAL_ANALOG), \
+    DEFINE_KEYCODE(TV_TERRESTRIAL_DIGITAL), \
+    DEFINE_KEYCODE(TV_SATELLITE), \
+    DEFINE_KEYCODE(TV_SATELLITE_BS), \
+    DEFINE_KEYCODE(TV_SATELLITE_CS), \
+    DEFINE_KEYCODE(TV_SATELLITE_SERVICE), \
+    DEFINE_KEYCODE(TV_NETWORK), \
+    DEFINE_KEYCODE(TV_ANTENNA_CABLE), \
+    DEFINE_KEYCODE(TV_INPUT_HDMI_1), \
+    DEFINE_KEYCODE(TV_INPUT_HDMI_2), \
+    DEFINE_KEYCODE(TV_INPUT_HDMI_3), \
+    DEFINE_KEYCODE(TV_INPUT_HDMI_4), \
+    DEFINE_KEYCODE(TV_INPUT_COMPOSITE_1), \
+    DEFINE_KEYCODE(TV_INPUT_COMPOSITE_2), \
+    DEFINE_KEYCODE(TV_INPUT_COMPONENT_1), \
+    DEFINE_KEYCODE(TV_INPUT_COMPONENT_2), \
+    DEFINE_KEYCODE(TV_INPUT_VGA_1), \
+    DEFINE_KEYCODE(TV_AUDIO_DESCRIPTION), \
+    DEFINE_KEYCODE(TV_AUDIO_DESCRIPTION_MIX_UP), \
+    DEFINE_KEYCODE(TV_AUDIO_DESCRIPTION_MIX_DOWN), \
+    DEFINE_KEYCODE(TV_ZOOM_MODE), \
+    DEFINE_KEYCODE(TV_CONTENTS_MENU), \
+    DEFINE_KEYCODE(TV_MEDIA_CONTEXT_MENU), \
+    DEFINE_KEYCODE(TV_TIMER_PROGRAMMING), \
+    DEFINE_KEYCODE(HELP), \
+    DEFINE_KEYCODE(NAVIGATE_PREVIOUS), \
+    DEFINE_KEYCODE(NAVIGATE_NEXT), \
+    DEFINE_KEYCODE(NAVIGATE_IN), \
+    DEFINE_KEYCODE(NAVIGATE_OUT), \
+    DEFINE_KEYCODE(STEM_PRIMARY), \
+    DEFINE_KEYCODE(STEM_1), \
+    DEFINE_KEYCODE(STEM_2), \
+    DEFINE_KEYCODE(STEM_3), \
+    DEFINE_KEYCODE(DPAD_UP_LEFT), \
+    DEFINE_KEYCODE(DPAD_DOWN_LEFT), \
+    DEFINE_KEYCODE(DPAD_UP_RIGHT), \
+    DEFINE_KEYCODE(DPAD_DOWN_RIGHT), \
+    DEFINE_KEYCODE(MEDIA_SKIP_FORWARD), \
+    DEFINE_KEYCODE(MEDIA_SKIP_BACKWARD), \
+    DEFINE_KEYCODE(MEDIA_STEP_FORWARD), \
+    DEFINE_KEYCODE(MEDIA_STEP_BACKWARD), \
+    DEFINE_KEYCODE(SOFT_SLEEP), \
+    DEFINE_KEYCODE(CUT), \
+    DEFINE_KEYCODE(COPY), \
+    DEFINE_KEYCODE(PASTE), \
+    DEFINE_KEYCODE(SYSTEM_NAVIGATION_UP), \
+    DEFINE_KEYCODE(SYSTEM_NAVIGATION_DOWN), \
+    DEFINE_KEYCODE(SYSTEM_NAVIGATION_LEFT), \
+    DEFINE_KEYCODE(SYSTEM_NAVIGATION_RIGHT), \
+    DEFINE_KEYCODE(ALL_APPS), \
+    DEFINE_KEYCODE(REFRESH), \
+    DEFINE_KEYCODE(THUMBS_UP), \
+    DEFINE_KEYCODE(THUMBS_DOWN), \
+    DEFINE_KEYCODE(PROFILE_SWITCH)
+
+// NOTE: If you add a new axis here you must also add it to several other files.
+//       Refer to frameworks/base/core/java/android/view/MotionEvent.java for the full list.
+#define AXES_SEQUENCE \
+    DEFINE_AXIS(X), \
+    DEFINE_AXIS(Y), \
+    DEFINE_AXIS(PRESSURE), \
+    DEFINE_AXIS(SIZE), \
+    DEFINE_AXIS(TOUCH_MAJOR), \
+    DEFINE_AXIS(TOUCH_MINOR), \
+    DEFINE_AXIS(TOOL_MAJOR), \
+    DEFINE_AXIS(TOOL_MINOR), \
+    DEFINE_AXIS(ORIENTATION), \
+    DEFINE_AXIS(VSCROLL), \
+    DEFINE_AXIS(HSCROLL), \
+    DEFINE_AXIS(Z), \
+    DEFINE_AXIS(RX), \
+    DEFINE_AXIS(RY), \
+    DEFINE_AXIS(RZ), \
+    DEFINE_AXIS(HAT_X), \
+    DEFINE_AXIS(HAT_Y), \
+    DEFINE_AXIS(LTRIGGER), \
+    DEFINE_AXIS(RTRIGGER), \
+    DEFINE_AXIS(THROTTLE), \
+    DEFINE_AXIS(RUDDER), \
+    DEFINE_AXIS(WHEEL), \
+    DEFINE_AXIS(GAS), \
+    DEFINE_AXIS(BRAKE), \
+    DEFINE_AXIS(DISTANCE), \
+    DEFINE_AXIS(TILT), \
+    DEFINE_AXIS(SCROLL), \
+    DEFINE_AXIS(RELATIVE_X), \
+    DEFINE_AXIS(RELATIVE_Y), \
+    DEFINE_AXIS(GENERIC_1), \
+    DEFINE_AXIS(GENERIC_2), \
+    DEFINE_AXIS(GENERIC_3), \
+    DEFINE_AXIS(GENERIC_4), \
+    DEFINE_AXIS(GENERIC_5), \
+    DEFINE_AXIS(GENERIC_6), \
+    DEFINE_AXIS(GENERIC_7), \
+    DEFINE_AXIS(GENERIC_8), \
+    DEFINE_AXIS(GENERIC_9), \
+    DEFINE_AXIS(GENERIC_10), \
+    DEFINE_AXIS(GENERIC_11), \
+    DEFINE_AXIS(GENERIC_12), \
+    DEFINE_AXIS(GENERIC_13), \
+    DEFINE_AXIS(GENERIC_14), \
+    DEFINE_AXIS(GENERIC_15), \
+    DEFINE_AXIS(GENERIC_16)
+
+
+// NOTE: If you add new LEDs here, you must also add them to Input.h
+#define LEDS_SEQUENCE \
+    DEFINE_LED(NUM_LOCK), \
+    DEFINE_LED(CAPS_LOCK), \
+    DEFINE_LED(SCROLL_LOCK), \
+    DEFINE_LED(COMPOSE), \
+    DEFINE_LED(KANA), \
+    DEFINE_LED(SLEEP), \
+    DEFINE_LED(SUSPEND), \
+    DEFINE_LED(MUTE), \
+    DEFINE_LED(MISC), \
+    DEFINE_LED(MAIL), \
+    DEFINE_LED(CHARGING), \
+    DEFINE_LED(CONTROLLER_1), \
+    DEFINE_LED(CONTROLLER_2), \
+    DEFINE_LED(CONTROLLER_3), \
+    DEFINE_LED(CONTROLLER_4)
+
+#define FLAGS_SEQUENCE \
+    DEFINE_FLAG(VIRTUAL), \
+    DEFINE_FLAG(FUNCTION), \
+    DEFINE_FLAG(GESTURE), \
+    DEFINE_FLAG(WAKE)
+
+// --- InputEventLookup ---
+const std::unordered_map<std::string, int> InputEventLookup::KEYCODES = {KEYCODES_SEQUENCE};
+
+const std::vector<InputEventLabel> InputEventLookup::KEY_NAMES = {KEYCODES_SEQUENCE};
+
+const std::unordered_map<std::string, int> InputEventLookup::AXES = {AXES_SEQUENCE};
+
+const std::vector<InputEventLabel> InputEventLookup::AXES_NAMES = {AXES_SEQUENCE};
+
+const std::unordered_map<std::string, int> InputEventLookup::LEDS = {LEDS_SEQUENCE};
+
+const std::unordered_map<std::string, int> InputEventLookup::FLAGS = {FLAGS_SEQUENCE};
+
+int InputEventLookup::lookupValueByLabel(const std::unordered_map<std::string, int>& map,
+                                         const char* literal) {
+    std::string str(literal);
+    auto it = map.find(str);
+    return it != map.end() ? it->second : 0;
+}
+
+const char* InputEventLookup::lookupLabelByValue(const std::vector<InputEventLabel>& vec,
+                                                 int value) {
+    if (static_cast<size_t>(value) < vec.size()) {
+        return vec[value].literal;
+    }
+    return nullptr;
+}
+
+int32_t InputEventLookup::getKeyCodeByLabel(const char* label) {
+    return int32_t(lookupValueByLabel(KEYCODES, label));
+}
+
+const char* InputEventLookup::getLabelByKeyCode(int32_t keyCode) {
+    if (keyCode >= 0 && static_cast<size_t>(keyCode) < KEYCODES.size()) {
+        return lookupLabelByValue(KEY_NAMES, keyCode);
+    }
+    return nullptr;
+}
+
+uint32_t InputEventLookup::getKeyFlagByLabel(const char* label) {
+    return uint32_t(lookupValueByLabel(FLAGS, label));
+}
+
+int32_t InputEventLookup::getAxisByLabel(const char* label) {
+    return int32_t(lookupValueByLabel(AXES, label));
+}
+
+const char* InputEventLookup::getAxisLabel(int32_t axisId) {
+    return lookupLabelByValue(AXES_NAMES, axisId);
+}
+
+int32_t InputEventLookup::getLedByLabel(const char* label) {
+    return int32_t(lookupValueByLabel(LEDS, label));
+}
+
+} // namespace android
index cb68165..5c03d50 100644 (file)
@@ -880,7 +880,7 @@ status_t KeyCharacterMap::Parser::parseMapKey() {
 
     mTokenizer->skipDelimiters(WHITESPACE);
     String8 keyCodeToken = mTokenizer->nextToken(WHITESPACE);
-    int32_t keyCode = getKeyCodeByLabel(keyCodeToken.string());
+    int32_t keyCode = InputEventLookup::getKeyCodeByLabel(keyCodeToken.string());
     if (!keyCode) {
         ALOGE("%s: Expected key code label, got '%s'.", mTokenizer->getLocation().string(),
                 keyCodeToken.string());
@@ -897,7 +897,7 @@ status_t KeyCharacterMap::Parser::parseMapKey() {
 
 status_t KeyCharacterMap::Parser::parseKey() {
     String8 keyCodeToken = mTokenizer->nextToken(WHITESPACE);
-    int32_t keyCode = getKeyCodeByLabel(keyCodeToken.string());
+    int32_t keyCode = InputEventLookup::getKeyCodeByLabel(keyCodeToken.string());
     if (!keyCode) {
         ALOGE("%s: Expected key code label, got '%s'.", mTokenizer->getLocation().string(),
                 keyCodeToken.string());
@@ -1017,7 +1017,7 @@ status_t KeyCharacterMap::Parser::parseKeyProperty() {
             } else if (token == "fallback") {
                 mTokenizer->skipDelimiters(WHITESPACE);
                 token = mTokenizer->nextToken(WHITESPACE);
-                int32_t keyCode = getKeyCodeByLabel(token.string());
+                int32_t keyCode = InputEventLookup::getKeyCodeByLabel(token.string());
                 if (!keyCode) {
                     ALOGE("%s: Invalid key code label for fallback behavior, got '%s'.",
                             mTokenizer->getLocation().string(),
@@ -1034,7 +1034,7 @@ status_t KeyCharacterMap::Parser::parseKeyProperty() {
             } else if (token == "replace") {
                 mTokenizer->skipDelimiters(WHITESPACE);
                 token = mTokenizer->nextToken(WHITESPACE);
-                int32_t keyCode = getKeyCodeByLabel(token.string());
+                int32_t keyCode = InputEventLookup::getKeyCodeByLabel(token.string());
                 if (!keyCode) {
                     ALOGE("%s: Invalid key code label for replace, got '%s'.",
                             mTokenizer->getLocation().string(),
index efca68d..9c399b3 100644 (file)
@@ -264,7 +264,7 @@ status_t KeyLayoutMap::Parser::parseKey() {
 
     mTokenizer->skipDelimiters(WHITESPACE);
     String8 keyCodeToken = mTokenizer->nextToken(WHITESPACE);
-    int32_t keyCode = getKeyCodeByLabel(keyCodeToken.string());
+    int32_t keyCode = InputEventLookup::getKeyCodeByLabel(keyCodeToken.string());
     if (!keyCode) {
         ALOGE("%s: Expected key code label, got '%s'.", mTokenizer->getLocation().string(),
                 keyCodeToken.string());
@@ -277,7 +277,7 @@ status_t KeyLayoutMap::Parser::parseKey() {
         if (mTokenizer->isEol() || mTokenizer->peekChar() == '#') break;
 
         String8 flagToken = mTokenizer->nextToken(WHITESPACE);
-        uint32_t flag = getKeyFlagByLabel(flagToken.string());
+        uint32_t flag = InputEventLookup::getKeyFlagByLabel(flagToken.string());
         if (!flag) {
             ALOGE("%s: Expected key flag label, got '%s'.", mTokenizer->getLocation().string(),
                     flagToken.string());
@@ -326,7 +326,7 @@ status_t KeyLayoutMap::Parser::parseAxis() {
 
         mTokenizer->skipDelimiters(WHITESPACE);
         String8 axisToken = mTokenizer->nextToken(WHITESPACE);
-        axisInfo.axis = getAxisByLabel(axisToken.string());
+        axisInfo.axis = InputEventLookup::getAxisByLabel(axisToken.string());
         if (axisInfo.axis < 0) {
             ALOGE("%s: Expected inverted axis label, got '%s'.",
                     mTokenizer->getLocation().string(), axisToken.string());
@@ -346,7 +346,7 @@ status_t KeyLayoutMap::Parser::parseAxis() {
 
         mTokenizer->skipDelimiters(WHITESPACE);
         String8 lowAxisToken = mTokenizer->nextToken(WHITESPACE);
-        axisInfo.axis = getAxisByLabel(lowAxisToken.string());
+        axisInfo.axis = InputEventLookup::getAxisByLabel(lowAxisToken.string());
         if (axisInfo.axis < 0) {
             ALOGE("%s: Expected low axis label, got '%s'.",
                     mTokenizer->getLocation().string(), lowAxisToken.string());
@@ -355,14 +355,14 @@ status_t KeyLayoutMap::Parser::parseAxis() {
 
         mTokenizer->skipDelimiters(WHITESPACE);
         String8 highAxisToken = mTokenizer->nextToken(WHITESPACE);
-        axisInfo.highAxis = getAxisByLabel(highAxisToken.string());
+        axisInfo.highAxis = InputEventLookup::getAxisByLabel(highAxisToken.string());
         if (axisInfo.highAxis < 0) {
             ALOGE("%s: Expected high axis label, got '%s'.",
                     mTokenizer->getLocation().string(), highAxisToken.string());
             return BAD_VALUE;
         }
     } else {
-        axisInfo.axis = getAxisByLabel(token.string());
+        axisInfo.axis = InputEventLookup::getAxisByLabel(token.string());
         if (axisInfo.axis < 0) {
             ALOGE("%s: Expected axis label, 'split' or 'invert', got '%s'.",
                     mTokenizer->getLocation().string(), token.string());
@@ -428,7 +428,7 @@ status_t KeyLayoutMap::Parser::parseLed() {
 
     mTokenizer->skipDelimiters(WHITESPACE);
     String8 ledCodeToken = mTokenizer->nextToken(WHITESPACE);
-    int32_t ledCode = getLedByLabel(ledCodeToken.string());
+    int32_t ledCode = InputEventLookup::getLedByLabel(ledCodeToken.string());
     if (ledCode < 0) {
         ALOGE("%s: Expected LED code label, got '%s'.", mTokenizer->getLocation().string(),
                 ledCodeToken.string());
index 14f922f..c63c179 100644 (file)
@@ -108,7 +108,7 @@ void InputDevice::dump(std::string& dump) {
         dump += INDENT2 "Motion Ranges:\n";
         for (size_t i = 0; i < ranges.size(); i++) {
             const InputDeviceInfo::MotionRange& range = ranges[i];
-            const char* label = getAxisLabel(range.axis);
+            const char* label = InputEventLookup::getAxisLabel(range.axis);
             char name[32];
             if (label) {
                 strncpy(name, label, sizeof(name));
index 57acba5..abd8aa9 100644 (file)
@@ -73,14 +73,14 @@ void JoystickInputMapper::dump(std::string& dump) {
 
     dump += INDENT3 "Axes:\n";
     for (const auto& [rawAxis, axis] : mAxes) {
-        const char* label = getAxisLabel(axis.axisInfo.axis);
+        const char* label = InputEventLookup::getAxisLabel(axis.axisInfo.axis);
         if (label) {
             dump += StringPrintf(INDENT4 "%s", label);
         } else {
             dump += StringPrintf(INDENT4 "%d", axis.axisInfo.axis);
         }
         if (axis.axisInfo.mode == AxisInfo::MODE_SPLIT) {
-            label = getAxisLabel(axis.axisInfo.highAxis);
+            label = InputEventLookup::getAxisLabel(axis.axisInfo.highAxis);
             if (label) {
                 dump += StringPrintf(" / %s (split at %d)", label, axis.axisInfo.splitValue);
             } else {