Mozc

fcitx-contrib · Dec 30, 2024 · 14f84bb · 14f84bb
1 parent 4aa7b8b
commit 14f84bb
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,6 +21,8 @@ jobs:
   build:
     needs: lint
     runs-on: ${{ matrix.os }}
+    env:
+      MOZC_SHA: ad0e97b8b8dcfd4c841a02c5d6a043fb5e741405
     strategy:
       fail-fast: false
       matrix:
@@ -34,6 +36,13 @@ jobs:
         with:
           submodules: recursive
 
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          repository: google/mozc
+          path: engines/fcitx5-mozc/mozc
+          ref: ${{ env.MOZC_SHA }}
+
       - name: Install dependencies
         run: |
           brew install \

diff --git a/.gitmodules b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "engines/fcitx5-lua"]
 	path = engines/fcitx5-lua
 	url = https://github.com/fcitx/fcitx5-lua
+[submodule "engines/fcitx5-mozc"]
+	path = engines/fcitx5-mozc
+	url = https://github.com/fcitx-contrib/fcitx5-mozc
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -12,7 +12,7 @@
         {
             "type": "shell",
             "label": "Configure",
-            "command": "cmake -B build -G Xcode -DURL_SCHEME=fcitx -DCHINESE_ADDONS=ON -DHALLELUJAH=ON -DRIME=ON -DIOS_PLATFORM=SIMULATOR",
+            "command": "cmake -B build -G Xcode -DURL_SCHEME=fcitx -DCHINESE_ADDONS=ON -DHALLELUJAH=ON -DMOZC=ON -DRIME=ON -DIOS_PLATFORM=SIMULATOR",
             "group": {
                 "kind": "build"
             }

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -84,6 +84,7 @@ add_subdirectory(ipc)
 
 option(CHINESE_ADDONS "" ON)
 option(HALLELUJAH "" OFF)
+option(MOZC "" OFF)
 option(RIME "" OFF)
 
 function(copy_to_keyboard cmd file relative_path)

diff --git a/README.md b/README.md
@@ -17,6 +17,7 @@ IOS_PLATFORM=SIMULATOR ./scripts/install-deps.sh
 git apply --directory=fcitx5 patches/fcitx5.patch
 git apply --directory=engines/libime/src/libime/core/kenlm patches/kenlm.patch
 git apply --directory=engines/fcitx5-rime patches/rime.patch # if building with Rime
+git clone https://github.com/google/mozc engines/fcitx5-mozc/mozc --depth=1 --recurse-submodules # if building with Mozc
 ```
 
 ### Build with CMake

diff --git a/engines/CMakeLists.txt b/engines/CMakeLists.txt
@@ -39,6 +39,22 @@ if (HALLELUJAH)
     list(APPEND DEFAULT_INPUT_METHODS hallelujah)
 endif()
 
+if (MOZC)
+    set(MOZC_TARGET
+        "-L${PREBUILDER_LIB_DIR}"
+        "-lmozc-static"
+        "-lutf8_validity"
+        "-lprotobuf"
+        "-labsl"
+    )
+    add_subdirectory(fcitx5-mozc)
+    target_include_directories(mozc PRIVATE
+        "${PREBUILDER_INCLUDE_DIR}/mozc"
+        "${PROJECT_SOURCE_DIR}/include"
+    )
+    list(APPEND DEFAULT_INPUT_METHODS mozc)
+endif()
+
 if (RIME)
     # RIME_DATA_DIR is not actually used but must exist.
     set(RIME_DATA_DIR "/usr/share/rime-data")

diff --git a/engines/fcitx5-chinese-addons b/engines/fcitx5-chinese-addons
diff --git a/engines/fcitx5-mozc b/engines/fcitx5-mozc
diff --git a/engines/libime b/engines/libime
diff --git a/fcitx5 b/fcitx5
diff --git a/include/Fcitx5/Utils/fcitx-utils/macros.h b/include/Fcitx5/Utils/fcitx-utils/macros.h
@@ -0,0 +1 @@
+../../../../fcitx5/src/lib/fcitx-utils/macros.h
diff --git a/include/fcitx-module/clipboard/clipboard_public.h b/include/fcitx-module/clipboard/clipboard_public.h
@@ -0,0 +1 @@
+../../../fcitx5/src/modules/clipboard/clipboard_public.h
diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh
@@ -5,6 +5,7 @@ deps=(
   json-c
   leveldb
   libintl
+  libmozc
   librime
   libuv
   lua

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -113,6 +113,12 @@ if (HALLELUJAH)
     copy_to_keyboard(copy "${HALLELUJAH_BINARY_DIR}/src/hallelujah.conf" "${IM_PREFIX}/hallelujah.conf")
 endif()
 
+if (MOZC)
+    set(MOZC_BINARY_DIR "${PROJECT_BINARY_DIR}/engines/fcitx5-mozc")
+    copy_to_keyboard(copy "${MOZC_BINARY_DIR}/src/unix/fcitx5/mozc-addon.conf" "${ADDON_PREFIX}/mozc.conf")
+    copy_to_keyboard(copy "${PROJECT_SOURCE_DIR}/engines/fcitx5-mozc/src/unix/fcitx5/mozc.conf" "${IM_PREFIX}/mozc.conf")
+endif()
+
 if (RIME)
     set(RIME_BINARY_DIR "${PROJECT_BINARY_DIR}/engines/fcitx5-rime")
     copy_to_keyboard(copy "${RIME_BINARY_DIR}/src/rime-addon.conf" "${ADDON_PREFIX}/rime.conf")
+53 −47		im/pinyin/pinyin.cpp
+235 −224		po/ca.po
+235 −224		po/da.po
+235 −224		po/de.po
+235 −224		po/fcitx5-chinese-addons.pot
+235 −224		po/he.po
+235 −224		po/ja.po
+237 −226		po/ko.po
+229 −210		po/ru.po
+222 −211		po/zh_CN.po
+220 −209		po/zh_TW.po
+2 −0		test/testautophrasedict.cpp
+10 −2		test/testdecoder.cpp
+9 −3		test/testhistorybigram.cpp
+2 −0		test/testinputbuffer.cpp
+5 −2		test/testmodel.cpp
+4 −0		test/testpinyincontext.cpp
+4 −0		test/testpinyindictionary.cpp
+4 −0		test/testpinyinencoder.cpp
+8 −1		test/testpinyinime.cpp
+2 −1		test/testpinyinime_unit.cpp
+3 −0		test/testprediction.cpp
+9 −0		test/testshuangpinprofile.cpp
+9 −0		test/testtable.cpp
+6 −0		test/testtableime.cpp
+3 −0		test/testtableime_unit.cpp
+2 −0		test/testtrie.cpp
+8 −2		test/testusermodel.cpp
+3 −0		test/testutils.h
+4 −0		test/triebench.cpp
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../../fcitx5/src/lib/fcitx-utils/macros.h
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../fcitx5/src/modules/clipboard/clipboard_public.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ deps=( @@
       json-c
       leveldb
       libintl
+      libmozc
       librime
       libuv
       lua
@@ Expand Down @@