long press globe; rework status area/input methods update (#47)

Author: eagleoflqj

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

@@ -1,11 +1,20 @@
 #include "harmonyfrontend.h"
+#include "../src/inputmethod.h"
 #include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
 namespace fcitx {
 HarmonyFrontend::HarmonyFrontend(Instance *instance)
     : instance_(instance), focusGroup_("harmony", instance->inputContextManager()) {
+    handler_ = instance_->watchEvent(
+        EventType::InputContextInputMethodActivated, EventWatcherPhase::Default, [this](Event &event) {
+            notify_main_async(json{
+                {"type", "INPUT_METHODS"},
+                {"data",
+                 {{"currentInputMethod", instance_->currentInputMethod()}, {"inputMethods", getInputMethodsJson()}}}}
+                                  .dump());
+        });
     createInputContext();
 }
 

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

@@ -31,6 +31,7 @@ class HarmonyFrontend : public AddonInstance {
     Instance *instance_;
     FocusGroup focusGroup_;
     HarmonyInputContext *ic_;
+    std::unique_ptr<HandlerTableEntry<EventHandler>> handler_;
 };
 
 class HarmonyFrontendFactory : public AddonFactory {

entry/src/main/cpp/napi_init.cpp

@@ -74,18 +74,20 @@ API(activateCandidateAction) {
     return {};
 }
 
-API(updateStatusArea) {
-    fcitx::updateStatusArea();
-    return {};
-}
-
 API(activateStatusAreaAction) {
     GET_ARGS(1)
     GET_I32(id, 0)
     fcitx::activateStatusAreaAction(id);
     return {};
 }
 
+API(setCurrentInputMethod) {
+    GET_ARGS(1)
+    GET_STRING(inputMethod, 0)
+    fcitx::setCurrentInputMethod(inputMethod);
+    return {};
+}
+
 static void CallJs(napi_env env, napi_value jsCb, void *context, void *data) {
     if (env == nullptr) {
         return;
@@ -122,7 +124,7 @@ static napi_value Init(napi_env env, napi_value exports) {
         {"selectCandidate", nullptr, selectCandidate, nullptr, nullptr, nullptr, napi_default, nullptr},
         {"askCandidateActions", nullptr, askCandidateActions, nullptr, nullptr, nullptr, napi_default, nullptr},
         {"activateCandidateAction", nullptr, activateCandidateAction, nullptr, nullptr, nullptr, napi_default, nullptr},
-        {"updateStatusArea", nullptr, updateStatusArea, nullptr, nullptr, nullptr, napi_default, nullptr},
+        {"setCurrentInputMethod", nullptr, setCurrentInputMethod, nullptr, nullptr, nullptr, napi_default, nullptr},
         {"activateStatusAreaAction", nullptr, activateStatusAreaAction, nullptr, nullptr, nullptr, napi_default,
          nullptr}};
     napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc);

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

@@ -38,7 +38,6 @@ namespace fcitx {
 std::unique_ptr<Instance> instance;
 std::unique_ptr<fcitx::EventDispatcher> dispatcher;
 HarmonyFrontend *frontend;
-WebKeyboard *ui;
 
 static native_streambuf log_streambuf;
 static std::ostream stream(&log_streambuf);
@@ -82,8 +81,7 @@ void init(const std::string &bundle, const std::string &resfile) {
     dispatcher->attach(&instance->eventLoop());
     fcitx_thread = std::thread([] { instance->eventLoop().exec(); });
     frontend = dynamic_cast<HarmonyFrontend *>(addonMgr.addon("harmonyfrontend"));
-    ui = dynamic_cast<WebKeyboard *>(addonMgr.addon("webkeyboard"));
-    setInputMethods({"keyboard-th", "pinyin"}); // XXX: for test only.
+    setInputMethods({"keyboard-us", "keyboard-th", "pinyin"}); // XXX: for test only.
 }
 
 void focusIn(bool clientPreedit) {
@@ -167,14 +165,6 @@ void activateCandidateAction(int index, int id) {
     });
 }
 
-void updateStatusArea() {
-    with_fcitx([] {
-        if (auto *ic = instance->mostRecentInputContext()) {
-            ui->updateStatusArea(ic);
-        }
-    });
-}
-
 void activateStatusAreaAction(int id) {
     with_fcitx([id] {
         if (auto *ic = instance->mostRecentInputContext()) {
@@ -187,4 +177,8 @@ void activateStatusAreaAction(int id) {
 void toggle() {
     with_fcitx([] { instance->toggle(); });
 }
+
+void setCurrentInputMethod(const std::string &inputMethod) {
+    with_fcitx([&] { instance->setCurrentInputMethod(inputMethod); });
+}
 } // namespace fcitx

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

@@ -23,7 +23,7 @@ InputContextState processKey(uint32_t unicode, int32_t keyCode, bool isRelease);
 void selectCandidate(int index);
 void askCandidateAction(int index);
 void activateCandidateAction(int index, int id);
-void updateStatusArea();
 void activateStatusAreaAction(int id);
 void toggle();
+void setCurrentInputMethod(const std::string &inputMethod);
 } // namespace fcitx

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

@@ -15,5 +15,5 @@ export const toggle: () => void
 export const selectCandidate: (index: number) => void
 export const askCandidateActions: (index: number) => void
 export const activateCandidateAction: (index: number, id: number) => void
-export const updateStatusArea: () => void
 export const activateStatusAreaAction: (id: number) => void
+export const setCurrentInputMethod: (inputMethod: string) => void

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

@@ -4,7 +4,6 @@
 #include <fcitx/statusarea.h>
 
 #include "../src/fcitx.h"
-#include "../src/inputmethod.h"
 #include "webkeyboard.h"
 #include <sstream>
 
@@ -91,12 +90,7 @@ void WebKeyboard::updateStatusArea(InputContext *ic) {
         }
         actions.emplace_back(actionToJson(action, ic));
     }
-    notify_main_async(json{{"type", "STATUS_AREA"},
-                           {"data",
-                            {{"actions", actions},
-                             {"currentInputMethod", instance_->currentInputMethod()},
-                             {"inputMethods", getInputMethodsJson()}}}}
-                          .dump());
+    notify_main_async(json{{"type", "STATUS_AREA"}, {"data", actions}}.dump());
 }
 } // namespace fcitx
 

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

@@ -327,6 +327,8 @@ export class KeyboardController {
         break
       case 'SELECT_CANDIDATE':
         return fcitx.selectCandidate(event.data)
+      case 'SET_INPUT_METHOD':
+        return fcitx.setCurrentInputMethod(event.data)
       case 'STATUS_AREA_ACTION':
         return fcitx.activateStatusAreaAction(event.data)
       case 'UNDO':
@@ -436,7 +438,6 @@ export class KeyboardController {
       this.keyboardController = kbController;
       this.attribute = textInputClient.getEditorAttributeSync()
       fcitx.focusIn(this.attribute.isTextPreviewSupported)
-      fcitx.updateStatusArea()
       this.setEnterKeyType()
     })
     ability.on('inputStop', () => {