From c57ae83bfa2141edf637075696043cb98068684b Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Tue, 10 Sep 2024 22:16:49 +0200 Subject: [PATCH] Compose sequences can end in internal key names This adds the '\n' and '\t' sequences to showcase the new feature. --- srcs/compose/compose/extra.json | 4 ++++ srcs/juloo.keyboard2/ComposeKey.java | 2 +- srcs/juloo.keyboard2/ComposeKeyData.java | Bin 81341 -> 81458 bytes 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/srcs/compose/compose/extra.json b/srcs/compose/compose/extra.json index 08c6f8b..31cdf82 100644 --- a/srcs/compose/compose/extra.json +++ b/srcs/compose/compose/extra.json @@ -3,5 +3,9 @@ "s": "Š", "c": "Č", "z": "Ž" + }, + "\\": { + "n": "\\n", + "t": "\\t" } } diff --git a/srcs/juloo.keyboard2/ComposeKey.java b/srcs/juloo.keyboard2/ComposeKey.java index 9272bd0..9575486 100644 --- a/srcs/juloo.keyboard2/ComposeKey.java +++ b/srcs/juloo.keyboard2/ComposeKey.java @@ -42,7 +42,7 @@ public final class ComposeKey else if (next_header == 0xFFFF) // String final state { int next_length = edges[next]; - return KeyValue.makeStringKey( + return KeyValue.getKeyByName( new String(states, next + 1, next_length - 1)); } else // Character final state. diff --git a/srcs/juloo.keyboard2/ComposeKeyData.java b/srcs/juloo.keyboard2/ComposeKeyData.java index 48916eb5bed43856b69615be7448271d226a874a..dd24192ba3d140c714fabf967b088bc701331028 100644 GIT binary patch delta 11632 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