Select rule (#27)

* rule config only

* Set rule

Author: naokiri

.github/workflows/build_pass.yml

@@ -0,0 +1,62 @@
+name: Build passes check
+on: [ workflow_dispatch ]
+jobs:
+  build-check:
+    name: Build check
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        path:
+          - 'src'
+    steps:
+      - name: Install cargo
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          override: true
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target
+          key: ${{ runner.os }}-cargo-libtest-v6-${{ hashFiles('**/Cargo.lock') }}-cargo-c-v0.9.6
+      - name: Install cbindgen
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: cbindgen
+      - name: cargo-c-exists
+        id: cargoCCheck
+        run: test -e ~/.cargo/bin/cargo-cbuild
+        continue-on-error: true
+      - name: Install cargo-c
+        if: ${{ always() && steps.cargoCCheck.outcome == 'failure' }}
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: cargo-c --version 0.9.6
+      - name: Install required libs
+        run: sudo apt-get install libxkbcommon-dev
+
+      - name: checkout cskk
+        uses: actions/checkout@v3
+        with:
+          repository: 'naokiri/cskk'
+          path: cskk
+      - name: Build CSKK library
+        run: cargo cinstall
+        working-directory: cskk
+      - uses: actions/checkout@v3
+      - name: Build
+        uses: ashutoshvarma/action-cmake-build@master
+        with:
+          build-dir: ${{ runner.workspace }}/build
+          cc: gcc
+          cxx: g++
+          build-type: Release
+          run-test: false
+

.github/workflows/clang-format-check.yml

@@ -1,5 +1,5 @@
 name: clang-format Check
-on: [ push, pull_request ]
+on: [ pull_request ]
 jobs:
   formatting-check:
     name: Formatting Check
@@ -9,7 +9,7 @@ jobs:
         path:
           - 'src'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Run clang-format style check for C/C++ programs.
         uses: jidicula/clang-format-action@v4.6.2
         with:

CMakeLists.txt

@@ -12,7 +12,7 @@ include(ECMUninstallTarget)
 
 find_package(PkgConfig REQUIRED)
 find_package(Fcitx5Core 5.0.6 REQUIRED)
-pkg_check_modules(LIBCSKK REQUIRED "cskk>=0.3.0")
+pkg_check_modules(LIBCSKK REQUIRED "cskk>=0.6.0")
 
 include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake")
 

src/cskk.cpp

@@ -20,7 +20,6 @@
 #include <fcitx/addonmanager.h>
 #include <fcitx/inputpanel.h>
 #include <filesystem>
-#include <iostream>
 #include <string>
 #include <vector>
 using std::getenv;
@@ -369,6 +368,7 @@ void FcitxCskkContext::applyConfig() {
   CSKK_DEBUG() << "apply config";
   auto &config = engine_->config();
 
+  skk_context_set_rule(context_, config.cskkRule->c_str());
   skk_context_set_dictionaries(context_, engine_->dictionaries().data(),
                                engine_->dictionaries().size());
   skk_context_set_period_style(context_, *config.periodStyle);

src/cskkconfig.h

@@ -18,6 +18,7 @@
 extern "C" {
 #include <cskk/libcskk.h>
 }
+#include "log.h"
 #include <fcitx-config/configuration.h>
 #include <fcitx-config/enum.h>
 #include <fcitx-utils/i18n.h>
@@ -67,8 +68,23 @@ struct InputModeAnnotation : public EnumAnnotation {
   }
 };
 
+struct FcitxCskkRuleAnnotation : public EnumAnnotation {
+  void dumpDescription(RawConfig &config) const {
+    EnumAnnotation::dumpDescription(config);
+    uint length;
+    auto rules = skk_get_rules(&length);
+    for (uint i = 0; i < length; i++) {
+      config.setValueByPath("Enum/" + std::to_string(i), rules[i].id);
+      config.setValueByPath("EnumI18n/" + std::to_string(i), rules[i].name);
+    }
+    skk_free_rules(rules, length);
+  }
+};
+
 FCITX_CONFIGURATION(
     FcitxCskkConfig,
+    OptionWithAnnotation<std::string, FcitxCskkRuleAnnotation> cskkRule{
+        this, "Rule", _("Rule"), "default"};
     OptionWithAnnotation<InputMode, InputModeAnnotation> inputMode{
         this, "InitialInputMode", _("InitialInputMode"), Hiragana};
     OptionWithAnnotation<PeriodStyle, PeriodStyleI18NAnnotation> periodStyle{
@@ -118,7 +134,7 @@ FCITX_CONFIGURATION(
                                CandidateSelectionKeys::Number};
     //    Option<bool> showAnnotation{this, "ShowAnnotation",
     //                                _("Show Annotation. Fake yet."), true};);
-);
+    ) // FCITX_CONFIGURATION
 } // namespace fcitx
 
 #endif // FCITX5_CSKK_CSKKCONFIG_H