Dev

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -67,6 +67,8 @@ body:
         - AUR (fcitx5-lotus-git)
         - Cloudflare Pages (Debian/Ubuntu/Fedora/OpenSUSE)
         - NixOS
+        - VUR (Void Linux)
+        - GURU (Gentoo)
         - Tự build từ source
         - Khác
     validations:

.github/workflows/build.yml

@@ -44,7 +44,7 @@ jobs:
     steps:
       - name: Install dependencies
         run: |
-          pacman -Syu --noconfirm base-devel clang cmake ninja extra-cmake-modules fmt libuv boost git go libinput systemd-libs extra-cmake-modules libx11 python librsvg
+          pacman -Syu --noconfirm base-devel clang cmake ninja extra-cmake-modules fmt libuv boost git go libinput systemd-libs extra-cmake-modules python librsvg
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
           git config --global --add safe.directory "$GITHUB_WORKSPACE/fcitx5-lotus"
           git config --global --add safe.directory "$GITHUB_WORKSPACE/fcitx5"
@@ -72,7 +72,7 @@ jobs:
           submodules: true
       - name: Init CodeQL
         if: matrix.compiler == 'gcc'
-        uses: github/codeql-action/init@v4.37.9
+        uses: github/codeql-action/init@v4.38.0
         with:
           languages: cpp,go
           source-root: fcitx5-lotus
@@ -89,7 +89,7 @@ jobs:
           ctest --test-dir fcitx5-lotus/build --output-on-failure --no-tests=error
       - name: CodeQL Analysis
         if: matrix.compiler == 'gcc'
-        uses: github/codeql-action/analyze@v4.37.9
+        uses: github/codeql-action/analyze@v4.38.0
         with:
           checkout_path: fcitx5-lotus
 

.github/workflows/packaging-dev.yml

@@ -173,7 +173,7 @@ jobs:
             set -euo pipefail
             pacman -Syu --noconfirm \
               cmake extra-cmake-modules gcc go \
-              fcitx5 libinput libx11 systemd python \
+              fcitx5 libinput systemd python \
               make pkgconf zstd librsvg
 
             cd /work

.github/workflows/packaging-release.yml

@@ -361,7 +361,7 @@ jobs:
             set -euo pipefail
             pacman -Syu --noconfirm \
               cmake extra-cmake-modules gcc go \
-              fcitx5 libinput libx11 systemd python \
+              fcitx5 libinput systemd python \
               make pkgconf zstd librsvg
 
             cd /work

.github/workflows/update-nix-hash.yaml

@@ -0,0 +1,89 @@
+name: Update Nix Hash on Release
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Update version:'
+        required: false
+
+permissions:
+  contents: write
+  pull-requests: write
+
+concurrency:
+  group: update-nix-hash
+  cancel-in-progress: false
+
+jobs:
+  update-hash:
+    name: Update package hash
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          ref: main
+          fetch-depth: 0
+          persist-credentials: false
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+          extra_nix_config: |
+            experimental-features = nix-command flakes
+            accept-flake-config = true
+
+      - name: Determine version
+        id: version
+        run: |
+          if [ -n "${{ github.event.inputs.version }}" ]; then
+            VERSION="${{ github.event.inputs.version }}"
+          else
+            VERSION="${{ github.event.release.tag_name }}"
+            VERSION="${VERSION#v}"
+          fi
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Run nix-update via shim
+        run: |
+          cat > update-shim.nix << 'EOF'
+          { pkgs ? import <nixpkgs> { } }:
+          {
+            fcitx5-lotus = pkgs.callPackage ./nix/packages/fcitx5-lotus { };
+          }
+          EOF
+
+          nix run nixpkgs#nix-update -- \
+            --file ./update-shim.nix \
+            fcitx5-lotus \
+            --version="${{ steps.version.outputs.version }}"
+
+          rm update-shim.nix
+
+      - name: Build to verify
+        run: nix build -L --no-link .#packages.x86_64-linux.fcitx5-lotus
+
+      - name: Check for changes
+        id: git-check
+        run: |
+          if git diff --quiet; then
+            echo "changed=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "changed=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Create Pull Request
+        if: steps.git-check.outputs.changed == 'true'
+        uses: peter-evans/create-pull-request@v8
+        with:
+          base: main
+          commit-message: "nix: update fcitx5-lotus to ${{ steps.version.outputs.version }}"
+          title: "nix: update to v${{ steps.version.outputs.version }}"
+          body: |
+            Tự động cập nhật version và hash cho Nix sau khi release `v${{ steps.version.outputs.version }}`.
+            Đã build thành công trước khi tạo PR này.
+          branch: auto-update-nix-${{ steps.version.outputs.version }}
+          delete-branch: true

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-project(fcitx5-lotus VERSION 3.5.9)
+project(fcitx5-lotus VERSION 3.5.10)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 option(BUILD_TESTING "Build Lotus tests" OFF)
 
