render preedit on virtual keyboard (#48)

Author: eagleoflqj

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

@@ -88,7 +88,7 @@ void HarmonyInputContext::commitStringAsync() {
 
 void HarmonyInputContext::updatePreeditAsync() {
     auto state = state_;
-    auto j = json{{"type", "PREEDIT"}, {"data", {{"preedit", state.preedit}, {"cursorPos", state.cursorPos}}}};
+    auto j = json{{"type", "CLIENT_PREEDIT"}, {"data", {{"preedit", state.preedit}, {"cursorPos", state.cursorPos}}}};
     notify_main_async(j.dump());
 }
 

entry/src/main/cpp/webkeyboard/webkeyboard.cpp

@@ -31,6 +31,9 @@ void WebKeyboard::update(UserInterfaceComponent component, InputContext *inputCo
         int highlighted = -1;
         std::vector<Candidate> candidates;
         const InputPanel &inputPanel = inputContext->inputPanel();
+        auto auxUp = instance_->outputFilter(inputContext, inputPanel.auxUp()).toString();
+        auto preedit = instance_->outputFilter(inputContext, inputPanel.preedit()).toString();
+        notify_main_async(json{{"type", "PREEDIT"}, {"data", {{"auxUp", auxUp}, {"preedit", preedit}}}}.dump());
         if (const auto &list = inputPanel.candidateList()) {
             int size = list->size();
             candidates.reserve(size);
@@ -42,7 +45,7 @@ void WebKeyboard::update(UserInterfaceComponent component, InputContext *inputCo
             }
             highlighted = list->cursorIndex();
         }
-        if (candidates.empty()) {
+        if (auxUp.empty() && preedit.empty() && candidates.empty()) {
             notify_main_async(R"JSON({"type":"CLEAR"})JSON");
         } else {
             setCandidatesAsync(candidates, highlighted);

entry/src/main/ets/InputMethodExtensionAbility/model/FcitxEvent.ets

@@ -9,7 +9,7 @@ interface PreeditData {
 }
 
 interface PreeditEvent {
-  type: 'PREEDIT'
+  type: 'CLIENT_PREEDIT'
   data: PreeditData
 }
 

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

@@ -78,7 +78,7 @@ export class KeyboardController {
           this.commitString(event.data)
         }
         break
-      case 'PREEDIT':
+      case 'CLIENT_PREEDIT':
         this.updatePreviewText(event.data.preedit, event.data.cursorPos)
         break
       default: