diff options
| author | Po Lu | 2024-05-12 14:13:27 +0800 |
|---|---|---|
| committer | Po Lu | 2024-05-12 15:49:53 +0800 |
| commit | af6df8e0454f3f51d3855683216dfd12843e6959 (patch) | |
| tree | 97a4d66d5891b8a2e1daad9245091632878eb0ca /java | |
| parent | 5b9995052d547982281a4dd3db6d797f4006144a (diff) | |
| download | emacs-af6df8e0454f3f51d3855683216dfd12843e6959.tar.gz emacs-af6df8e0454f3f51d3855683216dfd12843e6959.zip | |
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')
| -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 | |||
| 691 | 691 | ||
| 692 | state = eventModifiers (event); | 692 | state = eventModifiers (event); |
| 693 | 693 | ||
| 694 | /* Num Lock, Scroll Lock and Meta aren't supported by systems older | 694 | /* Meta isn't supported by systems older than Android 3.0. */ |
| 695 | than Android 3.0. */ | ||
| 696 | 695 | ||
| 697 | if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) | 696 | if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) |
| 698 | extra_ignored = (KeyEvent.META_NUM_LOCK_ON | 697 | extra_ignored = KeyEvent.META_META_MASK; |
| 699 | | KeyEvent.META_SCROLL_LOCK_ON | ||
| 700 | | KeyEvent.META_META_MASK); | ||
| 701 | else | 698 | else |
| 702 | extra_ignored = 0; | 699 | extra_ignored = 0; |
| 703 | 700 | ||
| @@ -748,13 +745,10 @@ public final class EmacsWindow extends EmacsHandleObject | |||
| 748 | /* Compute the event's modifier mask. */ | 745 | /* Compute the event's modifier mask. */ |
| 749 | state = eventModifiers (event); | 746 | state = eventModifiers (event); |
| 750 | 747 | ||
| 751 | /* Num Lock, Scroll Lock and Meta aren't supported by systems older | 748 | /* Meta isn't supported by systems older than Android 3.0. */ |
| 752 | than Android 3.0. */ | ||
| 753 | 749 | ||
| 754 | if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) | 750 | if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) |
| 755 | extra_ignored = (KeyEvent.META_NUM_LOCK_ON | 751 | extra_ignored = KeyEvent.META_META_MASK; |
| 756 | | KeyEvent.META_SCROLL_LOCK_ON | ||
| 757 | | KeyEvent.META_META_MASK); | ||
| 758 | else | 752 | else |
| 759 | extra_ignored = 0; | 753 | extra_ignored = 0; |
| 760 | 754 | ||