From 37b8ebae48f93307d78b4ba3f092a3eaf5253873 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Sun, 21 Jul 2024 23:27:44 +0200 Subject: [PATCH] Rename the main compose state --- srcs/compose/README.md | 4 +++- .../en_US_UTF_8_Compose.pre | 0 .../extra.json | 0 .../keysymdef.h | 0 srcs/juloo.keyboard2/ComposeKeyData.java | Bin 81075 -> 81063 bytes srcs/juloo.keyboard2/KeyValue.java | 2 +- 6 files changed, 4 insertions(+), 2 deletions(-) rename srcs/compose/{en_US_UTF_8_Compose => compose}/en_US_UTF_8_Compose.pre (100%) rename srcs/compose/{en_US_UTF_8_Compose => compose}/extra.json (100%) rename srcs/compose/{en_US_UTF_8_Compose => compose}/keysymdef.h (100%) diff --git a/srcs/compose/README.md b/srcs/compose/README.md index 31f8bd9..fff4941 100644 --- a/srcs/compose/README.md +++ b/srcs/compose/README.md @@ -3,6 +3,8 @@ The `compose.py` program parses the compose sequences found in this directory and generates `srcs/juloo.keyboard2/ComposeKeyData.java`. -## `en_US_UTF_8_Compose/en_US_UTF_8_Compose.pre` +## `compose/en_US_UTF_8_Compose.pre` This file is copied from the `xorg` project. Copyright applies. + +## `compose/extra.json` diff --git a/srcs/compose/en_US_UTF_8_Compose/en_US_UTF_8_Compose.pre b/srcs/compose/compose/en_US_UTF_8_Compose.pre similarity index 100% rename from srcs/compose/en_US_UTF_8_Compose/en_US_UTF_8_Compose.pre rename to srcs/compose/compose/en_US_UTF_8_Compose.pre diff --git a/srcs/compose/en_US_UTF_8_Compose/extra.json b/srcs/compose/compose/extra.json similarity index 100% rename from srcs/compose/en_US_UTF_8_Compose/extra.json rename to srcs/compose/compose/extra.json diff --git a/srcs/compose/en_US_UTF_8_Compose/keysymdef.h b/srcs/compose/compose/keysymdef.h similarity index 100% rename from srcs/compose/en_US_UTF_8_Compose/keysymdef.h rename to srcs/compose/compose/keysymdef.h diff --git a/srcs/juloo.keyboard2/ComposeKeyData.java b/srcs/juloo.keyboard2/ComposeKeyData.java index 17a7dc87acb191e2bc144f8b9b68a83d34152e60..663043b5255ed4f64ff248b1715f7d0ed376fa0e 100644 GIT binary patch delta 29 kcmdn|lV$l&mWC~i(`*Ej^K%RGi&GVB70gTxt+{Hs0J)+HNB{r; delta 41 wcmZ4flV$TymWC~i(`;l@^WsB;<3mH-;w|Ex^K%RGi&GVB70gTxt+{Hs09)@4QUCw| diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java index 52b5094..876d5f5 100644 --- a/srcs/juloo.keyboard2/KeyValue.java +++ b/srcs/juloo.keyboard2/KeyValue.java @@ -570,7 +570,7 @@ public final class KeyValue implements Comparable case "autofill": return editingKey("auto", Editing.AUTOFILL); /* The compose key */ - case "compose": return makeComposePending(0xE016, ComposeKeyData.en_US_UTF_8_Compose, FLAG_SECONDARY | FLAG_SMALLER_FONT | FLAG_SPECIAL); + case "compose": return makeComposePending(0xE016, ComposeKeyData.compose, FLAG_SECONDARY | FLAG_SMALLER_FONT | FLAG_SPECIAL); /* Placeholder keys */ case "removed": return placeholderKey(Placeholder.REMOVED);