diff options
Diffstat (limited to 'srcs/juloo.keyboard2/KeyModifier.java')
| -rw-r--r-- | srcs/juloo.keyboard2/KeyModifier.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java index a3c499b..70f7315 100644 --- a/srcs/juloo.keyboard2/KeyModifier.java +++ b/srcs/juloo.keyboard2/KeyModifier.java @@ -10,10 +10,6 @@ public final class KeyModifier private static HashMap<KeyValue, HashMap<Pointers.Modifiers, KeyValue>> _cache = new HashMap<KeyValue, HashMap<Pointers.Modifiers, KeyValue>>(); - /** The current compose state. Whether a compose is pending is signaled by - the [COMPOSE_PENDING] modifier. */ - static int _compose_pending = -1; - /** Modify a key according to modifiers. */ public static KeyValue modify(KeyValue k, Pointers.Modifiers mods) { @@ -33,8 +29,6 @@ public final class KeyModifier /* Keys with an empty string are placeholder keys. */ if (r.getString().length() == 0) return null; - if (mods.has(KeyValue.Modifier.COMPOSE_PENDING)) - r = ComposeKey.apply(_compose_pending, r); return r; } @@ -44,6 +38,8 @@ public final class KeyModifier { case Modifier: return modify(k, mod.getModifier()); + case Compose_pending: + return ComposeKey.apply(mod.getPendingCompose(), k); } return k; } @@ -118,11 +114,6 @@ public final class KeyModifier } } - public static void set_compose_pending(int state) - { - _compose_pending = state; - } - private static KeyValue apply_map_char(KeyValue k, Map_char map) { switch (k.getKind()) |