Add always half space mode

Fix #14

Author: wengxt

CMakeLists.txt

@@ -27,6 +27,10 @@ if (NOT DEFINED ANTHY_TARGET)
     endif()
 endif()
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
 include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake")
 add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-anthy\" -D_GNU_SOURCE)
 fcitx5_add_i18n_definition()

src/config.h

@@ -70,9 +70,10 @@ enum class TypingMethod { ROMAJI, KANA, NICOLA };
 FCITX_CONFIG_ENUM_NAME_WITH_I18N(TypingMethod, N_("Romaji"), N_("Kana"),
                                  N_("Nicola"));
 
-enum class SpaceType { FOLLOWMODE, WIDE };
+enum class SpaceType { FOLLOWMODE, WIDE, HALF };
 
-FCITX_CONFIG_ENUM_NAME_WITH_I18N(SpaceType, N_("Follow mode"), N_("Wide"));
+FCITX_CONFIG_ENUM_NAME_WITH_I18N(SpaceType, N_("Follow mode"), N_("Wide"),
+                                 N_("Half"));
 
 enum class TenKeyType {
     WIDE,

src/state.cpp

@@ -633,14 +633,24 @@ bool AnthyState::action_insert_space() {
         !*config().general->romajiPseudoAsciiBlankBehavior) {
         return false;
     }
-
-    if (*config().general->spaceType == SpaceType::FOLLOWMODE) {
+    // Determine whether to insert a wide space or half space based on
+    // configuration.
+    switch (*config().general->spaceType) {
+    case SpaceType::FOLLOWMODE: {
         const InputMode mode = inputMode();
+        // Insert wide space unless in LATIN, HALF_KATAKANA, or pseudo ASCII
+        // mode.
         is_wide =
             (mode != InputMode::LATIN && mode != InputMode::HALF_KATAKANA &&
              !preedit_.isPseudoAsciiMode());
-    } else if (*config().general->spaceType == SpaceType::WIDE) {
+        break;
+    }
+    case SpaceType::WIDE:
         is_wide = true;
+        break;
+    case SpaceType::HALF:
+        is_wide = false;
+        break;
     }
 
     if (is_wide) {

test/testanthy.cpp

@@ -19,8 +19,8 @@
 
 using namespace fcitx;
 
-void scheduleEvent(EventDispatcher *dispatcher, Instance *instance) {
-    dispatcher->schedule([instance]() {
+void setup(Instance *instance) {
+    instance->eventDispatcher().schedule([instance]() {
         auto *anthy = instance->addonManager().addon("anthy", true);
         FCITX_ASSERT(anthy);
 
@@ -29,6 +29,39 @@ void scheduleEvent(EventDispatcher *dispatcher, Instance *instance) {
         defaultGroup.inputMethodList().push_back(InputMethodGroupItem("anthy"));
         defaultGroup.setDefaultInputMethod("");
         instance->inputMethodManager().setGroup(defaultGroup);
+    });
+}
+
+void testSpace(Instance *instance) {
+    instance->eventDispatcher().schedule([instance]() {
+        auto *anthy = instance->addonManager().addon("anthy", true);
+        FCITX_ASSERT(anthy);
+        auto *testfrontend = instance->addonManager().addon("testfrontend");
+        auto uuid =
+            testfrontend->call<ITestFrontend::createInputContext>("testapp");
+        auto *ic = instance->inputContextManager().findByUUID(uuid);
+        FCITX_ASSERT(ic);
+
+        RawConfig config;
+        config.setValueByPath("General/SpaceType", "Wide");
+        anthy->setConfig(config);
+
+        testfrontend->call<ITestFrontend::pushCommitExpectation>("　");
+        FCITX_ASSERT(testfrontend->call<ITestFrontend::sendKeyEvent>(
+            uuid, Key("space"), false));
+
+        config.setValueByPath("General/SpaceType", "Half");
+        anthy->setConfig(config);
+
+        FCITX_ASSERT(!testfrontend->call<ITestFrontend::sendKeyEvent>(
+            uuid, Key("space"), false));
+    });
+}
+
+void testNicola(Instance *instance) {
+    instance->eventDispatcher().schedule([instance]() {
+        auto *anthy = instance->addonManager().addon("anthy", true);
+        FCITX_ASSERT(anthy);
         auto *testfrontend = instance->addonManager().addon("testfrontend");
         auto uuid =
             testfrontend->call<ITestFrontend::createInputContext>("testapp");
@@ -45,13 +78,11 @@ void scheduleEvent(EventDispatcher *dispatcher, Instance *instance) {
         testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("a"), true);
         testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Muhenkan"),
                                                     true);
-
-        instance->exit();
     });
 }
 
 int main() {
-    setupTestingEnvironment(TESTING_BINARY_DIR, {TESTING_BINARY_DIR "/src"},
+    setupTestingEnvironment(TESTING_BINARY_DIR, {"bin"},
                             {TESTING_BINARY_DIR "/test"});
     // fcitx::Log::setLogRule("default=5,table=5,libime-table=5");
     char arg0[] = "testanthy";
@@ -61,9 +92,10 @@ int main() {
     fcitx::Log::setLogRule("default=5,anthy=5");
     Instance instance(FCITX_ARRAY_SIZE(argv), argv);
     instance.addonManager().registerDefaultLoader(nullptr);
-    EventDispatcher dispatcher;
-    dispatcher.attach(&instance.eventLoop());
-    scheduleEvent(&dispatcher, &instance);
+    setup(&instance);
+    testSpace(&instance);
+    testNicola(&instance);
+    instance.eventDispatcher().schedule([&instance]() { instance.exit(); });
     instance.exec();
 
     return 0;