toggle input method and fix initial space label (#46)

Author: eagleoflqj

entry/src/main/cpp/napi_init.cpp

@@ -33,6 +33,11 @@ API(reset) {
     return ret;
 }
 
+API(toggle) {
+    fcitx::toggle();
+    return {};
+}
+
 API(processKey) {
     GET_ARGS(3)
     GET_U32(unicode, 0)
@@ -69,6 +74,11 @@ API(activateCandidateAction) {
     return {};
 }
 
+API(updateStatusArea) {
+    fcitx::updateStatusArea();
+    return {};
+}
+
 API(activateStatusAreaAction) {
     GET_ARGS(1)
     GET_I32(id, 0)
@@ -107,10 +117,12 @@ static napi_value Init(napi_env env, napi_value exports) {
         {"focusIn", nullptr, focusIn, nullptr, nullptr, nullptr, napi_default, nullptr},
         {"focusOut", nullptr, focusOut, nullptr, nullptr, nullptr, napi_default, nullptr},
         {"reset", nullptr, reset, nullptr, nullptr, nullptr, napi_default, nullptr},
+        {"toggle", nullptr, toggle, nullptr, nullptr, nullptr, napi_default, nullptr},
         {"processKey", nullptr, processKey, nullptr, nullptr, nullptr, napi_default, nullptr},
         {"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},
         {"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

@@ -13,6 +13,7 @@
 #include "keycode.h"
 #include "util.h"
 #include "../harmonyfrontend/harmonyfrontend.h"
+#include "../webkeyboard/webkeyboard.h"
 #include "inputmethod.h"
 
 #ifdef __x86_64__
@@ -37,6 +38,7 @@ 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);
@@ -80,7 +82,8 @@ 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"));
-    setInputMethods({"pinyin"}); // XXX: for test only.
+    ui = dynamic_cast<WebKeyboard *>(addonMgr.addon("webkeyboard"));
+    setInputMethods({"keyboard-th", "pinyin"}); // XXX: for test only.
 }
 
 void focusIn(bool clientPreedit) {
@@ -164,6 +167,14 @@ 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()) {
@@ -172,4 +183,8 @@ void activateStatusAreaAction(int id) {
         }
     });
 }
+
+void toggle() {
+    with_fcitx([] { instance->toggle(); });
+}
 } // namespace fcitx

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

@@ -23,5 +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();
 } // namespace fcitx

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

@@ -11,7 +11,9 @@ export interface InputContextState {
 }
 export const processKey: (unicode: number, keyCode: number, isRelease: boolean) => InputContextState
 export const reset: () => InputContextState
+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

entry/src/main/cpp/webkeyboard/utility.h

@@ -6,7 +6,17 @@
 #include "../src/fcitx.h"
 #include "../src/inputmethod.h"
 #include "webkeyboard.h"
+#include <sstream>
 
+#include "pugixml.hpp"
+
+std::string escape_html(const std::string &content) {
+    std::ostringstream oss;
+    pugi::xml_document doc;
+    doc.append_child(pugi::node_pcdata).set_value(content);
+    doc.print(oss, "", pugi::format_raw);
+    return oss.str();
+}
 
 namespace fcitx {
 

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

@@ -6,10 +6,10 @@
 #include <fcitx/instance.h>
 #include <nlohmann/json.hpp>
 
-#include "utility.h"
-
 using json = nlohmann::json;
 
+std::string escape_html(const std::string &content);
+
 namespace fcitx {
 
 struct Candidate {
@@ -41,12 +41,12 @@ class WebKeyboard final : public VirtualKeyboardUserInterface {
     bool isVirtualKeyboardVisible() const override { return true; }
     void showVirtualKeyboard() override;
     void hideVirtualKeyboard() override {}
+    void updateStatusArea(InputContext *ic);
 
 private:
     Instance *instance_;
 
     void setCandidatesAsync(const std::vector<Candidate> &candidates, int highlighted);
-    void updateStatusArea(InputContext *ic);
 };
 
 class WebKeyboardFactory : public AddonFactory {

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

@@ -310,6 +310,8 @@ export class KeyboardController {
         this.selecting = false
         this.setCursor(this.textInputClient?.getTextIndexAtCursorSync() ?? 0)
         break
+      case 'GLOBE':
+        return fcitx.toggle()
       case 'KEY_DOWN':
         return this.handleKey(event.data.key, convertCode(event.data.code))
       case 'PASTE':
@@ -434,6 +436,7 @@ export class KeyboardController {
       this.keyboardController = kbController;
       this.attribute = textInputClient.getEditorAttributeSync()
       fcitx.focusIn(this.attribute.isTextPreviewSupported)
+      fcitx.updateStatusArea()
       this.setEnterKeyType()
     })
     ability.on('inputStop', () => {

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

@@ -38,6 +38,7 @@ const jsCodeMap: Record<string, KeyCode> = {
   'KeyZ': KeyCode.KEYCODE_Z,
   'Period': KeyCode.KEYCODE_PERIOD,
   'Semicolon': KeyCode.KEYCODE_SEMICOLON,
+  'Space': KeyCode.KEYCODE_SPACE,
 }
 
 export function convertCode(jsCode: string): KeyCode | undefined {