set client preedit (#12)

entry/src/main/cpp/harmonyfrontend/harmonyfrontend.cpp

@@ -17,14 +17,19 @@ InputContextState HarmonyFrontend::keyEvent(const Key &key, bool isRelease) {
     return ic_->popState(event.accepted());
 }
 
-void HarmonyFrontend::focusIn() { ic_->focusIn(); }
+void HarmonyFrontend::focusIn(bool clientPreedit) {
+    CapabilityFlags flags;
+    if (clientPreedit) {
+        flags |= CapabilityFlag::Preedit;
+    }
+    ic_->setCapabilityFlags(flags);
+    ic_->focusIn();
+}
 
 void HarmonyFrontend::focusOut() { ic_->focusOut(); }
 
 HarmonyInputContext::HarmonyInputContext(HarmonyFrontend *frontend, InputContextManager &inputContextManager)
     : InputContext(inputContextManager, ""), frontend_(frontend) {
-    CapabilityFlags flags = CapabilityFlag::Preedit;
-    setCapabilityFlags(flags);
     created();
 }
 

entry/src/main/cpp/harmonyfrontend/harmonyfrontend.h

@@ -23,7 +23,7 @@ class HarmonyFrontend : public AddonInstance {
 
     void createInputContext();
     InputContextState keyEvent(const Key &key, bool isRelease);
-    void focusIn();
+    void focusIn(bool clientPreedit);
     void focusOut();
 
 private:

entry/src/main/cpp/napi_init.cpp

@@ -73,7 +73,9 @@ API(init) {
 }
 
 API(focusIn) {
-    fcitx::focusIn();
+    GET_ARGS(1)
+    GET_BOOL(clientPreedit, 0)
+    fcitx::focusIn(clientPreedit);
     return {};
 }
 

entry/src/main/cpp/src/fcitx.cpp

@@ -70,8 +70,8 @@ void init(const std::string &bundle, const std::string &resfile) {
     setInputMethods({"pinyin"}); // XXX: for test only.
 }
 
-void focusIn() {
-    with_fcitx([] { frontend->focusIn(); });
+void focusIn(bool clientPreedit) {
+    with_fcitx([clientPreedit] { frontend->focusIn(clientPreedit); });
 }
 
 void focusOut() {

entry/src/main/cpp/src/fcitx.h

@@ -12,7 +12,7 @@ struct InputContextState {
 };
 
 void init(const std::string &bundle, const std::string &resfile);
-void focusIn();
+void focusIn(bool clientPreedit);
 void focusOut();
 InputContextState processKey(uint32_t unicode, int32_t keyCode, bool isRelease);
 } // namespace fcitx

entry/src/main/cpp/types/libentry/Index.d.ts

@@ -1,5 +1,5 @@
 export const init: (bundle: string, resfile: string) => void
-export const focusIn: () => void
+export const focusIn: (clientPreedit: boolean) => void
 export const focusOut: () => void
 export const processKey: (unicode: number, keyCode: number, isRelease: boolean) => {
   commit: string

entry/src/main/ets/InputMethodExtensionAbility/model/KeyboardController.ts

@@ -1,5 +1,5 @@
 import { inputMethodEngine } from '@kit.IMEKit'
-import type { InputMethodExtensionContext} from '@kit.IMEKit'
+import type { InputMethodExtensionContext } from '@kit.IMEKit'
 import { display } from '@kit.ArkUI';
 import { KeyCode } from '@kit.InputKit';
 import fcitx from 'libentry.so';
@@ -12,6 +12,8 @@ export class KeyboardController {
   private panel: inputMethodEngine.Panel | undefined = undefined;
   private textInputClient: inputMethodEngine.InputClient | undefined = undefined;
   private keyboardController: inputMethodEngine.KeyboardController | undefined = undefined;
+  private preedit = ''
+  private preeditIndex = 0
 
   constructor() {
   }
@@ -34,11 +36,45 @@ export class KeyboardController {
     }
   }
 
+  private getCursor() {
+    if (!this.textInputClient) {
+      return -1
+    }
+    let step = 1024
+    while (true) {
+      const text = this.textInputClient.getForwardSync(step)
+      if (text.length < step) {
+        return text.length
+      }
+      step *= 2
+    }
+  }
+
   private processResult(res: ReturnType<typeof fcitx.processKey>): boolean {
+    if (!res.accepted) {
+      return false
+    }
     if (res.commit) {
+      if (this.preedit) {
+        this.textInputClient?.setPreviewTextSync('',
+          { start: this.preeditIndex, end: this.preeditIndex + this.preedit.length })
+        this.textInputClient?.finishTextPreviewSync()
+      }
       this.insertText(res.commit)
+      this.preedit = ''
+      this.preeditIndex = this.getCursor()
     }
-    return res.accepted
+    const start = this.preedit ? this.preeditIndex : this.getCursor()
+    const end = start + this.preedit.length
+    if (this.preedit || res.preedit) {
+      this.textInputClient?.setPreviewTextSync(res.preedit, { start, end })
+      if (!res.preedit) {
+        this.textInputClient?.finishTextPreviewSync()
+      }
+    }
+    this.preedit = res.preedit
+    this.preeditIndex = start
+    return true
   }
 
   public handleKey(key: string, keyCode?: number): void {
@@ -80,11 +116,8 @@ export class KeyboardController {
     };
     ability.createPanel(this.ctx, panelInfo).then(async (inputPanel: inputMethodEngine.Panel) => {
       this.panel = inputPanel;
-      if (this.panel) {
-        await this.panel.resize(dWidth, keyHeight);
-        await this.panel.moveTo(0, nonBarPosition);
-        await this.panel.setUiContent('InputMethodExtensionAbility/pages/Index');
-      }
+      await this.panel.resize(dWidth, keyHeight);
+      await this.panel.setUiContent('InputMethodExtensionAbility/pages/Index');
     });
   }
 
@@ -105,7 +138,8 @@ export class KeyboardController {
       console.debug('inputStart')
       this.textInputClient = textInputClient;
       this.keyboardController = kbController;
-      fcitx.focusIn()
+      const attribute = textInputClient.getEditorAttributeSync()
+      fcitx.focusIn(attribute.isTextPreviewSupported)
     })
     ability.on('inputStop', () => {
       console.debug('inputStop')