revive auto add im feature

fcitx-contrib · Oct 30, 2024 · 5fa38f6 · 5fa38f6
1 parent f26fbe6
commit 5fa38f6
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -71,8 +71,7 @@ jobs:
 
       - name: Test
         run: |
-          cd build
-          ctest --output-on-failure
+          ctest --test-dir build --output-on-failure
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -48,6 +48,14 @@
             "group": {
                 "kind": "build"
             }
+        },
+        {
+            "type": "shell",
+            "label": "Test",
+            "command": "ctest --test-dir build --output-on-failure",
+            "group": {
+                "kind": "build"
+            }
         }
     ]
 }
diff --git a/config/ipc.swift b/config/ipc.swift
@@ -1,9 +1,11 @@
 import AppKit
 
 let bundleId = "org.fcitx.inputmethod.Fcitx5"
+let fcitx5Executable = "/Library/Input Methods/Fcitx5.app/Contents/MacOS/Fcitx5"
 
-func restartFcitxProcess() {
+func restartFcitxProcess(inputMethods: [String] = []) {
   for app in NSRunningApplication.runningApplications(withBundleIdentifier: bundleId) {
     app.terminate()
   }
+  exec(fcitx5Executable, inputMethods, isAsync: true)
 }
diff --git a/config/plugin.swift b/config/plugin.swift
@@ -235,14 +235,8 @@ struct PluginView: View {
             (nativeResults[$0] ?? true) && (dataResults[$0] ?? true)
           }.flatMap { getAutoAddIms($0) }
         refreshPlugins()
-        // if Fcitx.imGroupCount() == 1 {
-        //   // Otherwise user knows how to play with it, don't mess it up.
-        //   for im in inputMethods {
-        //     Fcitx.imAddToCurrentGroup(im)
-        //   }
-        // }
+        restartFcitxProcess(inputMethods: inputMethods)
         processing = false
-        restartFcitxProcess()
       },
       onProgress: { progress in
         downloadProgress = progress

diff --git a/src/server.swift b/src/server.swift
@@ -54,6 +54,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     let locale = getLocale()
     start_fcitx_thread(locale)
+
+    // Config Tool may restart Fcitx5 with input methods to auto add.
+    let inputMethods = CommandLine.arguments.dropFirst()
+    if imGroupCount() == 1 {
+      // Otherwise user knows how to play with it, don't mess it up.
+      for im in inputMethods {
+        Fcitx.imAddToCurrentGroup(im)
+      }
+    }
   }
 
   func applicationWillTerminate(_ notification: Notification) {