@@ -14,6 +14,7 @@ set(fcitx_lotus_core_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lotus-utils.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lotus-monitor.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lotus-icon-resolver.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lotus-plasma-theme.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/emoji.cpp
 )
 
@@ -28,12 +29,10 @@ find_package(Fcitx5Core ${REQUIRED_FCITX_VERSION} REQUIRED)
 find_package(Fcitx5ModuleEmoji REQUIRED)
 find_package(Pthread REQUIRED)
 find_package(Gettext REQUIRED)
-find_package(X11 REQUIRED)
 
 include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake")
 add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-lotus\") 
 
-find_package(Fcitx5Utils REQUIRED)
 if (Fcitx5Utils_VERSION VERSION_GREATER_EQUAL "5.1.13")
     add_definitions(-DLOTUS_USE_MODERN_FCITX_API)
     message(STATUS "Fcitx5 version ${Fcitx5Utils_VERSION} detected: Using modern API")

README.en.md

@@ -67,10 +67,10 @@ If you want to compile the input method from source to contribute or customize:
 
 ### Dependencies
 
-- **Debian/Ubuntu:** `sudo apt-get install cmake extra-cmake-modules libfcitx5core-dev libfcitx5config-dev libfcitx5utils-dev libinput-dev libudev-dev g++ golang hicolor-icon-theme pkg-config libx11-dev fcitx5-modules-dev python3-qtpy python3-dbus acl librsvg2-bin`
-- **Fedora/RHEL:** `sudo dnf install cmake extra-cmake-modules fcitx5-devel libinput-devel libudev-devel gcc-c++ golang hicolor-icon-theme systemd-devel libX11-devel python3-pyside6 python3-QtPy python3-dbus acl librsvg2-tools`
-- **openSUSE:** `sudo zypper install cmake kf6-extra-cmake-modules fcitx5-devel libinput-devel systemd-devel gcc-c++ go hicolor-icon-theme systemd-devel libX11-devel python3-pyside6 python3-QtPy python3-dbus-python acl rsvg-convert`
-- **Arch:** `sudo pacman -S --needed cmake extra-cmake-modules gcc go git libx11 python make pkgconf acl fcitx5 libinput hicolor-icon-theme python-qtpy python-dbus librsvg`
+- **Debian/Ubuntu:** `sudo apt-get install cmake extra-cmake-modules libfcitx5core-dev libfcitx5config-dev libfcitx5utils-dev libinput-dev libudev-dev g++ golang hicolor-icon-theme pkg-config fcitx5-modules-dev python3-qtpy python3-dbus acl librsvg2-bin`
+- **Fedora/RHEL:** `sudo dnf install cmake extra-cmake-modules fcitx5-devel libinput-devel libudev-devel gcc-c++ golang hicolor-icon-theme systemd-devel python3-pyside6 python3-QtPy python3-dbus acl librsvg2-tools`
+- **openSUSE:** `sudo zypper install cmake kf6-extra-cmake-modules fcitx5-devel libinput-devel systemd-devel gcc-c++ go hicolor-icon-theme systemd-devel python3-pyside6 python3-QtPy python3-dbus-python acl rsvg-convert`
+- **Arch:** `sudo pacman -S --needed cmake extra-cmake-modules gcc go git python make pkgconf acl fcitx5 libinput hicolor-icon-theme python-qtpy python-dbus librsvg`
 
 ### Install
 

