diff options
| author | Po Lu <luangruo@yahoo.com> | 2024-05-12 14:13:27 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2024-05-12 15:49:53 +0800 |
| commit | af6df8e0454f3f51d3855683216dfd12843e6959 (patch) | |
| tree | 97a4d66d5891b8a2e1daad9245091632878eb0ca /java/org/gnu/emacs/EmacsWindow.java | |
| parent | 5b9995052d547982281a4dd3db6d797f4006144a (diff) | |
Correct earlier changes to processing of Num Lock on Android
* java/org/gnu/emacs/EmacsWindow.java (onKeyDown, onKeyUp):
Cease stripping META_NUM_LOCK_ON and META_SCROLL_LOCK_ON from
meta masks reported to getUnicodeChar.
Diffstat (limited to 'java/org/gnu/emacs/EmacsWindow.java')
| -rw-r--r-- | java/org/gnu/emacs/EmacsWindow.java | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java index 9acdc9502cf..6442f373736 100644 --- a/java/org/gnu/emacs/EmacsWindow.java +++ b/java/org/gnu/emacs/EmacsWindow.java @@ -691,13 +691,10 @@ public final class EmacsWindow extends EmacsHandleObject state = eventModifiers (event); - /* Num Lock, Scroll Lock and Meta aren't supported by systems older - than Android 3.0. */ + /* Meta isn't supported by systems older than Android 3.0. */ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) - extra_ignored = (KeyEvent.META_NUM_LOCK_ON - | KeyEvent.META_SCROLL_LOCK_ON - | KeyEvent.META_META_MASK); + extra_ignored = KeyEvent.META_META_MASK; else extra_ignored = 0; @@ -748,13 +745,10 @@ public final class EmacsWindow extends EmacsHandleObject /* Compute the event's modifier mask. */ state = eventModifiers (event); - /* Num Lock, Scroll Lock and Meta aren't supported by systems older - than Android 3.0. */ + /* Meta isn't supported by systems older than Android 3.0. */ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) - extra_ignored = (KeyEvent.META_NUM_LOCK_ON - | KeyEvent.META_SCROLL_LOCK_ON - | KeyEvent.META_META_MASK); + extra_ignored = KeyEvent.META_META_MASK; else extra_ignored = 0; |