start fcitx5 using a script if necessary

Author: hantengc

CMakeLists.txt

@@ -36,6 +36,7 @@ option(ENABLE_SERVER "Build a fcitx as server, disable this option if you want t
 option(ENABLE_KEYBOARD "Enable key event translation with XKB and build keyboard engine" On)
 option(USE_SYSTEMD "Use systemd for event loop and dbus, will fallback to libuv/libdbus if not found. Only used when EVENT_LOOP_BACKEND is auto." On)
 option(ENABLE_XDGAUTOSTART "Enable xdg autostart desktop file installation" On)
+option(ENABLE_START_SCRIPT "Enable to start fcitx5 using a script" On)
 option(USE_FLATPAK_ICON "Use flatpak icon name for desktop files" Off)
 option(ENABLE_EMOJI "Enable emoji module" On)
 option(ENABLE_LIBUUID "Use libuuid for uuid generation" On)
@@ -180,6 +181,13 @@ if(ENABLE_ENCHANT)
   endif()
 endif()
 
+if (ENABLE_START_SCRIPT)
+    set(FCITX_START_EXEC "fcitx5-exec")
+else()
+    set(FCITX_START_EXEC "fcitx5")
+endif()
+add_compile_definitions(FCITX_START_EXEC="${FCITX_START_EXEC}")
+
 if (TARGET Wayland::Client AND ENABLE_WAYLAND)
     set(WAYLAND_FOUND TRUE)
 else()

data/CMakeLists.txt

@@ -6,6 +6,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.fcitx.Fcitx5.desktop.in.in
                ${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.desktop.in @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcitx5-diagnose.sh
                ${CMAKE_CURRENT_BINARY_DIR}/fcitx5-diagnose ESCAPE_QUOTES @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcitx5-exec.sh
+               ${CMAKE_CURRENT_BINARY_DIR}/fcitx5-exec ESCAPE_QUOTES @ONLY)
 
 fcitx5_translate_desktop_file(${CMAKE_CURRENT_BINARY_DIR}/fcitx5-configtool.desktop.in
                               fcitx5-configtool.desktop)
@@ -18,6 +20,11 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.desktop"
               "${CMAKE_CURRENT_BINARY_DIR}/fcitx5-configtool.desktop"
         DESTINATION "${FCITX_INSTALL_DATADIR}/applications")
 
+if (ENABLE_START_SCRIPT)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/fcitx5-exec" DESTINATION ${FCITX_INSTALL_BINDIR}  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+    GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+endif()
+
 if (ENABLE_XDGAUTOSTART)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.desktop" DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/autostart)
 endif()

data/fcitx5-exec.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+export XDG_DATA_DIRS=/usr/share:/usr/local/share:${XDG_DATA_DIRS}
+export FCITX_ADDON_DIRS=/usr/lib/fcitx5:/usr/local/lib/fcitx5:@FCITX_INSTALL_ADDONDIR@:${FCITX_ADDON_DIRS}
+export PATH=/usr/bin:/usr/local/bin:${PATH}
+
+exec @FCITX_INSTALL_BINDIR@/fcitx5 "$@"

data/fcitx5.sh.in

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+export FCITX_ADDON_DIRS=${FCITX_ADDON_DIRS}
+export XDG_DATA_DIRS=${XDG_DATA_DIRS}
+export PATH=${PATH}
+
+exec @FCITX_INSTALL_BINDIR@/fcitx5

data/org.fcitx.Fcitx5.desktop.in.in

@@ -2,7 +2,7 @@
 Name=Fcitx 5
 GenericName=Input Method
 Comment=Start Input Method
-Exec=@FCITX_INSTALL_BINDIR@/fcitx5
+Exec=@FCITX_START_EXEC@
 Icon=@FCITX_ICON_NAME@
 Terminal=false
 Type=Application

src/server/main.cpp

@@ -90,11 +90,9 @@ int main(int argc, char *argv[]) {
         std::vector<std::string> args;
         if (isInFlatpak()) {
             args = {"flatpak-spawn",
-                    StandardPaths::fcitxPath("bindir", "fcitx5").string(),
-                    "-rd"};
+                    StandardPath::fcitxPath("bindir", FCITX_START_EXEC), "-rd"};
         } else {
-            args = {StandardPaths::fcitxPath("bindir", "fcitx5").string(),
-                    "-r"};
+            args = {StandardPath::fcitxPath("bindir", FCITX_START_EXEC), "-r"};
         }
         startProcess(args);
     }