README.md

@@ -67,10 +67,10 @@ Nếu bạn muốn tự biên dịch bộ gõ từ mã nguồn để đóng góp
 
 ### Yêu cầu hệ thống
 
-- **Debian/Ubuntu:** `sudo apt-get install cmake extra-cmake-modules libfcitx5core-dev libfcitx5config-dev libfcitx5utils-dev libinput-dev libudev-dev g++ golang hicolor-icon-theme pkg-config libx11-dev fcitx5-modules-dev python3-qtpy python3-dbus acl librsvg2-bin`
-- **Fedora/RHEL:** `sudo dnf install cmake extra-cmake-modules fcitx5-devel libinput-devel libudev-devel gcc-c++ golang hicolor-icon-theme systemd-devel libX11-devel python3-pyside6 python3-QtPy python3-dbus acl librsvg2-tools`
-- **openSUSE:** `sudo zypper install cmake kf6-extra-cmake-modules fcitx5-devel libinput-devel systemd-devel gcc-c++ go hicolor-icon-theme systemd-devel libX11-devel python3-pyside6 python3-QtPy python3-dbus-python acl rsvg-convert`
-- **Arch:** `sudo pacman -S --needed cmake extra-cmake-modules gcc go git libx11 python make pkgconf acl fcitx5 libinput hicolor-icon-theme python-qtpy python-dbus librsvg`
+- **Debian/Ubuntu:** `sudo apt-get install cmake extra-cmake-modules libfcitx5core-dev libfcitx5config-dev libfcitx5utils-dev libinput-dev libudev-dev g++ golang hicolor-icon-theme pkg-config fcitx5-modules-dev python3-qtpy python3-dbus acl librsvg2-bin`
+- **Fedora/RHEL:** `sudo dnf install cmake extra-cmake-modules fcitx5-devel libinput-devel libudev-devel gcc-c++ golang hicolor-icon-theme systemd-devel python3-pyside6 python3-QtPy python3-dbus acl librsvg2-tools`
+- **openSUSE:** `sudo zypper install cmake kf6-extra-cmake-modules fcitx5-devel libinput-devel systemd-devel gcc-c++ go hicolor-icon-theme systemd-devel python3-pyside6 python3-QtPy python3-dbus-python acl rsvg-convert`
+- **Arch:** `sudo pacman -S --needed cmake extra-cmake-modules gcc go git python make pkgconf acl fcitx5 libinput hicolor-icon-theme python-qtpy python-dbus librsvg`
 
 ### Cài đặt
 

bamboo/bamboo-c.go

