diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-08-21 09:59:10 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-08-21 09:59:10 +0200 |
| commit | abe0822e3cccae6098c56f4fecb029f300b9a01a (patch) | |
| tree | d34afb066008dce5db1bfb9fd576f22bf0cdaa5d | |
| parent | 5ad9febb1c7e08fe24413f9bd04f30d92b4cfa3a (diff) | |
| download | external_qemu-abe0822e3cccae6098c56f4fecb029f300b9a01a.zip external_qemu-abe0822e3cccae6098c56f4fecb029f300b9a01a.tar.gz external_qemu-abe0822e3cccae6098c56f4fecb029f300b9a01a.tar.bz2 | |
Fix F2/PageUp to properly generate an emulated Menu key press.
This bug was introduced by previous changes to hw/goldfish_events_device.c
where the list of valid key scancodes reported by the kernel was restricted
to KEY_SOFT1 but not KEY_MENU.
KEY_SOFT1 is the scan-code used to represent a press of the Menu key on
the emulated device. KEY_MENU is some Linux thing that is confusingly unrelated.
Before we filtered out KEY_MENU, the framework or keymap was capable of
transforming KEY_MENU into the proper kKeyCodeMenu at runtime. But the event
filtering added in goldfish_events_device.c meant that KEY_MENU was never
passed by the kernel to user-space.
The fix is simply to generate KEY_SOFT1 for emulated Menu key presses.
| -rw-r--r-- | CHANGES.TXT | 3 | ||||
| -rw-r--r-- | android/charmap.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES.TXT b/CHANGES.TXT index d529ce6..aca11fd 100644 --- a/CHANGES.TXT +++ b/CHANGES.TXT @@ -25,6 +25,9 @@ IMPORTANT BUG FIXES: - Fixed a nasty race condition in the Linux EsounD audio backend which resulted in rare lockups when stopping the emulator on this platform. +- The key-bindings for the Menu button (F2 and PageUp by default) didn't work + due to a typo. + ============================================================================== Changes between 1.11 and 1.10 diff --git a/android/charmap.h b/android/charmap.h index 367e730..2b0d071 100644 --- a/android/charmap.h +++ b/android/charmap.h @@ -98,7 +98,7 @@ typedef enum { kKeyCodeHeadsetHook = KEY_HEADSETHOOK, kKeyCodeFocus = KEY_FOCUS, kKeyCodePlus = KEY_PLUS, - kKeyCodeMenu = KEY_MENU, + kKeyCodeMenu = KEY_SOFT1, kKeyCodeNotification = KEY_NOTIFICATION, kKeyCodeSearch = KEY_SEARCH, |