diff options
| author | Dmitry Torokhov <dtor@google.com> | 2015-09-24 13:13:55 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@google.com> | 2015-09-29 13:27:16 -0700 |
| commit | 0faaa0bd7aa5dadea7c365fbb1f186da6eb097ef (patch) | |
| tree | 2dc2ff68804e4cb736dd5348d2a755e5ca8a6b71 /services/inputflinger/EventHub.h | |
| parent | 115f93eeebf7f33b56ed090de70d6e8c733e5d88 (diff) | |
| download | frameworks_native-0faaa0bd7aa5dadea7c365fbb1f186da6eb097ef.zip frameworks_native-0faaa0bd7aa5dadea7c365fbb1f186da6eb097ef.tar.gz frameworks_native-0faaa0bd7aa5dadea7c365fbb1f186da6eb097ef.tar.bz2 | |
Inputflinger: hook up key event replacement processing
Add handling of "replacement" key events in InputReader and EventHub by
consulting device's character key map (if exists) for presence of
replacement key code for given get code and meta state combination,
before passing it to InputDispatcher.
This enables defining special keys, such as ESC, on keyboards lacking
enough physical keys, via combination of normal keys and modifiers, for
example AltR + 1 => ESC.
Bug: 24504154
Change-Id: I7e36104808bedcf724436c1fbb63d37c35cca8af
Diffstat (limited to 'services/inputflinger/EventHub.h')
| -rw-r--r-- | services/inputflinger/EventHub.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/services/inputflinger/EventHub.h b/services/inputflinger/EventHub.h index 3ec4910..0f94c77 100644 --- a/services/inputflinger/EventHub.h +++ b/services/inputflinger/EventHub.h @@ -197,8 +197,9 @@ public: virtual bool hasInputProperty(int32_t deviceId, int property) const = 0; - virtual status_t mapKey(int32_t deviceId, int32_t scanCode, int32_t usageCode, - int32_t* outKeycode, uint32_t* outFlags) const = 0; + virtual status_t mapKey(int32_t deviceId, + int32_t scanCode, int32_t usageCode, int32_t metaState, + int32_t* outKeycode, int32_t *outMetaState, uint32_t* outFlags) const = 0; virtual status_t mapAxis(int32_t deviceId, int32_t scanCode, AxisInfo* outAxisInfo) const = 0; @@ -285,8 +286,9 @@ public: virtual bool hasInputProperty(int32_t deviceId, int property) const; - virtual status_t mapKey(int32_t deviceId, int32_t scanCode, int32_t usageCode, - int32_t* outKeycode, uint32_t* outFlags) const; + virtual status_t mapKey(int32_t deviceId, + int32_t scanCode, int32_t usageCode, int32_t metaState, + int32_t* outKeycode, int32_t *outMetaState, uint32_t* outFlags) const; virtual status_t mapAxis(int32_t deviceId, int32_t scanCode, AxisInfo* outAxisInfo) const; |