@@ -148,9 +148,9 @@ func EngineSetOption(engine uintptr, option *C.FcitxBambooEngineOption) {
 
 //export NewEngine
 func NewEngine(name *C.cchar, dictHandle uintptr, tableHandle uintptr) uintptr {
-	dict, ok := dictionaryFromHandle(dictHandle)
-	if !ok {
-		return 0
+	dictionary := map[string]bool{}
+	if dict, ok := dictionaryFromHandle(dictHandle); ok {
+		dictionary = *dict
 	}
 
 	table, ok := macroTableFromHandle(tableHandle)
@@ -163,7 +163,7 @@ func NewEngine(name *C.cchar, dictHandle uintptr, tableHandle uintptr) uintptr {
 	var engine = &FcitxBambooEngine{
 		preeditor:               bamboo.NewEngine(bamboo.ParseInputMethod(bamboo.InputMethodDefinitions, imName), bamboo.EstdFlags),
 		macroTable:              table,
-		dictionary:              *dict,
+		dictionary:              dictionary,
 		autoNonVnRestore:        true,
 		ddFreeStyle:             true,
 		macroEnabled:            false,
@@ -182,9 +182,9 @@ func NewEngine(name *C.cchar, dictHandle uintptr, tableHandle uintptr) uintptr {
 
 //export NewCustomEngine
 func NewCustomEngine(definition **C.char, dictHandle uintptr, tableHandle uintptr) uintptr {
-	dict, ok := dictionaryFromHandle(dictHandle)
-	if !ok {
-		return 0
+	dictionary := map[string]bool{}
+	if dict, ok := dictionaryFromHandle(dictHandle); ok {
+		dictionary = *dict
 	}
 
 	table, ok := macroTableFromHandle(tableHandle)
@@ -206,7 +206,7 @@ func NewCustomEngine(definition **C.char, dictHandle uintptr, tableHandle uintpt
 	var engine = &FcitxBambooEngine{
 		preeditor:               bamboo.NewEngine(bamboo.ParseInputMethod(definitions, "Custom"), bamboo.EstdFlags),
 		macroTable:              table,
-		dictionary:              *dict,
+		dictionary:              dictionary,
 		autoNonVnRestore:        true,
 		ddFreeStyle:             true,
 		macroEnabled:            false,

bamboo/fcitxbambooengine.go

@@ -68,15 +68,13 @@ const (
 func determineMacroCase(str string) uint8 {
 	var hasLower, hasUpper bool
 	for _, c := range str {
-		if unicode.IsLetter(c) {
-			if unicode.IsLower(c) {
-				hasLower = true
-			} else if unicode.IsUpper(c) {
-				hasUpper = true
-			}
-			if hasLower && hasUpper {
-				return VnCaseNoChange
-			}
+		if unicode.IsLower(c) {
+			hasLower = true
+		} else if unicode.IsUpper(c) {
+			hasUpper = true
+		}
+		if hasLower && hasUpper {
+			return VnCaseNoChange
 		}
 	}
 	if hasLower {

nix/packages/fcitx5-lotus/default.nix

@@ -12,7 +12,7 @@
   kdePackages,
   libinput,
   librsvg,
-  libx11,
+  nix-update-script,
   pkg-config,
   python3,
   qt6,
@@ -40,6 +40,20 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  vendorDir = finalAttrs.passthru."go-modules";
+
+  passthru = {
+    "go-modules" =
+      (buildGoModule {
+        pname = "fcitx5-lotus-go-modules";
+        inherit (finalAttrs) version src;
+        modRoot = "bamboo";
+        vendorHash = "sha256-CNDYjxDfqh9nGs5vlpb/7qXZeNtkvegC5nPvBOZcDrc=";
+      }).goModules;
+
+    updateScript = nix-update-script { };
+  };
+
   nativeBuildInputs = [
     cmake
     gettext
@@ -56,20 +70,17 @@ stdenv.mkDerivation (finalAttrs: {
     fcitx5
     kdePackages.extra-cmake-modules
     libinput
-    libx11
     pythonEnv
     qt6.qtbase
     qt6.qtsvg
     udev
   ];
 
-  vendorDir =
-    (buildGoModule {
-      pname = "fcitx5-lotus-go-modules";
-      inherit (finalAttrs) version src;
-      modRoot = "bamboo";
-      vendorHash = "sha256-CNDYjxDfqh9nGs5vlpb/7qXZeNtkvegC5nPvBOZcDrc=";
-    }).goModules;
+  strictDeps = true;
+
+  __structuredAttrs = true;
+
+  dontWrapQtApps = true;
 
   preConfigure = ''
     export GOCACHE=$TMPDIR/go-cache
@@ -113,10 +124,16 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share"
   '';
 
-  meta = with lib; {
-    description = "Fcitx5 Lotus input method for Vietnamese typing";
+  meta = {
+    description = "Vietnamese input method engine for Fcitx5";
     homepage = "https://github.com/LotusInputMethod/fcitx5-lotus";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
+    license = with lib.licenses; [
+      gpl3Plus
+      lgpl21Plus
+    ];
+    maintainers = with lib.maintainers; [
+      justanoobcoder
+    ];
+    platforms = lib.platforms.linux;
   };
 })