fix: adjust command line size to allow expanding

OpenClipboard() can fail transiently when another process holds the
clipboard mutex. Add a retry loop (5 attempts, 5ms delay) so that
Deskflow handles brief contention gracefully instead of immediately
failing.

.github/CODEOWNERS

@@ -1,2 +1,9 @@
 # Apply to all files
 * @nbolton @sithlord48
+
+# Translators
+translations/deskflow_es.ts @sithlord48
+translations/deskflow_it.ts @sithlord48
+translations/deskflow_ja.ts @ykasap
+translations/deskflow_ru.ts @levpr1c
+translations/deskflow_zh_CN.ts @sailordiary

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,18 @@
+# Deskflow Code of Conduct
+
+## Our Pledge
+
+We want the Deskflow community to be one where everyone can work together. We pledge to keep our community focused on the project and the code around the project. 
+
+## Community Standards
+
+ * Keep interactions respectful and focused on the project
+ * Contributions are expected to follow the [contribution guide](https://github.com/deskflow/deskflow/wiki/Contributing).
+ 
+## Enforcement
+
+Enforcement will be done at the descression of the Deskflow Moderators.
+
+ 1. Warning
+ 2. Temporary ban
+ 3. Permanent banning

.github/README.md

@@ -25,10 +25,11 @@ TLS encryption is enabled by default. Wayland is supported. Clipboard sharing is
 > [!NOTE]
 > On Windows, you will need to install the
 > [Microsoft Visual C++ Redistributable](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170#latest-microsoft-visual-c-redistributable-version).  
-> Download latest: [`vc_redist.x64.exe`](https://aka.ms/vs/17/release/vc_redist.x64.exe) [`vc_redist.arm64.exe`](https://aka.ms/vs/17/release/vc_redist.arm64.exe)
+> Download latest: [`vc_redist.x64.exe`](https://aka.ms/vc14/vc_redist.x64.exe) [`vc_redist.arm64.exe`](https://aka.ms/vc14/vc_redist.arm64.exe)
 
 > [!TIP]
 > For macOS users, the easiest way to install and stay up to date is to use [Homebrew](https://brew.sh) with our [homebrew-tap](https://github.com/deskflow/homebrew-tap).
+> macOS reports unsigned apps as damaged. This occurs because we do not use an Apple certificate for notarization. Clear the quarantine attribute to run the app: `xattr -c Deskflow.app`
 
 To use Deskflow, download one of our [packages](https://github.com/deskflow/deskflow/releases), install `deskflow` (from your package repository), or [build it](https://github.com/deskflow/deskflow/wiki/Building) from source.
 
@@ -50,7 +51,7 @@ To use Deskflow, download one of our [packages](https://github.com/deskflow/desk
 
 ## Contribute
 
-[![Good first issues](https://img.shields.io/github/issues/deskflow/deskflow/good%20first%20issue?label=good%20first%20issues&color=%2344cc11)](https://github.com/deskflow/deskflow/labels/good%20first%20issue) [![Open bounty issues](https://img.shields.io/github/issues/deskflow/deskflow/%F0%9F%92%8E%20bounty?label=💎%20open%20bounty%20issues&color=%2344cc11)](https://github.com/deskflow/deskflow/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22%F0%9F%92%8E%20bounty%22) [![Rewarded bounties](https://img.shields.io/github/issues-search/deskflow/deskflow?query=label%3A%22%F0%9F%92%B0%20rewarded%22&label=%F0%9F%92%B0%20rewarded%20bounties&color=yellow)](https://github.com/deskflow/deskflow/issues?q=label%3A%22%F0%9F%92%B0%20rewarded%22%20sort%3Aupdated-desc)
+[![Good first issues](https://img.shields.io/github/issues/deskflow/deskflow/good%20first%20issue?label=good%20first%20issues&color=%2344cc11)](https://github.com/deskflow/deskflow/labels/good%20first%20issue)
 
 There are many ways to contribute to the Deskflow project.
 
@@ -64,9 +65,9 @@ For instructions on building Deskflow, use the wiki page: [Building](https://git
 
 We support all major operating systems, including Windows, macOS, Linux, and Unix-like BSD-derived.
 
-Windows 10 or higher is required.
+Windows 10 v1809 or higher is required.
 
-macOS 12 or higher is required.
+macOS 13 or higher is required to use our CI builds for Apple Silicon machines. macOS 12 or higher is required for Intel macs or local builds.
 
 Linux requires libei 1.3+ and libportal 0.8+ for the server/client. Additionally, Qt 6.7+ is required for the GUI.
 Linux users with systems not meeting these requirements should use flatpak in place of a native package.
@@ -80,8 +81,6 @@ versions across them and gathering other information.
 
 [![Repology](https://repology.org/badge/vertical-allrepos/deskflow.svg?exclude_unsupported=1)](https://repology.org/project/deskflow/versions)
 
-**Note:** We are working with package maintainers to have our new package name adopted.
-
 ## Installing on macOS
 
 When you install Deskflow on macOS, you need to allow accessibility access (Privacy & Security) to both the `Deskflow` app and the `deskflow` process.
@@ -94,12 +93,12 @@ on the allowed list you will need to manually remove them before accessibility a
 
 macOS users who download directly from releases may need to run `xattr -c /Applications/Deskflow.app` after copying the app to the `Applications` dir.
 
-It is recommend to install Deskflow using [Homebrew](https://brew.sh) from our [homebrew-tap](https://github.com/deskflow/homebrew-tap)
+It is recommended to install Deskflow using [Homebrew](https://brew.sh) from our [homebrew-tap](https://github.com/deskflow/homebrew-tap)
 
 To add our tap, run:
 
 ```
-brew tap deskflow/homebrew-tap
+brew tap deskflow/tap
 ```
 
 Then install either:
@@ -185,4 +184,4 @@ Deskflow is made by possible by these contributors.
 
 ## License
 
-This project is licensed under [GPL-2.0](LICENSE) with an [OpenSSL exception](LICENSES/LicenseRef-OpenSSL-Exception.txt).
+This project is licensed under [GPL-2.0](LICENSE) with an [OpenSSL exception](../LICENSES/LicenseRef-OpenSSL-Exception.txt).

.github/actions/add-kitware-repo/action.yml

@@ -1,34 +0,0 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-License-Identifier: MIT
-
-name: "Add Kitware repo"
-description: "Add Kitware repo for Debian-like distros"
-
-inputs:
-  distro:
-    description: "Ubuntu codename, Kitware uses: noble, jammy, focal"
-    required: true
-
-runs:
-  using: "composite"
-
-  steps:
-
-    # This mirrors instructions at https://apt.kitware.com
-    - name: Add repo
-      run: |
-          apt update -y -qqq
-          apt install ca-certificates gpg wget -y -qqq
-
-          wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
-            | gpg --dearmor - \
-            > /usr/share/keyrings/kitware-archive-keyring.gpg
-
-          echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ ${{ inputs.distro }} main' \
-            > /etc/apt/sources.list.d/kitware.list
-            
-          apt update -y -qqq
-      env:
-          # Prevent apt prompting for input.
-          DEBIAN_FRONTEND: noninteractive
-      shell: bash

.github/actions/install-dependencies/action.yml

@@ -30,7 +30,7 @@ runs:
       if: ${{ runner.os != 'Windows' }}
       run: |
           if [ "$RUNNER_OS" == "macOS" ]; then
-            brew install googletest openssl --quiet
+            brew install googletest openssl doxygen --quiet
           elif [ "$RUNNER_OS" == "Linux" ]; then
             if [ ${{inputs.like}} == "debian" ]; then
               apt update -qqq > /dev/null
@@ -38,17 +38,17 @@ runs:
                 xorg-dev libx11-dev libxtst-dev libssl-dev \
                 libglib2.0-dev libxkbfile-dev qt6-base-dev qt6-tools-dev \
                 libgtk-3-dev libgtest-dev libgmock-dev \
-                libei-dev libportal-dev help2man -y >/dev/null
+                libei-dev libportal-dev help2man doxygen -y >/dev/null
             elif [ ${{inputs.like}} == "fedora" ]; then
               dnf install -y cmake make ninja-build gcc-c++ rpm-build openssl-devel \
                 glib2-devel libXtst-devel libxkbfile-devel qt6-qtbase-devel qt6-qttools-devel \
-                gtk3-devel gtest-devel gmock-devel libei-devel libportal-devel help2man
+                gtk3-devel gtest-devel gmock-devel libei-devel libportal-devel help2man doxygen
             elif [ ${{inputs.like}} == "suse" ]; then
               zypper refresh
               zypper install -y --force-resolution \
                 cmake make ninja gcc-c++ rpm-build libopenssl-devel \
                 glib2-devel libXtst-devel libxkbfile-devel qt6-base-devel qt6-tools-devel \
-                qt6-linguist-devel gtk3-devel \
+                qt6-linguist-devel gtk3-devel doxygen \
                 googletest-devel googlemock-devel libei-devel libportal-devel help2man
             elif [ ${{ inputs.like }} == "arch" ]; then
               pacman -Syu --noconfirm base-devel cmake ninja \
@@ -83,6 +83,22 @@ runs:
         token: ${{ github.token }}
         revision: master
 
+    - name: Cache Chocolatey
+      id: cache-choco
+      if: (runner.os == 'Windows')
+      uses: actions/cache@v4
+      with:
+        path: |
+            C:/ProgramData/chocolatey/bin/
+            C:/ProgramData/chocolatey/lib/doxygen.install
+            C:/Program*/doxygen/
+        key: cache-chocolatey${{ matrix.config.arch }}-doxygen
+
+    - name: Install doxygen (windows)
+      if: ((runner.os == 'Windows') && (steps.cache-choco.outputs.cache-hit != 'true'))
+      shell: bash
+      run: choco install doxygen.install
+
     - name: Install Wix
       if: ${{ runner.os == 'Windows' }}
       run: |
@@ -91,3 +107,4 @@ runs:
         wix extension add --global WixToolset.Util.wixext/5.0.2
         wix extension add --global WixToolset.Firewall.wixext/5.0.2
       shell: pwsh
+

.github/actions/test-package/action.yml

@@ -0,0 +1,49 @@
+name: "Test Package"
+description: "Installs the built package and verifies the installed binaries can run"
+
+inputs:
+  like:
+    description: "Used only on linux distro type: debian, fedora, suse, arch"
+    required: false
+    default: ""
+
+runs:
+  using: "composite"
+
+  steps:
+    - name: Test package
+      shell: bash
+      run: |
+        if [ "$RUNNER_OS" == "macOS" ]; then
+          dmg=$(ls build/deskflow-*.dmg | head -1)
+          echo "Y" | hdiutil attach "$dmg" -nobrowse -mountpoint /tmp/deskflow-dmg
+          /tmp/deskflow-dmg/Deskflow.app/Contents/MacOS/deskflow-core --version
+          hdiutil detach /tmp/deskflow-dmg
+
+        elif [ "$RUNNER_OS" == "Windows" ]; then
+          7z x build/deskflow-*-portable.7z -otmp/deskflow-pkg
+          exe=$(find tmp/deskflow-pkg -name "deskflow-core.exe" -type f | head -1)
+          exe_dir=$(dirname "$exe")
+          pkg_root=$(dirname "$exe_dir")
+          export PATH="$exe_dir:$pkg_root:$pkg_root/lib:$PATH"
+          "$exe" --version
+
+        elif [ "$RUNNER_OS" == "Linux" ]; then
+          if [ "${{inputs.like}}" == "debian" ]; then
+            apt-get install -y ./build/deskflow-*.deb
+          elif [ "${{inputs.like}}" == "fedora" ]; then
+            dnf install -y build/deskflow-*.rpm
+          elif [ "${{inputs.like}}" == "suse" ]; then
+            zypper install -y --allow-unsigned-rpm build/deskflow-*.rpm
+          elif [ "${{inputs.like}}" == "arch" ]; then
+            pacman -U --noconfirm build/deskflow-*.pkg.tar.zst
+          else
+            echo "Unknown like: ${{inputs.like}}"
+            exit 1
+          fi
+          deskflow-core --version
+
+        else
+          echo "Unknown OS: $RUNNER_OS"
+          exit 1
+        fi

.github/actions/test-summary/action.yml

@@ -60,7 +60,7 @@ runs:
 
         echo "$table" > $GITHUB_STEP_SUMMARY
 
-        count=$(echo "$table" | awk -v RS='' '{gsub(/[^❌]/, ""); print length}')
+        count=$(echo "$table" | { grep -o '❌' || true; } | wc -l)
 
         # Keep at this indentation level for heredoc.
         fail_summary=$(cat <<EOF

.github/actions/winget-publish/action.yaml

@@ -1,33 +0,0 @@
-name: Winget Publish
-description: A composite action to publish packages to the Windows Package Manager (Winget) repository
-
-inputs:
-  release-version:
-    description: "Version to publish to Winget package manager (without 'v' prefix)"
-    required: true
-  token:
-    description: "GitHub token with public read permissions on the source repo"
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-    - name: Submit package to Windows Package Manager Community Repository
-      if: ${{ runner.os == 'Windows' }}
-      env:
-        GITHUB_TOKEN: ${{ inputs.token }}
-      run: |
-        # Download latest wingetcreate
-        Invoke-WebRequest https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
-        
-        $packageId = "Deskflow.Deskflow"
-        $x64Url = "https://github.com/deskflow/deskflow/releases/download/v${{ inputs.release-version }}/deskflow-${{ inputs.release-version }}-win-x64.msi"
-        $arm64Url = "https://github.com/deskflow/deskflow/releases/download/v${{ inputs.release-version }}/deskflow-${{ inputs.release-version }}-win-arm64.msi"
-
-        # Submit package update
-        .\wingetcreate.exe update "$packageId" `
-          --version "${{ inputs.release-version }}" `
-          --urls "$x64Url|x64" "$arm64Url|arm64"`
-          --submit `
-          --token "${{ inputs.token }}"
-      shell: pwsh

.github/pull_request_template.md

@@ -0,0 +1,15 @@
+## Description
+<!--- Describe your what your changes do -->
+
+## Disclosure of AI use
+<!--- Disclouse your use of AI Tools used to make this pr -->
+<!--- If any AI tools were used to crate the code let us know -->
+
+## Related Issue
+<!--- If fixing an issue you must add a `fixes` line for each issues fixed-->
+<!--- Example, if fixing Issues #1234 you would add -->
+<!--- fixes: #1234 -->
+
+## How Has This Been Tested?
+<!--- Please describe how you tested your changes -->
+<!--- Include details of your testing environment -->

.github/workflows/ci-comment.yml

@@ -18,12 +18,15 @@ on:
 jobs:
   summary:
     if: github.event.workflow_run.event == 'pull_request'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
 
     steps:
+      # If the workflow fails before uploading summaries, no artifacts exist and this step fails.
+      # Allow failure so the "Delete PR comment" step still runs to clean up stale comments.
       - name: Download summaries
         id: download
         uses: actions/download-artifact@v4
+        continue-on-error: true
         with:
           run-id: ${{ github.event.workflow_run.id }}
           pattern: summary-*
@@ -54,15 +57,16 @@ jobs:
               console.log("Found PR:", pr.number);
               return pr.number;
             } else {
-              core.setFailed("PR not found");
+              core.warning("PR not found for SHA (maybe removed by force push)");
             }
 
       - name: Merge summaries
+        if: steps.get-pr-number.outputs.result
         id: summary
         run: |
           ls -R
 
-          files=$(find $dir -type f)
+          files=$(find summaries -type f 2>/dev/null || true)
           if [ -z "$files" ]; then
             echo "No files found in dir: $dir"
             exit 0
@@ -85,7 +89,7 @@ jobs:
           } >> $GITHUB_OUTPUT
 
       - name: Set PR comment
-        if: steps.summary.outputs.message
+        if: steps.get-pr-number.outputs.result && steps.summary.outputs.message
         uses: marocchino/sticky-pull-request-comment@v2
         with:
           number: ${{ steps.get-pr-number.outputs.result }}
@@ -93,7 +97,7 @@ jobs:
           message: ${{ steps.summary.outputs.message }}
 
       - name: Delete PR comment
-        if: ${{ !steps.summary.outputs.message }}
+        if: ${{ steps.get-pr-number.outputs.result && !steps.summary.outputs.message }}
         uses: marocchino/sticky-pull-request-comment@v2
         with:
           number: ${{ steps.get-pr-number.outputs.result }}

.github/workflows/codeql-analysis.yml

@@ -22,6 +22,10 @@ on:
       - '!src/res/**'
       - '!src/unittests/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   codeql:
     runs-on: ubuntu-latest
@@ -35,7 +39,7 @@ jobs:
           apt install -qqq git > /dev/null
 
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       - name: Install dependencies
         uses: ./.github/actions/install-dependencies
@@ -43,12 +47,12 @@ jobs:
           like: "debian"
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: cpp
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4

.github/workflows/continuous-integration.yml

@@ -11,6 +11,10 @@ on:
       - "v*"
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   GIT_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
   PACKAGE_PREFIX: "deskflow"
@@ -21,10 +25,17 @@ jobs:
   # Quality gate to allow PR merge, used in the branch protection rules.
   ci-passed:
     runs-on: ubuntu-latest
-    needs: [test-results, unix, flatpak]
+    needs: [main-build, test-results, unix, flatpak]
+    if: always()
 
     steps:
-      - run: echo "✅ CI passed" > $GITHUB_STEP_SUMMARY
+      - name: Check all steps passed
+        run: |
+          if [[ ${{needs.main-build.result}} == 'success' && ${{needs.test-results.result}} == 'success' && ${{needs.unix.result}} == 'success' && ${{needs.flatpak.result}} == 'success' ]]; then
+            echo "✅ CI passed" > $GITHUB_STEP_SUMMARY
+          else
+            exit 1
+          fi
 
   # Summary of test results, combined from test result artifacts.
   # Runs even if the tests fail to provide a summary of the failures.
@@ -32,7 +43,7 @@ jobs:
     needs: main-build
     if: always() && needs.main-build.result != 'skipped'
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     timeout-minutes: 5
 
     steps:
@@ -54,7 +65,7 @@ jobs:
 
   lint-clang:
     needs: [lint-reuse]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     timeout-minutes: 5
 
     steps:
@@ -88,6 +99,7 @@ jobs:
             config-args: "-G Ninja"
             vcpkg-triplet: x64-windows-release
             arch: "amd64"
+            qt-version: 6.10.2
 
           - name: "windows-2022-arm64"
             runs-on: "windows-11-arm"
@@ -95,42 +107,45 @@ jobs:
             config-args: "-G Ninja"
             vcpkg-triplet: arm64-windows
             arch: "arm64"
+            qt-version: 6.10.2
 
           - name: "macos-arm64"
             runs-on: macos-15
             timeout: 10
+            qt-version: 6.10.2
             config-args: '-DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET=14 -DCMAKE_OSX_SYSROOT=/Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'
 
           - name: "macos-x64"
             runs-on: macos-15-intel
             timeout: 20
+            qt-version: 6.9.3
             config-args: '-DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET=12 -DCMAKE_OSX_SYSROOT=/Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'
 
-          - name: "debian-13-x86_64"
+          - name: "debian-x86_64"
             runs-on: ubuntu-latest
-            container: debian:trixie-slim
+            container: debian:stable-slim
             like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "debian-13-arm64"
+          - name: "debian-arm64"
             runs-on: ubuntu-24.04-arm
-            container: debian:trixie-slim
+            container: debian:stable-slim
             like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "fedora-43-x86_64"
+          - name: "debian-testing-x86_64"
             runs-on: ubuntu-latest
-            container: fedora:43
+            container: debian:testing-slim
-            like: "fedora"
+            like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "fedora-43-arm64"
+          - name: "debian-testing-arm64"
             runs-on: ubuntu-24.04-arm
-            container: fedora:43
+            container: debian:testing-slim
-            like: "fedora"
+            like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
@@ -148,16 +163,16 @@ jobs:
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "fedora-41-x86_64"
+          - name: "fedora-43-x86_64"
             runs-on: ubuntu-latest
-            container: fedora:41
+            container: fedora:43
             like: "fedora"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "fedora-41-arm64"
+          - name: "fedora-43-arm64"
             runs-on: ubuntu-24.04-arm
-            container: fedora:41
+            container: fedora:43
             like: "fedora"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
@@ -183,20 +198,6 @@ jobs:
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DEV_DOCS=ON"
 
-          - name: "ubuntu-25.04-x86_64"
-            runs-on: ubuntu-latest
-            container: ubuntu:25.04
-            like: "debian"
-            timeout: 20
-            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
-
-          - name: "ubuntu-25.04-arm64"
-            runs-on: ubuntu-24.04-arm
-            container: ubuntu:25.04
-            like: "debian"
-            timeout: 20
-            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
-
           - name: "ubuntu-25.10-x86_64"
             runs-on: ubuntu-latest
             container: ubuntu:25.10
@@ -211,6 +212,20 @@ jobs:
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
+          - name: "ubuntu-26.04-x86_64"
+            runs-on: ubuntu-latest
+            container: ubuntu:26.04
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "ubuntu-26.04-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: ubuntu:26.04
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
     steps:
       # Make sure the container has git before we do anything else
       - name: Install Git on Container
@@ -232,7 +247,7 @@ jobs:
       # Fancy checkout gets all the tags
       # it also makes sure we can use git --describe correctly
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       # This effectively runs `vcvarsall.bat`, etc. It's not actually installing
       # VC++ as that's already pre-installed on the Windows runner.
@@ -246,13 +261,18 @@ jobs:
         id: get-deps
         uses: ./.github/actions/install-dependencies
         with:
-          qt-version: 6.10.0
+          qt-version: ${{matrix.target.qt-version}}
           vcpkg-triplet: ${{matrix.target.vcpkg-triplet}}
           like: ${{ matrix.target.like }}
 
       - name: Get version
         uses: ./.github/actions/get-version
 
+      - name: Update Windows Paths
+        if: (runner.os == 'Windows')
+        shell: pwsh
+        run: echo "C:\Program Files\doxygen\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
       - name: Configure
         run: ${{env.CMAKE_CONFIGURE}} ${{ matrix.target.config-args }} ${{ steps.get-deps.outputs.vcpkg-cmake-config }} -DPACKAGE_VERSION_LABEL="${{env.DESKFLOW_PACKAGE_VERSION}}"
 
@@ -260,7 +280,21 @@ jobs:
         shell: bash
         run: |
           if [[ "${{matrix.target.like}}" != "arch" ]]; then
-            cmake --build build --config Release -j8 --target package
+            if [ "$RUNNER_OS" != "macOS" ]; then
+              cmake --build build --config Release -j8 --target package
+            else
+              cmake --build build --config Release -j8
+              for i in $(seq 1 5); do
+                cmake --build build --config Release -j8 --target package 2>&1
+                if [ $? -eq 0 ]; then
+                  echo "Package successful"
+                  break
+                else
+                  echo "Package attempt $i failed"
+                  sleep 1
+                fi
+              done
+            fi
           else
             cmake --build build --config Release -j8
             useradd -m build
@@ -273,18 +307,31 @@ jobs:
             cd ..
           fi
 
+      - name: Check for unexpected repo changes
+        shell: bash
+        run: |
+          if [[ `git status --porcelain` ]]; then
+            echo "Unexpected changes to the repo, Often caused by forgetting to commit the updated translation files"
+            exit 1
+          fi
+
       - name: Tests
         uses: ./.github/actions/run-tests
         timeout-minutes: 2
         with:
           job: ${{ matrix.target.name }}
 
+      - name: Test package
+        uses: ./.github/actions/test-package
+        with:
+          like: ${{ matrix.target.like }}
+
       - name: Update Development Documentation
         if: matrix.target.like == 'arch' && github.ref == 'refs/heads/master'
         uses: JamesIves/github-pages-deploy-action@v4.7.3
         with:
           branch: gh-pages
-          folder: build/doc/dev/html
+          folder: build/docs/dev/html
 
       - name: Upload
         uses: actions/upload-artifact@v4
@@ -310,7 +357,7 @@ jobs:
       # Fancy checkout gets all the tags
       # it also makes sure we can use git --describe correctly
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
       - name: Build on FreeBSD
         if: ${{ matrix.distro.name == 'freebsd' }}
         uses: vmactions/freebsd-vm@v1
@@ -318,8 +365,8 @@ jobs:
           usesh: true
           run: |
             pkg install -y cmake ninja gmake gcc12 openssl glib \
-            libX11 libXtst libxkbfile qt6-base qt6-tools gtk3 googletest \
+            libX11 libXtst libxkbfile qt6-base qt6-tools gtk3 \
-            tomlplusplus cli11 pkgconf libei libportal
+            googletest pkgconf libei libportal doxygen
             ${{env.CMAKE_CONFIGURE}} -G Ninja
             cmake --build build -j16
             # Integration tests are flakey by nature, make them optional.
@@ -331,7 +378,7 @@ jobs:
     runs-on: ${{matrix.flatpak.runs-on}}
     timeout-minutes: 60
     container:
-      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.10
       options: --privileged
     strategy:
       fail-fast: false
@@ -343,7 +390,7 @@ jobs:
             arch: aarch64
     steps:
       - name: Check out repository
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       - run: git config --global protocol.file.allow always
 
@@ -381,7 +428,7 @@ jobs:
 
     steps:
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       - name: Get version
         uses: ./.github/actions/get-version
@@ -420,19 +467,12 @@ jobs:
             deskflow-*
             sums.txt
 
-  winget-publish:
+      - name: Update Homebrewtap
-    needs: release
+        shell: bash
-    if: contains(github.ref, 'tags/v')
+        run: |
-    runs-on: windows-latest
+          curl -L -X POST \
-    steps:
+          -H "Accept: application/vnd.github+json" \
-      - name: Fancy Checkout
+          -H "Authorization: Bearer ${{ secrets.DF_TAP_TOKEN }}" \
-        uses: sithlord48/fancy-checkout@v1
+          -H "X-GitHub-Api-Version: 2022-11-28" \
-
+          https://api.github.com/repos/deskflow/homebrew-tap/dispatches \
-      - name: Get version
+          -d '{"event_type":"update_tap"}'
-        uses: ./.github/actions/get-version
-
-      - name: Submit
-        uses: ./.github/actions/winget-publish
-        with:
-          release-version: ${{env.DESKFLOW_PACKAGE_VERSION}}
-          token: ${{ secrets.WINGET_DEPLOY_TOKEN }}

.github/workflows/issue-check-stale.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   stale-issues:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     timeout-minutes: 10
 
     steps:

.github/workflows/sonarcloud-analysis.yml

@@ -23,6 +23,10 @@ on:
       - '!src/res/**'
       - '!src/unittests/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   sonar:
     # This job would fail for contributors who open PRs as the workflow runs outside of our repo
@@ -43,7 +47,7 @@ jobs:
           apt install -qqq git curl unzip gcovr > /dev/null
 
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       - name: Install project dependencies
         uses: ./.github/actions/install-dependencies

.github/workflows/valgrind-analysis.yml

@@ -17,7 +17,7 @@ jobs:
           apt install -qqq git valgrind > /dev/null
 
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       - name: Install dependencies
         uses: ./.github/actions/install-dependencies

.gitignore

@@ -45,3 +45,7 @@ CMakeFiles/*
 
 # scripts folder
 /scripts
+
+# Ai helperfilers
+**/[cC]laude.[mM][dD]
+**/CLAUDE.[mM][dD]

CMakeLists.txt

@@ -1,6 +1,6 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2024 - 2026 Deskflow Developers
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
 cmake_minimum_required(VERSION 3.24)
@@ -11,6 +11,11 @@ cmake_policy(SET CMP0003 NEW)
 # Fix define escaping
 cmake_policy(SET CMP0005 NEW)
 
+# De-duplicate libraries on linker calls
+if(POLICY CMP0156)
+  cmake_policy(SET CMP0156 NEW)
+endif()
+
 # Set CXX Requirements
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -18,7 +23,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Fallback for when git can not be found
 set(DESKFLOW_VERSION_MAJOR 1)
-set(DESKFLOW_VERSION_MINOR 25)
+set(DESKFLOW_VERSION_MINOR 26)
 set(DESKFLOW_VERSION_PATCH 0)
 set(DESKFLOW_VERSION_TWEAK 0)
 
@@ -33,38 +38,28 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
       ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     execute_process(
-      COMMAND ${GIT_EXECUTABLE} rev-list --tags --count
+      COMMAND ${GIT_EXECUTABLE} describe --long --match v* --always
       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-      OUTPUT_VARIABLE GIT_TAG_COUNT
+      OUTPUT_VARIABLE GITREV
       ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-
+    string(FIND "${GITREV}" "v" isRev)
-    if(${GIT_TAG_COUNT} EQUAL 0)
+    if(NOT ${isRev} EQUAL -1)
-      set(DESKFLOW_VERSION_TWEAK "9999")
+      string(REGEX MATCH [0-9]+ MAJOR ${GITREV})
+      string(REGEX MATCH \\.[0-9]+ MINOR ${GITREV})
+      string(REPLACE "." "" MINOR "${MINOR}")
+      string(REGEX MATCH [0-9]+\- PATCH ${GITREV})
+      string(REPLACE "-" "" PATCH "${PATCH}")
+      string(REGEX MATCH \-[0-9]+\- TWEAK ${GITREV})
+      string(REPLACE "-" "" TWEAK "${TWEAK}")
+      set(DESKFLOW_VERSION_MAJOR ${MAJOR})
+      set(DESKFLOW_VERSION_MINOR ${MINOR})
+      set(DESKFLOW_VERSION_PATCH ${PATCH})
+      set(DESKFLOW_VERSION_TWEAK ${TWEAK})
     else()
-      execute_process(
+      set(DESKFLOW_VERSION_TWEAK "9999")
-        COMMAND ${GIT_EXECUTABLE} describe --long --match v* --always
-        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-        OUTPUT_VARIABLE GITREV
-        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
-      )
-      string(FIND "${GITREV}" "v" isRev)
-      if(NOT ${isRev} EQUAL -1)
-        string(REGEX MATCH [0-9]+ MAJOR ${GITREV})
-        string(REGEX MATCH \\.[0-9]+ MINOR ${GITREV})
-        string(REPLACE "." "" MINOR "${MINOR}")
-        string(REGEX MATCH [0-9]+\- PATCH ${GITREV})
-        string(REPLACE "-" "" PATCH "${PATCH}")
-        string(REGEX MATCH \-[0-9]+\- TWEAK ${GITREV})
-        string(REPLACE "-" "" TWEAK "${TWEAK}")
-        set(DESKFLOW_VERSION_MAJOR ${MAJOR})
-        set(DESKFLOW_VERSION_MINOR ${MINOR})
-        set(DESKFLOW_VERSION_PATCH ${PATCH})
-        set(DESKFLOW_VERSION_TWEAK ${TWEAK})
-      elseif(NOT ${GITREV} STREQUAL "")
-        set(DESKFLOW_VERSION_TWEAK ${GITREV})
-      endif()
     endif()
+    unset(GITREV)
   endif()
 endif()
 
@@ -89,7 +84,7 @@ project(
 # Define Additional "PROJECT" vars for packaging and metadata
 set(CMAKE_PROJECT_PROPER_NAME "Deskflow")
 set(CMAKE_PROJECT_VENDOR "${CMAKE_PROJECT_PROPER_NAME} Devs")
-set(CMAKE_PROJECT_COPYRIGHT "(C) 2024-2025 ${CMAKE_PROJECT_VENDOR}")
+set(CMAKE_PROJECT_COPYRIGHT "(C) 2024-2026 ${CMAKE_PROJECT_VENDOR}")
 set(CMAKE_PROJECT_CONTACT "${CMAKE_PROJECT_PROPER_NAME} <maintainers@deskflow.org>")
 set(CMAKE_PROJECT_REV_FQDN "org.deskflow.deskflow")
 
@@ -104,11 +99,10 @@ message(STATUS "Building ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
 # Set lib versions
 set(REQUIRED_OPENSSL_VERSION 3.0)
 set(REQUIRED_LIBEI_VERSION 1.3)
-set(REQUIRED_LIBPORTAL_VERSION 0.8)
+set(REQUIRED_LIBPORTAL_VERSION 0.9.1)
 set(REQUIRED_QT_VERSION 6.7.0)
 
 if (WIN32)
-  add_definitions(-DSYSAPI_WIN32 -DWINAPI_MSWINDOWS)
   # VSCMD_ARG_TGT_ARCH is set on CI
   if ("$ENV{VSCMD_ARG_TGT_ARCH}" STREQUAL "")
     # NOT on CI
@@ -167,11 +161,16 @@ endif()
 include(cmake/Libraries.cmake)
 configure_libs()
 
+if(BUILD_OSX_BUNDLE AND APPLE_CODESIGN_DEV)
+  include(cmake/MacCodesign.cmake)
+endif()
+
 # setup install paths
 include(GNUInstallDirs)
 if (WIN32)
   set(CMAKE_INSTALL_BINDIR .)
   set(CMAKE_INSTALL_LIBDIR .)
+  set(CMAKE_INSTALL_DOCDIR docs)
   set(CMAKE_INSTALL_LICENSE_DIR .)
   set(CMAKE_INSTALL_I18N_DIR translations)
 elseif(BUILD_OSX_BUNDLE)
@@ -182,10 +181,13 @@ else()
   set(CMAKE_INSTALL_I18N_DIR ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/translations)
 endif()
 
-add_subdirectory(doc)
+add_subdirectory(docs)
-add_subdirectory(src)
+
+# build translations before source, I18N unit tests fail if they are missing
 add_subdirectory(translations)
 
+add_subdirectory(src)
+
 option(BUILD_INSTALLER "Build installer" ON)
 if(BUILD_INSTALLER)
     add_subdirectory(deploy)

REUSE.toml

@@ -17,7 +17,7 @@ path = [
  , "sonar-project.properties"
  , "cmake/vcpkg.json.in"
  , "**/*.md"
- , "doc/**"
+ , "docs/**"
  , "deploy/linux/flatpak/**"
  , "deploy/linux/org.deskflow.deskflow.metainfo.xml"
  , "deploy/windows/wix-patch.xml.in"

cmake/CodeCoverage.cmake

@@ -1,9 +1,9 @@
 # SOURCE https://github.com/bilke/cmake-modules/blob/master/CodeCoverage.cmake
-# SPDX-FileCopyrightText: 2020 Bob Apthrope
+# SPDX-FileCopyrightText: (C) 2020 Bob Apthrope
-# SPDX-FileCopyrightText: 2019 Anatolii Kurotych
+# SPDX-FileCopyrightText: (C) 2019 Anatolii Kurotych
-# SPDX-FileCopyrightText: 2019 - 2020 Frank Dana
+# SPDX-FileCopyrightText: (C) 2019 - 2020 Frank Dana
-# SPDX-FileCopyrightText: 2013 Joakim Söderberg
+# SPDX-FileCopyrightText: (C) 2013 Joakim Söderberg
-# SPDX-FileCopyrightText: 2012 - 2017 Lars Bilke
+# SPDX-FileCopyrightText: (C) 2012 - 2017 Lars Bilke
 # SPDX-License-Identifier: MIT
 
 # USAGE:

cmake/Libraries.cmake

@@ -1,5 +1,5 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2024 - 2025 Deskflow Developers
-# SPDX-FileCopyrightText: 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2024 Symless Ltd
 # SPDX-License-Identifier: MIT
 
 macro(configure_libs)
@@ -141,8 +141,6 @@ macro(configure_unix_libs)
       ${lib_ScreenSaver} ${lib_IOKit} ${lib_ApplicationServices}
       ${lib_Foundation} ${lib_Carbon} ${lib_UserNotifications}
     )
-
-    add_definitions(-DWINAPI_CARBON=1)
   else()
 
     if (BUILD_X11_SUPPORT)
@@ -163,15 +161,6 @@ macro(configure_unix_libs)
       message(WARNING "pkg-config not found, skipping wayland libraries")
     endif()
   endif()
-
-  # Unix only: For config.h, save the results based on a template (config.h.in).
-  # Note that this won't work on Windows because filenames are not case sensitive,
-  # and we have header files named "Config.h" (upper case 'C').
-  configure_file(${CMAKE_SOURCE_DIR}/src/lib/Config.h.in
-                 ${CMAKE_BINARY_DIR}/src/lib/Config.h @ONLY)
-
-  add_definitions(-DSYSAPI_UNIX=1 -DHAVE_CONFIG_H)
-
 endmacro()
 
 #

cmake/MacCodesign.cmake

@@ -0,0 +1,51 @@
+# SPDX-FileCopyrightText: (C) 2025-2026 Deskflow Contributors
+# SPDX-License-Identifier: MIT
+
+# Warning: Do not use for CI/production, as the `entitlements-dev.plist` file adds special
+# entitlements that are only appropriate for local development.
+#
+# macOS made TCC stricter so that if you don't sign your local dev builds properly, macOS will
+# nag you to remove and re-approve the app every time you make a change to the binary which is
+# extremely annoying during development.
+#
+# If you were to use ad-hoc signing (i.e. not specify a certificate), TCC would still nag you
+# because the binary identity is anchored not on the app ID, but on the CD hash (which changes
+# based on the binary contents).
+#
+# To use, simply generate a personal certificate for free with Xcode and pass the ID to CMake.
+# Full instructions are in the docs.
+
+function(configure_mac_codesign target)
+  set_property(GLOBAL APPEND PROPERTY _MAC_CODESIGN_DEPENDS $<TARGET_FILE:${target}>)
+
+  get_property(deferred GLOBAL PROPERTY _MAC_CODESIGN_DEFERRED)
+
+  if(NOT deferred)
+    set_property(GLOBAL PROPERTY _MAC_CODESIGN_DEFERRED TRUE)
+    message(STATUS "Apple codesign ID for development only: ${APPLE_CODESIGN_DEV}")
+    cmake_language(DEFER DIRECTORY ${CMAKE_SOURCE_DIR} CALL _finalize_mac_codesign)
+  endif()
+endfunction()
+
+function(_finalize_mac_codesign)
+  get_property(depends GLOBAL PROPERTY _MAC_CODESIGN_DEPENDS)
+
+  set(stamp_file "${CMAKE_BINARY_DIR}/CMakeFiles/codesign-dev.stamp")
+
+  # Use a stamp file because codesign modifies the binaries it signs.
+  add_custom_command(
+    OUTPUT ${stamp_file}
+    COMMAND /usr/bin/codesign
+            --force
+            --options runtime
+            --entitlements "${CMAKE_SOURCE_DIR}/src/apps/res/entitlements-dev.plist"
+            --sign "${APPLE_CODESIGN_DEV}"
+            "$<TARGET_BUNDLE_DIR:${CMAKE_PROJECT_PROPER_NAME}>"
+    COMMAND ${CMAKE_COMMAND} -E touch ${stamp_file}
+    DEPENDS ${depends}
+    COMMENT "Codesigning ${CMAKE_PROJECT_PROPER_NAME}"
+    VERBATIM
+  )
+
+  add_custom_target(codesign-dev ALL DEPENDS ${stamp_file})
+endfunction()

deploy/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 # Copy License with txt ext for picky package creation tools
@@ -8,7 +8,6 @@ file(COPY_FILE
   ONLY_IF_DIFFERENT
 )
 
-
 # Generic Package Items
 set(CPACK_STRIP_FILES TRUE)
 set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})

deploy/linux/arch/PKGBUILD.in

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2024 Deskflow Developers
 # SPDX-License-Identifier: MIT
 # Maintainer: Deskflow Developers
 

deploy/linux/deploy.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 # HACK This is set when the files is included so its the real path
@@ -35,6 +35,7 @@ configure_file(
 
 set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "qt6-svg-plugins")
 set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
 set(CPACK_RPM_PACKAGE_GROUP "Applications/System")
 

deploy/linux/flatpak/org.deskflow.deskflow.yml

@@ -1,6 +1,6 @@
 app-id: org.deskflow.deskflow
 runtime: org.kde.Platform
-runtime-version: "6.9"
+runtime-version: "6.10"
 sdk: org.kde.Sdk
 command: deskflow
 finish-args:
@@ -29,8 +29,12 @@ modules:
         --prefix=${FLATPAK_DEST} --no-build-isolation Jinja2
     sources:
       - type: file
-        url: https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl
+        url: https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl
-        sha256: 7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa
+        sha256: 85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67
+        x-checker-data:
+          type: pypi
+          name: Jinja2
+          packagetype: bdist_wheel
       - type: file
         url: https://files.pythonhosted.org/packages/87/5b/aae44c6655f3801e81aa3eef09dbbf012431987ba564d7231722f68df02d/MarkupSafe-2.1.5.tar.gz
         sha256: d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b
@@ -45,8 +49,11 @@ modules:
     sources:
         - type: git
           url: https://gitlab.freedesktop.org/libinput/libei
-          tag: 1.4.1
+          tag: 1.5.0
-          commit: 9e0413cbc7d3ae6656266890425f152589ddf74d
+          commit: 19b64535408aa47abbc8151bc2c925afd6583851
+          x-checker-data:
+            type: git
+            tag-pattern: ^([\\d.]+)$
   - name: libportal
     buildsystem: meson
     config-opts:
@@ -67,8 +74,11 @@ modules:
     sources:
       - type: git
         url: https://github.com/google/googletest.git
-        tag: v1.15.2
+        tag: v1.17.0
-        commit: b514bdc898e2951020cbdca1304b75f5950d1f59
+        commit: 52eb8108c5bdec04579160ae17225d66034bd723
+        x-checker-data:
+          type: git
+          tag-pattern: ^([\\d.]+)$
     cleanup:
       - '*'
   - name: deskflow

deploy/linux/org.deskflow.deskflow.desktop

@@ -17,3 +17,6 @@ Keywords[zh_CN]=键盘;鼠标;网络;共享;
 Name[ru]=Deskflow
 Comment[ru]=Приложения чтобы использовать одну мышку и клавиатуру с разными устройствами
 Keywords[ru]=Передача;Трансляция;barrier;input-leap;
+Name[ko]=Deskflow
+Comment[ko]=마우스 및 키보드 공유 유틸리티
+Keywords[ko]=키보드;마우스;공유;네트워크;

deploy/linux/org.deskflow.deskflow.metainfo.xml

@@ -9,6 +9,7 @@
 	</developer>
 	<summary>Software Keyboard and mouse sharing</summary>
 	<summary xml:lang="zh_CN">用软件共享键鼠</summary>
+	<summary xml:lang="ko">키보드 및 마우스 공유 소프트웨어</summary>
 	<description>
 		<p>
 			Use the keyboard, mouse, or trackpad of one computer to control nearby computers, and work seamlessly between them.
@@ -16,6 +17,9 @@
 		<p xml:lang="zh_CN">
 			使用一台计算机的键盘、鼠标或触控板来控制附近的其它计算机，并在它们之间无缝工作。
 		</p>
+		<p xml:lang="ko">
+			한 대의 컴퓨터에 연결된 키보드, 마우스 또는 트랙패드로 주변의 다른 컴퓨터를 제어하고, 컴퓨터 사이를 끊김 없이 오가며 작업할 수 있습니다.
+		</p>
 	</description>
 	<launchable type="desktop-id">org.deskflow.deskflow.desktop</launchable>
 	<url type="homepage">https://deskflow.org</url>
@@ -57,8 +61,10 @@
 	<keywords>
 		<keyword>Input</keyword>
 		<keyword xml:lang="zh_CN">输入</keyword>
+		<keyword xml:lang="ko">입력</keyword>
 		<keyword>Sharing</keyword>
 		<keyword xml:lang="zh_CN">共享</keyword>
+		<keyword xml:lang="ko">공유</keyword>
 		<keyword translate="no">KVM</keyword>
 		<keyword translate="no">Synergy</keyword>
 	</keywords>
@@ -68,6 +74,45 @@
 	</branding>
 	<content_rating type="oars-1.0" />
 	<releases>
+		<release version="1.26.0" date="2026-02-16" urgency="high">
+			<description>
+				<p>This stable release fixes known issues and adds a few new features, For the full changelog, see the release page.</p>
+				<ul>
+					<li>New: Korean(ko) translation</li>
+					<li>New: Option to start in the "locked to computer" state</li>
+					<li>New: Option to show the version in the windows title</li>
+					<li>New: Clients can now use a list hostnames or ips for the server address</li>
+					<li>New: Client options are in a new client configuration dialog</li>
+					<li>New: Provide a more accurate suggested IP, Update as network info changes if needed.</li>
+					<li>New: Add a simple search to the log</li>
+					<li>New: Lookup host name with IP4 or IP6</li>
+					<li>New: Replace broken scroll speed with a scroll scaling options</li>
+					<li>Fix: Horizontal scrolling is working again on all platforms</li>
+					<li>Fix: Key repeat events are now sent as repeat not press and release</li>
+					<li>Fix: Deskflow-core correctly blocks new instances when run without the `--new-instance` option</li>
+					<li>Fix: Server Mode, Only use the external config path if the option is enabled</li>
+					<li>Fix: Allow comma and semicolon to be used in the hotkey configuration</li>
+					<li>Fix: Gui can crash when clearing settings in debug mode</li>
+					<li>Fix: Mouse Back and Forward buttons are now working (again) on all platforms</li>
+					<li>Fix: macOS, crash when the log is opened and the gui minimized</li>
+					<li>Fix: macOS, restore Preferences menu entry when the application is using non english language</li>
+					<li>Fix: macOS, try icon was not showing when in `Colorful` mode</li>
+					<li>Fix: macOS, do not allow the os to kill deskflow for memory reasons</li>
+					<li>Fix: macOS, possible server crash when a client disconnects abruptly</li>
+					<li>Fix: macOS, possible crash on screen wake / screen saver activation</li>
+					<li>Fix: macOS, Wrong keys send when using "RIME" input method</li>
+					<li>Fix: Windows, possible crash when the daemon is started for the first time</li>
+					<li>Use `Computer` in place of `Screen` to indicate we work with Computers display layout and not individual screens attached</li>
+					<li>Clean and update the settings when starting up.</li>
+					<li>Do not show client connection error messages dialogs if the gui is hidden</li>
+					<li>Use Qt 6.9.3 for Intel Mac builds.</li>
+					<li>Windows: Use ICU dlls from the host system</li>
+					<li>Code continues to be cleaned of unused methods and updated to modern C++</li>
+					<li>Consolidate Debug levels to remove DEBUG3-5 levels</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.26.0</url>
+		</release>
 		<release version="1.25.0" date="2025-11-21" urgency="high">
 			<description>
 				<p>This stable release fixes known issues and adds a few new features. Most notable symbolic icon support, I18N support and experimental support for wl-clipboard to access clipboards on wayland. This release also continues our trend of cleaning up the codebase. For the full changelog, see the release page.</p>

deploy/mac/deploy.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 # HACK This is set when the files is included so its the real path

deploy/windows/cpack-options.cmake.in

@@ -1,4 +1,4 @@
-#SPDX-FileCopyrightText: 2025 Chris Rizzitello <sithlord48@gmail.com>
+#SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
 #SPDX-License-Identifier: MIT
 
 if(CPACK_GENERATOR MATCHES 7Z|ZIP)

deploy/windows/deploy.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 # HACK This is set when the files is included so its the real path

deploy/windows/pre-cpack.cmake.in

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 if(CPACK_GENERATOR MATCHES 7Z|ZIP)

docs/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2019 - 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2019 - 2025 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 find_package(Doxygen QUIET)
@@ -24,3 +24,12 @@ if (DOXYGEN_FOUND)
 else()
   message(STATUS "Doxygen not found, skipping docs build")
 endif()
+
+# Show our documents in the IDE
+add_custom_target(docs
+  SOURCES
+    Readme.md
+    Security.md
+)
+
+install(FILES Security.md Readme.md DESTINATION ${CMAKE_INSTALL_DOCDIR})

docs/Readme.md

@@ -0,0 +1,18 @@
+# Deskflow
+
+Deskflow is a free and open source keyboard and mouse sharing app. Use the keyboard, mouse, or trackpad of one computer to control nearby computers, and work seamlessly between them.
+
+[Homepage](https://deskflow.org) [Code](https://github.com/deskflow/deskflo)
+
+## Getting help online
+
+ - View the [wiki](https://github.com/deskflow/deskflow/wiki) Online resource
+
+### Chat with us
+ - Main discussion on Matrix: [`#deskflow:matrix.org`](https://matrix.to/#/#deskflow:matrix.org) ([Matrix clients](https://matrix.org/ecosystem/clients/))
+ - Discussion also happens on IRC: `#deskflow` or `#deskflow-dev` on [Libera Chat](https://libera.chat/)
+ - Start a [new discussion](https://github.com/deskflow/deskflow/discussions) on our GitHub project.
+
+## Reporting security issues
+
+Check [Security](Security.md) to find out how to report security issues.

docs/dev/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 set(DOXYGEN_USE_MDFILE_AS_MAINPAGE mainpage.md)

docs/dev/build.md

@@ -4,7 +4,7 @@ To build Deskflow you will a minimum of:
     - [cmake] 3.24+
     - [Qt] 6.7.0+
     - [openssl] 3.0+
-    - [libportal] 0.8+ (linux, bsd)
+    - [libportal] 0.9.1+ (linux, bsd)
     - [libei] 1.3+ (linux, bsd)
     - [google_test] ^
 

docs/user/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 set(DOXYGEN_USE_MDFILE_AS_MAINPAGE mainpage.md)
@@ -16,5 +16,4 @@ target_sources(user-docs PRIVATE
 install(
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html"
   DESTINATION ${CMAKE_INSTALL_DOCDIR}
-  COMPONENT deskflow_user_docs
 )

docs/user/configuration.md

@@ -50,30 +50,37 @@ option=value
 This section contains options used when in client mode. 
 It will begin with `[client]`
 
-
+| Option            |    Valid Values    | Description |
-| Option                |    Valid Values    | Description |
+|:------------------|:------------------:|:-----------|
-|:----------------------|:------------------:|:-----------|
+| languageSync      | `true` or `false`  | Sync to server language [default: true] |
-| binary                | Filename           | The filename of the binary to call for client mode. This binary exists in the same path as the GUI |
+| remoteHost        | `IP` or `hostname` | The remote host(s) to connect to. Use a comma separated list when you want to try several hosts |
-| invertScrollDirection | `true` or `false`  | Invert scroll on this client [default: false] |
+| yScrollScale      | Double 0.1 - 10.0  | Vertical mouse scrolling will be scaled by this amount on the client [default: 1.0] |
-| languageSync          | `true` or `false`  | Sync to server language [default: true] |
+| xScrollScale      | Double 0.1 - 10.0  | Horizontal mouse scrolling will be scaled by this amount on the client [default: 1.0] |
-| remoteHost            | `IP` or `hostname` | The remote host last connected to | 
+| invertYScroll     | `true` or `false`  | Invert vertical scroll on this client [default: false] |
-| xdpRestoreToken       | UUID               | Restore token provided by XDG portals |
+| invertXScroll     | `true` or `false`  | Invert horizontal scroll on this client [default: false] |
-
+| xdpRestoreToken   | UUID               | Restore token provided by XDG portals |
 
 ### Core
+
 This section contains general options it will begin with `[core]`
 
 |Option         | Valid Values|Description|
 |:--------------|:-----------:|:-----------|
 | coreMode      | `0` or `1` or `2` | The mode to start in 0: None, 1: Client, 2: Server [default: 0]|
+| display       |  int              | The XWindow display to use [default: autodetected] |
 | interface     | IP Address        | Preferred IP to use for network communication. By default the server board casts on any available address |
 | lastVersion   | M.m.p.t           | The version last run used for checking for updates |
 | port          | port #            | Port to use when connecting [default: 24800 |
 | preventSleep  | `true` or `false` | Prevent sleep when Deskflow is active [default: false] |
 | processMode   | `1` or `0`        | The mode we use to start the process Service or Desktop |
-| screenName    | string            | Name used to identify the screen [default: machine's hostname] |
+| computerName  | string            | Name used to identify the computer [default: machine's hostname] |
-| startedBefore | `true` or `false `| Have we started client or server before. Used in logic when deciding to show some dialogs.
+| useHooks      | `true` or `false` | If Windows uses hooks or not [default: true] |
-| updateUrl     | URL               | The URL to use when checking for a new version number, it should return a version [default: https://api.deskflow.org/version]|
+| language      | 639 language      | The language to display the GUI in [default: en] |
+| wlClipboard   | `true` or `false` | When true the wl-clipboard backend will be enabled [default: false] |
+| enableEnterCommand | `true` or `false` | Should the enter command be triggered when the screen is entered [defaut: false] |
+| enterCommand  | command | A command to run when the screen is entered. |
+| enableExitCommand | `true` or `false` | Should the exit command be triggered when the screen is exited [defaut: false] |
+| exitCommand  | command | A command to run when the screen is exited. |
 
 ### Daemon
 
@@ -90,25 +97,32 @@ This section contains options used by the daemon on windows it will begin with `
 
 This section contains options used by the GUI it will begin with `[gui]`
 
-|Option             | Valid Values      |Description|
+|Option                          | Valid Values      |Description|
-|:------------------|:-----------------:|:-----------|
+|:-------------------------------|:-----------------:|:-----------|
-| autoHide          | `true` or `false` | When true the app will hide itself on start up [default: false] |
+| autoHide                       | `true` or `false` | When true the app will hide itself on start up [default: false] |
-| enableUpdateCheck | `true` or `false` | When true check the update URL to see if a new version was released on start up [default: false] |
+| enableUpdateCheck              | `true` or `false` | When true check the update URL to see if a new version was released on start up [default: false] |
-| closeReminder     | `true` or `false` | Used to track if we have shown the reminder that when you close the app it remain running in the background  [default: true]|
+| closeReminder                  | `true` or `false` | Used to track if we have shown the reminder that when you close the app it remain running in the background  [default: true]|
-| logExpanded       | `true` or `false` | Should the log section of the GUI be opened [default: false] |
+| closeToTray                    | `true` or `false` | When `true` the gui will run in the systemTray when its closed [default: true] |
-| symbolicTrayIcon  | `true` or `false` | When true use the monocolor (symbolic) icon false uses a colorful icon for the tray |
+| logExpanded                    | `true` or `false` | Should the log section of the GUI be opened [default: false] |
-| windowGeometry    | QRect             | Geometry of the window used to restore the window geometry after exiting the app |
+| symbolicTrayIcon               | `true` or `false` | When true use the monocolor (symbolic) icon false uses a colorful icon for the tray [default: true] |
+| windowGeometry                 | QRect             | Geometry of the window used to restore the window geometry after exiting the app |
+| showGenericClientFailureDialog | `true` or `false` | When `true` client connection errors will not show popup error messages [default: true] |
+| shownFirstConnectedMessage     | `true` or `false` | When `true` GUI has shown the user the message for connecting the first time [default: false] |
+| shownServerFirstStartMessage   | `true` or `false` | When `true` GUI has shown the user the Deskflow server is now running message [default: false] |
+| shownVerionInTitle             | `true` or `false` | When `true` GUI will include the version in the window title [default: false] |
+| startCoreWithGui               | `true` or `false` | When true the Core will be started with the GUI. It is set to the Core's state on exit. |
+| updateCheckUrl                 | URL               | The URL to use when checking for a new version number, it should return a version [default: https://api.deskflow.org/version]|
 
 ### Log
 
 This section contains options used by the application logging it will begin with `[log]`
 
-|Option |    Valid Values   |Description|
+|Option    |    Valid Values   |Description|
-|:------|:-----------------:|:-----------|
+|:---------|:-----------------:|:-----------|
-| file   | Filepath          | The file to write the log into |
+| file     | Filepath          | The file to write the log into |
-| level  | Valid log level   | Log level to use |
+| level    | Valid log level   | Log level to use |
-| toFile | `true` or `false` | When true the log will be written to the value of the `file` option |
+| toFile   | `true` or `false` | When true the log will be written to the value of the `file` option |
-
+| guiDebug | `true` or `false` | When true the log will show the Gui's internal debug messages |
 
 ### Security
 
@@ -127,8 +141,6 @@ This section contains options used when in server mode it will begin with `[serv
 
 |Option              |    Valid Values   |Description|
 |:-------------------|:-----------------:|:-----------|
-| binary             | Filename          | The name of the binary to call for client mode. This binary exists in same path as the Deskflow GUI |
-| configVisible      | `true` or `false` | Used internally to track when the severs has a configuration dialog showing.|
 | externalConfig     | `true` or `false` | When true use the external config path |
 | externalConfigFile | Filepath          | Path the server config file if it does not exist the GUI will it generated based on the `internalConfig` section.|
 
@@ -141,6 +153,7 @@ block of a server config file as seen below. This section is used by the GUI to
 [internalConfig]
 clipboardSharing=true
 clipboardSharingSize=@Variant(\0\0\0\x84\0\0\0\0\0\0<\0)
+defaultLockToScreenState=false
 disableLockToScreen=false
 hasHeartbeat=false
 hasSwitchDelay=false
@@ -290,7 +303,7 @@ The file is parsed top to bottom and names cannot be used before they've been de
 
 ### The screens section
 
-''args'' is a list of screen names, one name per line, each followed by a colon. Names are arbitrary strings but they must be unique. The hostname of each computer is recommended. (This is the computer's network name on win32 and the name reported by the program hostname on Unix and OS X. Note that OS X may append .local to the name you gave your computer; e.g. somehost.local.) There must be a screen name for the server and each client. Each screen can specify a number of options. Options have the form name = value and are listed one per line after the screen name.
+''args'' is a list of computer names, one name per line, each followed by a colon. Names are arbitrary strings but they must be unique. The hostname of each computer is recommended. (This is the computer's network name on win32 and the name reported by the program hostname on Unix and OS X. Note that OS X may append .local to the name you gave your computer; e.g. somehost.local.) There must be a computer name for the server and each client. Each computer can specify a number of options. Options have the form name = value and are listed one per line after the computer name.
 
 ```
 section: screens
@@ -303,29 +316,29 @@ section: screens
 end
 ```
 
-This declares three screens named ''moe'', ''larry'', and ''curly''. Screen ''larry'' has half-duplex ''Caps Lock'' and ''Num Lock'' keys (see below) and screen ''curly'' converts the ''Meta'' modifier key to the ''Alt'' modifier key.
+This declares three computers named ''moe'', ''larry'', and ''curly''. Computer ''larry'' has half-duplex ''Caps Lock'' and ''Num Lock'' keys (see below) and computer ''curly'' converts the ''Meta'' modifier key to the ''Alt'' modifier key.
 
 #### screen options
 
-A screen can have the following options:
+A computer can have the following options:
 |Option | Valid Values| Description|
 |:----------|:-----------:|:-----------|
-|halfDuplexCapsLock| `true` or `false` | This computer has a ''Caps Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Caps Lock'' acts strangely on all screens then you may need to set this option to true on the server screen. If it acts strangely on one screen then that screen may need the option set to true.|
+|halfDuplexCapsLock| `true` or `false` | This computer has a ''Caps Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Caps Lock'' acts strangely on all computers then you may need to set this option to true on the server. If it acts strangely on one computer then that computer may need the option set to true.|
-|halfDuplexNumLock | `true` or `false` | This computer has a ''Num Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Num Lock'' acts strangely on all screens then you may need to set this option to true on the server screen. If it acts strangely on one screen then that screen may need the option set to true.|
+|halfDuplexNumLock | `true` or `false` | This computer has a ''Num Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Num Lock'' acts strangely on all computers then you may need to set this option to true on the server. If it acts strangely on one computer then that computer may need the option set to true.|
-|halfDuplexScrollLock| `true` or `false`| This computer has a ''Scroll Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Scroll Lock'' acts strangely on all screens then you may need to set this option to true on the server screen. If it acts strangely on one screen then that screen may need the option set to true.|
+|halfDuplexScrollLock| `true` or `false`| This computer has a ''Scroll Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Scroll Lock'' acts strangely on all computers then you may need to set this option to true on the server. If it acts strangely on one computer then that computer may need the option set to true.|
 |xtestIsXineramaUnaware| `true` or `false`| This option works around a bug in the XTest extension when used in combination with Xinerama. It affects X11 clients only. Not all versions of the XTest extension are aware of the Xinerama extension. As a result, they do not move the mouse correctly when using multiple Xinerama screens. This option is currently ''true'' by default. If you know your XTest extension is Xinerama aware then set this option to ''false''.|
-|preserveFocus| `true` or `false` | When true don't drop focus when switching screens
+|preserveFocus| `true` or `false` | When true don't drop focus when switching computers
 |switchCorners| corners |See <a href="#switch-corners">switchCorners</a> below.|
 |switchCornerSize | integer | see switchCornerSize below.|
-|shift | shift ctrl alt meta super none | Map the server's shift modifer to different key on a client screen|
+|shift | shift ctrl alt meta super none | Map the server's shift modifer to different key on a client computer|
-|ctrl  | shift ctrl alt meta super none | Map the server's ctrl modifer to different key on a client screen|
+|ctrl  | shift ctrl alt meta super none | Map the server's ctrl modifer to different key on a client computer|
-|alt | shift ctrl alt meta super none | Map the server's alt modifer to different key on a client screen|
+|alt | shift ctrl alt meta super none | Map the server's alt modifer to different key on a client computer|
-|meta|  shift ctrl alt meta super none | Map the server's meta modifer to different key on a client screen|
+|meta|  shift ctrl alt meta super none | Map the server's meta modifer to different key on a client computer|
-|super|  shift ctrl alt meta super none | Map the server's super modifer to different key on a client screen|
+|super|  shift ctrl alt meta super none | Map the server's super modifer to different key on a client computer|
 
 ### aliases section
 
-''args'' is a list of screen names just like in the ''screens'' section except each screen is followed by a list of aliases, one per line, not followed by a colon. An ''alias'' is a screen name and must be unique. During screen name lookup each alias is equivalent to the screen name it aliases. So a client can connect using its canonical screen name or any of its aliases.
+''args'' is a list of computer names just like in the ''screens'' section except each computer is followed by a list of aliases, one per line, not followed by a colon. An ''alias'' is a computer name and must be unique. When searching for computers each alias is equivalent to the computer name it aliases. So a client can connect using its canonical computer name or any of its aliases.
 
 ```
 section: aliases
@@ -336,20 +349,20 @@ section: aliases
 end
 ```
 
-Screen ''larry'' is also known as ''larry.stooges.com'' and can connect as either name. Screen ''curly'' is also known as ''shemp'' (hey, it's just an example).
+Computer ''larry'' is also known as ''larry.stooges.com'' and can connect as either name. Computer ''curly'' is also known as ''shemp'' (hey, it's just an example).
 
 ### links secion
 
-''args'' is a list of screen names just like in the ''screens'' section except each screen is followed by a list of links, one per line. Each link has the form:
+''args'' is a list of computer names just like in the ''screens'' section except each computer is followed by a list of links, one per line. Each link has the form:
 ```
  {left|right|up|down}[<range>] = name[<range>]
 ```
 
-A link indicates which screen is adjacent in the given direction.
+A link indicates which computer is adjacent in the given direction.
 
-Each side of a link can specify a range which defines a portion of an edge. A range on the direction is the portion of edge you can leave from while a range on the screen is the portion of edge you'll enter into. Ranges are optional and default to the entire edge. All ranges on a particular direction of a particular screen must not overlap.
+Each side of a link can specify a range which defines a portion of an edge. A range on the direction is the portion of edge you can leave from while a range on the computer is the portion of edge you'll enter into. Ranges are optional and default to the entire edge. All ranges on a particular direction of a particular computer must not overlap.
 
-A ''range'' is written as <code>(start,end)</code>. Both ''start'' and ''end'' are percentages in the range 0 to 100, inclusive. The start must be less than the end. 0 is the left or top of an edge and 100 is the right or bottom.
+A ''range'' is written as <code>(start,end)</code>. Both ''start'' and ''end'' are percentages in the range 0 to 100, inclusive. The start must be less than the end. 0 is the left or top of an edge and 100 is the right or bottom. 
 
 ```
 section: links
@@ -365,9 +378,9 @@ section: links
 end
 ```
 
-This indicates that screen ''larry'' is to the right of screen ''moe'' (so moving the cursor off the right edge of ''moe'' would make it appear at the left edge of ''larry''), the left half of curly is above the right half of ''moe'', ''moe'' is to the left of ''larry'' (edges are not necessarily symmetric so you have to provide both directions), the right half of curly is above the left half of ''larry'', all of ''moe'' is below the left half of ''curly'', and the left half of ''larry'' is below the right half of ''curly''.
+This indicates that computer ''larry'' is to the right of computer ''moe'' (so moving the cursor off the right edge of ''moe'' would make it appear at the left edge of ''larry''), the left half of curly is above the right half of ''moe'', ''moe'' is to the left of ''larry'' (edges are not necessarily symmetric so you have to provide both directions), the right half of curly is above the left half of ''larry'', all of ''moe'' is below the left half of ''curly'', and the left half of ''larry'' is below the right half of ''curly''.
 
-Note that links do not have to be symmetrical; for instance, here the edge between ''moe'' and ''curly'' maps to different ranges depending on if you're going up or down. In fact links don't have to be bidirectional. You can configure the right of ''moe'' to go to ''larry'' without a link from the left of ''larry'' to ''moe''. It's possible to configure a screen with no outgoing links; the cursor will get stuck on that screen unless you have a hot key configured to switch off of that screen.
+Note that links do not have to be symmetrical; for instance, here the edge between ''moe'' and ''curly'' maps to different ranges depending on if you're going up or down. In fact links don't have to be bidirectional. You can configure the right of ''moe'' to go to ''larry'' without a link from the left of ''larry'' to ''moe''. It's possible to configure a computer with no outgoing links; the cursor will get stuck on that computer unless you have a hot key configured to switch off of that computer.
 
 ### options section
 
@@ -387,17 +400,17 @@ end
 |:--------|:-----------:|:-----------|
 |protocol | barrier or synergy| The protocol to use when saying hello to clients. Can be set to barrier or synergy. If not set barrier is used as the default |
 |heartbeat| integer (N) | The server will expect each client to send a message no less than every `N` milliseconds. If no message arrives from a client within `3N` seconds the server forces that client to disconnect. If deskflow fails to detect clients disconnecting while the server is sleeping or vice versa, try using this option. |
-|switchCorners | none top-left top-right bottom-left bottom-right left right top bottom all | Deskflow won't switch screens when the mouse reaches the edge of the screen if it's in a listed corner. The size of all corners is given by the `switchCornerSize` option. The first name in the list is one of the above names and defines the initial set of corners. Subsequent names are prefixed with + or - to add the corner to or remove the corner from the set, respectively. For example: `all -left +top-left` starts will all corners, removes the left corners (top and bottom) then adds the top-left back in, resulting in the top-left, bottom-left and bottom-right corners.|
+|switchCorners | none top-left top-right bottom-left bottom-right left right top bottom all | Deskflow won't switch computers when the mouse reaches the edge of the computer if it's in a listed corner. The size of all corners is given by the `switchCornerSize` option. The first name in the list is one of the above names and defines the initial set of corners. Subsequent names are prefixed with + or - to add the corner to or remove the corner from the set, respectively. For example: `all -left +top-left` starts will all corners, removes the left corners (top and bottom) then adds the top-left back in, resulting in the top-left, bottom-left and bottom-right corners.|
 |switchCornerSize | integer (N) | Sets the size of all corners in pixels. The cursor must be within `N` pixels of the corner to be considered to be in the corner.|
-|switchDelay | integer| Deskflow won't switch screens when the mouse reaches the edge of a screen unless it stays on the edge for `N` milliseconds. This helps prevent unintentional switching when working near the edge of a screen.|
+|switchDelay | integer| Deskflow won't switch computers when the mouse reaches edge of a computer unless it stays on the edge for `N` milliseconds. This helps prevent unintentional switching when working near an edge.|
-|switchDoubleTap| integer(N) | Deskflow won't switch screens when the mouse reaches the edge of a screen unless it's moved away from the edge and then back to the edge within `N` milliseconds. With the option you have to quickly tap the edge twice to switch. This helps prevent unintentional switching when working near the edge of a screen.|
+|switchDoubleTap| integer(N) | Deskflow won't switch computers when the mouse reaches the edge of a computer unless it's moved away from the edge and then back to the edge within `N` milliseconds. With the option you have to quickly tap the edge twice to switch. This helps prevent unintentional switching when working near the edge.|
-|screenSaverSync| `true` or `false`| ''Note: Removed in v1.14.1'' If set to ''false'' then Deskflow won't synchronize screen savers. Client screen savers will start according to their individual configurations. The server screen saver won't start if there is input, even if that input is directed toward a client screen.|
+|screenSaverSync| `true` or `false`| ''Note: Removed in v1.14.1'' If set to ''false'' then Deskflow won't synchronize screen savers. Client screen savers will start according to their individual configurations. The server screen saver won't start if there is input, even if that input is directed toward a client computer.|
-|relativeMouseMoves| `true` or `false`| If set to ''true'' then secondary screens move the mouse using relative rather than absolute mouse moves when and only when the cursor is locked to the screen (by ''Scroll Lock'' or a configured hot key). This is intended to make Deskflow work better with certain games. If set to ''false'' or not set then all mouse moves are absolute.|
+|relativeMouseMoves| `true` or `false`| If set to ''true'' then secondary computers move the mouse using relative rather than absolute mouse moves when and only when the cursor is locked to the computer (by ''Scroll Lock'' or a configured hot key). This is intended to make Deskflow work better with certain games. If set to ''false'' or not set then all mouse moves are absolute.|
 |clipboardSharing| `true` or `false`|If set to ''true'' then clipboard sharing will be enabled and the ''clipboardSharingSize'' setting will be used. If set to false, then clipboard sharing will be disabled and the the ''clipboardSharingSize'' setting will be ignored.|
 |clipboardSharingSize| integer (N)| Deskflow will send a maximum of `N` kilobytes of clipboard data to another computer when the mouse transitions to that computer.|
 |win32KeepForeground | `true` or `false`| If set to ''true'' (the default), Deskflow will grab the foreground focus on a Windows server (thereby putting all other windows in the background) upon switching to a client. If set to ''false'', it will leave the currently foreground window in the foreground. Deskflow grabs the focus to avoid issues with other apps interfering with Deskflow's ability to read the hardware inputs. |
-|keystroke(key) | actions | Binds the ''key'' combination key to the given ''actions''. ''key'' is an optional list of modifiers (''shift'', ''control'', ''alt'', ''meta'' or ''super'') optionally followed by a character or a key name, all separated by + (plus signs). You must have either modifiers or a character/key name or both. See below for `valid key names` and `actions`. Keyboard hot keys are handled while the cursor is on the primary screen and secondary screens. Separate actions can be assigned to press and release.|
+|keystroke(key) | actions | Binds the ''key'' combination key to the given ''actions''. ''key'' is an optional list of modifiers (''shift'', ''control'', ''alt'', ''meta'' or ''super'') optionally followed by a character or a key name, all separated by + (plus signs). You must have either modifiers or a character/key name or both. See below for `valid key names` and `actions`. Keyboard hot keys are handled while the cursor any computer. Separate actions can be assigned to press and release.|
-|mousebutton(button) | actions| Binds the modifier and mouse button combination ''button'' to the given ''actions''. ''button'' is an optional list of modifiers (''shift'', ''control'', ''alt'', ''meta'' or ''super'') followed by a button number. The primary button (the left button for right handed users) is button 1, the middle button is 2, etc. Actions can be found below. Mouse button actions are not handled while the cursor is on the primary screen. You cannot use these to perform an action while on the primary screen. Separate actions can be assigned to press and release.|
+|mousebutton(button) | actions| Binds the modifier and mouse button combination ''button'' to the given ''actions''. ''button'' is an optional list of modifiers (''shift'', ''control'', ''alt'', ''meta'' or ''super'') followed by a button number. The primary button (the left button for right handed users) is button 1, the middle button is 2, etc. Actions can be found below. Mouse button actions are not handled while the cursor is on the server. You cannot use these to perform an action while on the server. Separate actions can be assigned to press and release.|
 
 
 You can use both the ''switchDelay'' and ''switchDoubleTap'' options at the same time. Deskflow will switch when either requirement is satisfied.
@@ -406,16 +419,16 @@ You can use both the ''switchDelay'' and ''switchDoubleTap'' options at the same
 
 Actions are two lists of individual actions separated by commas. The two lists are separated by a '';'' (semicolon). Either list can be empty and if the second list is empty then the semicolon is optional. The first list lists actions to take when the condition becomes true (e.g. the hot key or mouse button is pressed) and the second lists actions to take when the condition becomes false (e.g. the hot key or button is released). The condition becoming true is called activation and becoming false is called deactivation. Allowed individual actions are:
 
-* `keystroke(key[,screens])`
+* `keystroke(key[,computers])`
 
-* `keyDown(key[,screens])`
+* `keyDown(key[,computers])`
 
-* `keyUp(key[,screens])`
+* `keyUp(key[,computers])`
 
 
-: Synthesizes the modifiers and key given in ''key'' which has the same form as described in the ''keystroke'' option. If given, ''screens'' lists the screen or screens to direct the event to, regardless of the active screen. If not given then the event is directed to the active screen only.
+: Synthesizes the modifiers and key given in ''key'' which has the same form as described in the ''keystroke'' option. If given, ''computers'' lists the computer or computers to direct the event to, regardless of the active computer. If not given then the event is directed to the active computer only.
 : ''keyDown'' synthesizes a key press and ''keyUp'' synthesizes a key release. ''keystroke'' synthesizes a key press on activation and a release on deactivation and is equivalent to a ''keyDown'' on activation and ''keyUp'' on deactivation.
-: ''screens'' is either ''*'' (asterisk) to indicate all screens or a '':'' (colon) separated list of screen names. (Note that the screen name must have already been encountered in the configuration file so you'll probably want to put ''actions'' at the bottom of the file.)
+: ''computers'' is either ''*'' (asterisk) to indicate all computers or a '':'' (colon) separated list of computer names. (Note that the computer name must have already been encountered in the configuration file so you'll probably want to put ''actions'' at the bottom of the file.)
 
 * `mousebutton(button)`
 * `mouseDown(button)`
@@ -424,16 +437,16 @@ Actions are two lists of individual actions separated by commas. The two lists a
 : ''mouseDown'' synthesizes a mouse press and ''mouseUp'' synthesizes a mouse release. ''mousebutton'' synthesizes a mouse press on activation and a release on deactivation and is equivalent to a ''mouseDown'' on activation and ''mouseUp'' on deactivation.
 
 * `lockCursorToScreen(mode)`
-: Locks the cursor to or unlocks the cursor from the active screen. ''mode'' can be ''off'' to unlock the cursor, ''on'' to lock the cursor, or ''toggle'' to toggle the current state. The default is ''toggle''. If the configuration has no ''lockCursorToScreen'' action and ''Scroll Lock'' is not used as a hot key then ''Scroll Lock'' toggles cursor locking.
+: Locks the cursor to or unlocks the cursor from the active computer. ''mode'' can be ''off'' to unlock the cursor, ''on'' to lock the cursor, or ''toggle'' to toggle the current state. The default is ''toggle''. If the configuration has no ''lockCursorToScreen'' action and ''Scroll Lock'' is not used as a hot key then ''Scroll Lock'' toggles cursor locking.
 
-* `switchToScreen(screen)`
+* `switchToScreen(computerName)`
-: Jump to screen with name or alias ''screen''.
+: Jump to computer with name or alias ''computerName''.
 
 * `switchInDirection(dir)`
-: Switch to the screen in the direction ''dir'', which may be one of ''left'', ''right'', ''up'' or ''down''.
+: Switch to the computer in the direction ''dir'', which may be one of ''left'', ''right'', ''up'' or ''down''.
 
 * `switchToNextScreen()`
-: Cycle to the next screen in the configuration order. If at the last screen, cycles back to the first screen.
+: Cycle to the next computer in the configuration order. If at the last computer, cycles back to the first computer.
 
 ##### Keynames
 Valid key names are:
@@ -627,7 +640,7 @@ section: links
 	# iMac is to the right of Desktop1
 	# Laptop is to the left of Desktop1
 	Desktop1:
-		right(0,100) = iMac # the numbers in parentheses indicate the percentage of the screen's edge to be considered active for switching)
+	        right(0,100) = iMac # the numbers in parentheses indicate the percentage of the computer's edge to be considered active for switching)
 		left  = Laptop
 		shift = shift (shift, alt, super, meta can be mapped to any of the others)
 	# Desktop1 is to the right of Laptop
@@ -648,7 +661,7 @@ end
 
 #### Cursor Wrapping
 
-The text config allows screens to be wrapped around. For example, with two machines (a server and a client), the mouse can go off the right of the server onto the left side of the client, then off the right side of the client back onto the left side of server. This config also uses ''Ctrl''+''Super''+(''left arrow''/''right arrow'') to switch between machines on keypress.
+The text config allows computers to be wrapped around. For example, with two machines (a server and a client), the mouse can go off the right of the server onto the left side of the client, then off the right side of the client back onto the left side of server. This config also uses ''Ctrl''+''Super''+(''left arrow''/''right arrow'') to switch between machines on keypress.
 
 ```
 # Physical monitor arrangement, with machine names as used by Deskflow.
@@ -670,7 +683,7 @@ section: links
 		right = syn-serv   # "wrapping"
 end
 section: options
-		keystroke(control+super+right) = switchInDirection(right) # Switch screens on keypress 
+                keystroke(control+super+right) = switchInDirection(right) # Switch computers on keypress 
 <!--		keystroke(control+super+left) = switchInDirection(left) -->
 end
 ```
@@ -689,7 +702,7 @@ See also: the man page for ''deskflow-core''.
 
 ### Stacked Example
 
-Stack one computer's screen on top of another's.
+Stack one computer on top of another's.
 
 ```
 #           +-------+
@@ -733,7 +746,7 @@ end
 
 ### Horizontal Example
 
-Align all screens horizontally.
+Align all computers horizontally.
 
 ```
 # +-------+ +-------+ +-------+
@@ -767,7 +780,7 @@ end
 
 ### Span Example
 
-Span two screens on one computer across the screens of two computers.
+Span one computer across the two other computers.
 
 ```
 # +-------+ +-------+

src/CMakeLists.txt

@@ -1,10 +1,9 @@
-# SPDX-FileCopyrightText: 2024 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2024 Deskflow Developers
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
-include_directories(./lib)
+include_directories(./lib "${CMAKE_CURRENT_BINARY_DIR}/lib")
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/lib)
 
 add_subdirectory(lib)
 add_subdirectory(apps)

src/apps/CMakeLists.txt

@@ -1,6 +1,6 @@
-# SPDX-FileCopyrightText: 2024 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2024 Deskflow Developers
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
 if(UNIX AND NOT APPLE)
@@ -28,6 +28,15 @@ function(generate_app_man TARGET NAME)
   endif()
 endfunction()
 
+set(WIN32_PRE_EXCLUDE_REGEXES
+  "api-ms-win-.*"
+  "ext-ms-.*"
+  "^hvsifiletrust\\.dll$"
+  "^icu.*\\.dll$"
+)
+
+set(WIN32_POST_EXCLUDE_REGEXES ".*system32.*")
+
 add_subdirectory(deskflow-core)
 add_subdirectory(deskflow-daemon) #Only used on windows
 add_subdirectory(deskflow-gui)

src/apps/deskflow-core/CMakeLists.txt

@@ -1,6 +1,6 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
 set(target ${CMAKE_PROJECT_NAME}-core)
@@ -50,14 +50,13 @@ if(BUILD_OSX_BUNDLE)
     INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
     RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS
   )
+  if (APPLE_CODESIGN_DEV)
+    configure_mac_codesign(${target})
+  endif()
 elseif (WIN32)
   install(RUNTIME_DEPENDENCY_SET coreDeps
-    PRE_EXCLUDE_REGEXES
+    PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
-      "api-ms-win-.*"
+    POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
-      "ext-ms-.*"
-      "^hvsifiletrust\\.dll$"
-    POST_EXCLUDE_REGEXES
-      ".*system32.*"
     RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
 else()

src/apps/deskflow-core/CoreArgParser.cpp

@@ -6,11 +6,11 @@
 
 #include "CoreArgParser.h"
 #include "CoreArgs.h"
-#include "VersionInfo.h"
 
 #include "common/Constants.h"
 #include "common/ExitCodes.h"
 #include "common/Settings.h"
+#include "common/VersionInfo.h"
 #include "deskflow/ProtocolTypes.h"
 
 const QString CoreArgParser::s_headerText = QStringLiteral("%1: %2\n").arg(kCoreBinName, kDisplayVersion);

src/apps/deskflow-core/deskflow-core.cpp

@@ -16,7 +16,7 @@
 #include "deskflow/ClientApp.h"
 #include "deskflow/ServerApp.h"
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
 #include "arch/win32/ArchMiscWindows.h"
 #include <QCoreApplication>
 #endif
@@ -32,7 +32,7 @@ void showHelp(const CoreArgParser &parser)
 
 int main(int argc, char **argv)
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   // HACK to make sure settings gets the correct qApp path
   QCoreApplication m(argc, argv);
   m.deleteLater();
@@ -66,22 +66,19 @@ int main(int argc, char **argv)
     return s_exitSuccess;
   }
 
-  if (parser.singleInstanceOnly()) {
+  // Before we check any more args we need to check for a duplicate process.
-    // Before we check any more args we need to check for a duplicate process.
+  // Create a shared memory segment with a unique key
-    // Create a shared memory segment with a unique key
+  // This is to prevent a new instance from running if one is already running
-    // This is to prevent a new instance from running if one is already running
+  QSharedMemory sharedMemory(kCoreBinName);
-    QSharedMemory sharedMemory(kCoreBinName);
 
-    // Attempt to attach first and detach in order to clean up stale shm chunks
+  // Attempt to attach first and detach in order to clean up stale shm chunks
-    // This can happen if the previous instance was killed or crashed
+  // This can happen if the previous instance was killed or crashed
-    if (sharedMemory.attach())
+  if (sharedMemory.attach())
-      sharedMemory.detach();
+    sharedMemory.detach();
 
-    // If we can create 1 byte of SHM we are the only instance
+  if (!sharedMemory.create(1) && parser.singleInstanceOnly()) {
-    if (!sharedMemory.create(1)) {
+    LOG_WARN("an instance of deskflow core is already running");
-      LOG_WARN("an instance of deskflow core is already running");
+    return s_exitDuplicate;
-      return s_exitDuplicate;
-    }
   }
 
   parser.parse();

src/apps/deskflow-daemon/CMakeLists.txt

@@ -1,6 +1,6 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
 # Daemon is only needed on Windows for elevating processes to deal with UAC.
@@ -12,7 +12,12 @@ if(WIN32)
   set(EXE_ICON "IDI_DESKFLOW ICON DISCARDABLE \"${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico\"")
   configure_file(${CMAKE_SOURCE_DIR}/src/apps/res/windows.rc.in ${target}.rc)
 
-  add_executable(${target} WIN32 ${target}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${target}.rc)
+  add_executable(
+    ${target} WIN32
+    ${target}.cpp
+    DaemonApp.cpp
+    DaemonApp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/${target}.rc)
 
   target_link_libraries(
     ${target}
@@ -29,16 +34,12 @@ if(WIN32)
 
   install(
     TARGETS ${target}
-    RUNTIME_DEPENDENCY_SET deamonDeps
+    RUNTIME_DEPENDENCY_SET daemonDeps
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   )
   install(RUNTIME_DEPENDENCY_SET daemonDeps
-    PRE_EXCLUDE_REGEXES
+    PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
-      "api-ms-win-.*"
+    POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
-      "ext-ms-.*"
-      "^hvsifiletrust\\.dll$"
-    POST_EXCLUDE_REGEXES
-      ".*system32.*"
     RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
 endif()

src/apps/deskflow-daemon/DaemonApp.cpp

@@ -1,10 +1,11 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2026 Deskflow Developers
  * SPDX-FileCopyrightText: (C) 2012 - 2025 Symless Ltd.
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "deskflow/DaemonApp.h"
+#include "DaemonApp.h"
 
 #include "arch/Arch.h"
 #include "base/IEventQueue.h"
@@ -12,12 +13,10 @@
 #include "base/LogOutputters.h"
 #include "common/ExitCodes.h"
 #include "common/Settings.h"
-#include "deskflow/App.h"
 #include "deskflow/ipc/DaemonIpcServer.h"
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
-
+#include "arch/win32/ArchDaemonWindows.h"
-#include "arch/win32/ArchMiscWindows.h" // IWYU pragma: keep
 #include "deskflow/Screen.h"
 #include "platform/MSWindowsDebugOutputter.h"
 #include "platform/MSWindowsEventQueueBuffer.h"
@@ -28,18 +27,10 @@
 
 #endif
 
-#include <filesystem>
-#include <iostream>
 #include <string>
 
 using namespace deskflow::core;
 
-void showHelp(int argc, char **argv) // NOSONAR - CLI args
-{
-  const auto binName = argc > 0 ? std::filesystem::path(argv[0]).filename().string() : kDaemonBinName;
-  std::cout << "Usage: " << binName << " [-f|--foreground] [--install] [--uninstall]" << std::endl;
-}
-
 DaemonApp::DaemonApp(IEventQueue &events) : m_events(events)
 {
   // do nothing
@@ -72,7 +63,7 @@ void DaemonApp::applyWatchdogCommand() const
 {
   LOG_DEBUG("applying watchdog command");
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   m_pWatchdog->setProcessConfig(m_command, m_elevate);
 #else
   LOG_ERR("applying watchdog command not implemented on this platform");
@@ -86,7 +77,7 @@ void DaemonApp::clearWatchdogCommand()
   // Clear the setting to prevent it from being next time the daemon starts.
   setCommand("");
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   m_pWatchdog->setProcessConfig("", false);
 #else
   LOG_ERR("clearing watchdog command not implemented on this platform");
@@ -96,10 +87,10 @@ void DaemonApp::clearWatchdogCommand()
 void DaemonApp::clearSettings() const
 {
   LOG_INFO("clearing daemon settings");
-  Settings::setValue(Settings::Daemon::Command, QVariant());
+  Settings::setValue(Settings::Daemon::Command);
-  Settings::setValue(Settings::Daemon::Elevate, QVariant());
+  Settings::setValue(Settings::Daemon::Elevate);
-  Settings::setValue(Settings::Daemon::LogFile, QVariant());
+  Settings::setValue(Settings::Daemon::LogFile);
-  Settings::setValue(Settings::Daemon::LogLevel, QVariant());
+  Settings::setValue(Settings::Daemon::LogLevel);
 }
 
 void DaemonApp::connectIpcServer(const ipc::DaemonIpcServer *ipcServer) const
@@ -145,7 +136,7 @@ void DaemonApp::run(QThread &daemonThread)
     LOG_DEBUG("daemon thread finished");
   });
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   m_pWatchdog = std::make_unique<MSWindowsWatchdog>(m_foreground, *m_pFileLogOutputter);
 
   auto command = Settings::value(Settings::Daemon::Command).toString().toStdString();
@@ -162,27 +153,26 @@ void DaemonApp::run(QThread &daemonThread)
 
 int DaemonApp::daemonLoop()
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   // Runs the daemon through the Windows service controller, which controls the program lifecycle.
-  return ArchMiscWindows::runDaemon([this]() { return mainLoop(); });
+  return ArchDaemonWindows::runDaemon([this]() { return mainLoop(); });
-#elif SYSAPI_UNIX
+#else
   return mainLoop();
 #endif
 }
 
 int DaemonApp::mainLoop()
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   if (m_pWatchdog == nullptr) {
     LOG_ERR("watchdog not initialized");
     return s_exitFailed;
   }
+  ArchDaemonWindows::daemonRunning(true);
 #endif
 
-  DAEMON_RUNNING(true);
-
   try {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
     // Install the platform event queue to handle service stop events.
     // This must be done on the same thread as the event loop, otherwise the service stop
     // request will not add the quit event to the event queue, and the service won't stop.
@@ -202,7 +192,7 @@ int DaemonApp::mainLoop()
 
   LOG_INFO("daemon is stopping");
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   try {
     LOG_DEBUG("stopping process watchdog");
     m_pWatchdog->stop();
@@ -211,9 +201,9 @@ int DaemonApp::mainLoop()
   } catch (...) { // NOSONAR - Catching remaining exceptions
     LOG_CRIT("daemon stop watchdog unknown error");
   }
+  ArchDaemonWindows::daemonRunning(false);
 #endif
 
-  DAEMON_RUNNING(false);
   return s_exitSuccess;
 }
 
@@ -230,7 +220,7 @@ void DaemonApp::setForeground()
 
 void DaemonApp::initLogging()
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   if (!m_foreground) {
     // Only use MS debug outputter when the process is daemonized, since stdout won't be accessible
     // in that case, but is accessible when running in the foreground.
@@ -244,7 +234,7 @@ void DaemonApp::initLogging()
 
 void DaemonApp::showConsole()
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   // The daemon bin is compiled using the Win32 subsystem which works best for Windows services,
   // so when running as a foreground process we need to allocate a console (or we won't see output).
   // It is important to do this inside the arg check loop so that we can attach console ahead

src/apps/deskflow-daemon/DaemonApp.h

@@ -21,7 +21,7 @@ namespace deskflow::core::ipc {
 class DaemonIpcServer;
 }
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
 class MSWindowsWatchdog;
 #endif
 
@@ -32,20 +32,9 @@ class DaemonApp : public QObject
   Q_OBJECT
 
 public:
-  enum class InitResult
-  {
-    Installed,
-    Uninstalled,
-    StartDaemon,
-    ShowHelp,
-    ArgsError,
-    FatalError,
-  };
-
   explicit DaemonApp(IEventQueue &events);
   ~DaemonApp() override;
 
-  InitResult init(int argc, char **argv);
   void run(QThread &daemonThread);
   void setForeground();
   void initLogging();
@@ -67,7 +56,7 @@ private:
 
   static void showConsole();
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   std::unique_ptr<MSWindowsWatchdog> m_pWatchdog;
 #endif
 

src/apps/deskflow-daemon/deskflow-daemon.cpp

@@ -5,22 +5,21 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "VersionInfo.h"
+#include "DaemonApp.h"
+
 #include "arch/Arch.h"
 #include "base/EventQueue.h"
 #include "base/Log.h"
 #include "common/ExitCodes.h"
 #include "common/Settings.h"
-#include "deskflow/DaemonApp.h"
+#include "common/VersionInfo.h"
 #include "deskflow/ipc/DaemonIpcServer.h"
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
-
 #include "arch/win32/ArchMiscWindows.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
-
 #endif
 
 #include <QCommandLineParser>
@@ -33,7 +32,7 @@ void handleError(const char *message = "Unrecognized error.");
 
 int main(int argc, char **argv)
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   ArchMiscWindows::guardRuntimeVersion();
 
   // Save window instance for later use, e.g. `GetModuleFileName` which is used when installing the daemon.
@@ -84,7 +83,7 @@ int main(int argc, char **argv)
 
   try {
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
     // Show warning if not running as admin as daemon will behave differently.
     if (!ArchMiscWindows::isProcessElevated()) {
       LOG_WARN("not running as admin, some features may not work");
@@ -114,8 +113,7 @@ int main(int argc, char **argv)
   }
 }
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
-
 // Win32 subsystem entry point (simply forwards to main).
 // We need this because using regular main under the Win32 subsystem results in empty args.
 int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
@@ -130,7 +128,7 @@ void handleError(const char *message)
   // Always print error to stdout in case run as CLI program.
   LOG_ERR("%s", message);
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   // Show a message box for when run from MSI in Win32 subsystem.
   MessageBoxA(nullptr, message, "Deskflow daemon error", MB_OK | MB_ICONERROR);
 #endif

src/apps/deskflow-gui/CMakeLists.txt

@@ -1,5 +1,5 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-FileCopyrightText: 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2024 Symless Ltd
 # SPDX-License-Identifier: MIT
 
 if(APPLE)
@@ -60,12 +60,8 @@ if(WIN32)
   set_target_properties(${target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
 
   install(RUNTIME_DEPENDENCY_SET guiDeps
-    PRE_EXCLUDE_REGEXES
+    PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
-      "api-ms-win-.*"
+    POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
-      "ext-ms-.*"
-      "^hvsifiletrust\\.dll$"
-    POST_EXCLUDE_REGEXES
-      ".*system32.*"
     RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
 
@@ -90,6 +86,7 @@ if(WIN32)
     DIRECTORY ${QT_DEPENDS_DIR}/
     DESTINATION ${CMAKE_INSTALL_LIBDIR}
     PATTERN "dx*.dll" EXCLUDE
+    PATTERN "icu*.dll" EXCLUDE
   )
 
 elseif(APPLE)
@@ -98,32 +95,8 @@ elseif(APPLE)
       INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
       MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/deskflow.plist"
     )
-
+    if (APPLE_CODESIGN_DEV)
-    # Warning: Do not use for CI/production, as the `entitlements-dev.plist` file adds special
+      configure_mac_codesign(${target})
-    # entitlements that are only appropriate for local development.
-    #
-    # macOS made TCC stricter so that if you don't sign your local dev builds properly, macOS will
-    # nag you to remove and re-approve the app every time you make a change to the binary which is
-    # extremely annoying during development.
-    #
-    # If you were to use ad-hoc signing (i.e. not specify a certificate), TCC would still nag you
-    # because the binary identity is anchored not on the app ID, but on the CD hash (which changes
-    # based on the binary contents).
-    #
-    # To use, simply generate a personal certificate for free with Xcode and pass the ID to CMake.
-    # Full instructions are in the docs.
-    if (NOT "${APPLE_CODESIGN_DEV}" STREQUAL "")
-      message(STATUS "Apple codesign ID for development only: ${APPLE_CODESIGN_DEV}")
-      add_custom_command(
-        TARGET ${target} POST_BUILD
-        COMMAND /usr/bin/codesign
-                --force
-                --options runtime
-                --entitlements "$<SHELL_PATH:${CMAKE_SOURCE_DIR}/src/apps/res/entitlements-dev.plist>"
-                --sign "${APPLE_CODESIGN_DEV}"
-                "$<TARGET_BUNDLE_DIR:${target}>"
-        VERBATIM
-      )
     endif()
   else()
     set_target_properties(${target} PROPERTIES MACOSX_BUNDLE FALSE)

src/apps/deskflow-gui/deskflow-gui.cpp

@@ -6,12 +6,12 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "VersionInfo.h"
 #include "common/Constants.h"
 #include "common/ExitCodes.h"
 #include "common/I18N.h"
 #include "common/PlatformInfo.h"
 #include "common/UrlConstants.h"
+#include "common/VersionInfo.h"
 #include "gui/Diagnostic.h"
 #include "gui/MainWindow.h"
 #include "gui/Messages.h"
@@ -32,7 +32,7 @@
 #include <QLoggingCategory>
 #endif
 
-#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI)
+#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN)
 #include "platform/XDGPortalRegistry.h"
 #endif
 
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
   QLoggingCategory::setFilterRules(QStringLiteral("*.debug=true\nqt.*=false"));
 #endif
 
-#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI)
+#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN)
   deskflow::platform::setAppId();
 #endif
 

src/apps/res/deskflow.plist.in

@@ -30,8 +30,12 @@
 	<true/>
 	<key>NSHumanReadableCopyright</key>
 	<string>@BUNDLE_COPYRIGHT@</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.utilities</string>
 
-	<!-- Don't Allow Os to kill for memory -->
+	<!-- Prevent macOS from terminating during memory pressure -->
+	<key>NSSupportsAutomaticTermination</key>
+	<false/>
 	<key>NSSupportsSuddenTermination</key>
 	<false/>
 

src/apps/res/deskflow.qrc

@@ -5,11 +5,14 @@
         <file>icons/deskflow-dark/actions/16/document-edit.svg</file>
         <file>icons/deskflow-dark/actions/16/document-open.svg</file>
         <file>icons/deskflow-dark/actions/16/document-save-as.svg</file>
+        <file>icons/deskflow-dark/actions/16/go-down.svg</file>
+        <file>icons/deskflow-dark/actions/16/go-up.svg</file>
         <file>icons/deskflow-dark/actions/16/help-about.svg</file>
         <file>icons/deskflow-dark/actions/16/network-connect.svg</file>
         <file>icons/deskflow-dark/actions/16/network-disconnect.svg</file>
         <file>icons/deskflow-dark/actions/16/process-stop.svg</file>
         <file>icons/deskflow-dark/actions/16/system-run.svg</file>
+        <file>icons/deskflow-dark/actions/16/system-search.svg</file>
         <file>icons/deskflow-dark/actions/16/tools-report-bug.svg</file>
         <file>icons/deskflow-dark/actions/16/view-close.svg</file>
         <file>icons/deskflow-dark/actions/16/view-refresh.svg</file>
@@ -21,11 +24,14 @@
         <file>icons/deskflow-dark/actions/22/document-open.svg</file>
         <file>icons/deskflow-dark/actions/22/document-save-as.svg</file>
         <file>icons/deskflow-dark/actions/22/fingerprint.svg</file>
+        <file>icons/deskflow-dark/actions/22/go-down.svg</file>
+        <file>icons/deskflow-dark/actions/22/go-up.svg</file>
         <file>icons/deskflow-dark/actions/22/help-about.svg</file>
         <file>icons/deskflow-dark/actions/22/network-connect.svg</file>
         <file>icons/deskflow-dark/actions/22/network-disconnect.svg</file>
         <file>icons/deskflow-dark/actions/22/process-stop.svg</file>
         <file>icons/deskflow-dark/actions/22/system-run.svg</file>
+        <file>icons/deskflow-dark/actions/22/system-search.svg</file>
         <file>icons/deskflow-dark/actions/22/tools-report-bug.svg</file>
         <file>icons/deskflow-dark/actions/22/view-close.svg</file>
         <file>icons/deskflow-dark/actions/22/view-refresh.svg</file>
@@ -36,6 +42,8 @@
         <file>icons/deskflow-dark/actions/24/document-edit.svg</file>
         <file>icons/deskflow-dark/actions/24/document-open.svg</file>
         <file>icons/deskflow-dark/actions/24/document-save-as.svg</file>
+        <file>icons/deskflow-dark/actions/24/go-down.svg</file>
+        <file>icons/deskflow-dark/actions/24/go-up.svg</file>
         <file>icons/deskflow-dark/actions/24/edit-clear-all.svg</file>
         <file>icons/deskflow-dark/actions/24/fingerprint.svg</file>
         <file>icons/deskflow-dark/actions/24/help-about.svg</file>
@@ -43,6 +51,7 @@
         <file>icons/deskflow-dark/actions/24/network-disconnect.svg</file>
         <file>icons/deskflow-dark/actions/24/process-stop.svg</file>
         <file>icons/deskflow-dark/actions/24/system-run.svg</file>
+        <file>icons/deskflow-dark/actions/24/system-search.svg</file>
         <file>icons/deskflow-dark/actions/24/tools-report-bug.svg</file>
         <file>icons/deskflow-dark/actions/24/view-close.svg</file>
         <file>icons/deskflow-dark/actions/24/view-refresh.svg</file>
@@ -55,8 +64,11 @@
         <file>icons/deskflow-dark/actions/32/dialog-ok-apply.svg</file>
         <file>icons/deskflow-dark/actions/32/document-open.svg</file>
         <file>icons/deskflow-dark/actions/32/document-save-as.svg</file>
+        <file>icons/deskflow-dark/actions/32/go-down.svg</file>
+        <file>icons/deskflow-dark/actions/32/go-up.svg</file>
         <file>icons/deskflow-dark/actions/32/help-about.svg</file>
         <file>icons/deskflow-dark/actions/32/view-refresh.svg</file>
+        <file>icons/deskflow-dark/actions/32/system-search.svg</file>
         <file>icons/deskflow-dark/apps/64/org.deskflow.deskflow.svg</file>
         <file>icons/deskflow-dark/apps/64/org.deskflow.deskflow-symbolic.svg</file>
         <file>icons/deskflow-dark/devices/64/video-display.svg</file>
@@ -77,11 +89,14 @@
         <file>icons/deskflow-light/actions/16/document-edit.svg</file>
         <file>icons/deskflow-light/actions/16/document-open.svg</file>
         <file>icons/deskflow-light/actions/16/document-save-as.svg</file>
+        <file>icons/deskflow-light/actions/16/go-down.svg</file>
+        <file>icons/deskflow-light/actions/16/go-up.svg</file>
         <file>icons/deskflow-light/actions/16/help-about.svg</file>
         <file>icons/deskflow-light/actions/16/network-connect.svg</file>
         <file>icons/deskflow-light/actions/16/network-disconnect.svg</file>
         <file>icons/deskflow-light/actions/16/process-stop.svg</file>
         <file>icons/deskflow-light/actions/16/system-run.svg</file>
+        <file>icons/deskflow-light/actions/16/system-search.svg</file>
         <file>icons/deskflow-light/actions/16/tools-report-bug.svg</file>
         <file>icons/deskflow-light/actions/16/view-close.svg</file>
         <file>icons/deskflow-light/actions/16/view-refresh.svg</file>
@@ -94,11 +109,14 @@
         <file>icons/deskflow-light/actions/22/document-open.svg</file>
         <file>icons/deskflow-light/actions/22/document-save-as.svg</file>
         <file>icons/deskflow-light/actions/22/fingerprint.svg</file>
+        <file>icons/deskflow-light/actions/22/go-down.svg</file>
+        <file>icons/deskflow-light/actions/22/go-up.svg</file>
         <file>icons/deskflow-light/actions/22/network-connect.svg</file>
         <file>icons/deskflow-light/actions/22/network-disconnect.svg</file>
         <file>icons/deskflow-light/actions/22/help-about.svg</file>
         <file>icons/deskflow-light/actions/22/process-stop.svg</file>
         <file>icons/deskflow-light/actions/22/system-run.svg</file>
+        <file>icons/deskflow-light/actions/22/system-search.svg</file>
         <file>icons/deskflow-light/actions/22/tools-report-bug.svg</file>
         <file>icons/deskflow-light/actions/22/view-close.svg</file>
         <file>icons/deskflow-light/actions/22/view-refresh.svg</file>
@@ -111,11 +129,14 @@
         <file>icons/deskflow-light/actions/24/document-edit.svg</file>
         <file>icons/deskflow-light/actions/24/document-open.svg</file>
         <file>icons/deskflow-light/actions/24/document-save-as.svg</file>
+        <file>icons/deskflow-light/actions/24/go-down.svg</file>
+        <file>icons/deskflow-light/actions/24/go-up.svg</file>
         <file>icons/deskflow-light/actions/24/help-about.svg</file>
         <file>icons/deskflow-light/actions/24/network-connect.svg</file>
         <file>icons/deskflow-light/actions/24/network-disconnect.svg</file>
         <file>icons/deskflow-light/actions/24/process-stop.svg</file>
         <file>icons/deskflow-light/actions/24/system-run.svg</file>
+        <file>icons/deskflow-light/actions/24/system-search.svg</file>
         <file>icons/deskflow-light/actions/24/tools-report-bug.svg</file>
         <file>icons/deskflow-light/actions/24/view-close.svg</file>
         <file>icons/deskflow-light/actions/24/view-refresh.svg</file>
@@ -128,8 +149,11 @@
         <file>icons/deskflow-light/actions/32/dialog-ok-apply.svg</file>
         <file>icons/deskflow-light/actions/32/document-open.svg</file>
         <file>icons/deskflow-light/actions/32/document-save-as.svg</file>
+        <file>icons/deskflow-light/actions/32/go-down.svg</file>
+        <file>icons/deskflow-light/actions/32/go-up.svg</file>
         <file>icons/deskflow-light/actions/32/help-about.svg</file>
         <file>icons/deskflow-light/actions/32/view-refresh.svg</file>
+        <file>icons/deskflow-light/actions/32/system-search.svg</file>
         <file>icons/deskflow-light/apps/64/org.deskflow.deskflow.svg</file>
         <file>icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg</file>
         <file>icons/deskflow-light/devices/64/video-display.svg</file>

src/apps/res/icons/deskflow-dark/actions/16/go-down.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+    <path d="M8 11.707l-6-6L2.707 5 8 10.293 13.293 5l.707.707-6 6z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/16/go-up.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+    <path d="M8 4.293l-6 6 .707.707L8 5.707 13.293 11l.707-.707-6-6z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/16/system-search.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 6.5 2 C 4.007 2 2 4.01 2 6.5 C 2 8.993 4.01 11 6.5 11 C 7.5636432 11 8.5263409 10.618801 9.2949219 10.005859 L 13.292969 14.003906 L 14 13.296875 L 10.001953 9.2988281 C 10.617604 8.529048 11 7.565338 11 6.5 C 11 4.007 8.99 2 6.5 2 z M 6.5 3 C 8.439 3 10 4.561 10 6.5 C 10 8.439 8.439 10 6.5 10 C 4.561 10 3 8.439 3 6.5 C 3 4.561 4.561 3 6.5 3 z " class="ColorScheme-Text"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/22/go-down.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="m3.707031 7l-.707031.707031 6.125 6.125 1.875 1.875 1.875-1.875 6.125-6.125-.707031-.707031-6.125 6.125-1.167969 1.167969-1.167969-1.167969-6.125-6.125" class="ColorScheme-Text"/>  
+</svg>

src/apps/res/icons/deskflow-dark/actions/22/go-up.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+    <path d="M3.707 15L3 14.293l6.125-6.125L11 6.293l1.875 1.875L19 14.293l-.707.707-6.125-6.125L11 7.707 9.832 8.875 3.707 15" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/22/system-search.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 9 3 C 5.6759952 3 3 5.6759952 3 9 C 3 12.324005 5.6759952 15 9 15 C 10.481205 15 11.830584 14.465318 12.875 13.582031 L 18.292969 19 L 19 18.292969 L 13.582031 12.875 C 14.465318 11.830584 15 10.481205 15 9 C 15 5.6759952 12.324005 3 9 3 z M 9 4 C 11.770005 4 14 6.2299952 14 9 C 14 11.770005 11.770005 14 9 14 C 6.2299952 14 4 11.770005 4 9 C 4 6.2299952 6.2299952 4 9 4 z " class="ColorScheme-Text"/>  
+</svg>

src/apps/res/icons/deskflow-dark/actions/24/go-down.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="m3.707031 7l-.707031.707031 6.125 6.125 1.875 1.875 1.875-1.875 6.125-6.125-.707031-.707031-6.125 6.125-1.167969 1.167969-1.167969-1.167969-6.125-6.125" class="ColorScheme-Text"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-dark/actions/24/go-up.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  <g transform="translate(1,1)">
+    <path d="M3.707 15L3 14.293l6.125-6.125L11 6.293l1.875 1.875L19 14.293l-.707.707-6.125-6.125L11 7.707 9.832 8.875 3.707 15" class="ColorScheme-Text" fill="currentColor"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-dark/actions/24/system-search.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 9 3 C 5.6759952 3 3 5.6759952 3 9 C 3 12.324005 5.6759952 15 9 15 C 10.481205 15 11.830584 14.465318 12.875 13.582031 L 18.292969 19 L 19 18.292969 L 13.582031 12.875 C 14.465318 11.830584 15 10.481205 15 9 C 15 5.6759952 12.324005 3 9 3 z M 9 4 C 11.770005 4 14 6.2299952 14 9 C 14 11.770005 11.770005 14 9 14 C 6.2299952 14 4 11.770005 4 9 C 4 6.2299952 6.2299952 4 9 4 z " class="ColorScheme-Text"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-dark/actions/32/go-down.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+    <path d="M16 23.707l-14-14L2.707 9 16 22.293 29.293 9l.707.707z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/32/go-up.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+    <path d="M16 8.293l-14 14 .707.707L16 9.707 29.293 23l.707-.707z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/32/system-search.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="32" height="32">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+    <g id="system-search" transform="translate(0 -32) translate(-22,32)">
+        <path id="path66" class="ColorScheme-Text" d="m35 4a9 9 0 0 0-9 9 9 9 0 0 0 9 9 9 9 0 0 0 5.994141-2.298828l8.298828 8.298828 0.707031-0.707031-8.300781-8.300782a9 9 0 0 0 2.300781-5.992187 9 9 0 0 0-9-9zm0 1a8 8 0 0 1 8 8 8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8z" fill="currentColor"/>
+        <path id="path68" d="m22 0v32h32v-32z" fill="none"/>
+    </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/16/go-down.svg

@@ -0,0 +1,10 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <style
+        type="text/css"
+        id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <path d="M8 11.707l-6-6L2.707 5 8 10.293 13.293 5l.707.707-6 6z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/16/go-up.svg

@@ -0,0 +1,10 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <style
+        type="text/css"
+        id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <path d="M8 4.293l-6 6 .707.707L8 5.707 13.293 11l.707-.707-6-6z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/16/system-search.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 6.5 2 C 4.007 2 2 4.01 2 6.5 C 2 8.993 4.01 11 6.5 11 C 7.5636432 11 8.5263409 10.618801 9.2949219 10.005859 L 13.292969 14.003906 L 14 13.296875 L 10.001953 9.2988281 C 10.617604 8.529048 11 7.565338 11 6.5 C 11 4.007 8.99 2 6.5 2 z M 6.5 3 C 8.439 3 10 4.561 10 6.5 C 10 8.439 8.439 10 6.5 10 C 4.561 10 3 8.439 3 6.5 C 3 4.561 4.561 3 6.5 3 z "
+     class="ColorScheme-Text"
+     />
+</svg>

src/apps/res/icons/deskflow-light/actions/22/go-down.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+	d="m3.707031 7l-.707031.707031 6.125 6.125 1.875 1.875 1.875-1.875 6.125-6.125-.707031-.707031-6.125 6.125-1.167969 1.167969-1.167969-1.167969-6.125-6.125"
+    class="ColorScheme-Text"
+    />  
+</svg>

src/apps/res/icons/deskflow-light/actions/22/go-up.svg

@@ -0,0 +1,10 @@
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+    <style
+        type="text/css"
+        id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <path d="M3.707 15L3 14.293l6.125-6.125L11 6.293l1.875 1.875L19 14.293l-.707.707-6.125-6.125L11 7.707 9.832 8.875 3.707 15" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/22/system-search.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+    d="M 9 3 C 5.6759952 3 3 5.6759952 3 9 C 3 12.324005 5.6759952 15 9 15 C 10.481205 15 11.830584 14.465318 12.875 13.582031 L 18.292969 19 L 19 18.292969 L 13.582031 12.875 C 14.465318 11.830584 15 10.481205 15 9 C 15 5.6759952 12.324005 3 9 3 z M 9 4 C 11.770005 4 14 6.2299952 14 9 C 14 11.770005 11.770005 14 9 14 C 6.2299952 14 4 11.770005 4 9 C 4 6.2299952 6.2299952 4 9 4 z "
+    class="ColorScheme-Text"
+    />  
+</svg>

src/apps/res/icons/deskflow-light/actions/24/go-down.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="m3.707031 7l-.707031.707031 6.125 6.125 1.875 1.875 1.875-1.875 6.125-6.125-.707031-.707031-6.125 6.125-1.167969 1.167969-1.167969-1.167969-6.125-6.125" class="ColorScheme-Text"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/24/go-up.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <style type="text/css" id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+  <g transform="translate(1,1)">
+    <path d="M3.707 15L3 14.293l6.125-6.125L11 6.293l1.875 1.875L19 14.293l-.707.707-6.125-6.125L11 7.707 9.832 8.875 3.707 15" class="ColorScheme-Text" fill="currentColor"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/24/system-search.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 9 3 C 5.6759952 3 3 5.6759952 3 9 C 3 12.324005 5.6759952 15 9 15 C 10.481205 15 11.830584 14.465318 12.875 13.582031 L 18.292969 19 L 19 18.292969 L 13.582031 12.875 C 14.465318 11.830584 15 10.481205 15 9 C 15 5.6759952 12.324005 3 9 3 z M 9 4 C 11.770005 4 14 6.2299952 14 9 C 14 11.770005 11.770005 14 9 14 C 6.2299952 14 4 11.770005 4 9 C 4 6.2299952 6.2299952 4 9 4 z " class="ColorScheme-Text"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/32/go-down.svg

@@ -0,0 +1,10 @@
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+    <style
+        type="text/css"
+        id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <path d="M16 23.707l-14-14L2.707 9 16 22.293 29.293 9l.707.707z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/32/go-up.svg

@@ -0,0 +1,10 @@
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+    <style
+        type="text/css"
+        id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <path d="M16 8.293l-14 14 .707.707L16 9.707 29.293 23l.707-.707z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/32/system-search.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="32" height="32">
+    <style type="text/css" id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <g id="system-search" transform="translate(0 -32) translate(-22,32)">
+        <path id="path66" class="ColorScheme-Text" d="m35 4a9 9 0 0 0-9 9 9 9 0 0 0 9 9 9 9 0 0 0 5.994141-2.298828l8.298828 8.298828 0.707031-0.707031-8.300781-8.300782a9 9 0 0 0 2.300781-5.992187 9 9 0 0 0-9-9zm0 1a8 8 0 0 1 8 8 8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8z" fill="currentColor"/>
+        <path id="path68" d="m22 0v32h32v-32z" fill="none"/>
+    </g>
+</svg>

src/apps/res/windows.rc.in

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2025 Chris Rizzitello <sithlord48@gmail.com>
+// SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
 // SPDX-License-Identifier: MIT
 // Generic Template for rc files in deskflow
 #include <windows.h>

src/lib/CMakeLists.txt

@@ -1,10 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2024 Deskflow Developers
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
-configure_file(VersionInfo.h.in VersionInfo.h @ONLY)
-
 add_subdirectory(arch)
 add_subdirectory(base)
 add_subdirectory(client)

src/lib/arch/Arch.cpp

@@ -10,7 +10,7 @@
 
 #include <thread>
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
 #include "arch/win32/ArchMiscWindows.h"
 #endif
 
@@ -26,7 +26,7 @@ Arch::Arch()
   s_instance = this;
 }
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
 void Arch::init()
 {
   ARCH_NETWORK::init();

src/lib/arch/Arch.h

@@ -5,7 +5,7 @@
  * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
-
+#include <QtSystemDetection>
 // Consider whether or not to use either encapsulation (as below)
 // or inheritance (as it is now) for the ARCH stuff.
 //
@@ -25,20 +25,16 @@
 
 #pragma once
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
-
 #include "arch/win32/ArchDaemonWindows.h"
 #include "arch/win32/ArchLogWindows.h"
 #include "arch/win32/ArchMultithreadWindows.h"
 #include "arch/win32/ArchNetworkWinsock.h"
-
+#else
-#elif SYSAPI_UNIX
-
 #include "arch/ArchDaemonNone.h"
 #include "arch/unix/ArchLogUnix.h"
 #include "arch/unix/ArchMultithreadPosix.h"
 #include "arch/unix/ArchNetworkBSD.h"
-
 #endif
 
 /*!
@@ -63,7 +59,7 @@ public:
   Arch();
   ~Arch() override = default;
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   //! Call init on other arch classes.
   /*!
   Some arch classes depend on others to exist first. When init is called

src/lib/arch/CMakeLists.txt

@@ -1,6 +1,6 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
 # Platform Specific Code

src/lib/arch/IArchDaemon.h

@@ -1,6 +1,6 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
+ * SPDX-FileCopyrightText: (C) 2025 - 2026 Deskflow Developers
  * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
  * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
@@ -41,16 +41,16 @@ public:
     Becomes a service.  Argument 0 is the name of the service
     and the rest are the arguments passed to StartService().
     \c func is only called when the service is actually started.
-    \c func must call \c ArchMiscWindows::runDaemon() to finally
+    \c func must call \c ArchDaemonWindows::runDaemon() to finally
     becoming a service.  The \c runFunc function passed to \c runDaemon()
-    must call \c ArchMiscWindows::daemonRunning(true) when it
+    must call \c ArchDaemonWindows::daemonRunning(true) when it
     enters the main loop (i.e. after initialization) and
-    \c ArchMiscWindows::daemonRunning(false) when it leaves
+    \c ArchDaemonWindows::daemonRunning(false) when it leaves
     the main loop.  The \c stopFunc function passed to \c runDaemon()
     is called when the daemon must exit the main loop and it must cause
     \c runFunc to return.  \c func should return what \c runDaemon()
     returns.  \c func or \c runFunc can call
-    \c ArchMiscWindows::daemonFailed() to indicate startup failure.
+    \c ArchDaemonWindows::daemonFailed() to indicate startup failure.
   </ul>
   */
   virtual int daemonize(DaemonFunc const &func) = 0;

src/lib/arch/unix/ArchNetworkBSD.cpp

@@ -79,6 +79,10 @@ ArchSocket ArchNetworkBSD::newSocket(AddressFamily family, SocketType type)
   }
   try {
     setBlockingOnSocket(fd, false);
+#if defined(__APPLE__)
+    int on = 1;
+    setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on));
+#endif
   } catch (...) {
     close(fd);
     throw;
@@ -196,6 +200,10 @@ ArchSocket ArchNetworkBSD::acceptSocket(ArchSocket s, ArchNetAddress *addr)
 
   try {
     setBlockingOnSocket(fd, false);
+#if defined(__APPLE__)
+    int on = 1;
+    setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on));
+#endif
   } catch (...) {
     close(fd);
     delete newSocket;

src/lib/arch/win32/ArchMiscWindows.cpp

@@ -1,5 +1,6 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2026 Deskflow Developers
  * SPDX-FileCopyrightText: (C) 2012 - 2016, 2024 - 2025 Symless Ltd.
  * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
@@ -7,7 +8,6 @@
 
 #include "arch/win32/ArchMiscWindows.h"
 
-#include "arch/win32/ArchDaemonWindows.h"
 #include "arch/win32/XArchWindows.h"
 #include "base/Log.h"
 #include "base/String.h"
@@ -17,6 +17,7 @@
 
 #include <array>
 #include <filesystem>
+#include <stdexcept>
 
 // Useful for debugging Windows specific bootstrapping code before the logging system is initialized.
 // This output can be viewed by attaching a Microsoft debugger or by using the DebugView program.
@@ -64,26 +65,6 @@ void ArchMiscWindows::init()
   SetErrorMode(SEM_FAILCRITICALERRORS);
 }
 
-int ArchMiscWindows::runDaemon(RunFunc runFunc)
-{
-  return ArchDaemonWindows::runDaemon(runFunc);
-}
-
-void ArchMiscWindows::daemonRunning(bool running)
-{
-  ArchDaemonWindows::daemonRunning(running);
-}
-
-void ArchMiscWindows::daemonFailed(int result)
-{
-  ArchDaemonWindows::daemonFailed(result);
-}
-
-UINT ArchMiscWindows::getDaemonQuitMessage()
-{
-  return ArchDaemonWindows::getDaemonQuitMessage();
-}
-
 HKEY ArchMiscWindows::openKey(HKEY key, const TCHAR *keyName)
 {
   return openKey(key, keyName, false);
@@ -178,20 +159,16 @@ ArchMiscWindows::EValueType ArchMiscWindows::typeOfValue(HKEY key, const TCHAR *
 
 void ArchMiscWindows::setValue(HKEY key, const TCHAR *name, const std::string &value)
 {
-  assert(key != nullptr);
   if (key == nullptr) {
-    // TODO: throw exception
+    throw std::invalid_argument("Registry key cannot be nullptr");
-    return;
   }
   RegSetValueEx(key, name, 0, REG_SZ, reinterpret_cast<const BYTE *>(value.c_str()), (DWORD)value.size() + 1);
 }
 
 void ArchMiscWindows::setValue(HKEY key, const TCHAR *name, DWORD value)
 {
-  assert(key != nullptr);
   if (key == nullptr) {
-    // TODO: throw exception
+    throw std::invalid_argument("Registry key cannot be nullptr");
-    return;
   }
   RegSetValueEx(key, name, 0, REG_DWORD, reinterpret_cast<CONST BYTE *>(&value), sizeof(DWORD));
 }

src/lib/arch/win32/ArchMiscWindows.h

@@ -1,5 +1,6 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2026 Deskflow Developers
  * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
  * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
@@ -40,30 +41,6 @@ public:
   //! Initialize
   static void init();
 
-  //! Run the daemon
-  /*!
-  Delegates to ArchDaemonWindows.
-  */
-  static int runDaemon(RunFunc runFunc);
-
-  //! Indicate daemon is in main loop
-  /*!
-  Delegates to ArchDaemonWindows.
-  */
-  static void daemonRunning(bool running);
-
-  //! Indicate failure of running daemon
-  /*!
-  Delegates to ArchDaemonWindows.
-  */
-  static void daemonFailed(int result);
-
-  //! Get daemon quit message
-  /*!
-  Delegates to ArchDaemonWindows.
-  */
-  static UINT getDaemonQuitMessage();
-
   //! Open and return a registry key, closing the parent key
   static HKEY openKey(HKEY parent, const TCHAR *child);
 

src/lib/arch/win32/ArchNetworkWinsock.cpp

@@ -135,7 +135,7 @@ void ArchNetworkWinsock::initModule(HMODULE module)
   WSADATA data;
   int err = startup(version, &data);
   if (data.wVersion != version) {
-    throw ArchNetworkSupportException(winsockErrorToString(err));
+    throw ArchNetworkSupportException(windowsErrorToString(err));
   }
   if (err != 0) {
     // some other initialization error
@@ -819,12 +819,12 @@ bool ArchNetworkWinsock::isEqualAddr(ArchNetAddress a, ArchNetAddress b)
 {
   switch (err) {
   case WSAEACCES:
-    throw ArchNetworkAccessException(winsockErrorToString(err));
+    throw ArchNetworkAccessException(windowsErrorToString(err));
 
   case WSAEMFILE:
   case WSAENOBUFS:
   case WSAENETDOWN:
-    throw ArchNetworkResourceException(winsockErrorToString(err));
+    throw ArchNetworkResourceException(windowsErrorToString(err));
 
   case WSAEPROTOTYPE:
   case WSAEPROTONOSUPPORT:
@@ -838,50 +838,50 @@ bool ArchNetworkWinsock::isEqualAddr(ArchNetAddress a, ArchNetAddress b)
   case WSANOTINITIALISED:
   case WSAVERNOTSUPPORTED:
   case WSASYSNOTREADY:
-    throw ArchNetworkSupportException(winsockErrorToString(err));
+    throw ArchNetworkSupportException(windowsErrorToString(err));
 
   case WSAEADDRNOTAVAIL:
-    throw ArchNetworkNoAddressException(winsockErrorToString(err));
+    throw ArchNetworkNoAddressException(windowsErrorToString(err));
 
   case WSAEADDRINUSE:
-    throw ArchNetworkAddressInUseException(winsockErrorToString(err));
+    throw ArchNetworkAddressInUseException(windowsErrorToString(err));
 
   case WSAEHOSTUNREACH:
   case WSAENETUNREACH:
-    throw ArchNetworkNoRouteException(winsockErrorToString(err));
+    throw ArchNetworkNoRouteException(windowsErrorToString(err));
 
   case WSAENOTCONN:
-    throw ArchNetworkNotConnectedException(winsockErrorToString(err));
+    throw ArchNetworkNotConnectedException(windowsErrorToString(err));
 
   case WSAEDISCON:
-    throw ArchNetworkShutdownException(winsockErrorToString(err));
+    throw ArchNetworkShutdownException(windowsErrorToString(err));
 
   case WSAENETRESET:
   case WSAECONNABORTED:
   case WSAECONNRESET:
-    throw ArchNetworkDisconnectedException(winsockErrorToString(err));
+    throw ArchNetworkDisconnectedException(windowsErrorToString(err));
 
   case WSAECONNREFUSED:
-    throw ArchNetworkConnectionRefusedException(winsockErrorToString(err));
+    throw ArchNetworkConnectionRefusedException(windowsErrorToString(err));
 
   case WSAEHOSTDOWN:
   case WSAETIMEDOUT:
-    throw ArchNetworkTimedOutException(winsockErrorToString(err));
+    throw ArchNetworkTimedOutException(windowsErrorToString(err));
 
   case WSAHOST_NOT_FOUND:
-    throw ArchNetworkNameUnknownException(winsockErrorToString(err));
+    throw ArchNetworkNameUnknownException(windowsErrorToString(err));
 
   case WSANO_DATA:
-    throw ArchNetworkNameNoAddressException(winsockErrorToString(err));
+    throw ArchNetworkNameNoAddressException(windowsErrorToString(err));
 
   case WSANO_RECOVERY:
-    throw ArchNetworkNameFailureException(winsockErrorToString(err));
+    throw ArchNetworkNameFailureException(windowsErrorToString(err));
 
   case WSATRY_AGAIN:
-    throw ArchNetworkNameUnavailableException(winsockErrorToString(err));
+    throw ArchNetworkNameUnavailableException(windowsErrorToString(err));
 
   default:
-    throw ArchNetworkException(winsockErrorToString(err));
+    throw ArchNetworkException(windowsErrorToString(err));
   }
 }
 
@@ -889,18 +889,18 @@ bool ArchNetworkWinsock::isEqualAddr(ArchNetAddress a, ArchNetAddress b)
 {
   switch (err) {
   case WSAHOST_NOT_FOUND:
-    throw ArchNetworkNameUnknownException(winsockErrorToString(err));
+    throw ArchNetworkNameUnknownException(windowsErrorToString(err));
 
   case WSANO_DATA:
-    throw ArchNetworkNameNoAddressException(winsockErrorToString(err));
+    throw ArchNetworkNameNoAddressException(windowsErrorToString(err));
 
   case WSANO_RECOVERY:
-    throw ArchNetworkNameFailureException(winsockErrorToString(err));
+    throw ArchNetworkNameFailureException(windowsErrorToString(err));
 
   case WSATRY_AGAIN:
-    throw ArchNetworkNameUnavailableException(winsockErrorToString(err));
+    throw ArchNetworkNameUnavailableException(windowsErrorToString(err));
 
   default:
-    throw ArchNetworkNameException(winsockErrorToString(err));
+    throw ArchNetworkNameException(windowsErrorToString(err));
   }
 }

src/lib/arch/win32/XArchWindows.cpp

@@ -30,192 +30,7 @@ QString windowsErrorToQString(DWORD error)
   return QString("[%1] %2").arg(error).arg(message.trimmed());
 }
 
-QString winsockErrorToQString(int error)
-{
-  // built-in windows function for looking up error message strings
-  // may not look up network error messages correctly.  we'll have
-  // to do it ourself.
-  static const struct
-  {
-    int m_code;
-    const char *m_msg;
-  }
-
-  s_netErrorCodes[] = {
-
-      // 10004
-      {WSAEINTR, "The (blocking) call was canceled via WSACancelBlockingCall"},
-
-      // 10009
-      {WSAEBADF, "Bad file handle"},
-
-      // 10013
-      {WSAEACCES, "The requested address is a broadcast address, but the appropriate flag was not set"},
-
-      // 10014
-      {WSAEFAULT, "WSAEFAULT"},
-
-      // 10022
-      {WSAEINVAL, "WSAEINVAL"},
-
-      // 10024
-      {WSAEMFILE, "No more file descriptors available"},
-
-      // 10035
-      {WSAEWOULDBLOCK,
-       "Socket is marked as non-blocking and no connections are present or the receive operation would block"},
-
-      // 10036
-      {WSAEINPROGRESS, "A blocking Windows Sockets operation is in progress"},
-
-      // 10037
-      {WSAEALREADY, "The asynchronous routine being canceled has already completed"},
-
-      // 10038
-      {WSAENOTSOCK, "At least on descriptor is not a socket"},
-
-      // 10039
-      {WSAEDESTADDRREQ, "A destination address is required"},
-
-      // 10040
-      {WSAEMSGSIZE, "The datagram was too large to fit into the specified buffer and was truncated"},
-
-      // 10041
-      {WSAEPROTOTYPE, "The specified protocol is the wrong type for this socket"},
-
-      // 10042
-      {WSAENOPROTOOPT, "The option is unknown or unsupported"},
-
-      // 10043
-      {WSAEPROTONOSUPPORT, "The specified protocol is not supported"},
-
-      // 10044
-      {WSAESOCKTNOSUPPORT, "The specified socket type is not supported by this address family"},
-
-      // 10045
-      {WSAEOPNOTSUPP, "The referenced socket is not a type that supports that operation"},
-
-      // 10046
-      {WSAEPFNOSUPPORT, "BSD: Protocol family not supported"},
-
-      // 10047
-      {WSAEAFNOSUPPORT, "The specified address family is not supported"},
-
-      // 10048
-      {WSAEADDRINUSE, "The specified address is already in use"},
-
-      // 10049
-      {WSAEADDRNOTAVAIL, "The specified address is not available from the local machine"},
-
-      // 10050
-      {WSAENETDOWN, "The Windows Sockets implementation has detected that the network subsystem has failed"},
-
-      // 10051
-      {WSAENETUNREACH, "The network can't be reached from this host at this time"},
-
-      // 10052
-      {WSAENETRESET, "The connection must be reset because the Windows Sockets implementation dropped it"},
-
-      // 10053
-      {WSAECONNABORTED, "The virtual circuit was aborted due to timeout or other failure"},
-
-      // 10054
-      {WSAECONNRESET, "The virtual circuit was reset by the remote side"},
-
-      // 10055
-      {WSAENOBUFS, "No buffer space is available or a buffer deadlock has occurred. The socket cannot be created"},
-
-      // 10056
-      {WSAEISCONN, "The socket is already connected"},
-
-      // 10057
-      {WSAENOTCONN, "The socket is not connected"},
-
-      // 10058
-      {WSAESHUTDOWN, "The socket has been shutdown"},
-
-      // 10059
-      {WSAETOOMANYREFS, "BSD: Too many references"},
-
-      // 10060
-      {WSAETIMEDOUT, "Attempt to connect timed out without establishing a connection"},
-
-      // 10061
-      {WSAECONNREFUSED, "Connection was refused"},
-
-      // 10062
-      {WSAELOOP, "Undocumented WinSock error code used in BSD"},
-
-      // 10063
-      {WSAENAMETOOLONG, "Undocumented WinSock error code used in BSD"},
-
-      // 10064
-      {WSAEHOSTDOWN, "Undocumented WinSock error code used in BSD"},
-
-      // 10065
-      {WSAEHOSTUNREACH, "No route to host"},
-
-      // 10066
-      {WSAENOTEMPTY, "Undocumented WinSock error code"},
-
-      // 10067
-      {WSAEPROCLIM, "Undocumented WinSock error code"},
-
-      // 10068
-      {WSAEUSERS, "Undocumented WinSock error code"},
-
-      // 10069
-      {WSAEDQUOT, "Undocumented WinSock error code"},
-
-      // 10070
-      {WSAESTALE, "Undocumented WinSock error code"},
-
-      // 10071
-      {WSAEREMOTE, "Undocumented WinSock error code"},
-
-      // 10091
-      {WSASYSNOTREADY, "Underlying network subsytem is not ready for network communication"},
-
-      // 10092
-      {WSAVERNOTSUPPORTED, "The version of WinSock API support requested is not provided in this implementation"},
-
-      // 10093
-      {WSANOTINITIALISED, "WinSock subsystem not properly initialized"},
-
-      // 10101
-      {WSAEDISCON, "Virtual circuit has gracefully terminated connection"},
-
-      // 11001
-      {WSAHOST_NOT_FOUND, "The specified host is unknown"},
-
-      // 11002
-      {WSATRY_AGAIN, "A temporary error occurred on an authoritative name server"},
-
-      // 11003
-      {WSANO_RECOVERY, "A non-recoverable name server error occurred"},
-
-      // 11004
-      {WSANO_DATA, "The requested name is valid but does not have an IP address"},
-
-      // end
-      {0, nullptr}
-  };
-
-  for (unsigned int i = 0; s_netErrorCodes[i].m_code != 0; ++i) {
-    if (s_netErrorCodes[i].m_code == error) {
-      return QString("[%1] %2").arg(error).arg(s_netErrorCodes[i].m_msg);
-    }
-  }
-
-  return QString("Unknown Winsock error: %1").arg(error);
-}
-
 std::string windowsErrorToString(DWORD error)
 {
   return windowsErrorToQString(error).toStdString();
 }
-
-std::string winsockErrorToString(int error)
-{
-  return winsockErrorToQString(error).toStdString();
-}

src/lib/arch/win32/XArchWindows.h

@@ -14,7 +14,5 @@
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
-QString winsockErrorToQString(int error);
 QString windowsErrorToQString(DWORD error);
-std::string winsockErrorToString(int error);
 std::string windowsErrorToString(DWORD error);

src/lib/base/CMakeLists.txt

@@ -1,6 +1,6 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
 add_library(base STATIC
@@ -27,8 +27,6 @@ add_library(base STATIC
   Log.h
   LogLevel.h
   NetworkProtocol.h
-  Path.cpp
-  Path.h
   PriorityQueue.h
   SimpleEventQueueBuffer.cpp
   SimpleEventQueueBuffer.h

src/lib/base/DirectionTypes.h

@@ -11,20 +11,20 @@
 #include <cstdint>
 
 /**
- * @brief Screen edge directions for mouse movement
+ * @brief Computer edge directions for mouse movement
  *
- * Used to specify which edge of a screen the mouse cursor crosses
+ * Used to specify which edge of a computer the mouse cursor crosses
- * when moving between primary and secondary screens.
+ * when moving between primary and secondary computers.
  *
  * @since Protocol version 1.0
  */
 enum class Direction : uint8_t
 {
   NoDirection,                                                             ///< No specific direction
-  Left,                                                                    ///< Left edge of screen
+  Left,                                                                    ///< Left edge of computer
-  Right,                                                                   ///< Right edge of screen
+  Right,                                                                   ///< Right edge of computer
-  Top,                                                                     ///< Top edge of screen
+  Top,                                                                     ///< Top edge of computer
-  Bottom,                                                                  ///< Bottom edge of screen
+  Bottom,                                                                  ///< Bottom edge of computer
   FirstDirection = Direction::Left,                                        ///< First valid direction value
   LastDirection = Direction::Bottom,                                       ///< Last valid direction value
   NumDirections = Direction::LastDirection - Direction::FirstDirection + 1 ///< Total number of directions

src/lib/base/EventQueue.cpp

@@ -1,6 +1,6 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
+ * SPDX-FileCopyrightText: (C) 2025 - 2026 Deskflow Developers
  * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
  * SPDX-FileCopyrightText: (C) 2004 Chris Schoeneman
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
@@ -9,6 +9,7 @@
 #include "base/EventQueue.h"
 
 #include "arch/Arch.h"
+#include "base/EventQueueTimer.h"
 #include "base/Log.h"
 #include "base/SimpleEventQueueBuffer.h"
 #include "mt/Lock.h"
@@ -213,7 +214,7 @@ EventQueueTimer *EventQueue::newTimer(double duration, void *target)
 {
   assert(duration > 0.0);
 
-  EventQueueTimer *timer = m_buffer->newTimer(duration, false);
+  auto timer = new EventQueueTimer;
   if (target == nullptr) {
     target = timer;
   }
@@ -230,7 +231,7 @@ EventQueueTimer *EventQueue::newOneShotTimer(double duration, void *target)
 {
   assert(duration > 0.0);
 
-  EventQueueTimer *timer = m_buffer->newTimer(duration, true);
+  auto timer = new EventQueueTimer;
   if (target == nullptr) {
     target = timer;
   }
@@ -255,7 +256,7 @@ void EventQueue::deleteTimer(EventQueueTimer *timer)
   if (Timers::iterator index = m_timers.find(timer); index != m_timers.end()) {
     m_timers.erase(index);
   }
-  m_buffer->deleteTimer(timer);
+  delete timer;
 }
 
 void EventQueue::addHandler(EventTypes type, void *target, const EventHandler &handler)

src/lib/base/EventTypes.h

@@ -91,6 +91,11 @@ enum class EventTypes : uint32_t
   /// This event is sent whenever a server accepts a client.
   ClientListenerAccepted,
 
+  /**  This event is sent whenever a client disconnects/errors out before the connection
+       is fully accepted.
+  */
+  ClientListenerDisconnectedOnAccept,
+
   /** This event is sent when the client has completed the initial handshake.  Until it is sent,
       the client is not fully connected.
   */
@@ -111,23 +116,23 @@ enum class EventTypes : uint32_t
   */
   ClientProxyUnknownFailure,
 
-  /** This event is sent when a client screen has connected.
+  /** This event is sent when a client computer has connected.
-      The event data is a pointer to ScreenConnectedInfo that indicates the connected screen.
+      The event data is a pointer to ScreenConnectedInfo that indicates the connected computer.
   */
   ServerConnected,
 
   /// This is event sent when all the clients have disconnected.
   ServerDisconnected,
 
-  /** This event is sent to inform the server to switch screens.
+  /** This event is sent to inform the server to switch computers.
-      The event data is a pointer to SwitchToScreenInfo that indicates the target screen.
+      The event data is a pointer to SwitchToScreenInfo that indicates the target computer.
   */
   ServerSwitchToScreen,
 
-  /// This event is sent to inform the server to toggle screens.  These is no event data.
+  /// This event is sent to inform the server to toggle computers.  These is no event data.
   ServerToggleScreen,
 
-  /** This event is sent to inform the server to switch screens.
+  /** This event is sent to inform the server to switch computers.
       The event data is a pointer to SwitchInDirectionInfo that indicates the target direction.
   */
   ServerSwitchInDirection,
@@ -137,12 +142,12 @@ enum class EventTypes : uint32_t
   */
   ServerKeyboardBroadcast,
 
-  /** This event is sent to inform the server to lock the cursor to the active screen or to
+  /** This event is sent to inform the server to lock the cursor to the active computer or to
       unlock it. The event data is a pointer to LockCursorToScreenInfo.
   */
   ServerLockCursorToScreen,
 
-  /// This event is sent when the screen has been switched to a client.
+  /// This event is sent when the computer has been switched to a client.
   ServerScreenSwitched,
 
   ServerAppReloadConfig,
@@ -162,12 +167,12 @@ enum class EventTypes : uint32_t
   /// This event is sent when button is up. Event data is a pointer to ButtonInfo
   PrimaryScreenButtonUp,
 
-  /** This event is sent when mouse moves on primary screen.
+  /** This event is sent when mouse moves on the server.
       Event data is a pointer to MotionInfo, the values are absolute position.
   */
   PrimaryScreenMotionOnPrimary,
 
-  /** This event is sent when mouse moves on secondary screen.
+  /** This event is sent when mouse moves on a client.
       Event data is a pointer to MotionInfo, the values are relative motion deltas.
   */
   PrimaryScreenMotionOnSecondary,
@@ -193,12 +198,12 @@ enum class EventTypes : uint32_t
   /// This event is sent when fake input ends.
   PrimaryScreenFakeInputEnd,
 
-  /** This event is sent whenever the screen has failed for some reason (e.g. the X Windows
+  /** This event is sent whenever the computer has failed for some reason (e.g. the X Windows
       server died).
   */
   ScreenError,
 
-  /// This event is sent whenever the screen's shape changes.
+  /// This event is sent whenever the computer's display shape changes.
   ScreenShapeChanged,
 
   /** This event is sent whenever the system goes to sleep or a user session is deactivated (fast
@@ -224,9 +229,10 @@ enum class EventTypes : uint32_t
   /// This event is sent whenever a clipboard chunk is transferred.
   ClipboardSending,
 
-  /// Start libEI
+  /// Start libei
   EIConnected,
-  /// Stop libEi
+
-  EISessionClosed
+  /// Stop libei
+  EISessionClosed,
 };
 } // namespace deskflow

src/lib/base/IEventQueueBuffer.h

@@ -65,29 +65,9 @@ public:
   */
   virtual bool addEvent(uint32_t dataID) = 0;
 
-  //@}
-  //! @name accessors
-  //@{
-
   //! Check if event queue buffer is empty
   /*!
   Return true iff the event queue buffer  is empty.
   */
   virtual bool isEmpty() const = 0;
-
-  //! Create a timer object
-  /*!
-  Create and return a timer object.  The object is opaque and is
-  used only by the buffer but it must be a valid object (i.e.
-  not nullptr).
-  */
-  virtual EventQueueTimer *newTimer(double duration, bool oneShot) const = 0;
-
-  //! Destroy a timer object
-  /*!
-  Destroy a timer object previously returned by \c newTimer().
-  */
-  virtual void deleteTimer(EventQueueTimer *) const = 0;
-
-  //@}
 };

src/lib/base/Log.cpp

@@ -24,11 +24,10 @@
 const int kPriorityPrefixLength = 3;
 
 // names of priorities
-static const char *g_priority[] = {"FATAL",  "ERROR",  "WARNING", "NOTE",   "INFO",  "DEBUG",
+static const char *g_priority[] = {"FATAL", "ERROR", "WARNING", "NOTE", "INFO", "DEBUG", "DEBUG1", "DEBUG2"};
-                                   "DEBUG1", "DEBUG2", "DEBUG3",  "DEBUG4", "DEBUG5"};
 
 // number of priorities
-static const int g_numPriority = 11;
+static const int g_numPriority = 8;
 
 // if NDEBUG (not debug) is not specified, i.e. you're building in debug,
 // then set default log level to DEBUG, otherwise the max level is INFO.

src/lib/base/Log.h

@@ -209,9 +209,6 @@ otherwise it expands to a call that doesn't.
 #define CLOG_DEBUG CLOG_TRACE "%z\065"
 #define CLOG_DEBUG1 CLOG_TRACE "%z\066"
 #define CLOG_DEBUG2 CLOG_TRACE "%z\067"
-#define CLOG_DEBUG3 CLOG_TRACE "%z\070"
-#define CLOG_DEBUG4 CLOG_TRACE "%z\071" // char is '9'
-#define CLOG_DEBUG5 CLOG_TRACE "%z\072" // char is ':'
 
 #define LOG_IPC(...) LOG((CLOG_IPC __VA_ARGS__))
 #define LOG_PRINT(...) LOG((CLOG_PRINT __VA_ARGS__))
@@ -223,6 +220,3 @@ otherwise it expands to a call that doesn't.
 #define LOG_DEBUG(...) LOG((CLOG_DEBUG __VA_ARGS__))
 #define LOG_DEBUG1(...) LOG((CLOG_DEBUG1 __VA_ARGS__))
 #define LOG_DEBUG2(...) LOG((CLOG_DEBUG2 __VA_ARGS__))
-#define LOG_DEBUG3(...) LOG((CLOG_DEBUG3 __VA_ARGS__))
-#define LOG_DEBUG4(...) LOG((CLOG_DEBUG4 __VA_ARGS__))
-#define LOG_DEBUG5(...) LOG((CLOG_DEBUG5 __VA_ARGS__))