Use CapabilityFlag to determine commitStringWithCursor availability

rocka · rocka · commit 879137ac17c1 · 2023-10-12T23:19:49.000+08:00
diff --git a/app/src/main/cpp/androidkeyboard/androidkeyboard.cpp b/app/src/main/cpp/androidkeyboard/androidkeyboard.cpp
@@ -316,8 +316,8 @@ void AndroidKeyboardEngine::commitBuffer(InputContext *inputContext) {
     if (preedit.empty()) {
         return;
     }
-    if (auto icv2 = dynamic_cast<InputContextV2 *>(inputContext)) {
-        icv2->commitStringWithCursor(preedit, cursor);
+    if (inputContext->capabilityFlags().test(CapabilityFlag::CommitStringWithCursor)) {
+        inputContext->commitStringWithCursor(preedit, cursor);
     } else {
         inputContext->commitString(preedit);
     }
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/core/CapabilityFlag.kt b/app/src/main/java/org/fcitx/fcitx5/android/core/CapabilityFlag.kt
@@ -6,7 +6,7 @@ import splitties.bitflags.hasFlag
 
 /**
  * translated from
- * [fcitx-utils/capabilityflags.h](https://github.com/fcitx/fcitx5/blob/5.0.13/src/lib/fcitx-utils/capabilityflags.h)
+ * [fcitx-utils/capabilityflags.h](https://github.com/fcitx/fcitx5/blob/5.1.1/src/lib/fcitx-utils/capabilityflags.h)
  */
 @Suppress("unused")
 enum class CapabilityFlag(val flag: ULong) {
@@ -60,6 +60,17 @@ enum class CapabilityFlag(val flag: ULong) {
      */
     ClientSideInputPanel(1UL shl 39),
 
+    /**
+     * Whether client request input method to be disabled.
+     * Usually this means only allow to type with raw keyboard.
+     */
+    Disable(1UL shl 40),
+
+    /**
+     * Whether client support commit string with cursor location.
+     */
+    CommitStringWithCursor(1UL shl 41),
+
     PasswordOrSensitive(Password.flag or Sensitive.flag);
 
 }
@@ -75,7 +86,8 @@ value class CapabilityFlags constructor(val flags: ULong) {
 
         val DefaultFlags = CapabilityFlags(
             CapabilityFlag.Preedit,
-            CapabilityFlag.ClientUnfocusCommit
+            CapabilityFlag.ClientUnfocusCommit,
+            CapabilityFlag.CommitStringWithCursor
         )
 
         fun fromEditorInfo(info: EditorInfo): CapabilityFlags {

Original file line number	Diff line number	Diff line change
`@@ -316,8 +316,8 @@ void AndroidKeyboardEngine::commitBuffer(InputContext *inputContext) {`
`316`	`316`	`if (preedit.empty()) {`
`317`	`317`	`return;`
`318`	`318`	`}`
`319`		`- if (auto icv2 = dynamic_cast<InputContextV2 *>(inputContext)) {`
`320`		`- icv2->commitStringWithCursor(preedit, cursor);`
	`319`	`+ if (inputContext->capabilityFlags().test(CapabilityFlag::CommitStringWithCursor)) {`
	`320`	`+ inputContext->commitStringWithCursor(preedit, cursor);`
`321`	`321`	`} else {`
`322`	`322`	`inputContext->commitString(preedit);`
`323`	`323`	`}`