From 43154ee2810cf504c728a3be939a032cd6d7de97 Mon Sep 17 00:00:00 2001
From: Weida Hong <wdhongtw@gmail.com>
Date: Tue, 2 Jul 2024 19:17:15 +0800
Subject: [PATCH 1/2] feat: add value range to setting schema file

This change can allow users to do config through GSetting interface
directly, while prevent users from broken settings by themselves.
---
 .../org.freedesktop.IBus.Chewing.gschema.xml  | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/src/setup/org.freedesktop.IBus.Chewing.gschema.xml b/src/setup/org.freedesktop.IBus.Chewing.gschema.xml
index 6c448d30..3536734e 100644
--- a/src/setup/org.freedesktop.IBus.Chewing.gschema.xml
+++ b/src/setup/org.freedesktop.IBus.Chewing.gschema.xml
@@ -1,6 +1,23 @@
 <schemalist>
     <schema id="org.freedesktop.IBus.Chewing" path="/desktop/ibus/engine/chewing/" gettext-domain="ibus-chewing">
         <key name="kb-type" type="s">
+            <choices>
+                <choice value="default"/>
+                <choice value="hsu"/>
+                <choice value="ibm"/>
+                <choice value="gin_yieh"/>
+                <choice value="eten"/>
+                <choice value="eten26"/>
+                <choice value="dvorak"/>
+                <choice value="dvorak_hsu"/>
+                <choice value="dachen_26"/>
+                <choice value="hanyu"/>
+                <choice value="thl_pinying"/>
+                <choice value="mps2_pinyin"/>
+                <choice value="carpalx"/>
+                <choice value="colemak_dh_ansi"/>
+                <choice value="colemak_dh_orth"/>
+            </choices>
             <default l10n="messages">"default"</default>
             <summary>Keyboard Type</summary>
             <description>
@@ -8,6 +25,16 @@
             </description>
         </key>
         <key name="sel-keys" type="s">
+            <choices>
+                <choice value="1234567890"/>
+                <choice value="asdfghjkl;"/>
+                <choice value="asdfzxcv89"/>
+                <choice value="asdfjkl789"/>
+                <choice value="aoeu;qjkix"/>
+                <choice value="aoeuhtnsid"/>
+                <choice value="aoeuidhtns"/>
+                <choice value="1234qweras"/>
+            </choices>
             <default>"1234567890"</default>
             <summary>Selection keys</summary>
             <description>
@@ -59,6 +86,7 @@
             </description>
         </key>
         <key name="max-chi-symbol-len" type="i">
+            <range min="0" max="39"/>
             <default>20</default>
             <summary>Maximum Chinese characters</summary>
             <description>
@@ -66,12 +94,24 @@
             </description>
         </key>
         <key name="chi-eng-mode-toggle" type="s">
+            <choices>
+                <choice value="caps_lock"/>
+                <choice value="shift"/>
+                <choice value="shift_l"/>
+                <choice value="shift_r"/>
+            </choices>
             <default l10n="messages">"caps_lock"</default>
             <summary>Chinese/Alphanumeric Mode Toggle Key</summary>
             <description>
 </description>
         </key>
         <key name="default-english-case" type="s">
+            <choices>
+                <choice value="no default"/>
+                <choice value="lowercase"/>
+                <choice value="uppercase"/>
+                <choice value="shift_r"/>
+            </choices>
             <default l10n="messages">"lowercase"</default>
             <summary>Default English letter case
 (Only effective when Caps Lock is the toggle key)</summary>
@@ -82,6 +122,11 @@
             </description>
         </key>
         <key name="sync-caps-lock" type="s">
+            <choices>
+                <choice value="disable"/>
+                <choice value="keyboard"/>
+                <choice value="input method"/>
+            </choices>
             <default l10n="messages" context="Sync">"keyboard"</default>
             <summary>Sync between CapsLock and IM</summary>
             <description>
@@ -99,6 +144,7 @@
             </description>
         </key>
         <key name="cand-per-page" type="u">
+            <range min="4" max="10"/>
             <default>5</default>
             <summary>Candidate per page</summary>
             <description>

From 3bc70f9b276b9ed48420e2bbdd27c9e12118f38c Mon Sep 17 00:00:00 2001
From: Weida Hong <wdhongtw@gmail.com>
Date: Tue, 2 Jul 2024 20:12:59 +0800
Subject: [PATCH 2/2] fix: adjust value range for some setting

Increase the value range according the actual behavior by libchewing.
---
 src/IBusChewingProperties.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/IBusChewingProperties.c b/src/IBusChewingProperties.c
index 3c0dc429..f6917148 100644
--- a/src/IBusChewingProperties.c
+++ b/src/IBusChewingProperties.c
@@ -98,7 +98,7 @@ MkdgPropertySpec propSpecs[] = {
      N_("Escape key cleans the text in pre-edit-buffer"), NULL},
     {G_TYPE_INT, "max-chi-symbol-len", PAGE_EDITING,
      N_("Maximum Chinese characters"), IBUS_CHEWING_PROPERTIES_SUBSECTION, "20",
-     NULL, NULL, 11, 33, maxChiSymbolLen_apply_callback, 0,
+     NULL, NULL, 0, 39, maxChiSymbolLen_apply_callback, 0,
      N_("Maximum Chinese characters in pre-edit buffer, not including inputing "
         "Zhuyin symbols."),
      NULL},