diff options
| author | Jules Aguillon | 2022-02-19 21:48:48 +0100 |
|---|---|---|
| committer | Jules Aguillon | 2022-02-19 21:48:48 +0100 |
| commit | 632a9ac590b92a52afe57f1f0aaaa919f9dcebdc (patch) | |
| tree | 71198a17703808e738456652fa820c8bcbdf31c1 /srcs | |
| parent | d73be58c1a49fdbea2cc374edfe893f63424c89d (diff) | |
| download | unexpected-keyboard-632a9ac590b92a52afe57f1f0aaaa919f9dcebdc.tar.gz unexpected-keyboard-632a9ac590b92a52afe57f1f0aaaa919f9dcebdc.zip | |
Localize € and £
Show these characters only for users that have the corresponding locale
installed (a supported eu language for €, en-GB for £).
Add these characters to most layouts.
Diffstat (limited to 'srcs')
| -rw-r--r-- | srcs/juloo.keyboard2/Config.java | 2 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/KeyValue.java | 11 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/Keyboard2.java | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index 2a2be30..3e3d349 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -173,6 +173,8 @@ final class Config case "macron": return KeyValue.FLAG_ACCENT_MACRON; case "ring": return KeyValue.FLAG_ACCENT_RING; case "szlig": return KeyValue.FLAG_LANG_SZLIG; + case "euro": return KeyValue.FLAG_LANG_EURO; + case "pound": return KeyValue.FLAG_LANG_POUND; case "tilde": return KeyValue.FLAG_ACCENT4; case "trema": return KeyValue.FLAG_ACCENT6; default: throw new RuntimeException(name); diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java index fa5b4a6..8ce3cbe 100644 --- a/srcs/juloo.keyboard2/KeyValue.java +++ b/srcs/juloo.keyboard2/KeyValue.java @@ -56,8 +56,11 @@ class KeyValue // Language specific keys public static final int FLAG_LANG_SZLIG = (1 << 25); + public static final int FLAG_LANG_EURO = (1 << 29); + public static final int FLAG_LANG_POUND = (1 << 30); - public static final int FLAGS_LANGS = FLAG_LANG_SZLIG; + public static final int FLAGS_LANGS = FLAG_LANG_SZLIG | FLAG_LANG_EURO | + FLAG_LANG_POUND; public static final int FLAGS_NOT_HIDDEN_ACCENTS = FLAG_ACCENT_SUPERSCRIPT | FLAG_ACCENT_SUBSCRIPT | FLAG_ACCENT_ORDINAL; @@ -148,10 +151,6 @@ class KeyValue static { - String chars = "<>&\"_°~{|^}$*:!£%µ?.§€"; - for (int i = 0; i < chars.length(); i++) - addCharKey(chars.charAt(i), EVENT_NONE); - addModifierKey("shift", "\uE808", FLAG_LOCK | FLAG_SHIFT | FLAG_KEY_FONT); addModifierKey("ctrl", "Ctrl", FLAG_CTRL); addModifierKey("alt", "Alt", FLAG_ALT); @@ -224,6 +223,8 @@ class KeyValue addCharKey('(', KeyEvent.KEYCODE_NUMPAD_LEFT_PAREN); addCharKey(')', KeyEvent.KEYCODE_NUMPAD_RIGHT_PAREN); addCharKey('ß', EVENT_NONE, FLAG_LANG_SZLIG); + addCharKey('€', EVENT_NONE, FLAG_LANG_EURO); + addCharKey('£', EVENT_NONE, FLAG_LANG_POUND); addSpecialKey("config", "⛭", EVENT_CONFIG); addSpecialKey("switch_text", "ABC", EVENT_SWITCH_TEXT); diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java index 7f02ea7..0ce3af8 100644 --- a/srcs/juloo.keyboard2/Keyboard2.java +++ b/srcs/juloo.keyboard2/Keyboard2.java @@ -64,6 +64,8 @@ public class Keyboard2 extends InputMethodService String s = subtype.getExtraValueOf("default_layout"); if (s != null) l = Config.layoutId_of_string(s); + else + l = R.xml.qwerty; } _currentTextLayout = l; } |