Release 1.25.0

this is currently based on wl-copy/wl-paste.
One could probably just implement wl-copy/wl-paste without adding much
complexity and better performance.

Co-authored-by: KoljaFrahm <GitHub.Kolja@dfgh.net>

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# Apply to all files
+* @nbolton @sithlord48

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -4,24 +4,24 @@ type: "Triage [bug]"
 body:
   - type: markdown
     attributes:
-      value: Thanks for taking the time to help us improve Deskflow.
+      value: |
+        Thanks for taking the time to help us improve Deskflow.
 
-  - type: dropdown
-    id: project
+  - type: checkboxes
+    id: sanity-checks
     attributes:
-      label: Project
-      description: Are you using Deskflow or a fork/derivative?
+      label: Sanity checks
+      description: |
+        Before reporting a bug, please first:
+        1. Try the latest [continuous build](https://github.com/deskflow/deskflow/releases).
+        2. Wayland users, please review the [known issues](https://github.com/deskflow/deskflow/discussions/7499).
+        3. macOS users, if the app crashes, try [Apple's solution](https://support.apple.com/guide/mac-help/open-a-mac-app-from-an-unknown-developer-mh40616/mac).
       options:
-        # Empty option to force selection
-        -
-        - Deskflow
-        - Barrier
-        - Input Leap
-        - Synergy
-      default: 0
+        - label: I have done the sanity checks, and my issue persists
+        - label: These sanity checks are not relevant to the bug
     validations:
       required: true
-
+      
   - type: textarea
     id: version
     attributes:
@@ -66,60 +66,21 @@ body:
     validations:
       required: true
 
-  - type: checkboxes
-    id: linux-wayland
-    attributes:
-      label: Wayland on Linux
-      description: If using Wayland on Linux, please review the [known issues](https://github.com/deskflow/deskflow/discussions/7499) before reporting.
-      options:
-        - label: I have reviewed the Wayland [known issues](https://github.com/deskflow/deskflow/discussions/7499) and my issue is new
-        - label: I am not using Wayland on Linux
-
-  - type: checkboxes
-    id: mac-signing
-    attributes:
-      label: Signing on macOS
-      description: If using macOS and the app crashes, try [Apple's solution](https://support.apple.com/guide/mac-help/open-a-mac-app-from-an-unknown-developer-mh40616/mac) before reporting.
-      options:
-        - label: I have authorized the app to run on my Mac
-        - label: I am not using macOS
-
-  - type: checkboxes
-    id: continuous-build
-    attributes:
-      label: Continuous build
-      description: Please try the latest [continuous build](https://github.com/deskflow/deskflow/releases) of Deskflow. It may have a fix for your issue.
-      options:
-        - label: I have tried the latest continuous build and the issue persists
-        - label: I am unable to try the latest continuous build
-
-  - type: textarea
-    id: os-version
-    attributes:
-      label: OS versions/distros
-      description: |
-        Please provide the version number of your operating system (OS).
-        If you're using Linux, please provide the name of the distribution.
-      placeholder: |
-        - Windows 11
-        - macOS 15
-        - Ubuntu 24.04
-        - FreeBSD 14.0
-    validations:
-      required: true
-
   - type: textarea
     id: config
     attributes:
       label: Deskflow configuration
       description: |
         Please provide a very brief description of your configuration.
-        Let us know what OS your server and client are running.
+        Let us know what OS your server and client are running, including all OS versions.
+        If you're using Linux, please provide the name of the distribution.
       placeholder: |
         - Windows 11 server, macOS 15 client
         - Each computer has a single monitor
         - Windows is on the left, macOS is on the right
-
+    validations:
+      required: true
+      
   - type: textarea
     id: repro-steps
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,11 @@
 blank_issues_enabled: false
+contact_links:
+  - name: Ask a question
+    url: https://github.com/deskflow/deskflow/discussions/new?category=q-a
+    about: Where to ask general questions.
+  - name: Show and Tell
+    url: https://github.com/deskflow/deskflow/discussions/new?category=show-and-tell
+    about: Show off things you have done with Deskflow
+  - name: Chat with us
+    url: https://matrix.to/#/#deskflow:matrix.org
+    about: Join us in live chat.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -14,3 +14,14 @@ body:
         Please describe the feature you have in mind.
     validations:
       required: true
+
+  - type: textarea
+    id: votes
+    attributes:
+      label: Voting Instructions
+      description: Do not modify these instructions
+      value: |
+        React with :+1: or :-1: to vote on this request
+    validations:
+      required: true
+

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

@@ -38,26 +38,22 @@ 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 libtomlplusplus-dev libcli11-dev \
-                help2man -y >/dev/null
+                libei-dev libportal-dev help2man -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 tomlplusplus-devel \
-                cli11-devel help2man
+              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
             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 gtk3-devel \
-                googletest-devel googlemock-devel libei-devel \
-                libportal-devel tomlplusplus-devel cli11-devel help2man
+                glib2-devel libXtst-devel libxkbfile-devel qt6-base-devel qt6-tools-devel \
+                qt6-linguist-devel gtk3-devel \
+                googletest-devel googlemock-devel libei-devel libportal-devel help2man
             elif [ ${{ inputs.like }} == "arch" ]; then
               pacman -Syu --noconfirm base-devel cmake ninja \
                 gcc openssl glib2 libxtst libxkbfile gtest libei libportal \
-                qt6-base qt6-tools qt6-svg gtk3 tomlplusplus cli11 help2man doxygen graphviz rsync
+                qt6-base qt6-tools qt6-svg qt6-translations qt6-declarative gtk3 help2man doxygen graphviz rsync
             else
               echo "Unknown like"
             fi
@@ -85,6 +81,7 @@ runs:
         extra-args: --classic --host-triplet=${{inputs.vcpkg-triplet}}
         triplet: ${{inputs.vcpkg-triplet}}
         token: ${{ github.token }}
+        revision: master
 
     - name: Install Wix
       if: ${{ runner.os == 'Windows' }}

.github/actions/lint-clang/action.yml

@@ -1,5 +1,5 @@
-name: "Lint Check"
-description: "Checks for lint errors and posts a helpful comment"
+name: "Lint Clang"
+description: "Checks for Clang lint errors and posts a helpful comment"
 
 runs:
   using: "composite"
@@ -48,8 +48,10 @@ runs:
       run: |
         code_block="\`\`\`"
 
-        summary=$(cat<<EOF
-        ❌ \`clang-format\`: It looks like your changes don't match our code style.
+        clang_version=$(clang-format --version | sed -n 's/^.*version //p')
+
+        summary=$(cat <<EOF
+        ❌ \`clang-format\` \`v${clang_version}\`: It looks like your changes don't match our code style.
 
         🛠️ Please either run \`clang-format -i\` on the file or apply this patch with \`git apply\`:
 
@@ -57,12 +59,21 @@ runs:
         $code_block diff
         ${{ steps.changes.outputs.diff }}
         $code_block
+
+        Hint: Install the right version of \`clang-format\`, e.g.: \`pipx install --global clang-format==${clang_version}\`
         EOF
         )
         echo "$summary" >> $GITHUB_STEP_SUMMARY
 
-        file="ci_summary.md"
-        echo "❌🛠️ \`clang-format\`: Lint errors, fix available." >> $file
+        pr_comment=$(cat <<EOF
+        ### Lint result
+        
+        $summary
+        EOF
+        )
+
+        file="ci-summary.md"
+        echo "$pr_comment" | tee $file
         echo "file=$file" >> $GITHUB_OUTPUT
       shell: bash
 

.github/actions/run-tests/action.yml

@@ -16,7 +16,7 @@ runs:
 
   steps:
     - name: Unit Tests
-      id: unittests
+      id: unit-tests
       env:
         QT_QPA_PLATFORM: offscreen
       run: |
@@ -30,7 +30,7 @@ runs:
       continue-on-error: true
 
     - name: Legacy Tests
-      id: legacytests
+      id: legacy-tests
       env:
         QT_QPA_PLATFORM: offscreen
       run: |
@@ -48,12 +48,12 @@ runs:
       run: |
         pass="✅ Pass"
         fail="❌ Fail"
-        unittests_outcome="${{ steps.unittests.outcome }}"
-        legacytests_outcome="${{ steps.legacytests.outcome }}"
-        unittests=$( [ "$unittests_outcome" = "success" ] && echo $pass || echo $fail )
-        legacytests=$( [ "$legacytests_outcome" = "success" ] && echo $pass || echo $fail )
-        echo "unittests=$unittests" >> $GITHUB_OUTPUT
-        echo "legacytests=$legacytests" >> $GITHUB_OUTPUT
+        unit_tests_outcome="${{ steps.unit-tests.outcome }}"
+        legacy_tests_outcome="${{ steps.legacy-tests.outcome }}"
+        unit_tests=$( [ "$unit_tests_outcome" = "success" ] && echo $pass || echo $fail )
+        legacy_tests=$( [ "$legacy_tests_outcome" = "success" ] && echo $pass || echo $fail )
+        echo "unit-tests=$unit_tests" >> $GITHUB_OUTPUT
+        echo "legacy-tests=$legacy_tests" >> $GITHUB_OUTPUT
       shell: bash
 
     - name: Summary row
@@ -63,8 +63,8 @@ runs:
 
         row=""
         row+="| ${{ inputs.job }} "
-        row+="| ${{ steps.results.outputs.unittests }} "
-        row+="| ${{ steps.results.outputs.legacytests }} "
+        row+="| ${{ steps.results.outputs.unit-tests }} "
+        row+="| ${{ steps.results.outputs.legacy-tests }} "
         echo "$row" > $file
 
         echo "file=$file" > $GITHUB_OUTPUT
@@ -77,7 +77,7 @@ runs:
         path: ${{ steps.row.outputs.file }}
 
     - name: Check test outcome
-      if: (steps.unittests.outcome != 'success' || steps.legacytests.outcome != 'success')
+      if: (steps.unit-tests.outcome != 'success' || steps.legacy-tests.outcome != 'success')
       run: |
         echo "Tests failed"
         exit 1

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

@@ -28,8 +28,7 @@ runs:
         # Builds a markdown table from the row artifacts.
 
         header=$(cat <<EOF
-        # Test results
-        | Job name | Unit tests | Integration tests |
+        | OS | Unit tests | Legacy tests |
         | --- | --- | --- |
         EOF
         )
@@ -57,15 +56,25 @@ runs:
         if [ -z "$table" ]; then
           echo "No test results found" | tee $GITHUB_STEP_SUMMARY >&2
           exit 1
-        else
-          echo "$table" > $GITHUB_STEP_SUMMARY
         fi
 
-        count=$(echo "$table" | awk -v RS='' '{gsub(/[^❌]/, ""); print length}')
-        file="ci-summary.md"
+        echo "$table" > $GITHUB_STEP_SUMMARY
 
+        count=$(echo "$table" | awk -v RS='' '{gsub(/[^❌]/, ""); print length}')
+
+        # Keep at this indentation level for heredoc.
+        fail_summary=$(cat <<EOF
+        ### Test result
+        
+        ❌🔬 Tests failed: $count
+        
+        $table
+        EOF
+        )
+
+        file="ci-summary.md"
         if [ $count -gt 0 ]; then
-          echo "❌🔬 Tests failed: $count" | tee $file
+          echo "$fail_summary" | tee $file
           echo "file=$file" >> $GITHUB_OUTPUT
         else
           # For debugging; don't send success to CI summary (reduce noise).

.github/workflows/ci-comment.yml

@@ -76,7 +76,7 @@ jobs:
             echo "## CI Summary"
 
             for file in $files; do
-              echo $(cat $file)
+              cat $file
             done
 
             echo

.github/workflows/codeql-analysis.yml

@@ -1,42 +1,33 @@
 name: "CodeQL Analysis"
 
-# According to the docs, the CodeQL workflow should be triggered directly by push to master
-# and by pull requests (we only run this on open PRs as it's very slow). We also use the
-# `workflow_dispatch` event is also enabled to allow manual triggering of the workflow for testing.
-#
-# We should not trigger this workflow with `workflow_call` as this causes the error:
-#   "1 configuration present on `master` was not found"
-#
-# Sadly, this means we can't roll it into our monolithic CI workflow.
+# This is best run as a standalone workflow, not as part of another workflow like CI
+# because of how GitHub understands the code scanning workflows in it's UI.
 on:
   workflow_dispatch:
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
-    paths-ignore:
-      - '**/*.md'
-      - '.github/ISSUE_TEMPLATE/**'
-      - '.editorconfig'
-      - '.env-example'
-      - '.gitignore'
-      - '.gitattributes'
-      - 'cspell.json'
+    paths:
+      - '.github/workflows/codeql-analysis.yml'
+      - 'cmake/Libraries.cmake'
+      - 'CMakeLists.txt'
+      - 'src/**'
+      - '!src/res/**'
+      - '!src/unittests/**'
   push:
     branches: [master]
+    paths:
+      - '.github/workflows/codeql-analysis.yml'
+      - 'cmake/Libraries.cmake'
+      - 'CMakeLists.txt'
+      - 'src/**'
+      - '!src/res/**'
+      - '!src/unittests/**'
 
 jobs:
-  analyze:
-    if: ${{ !github.event.pull_request.draft }}
-
-    name: Analyze
+  codeql:
     runs-on: ubuntu-latest
     container: debian:trixie-slim
     timeout-minutes: 20
 
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ["cpp"]
-
     steps:
       - name: Install container dependencies
         run: |
@@ -54,7 +45,7 @@ jobs:
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:
-          languages: ${{ matrix.language }}
+          languages: cpp
 
       - name: Autobuild
         uses: github/codeql-action/autobuild@v3

.github/workflows/continuous-integration.yml

@@ -8,21 +8,8 @@ on:
   push:
     branches: [master]
     tags:
-      - 'v*'
+      - "v*"
   pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
-    paths-ignore:
-      - '**/*.md'
-      - '.github/ISSUE_TEMPLATE/**'
-      - '.editorconfig'
-      - '.env-example'
-      - '.gitignore'
-      - '.gitattributes'
-      - 'cspell.json'
 
 env:
   GIT_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
@@ -31,33 +18,6 @@ env:
   CMAKE_CONFIGURE: "cmake -Bbuild -DCMAKE_BUILD_TYPE=Release -DSKIP_BUILD_TESTS=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON"
 
 jobs:
-  # Always run this job, even if not on PR, since other jobs need it.
-  pr-comment-flags:
-    runs-on: ubuntu-latest
-    needs: lint-check
-
-    outputs:
-      no-sonar: ${{ steps.check.outputs.no-sonar }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Check PR comment for flags
-        if: ${{ github.event_name == 'pull_request' }}
-        id: check
-        env:
-          PR_BODY: ${{ github.event.pull_request.body }}
-        run: |
-          no_sonar="{no-sonar}"
-
-          if echo $PR_BODY | grep -q "$no_sonar"; then
-            echo "Flag $no_sonar found in PR body."
-            echo "no-sonar=true" >> $GITHUB_OUTPUT
-          else
-            echo "No $no_sonar flag found in PR body."
-          fi
-
   # Quality gate to allow PR merge, used in the branch protection rules.
   ci-passed:
     runs-on: ubuntu-latest
@@ -77,47 +37,40 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Test summary
         uses: ./.github/actions/test-summary
 
-  reuse-lint:
+  lint-reuse:
     runs-on: ubuntu-latest
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: REUSE Compliance Check
-        uses: fsfe/reuse-action@v4
+        uses: fsfe/reuse-action@v5
 
-  lint-check:
-    needs: [reuse-lint]
+  lint-clang:
+    needs: [lint-reuse]
     runs-on: ubuntu-latest
     timeout-minutes: 5
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Lint Checker
-        uses: ./.github/actions/lint-check
+        uses: ./.github/actions/lint-clang
 
-  analyse-valgrind:
-    needs: lint-check
+  analyze-valgrind:
+    needs: lint-clang
     if: ${{ github.event_name == 'pull_request' }}
     uses: ./.github/workflows/valgrind-analysis.yml
 
-  analyse-sonarcloud:
-    needs: pr-comment-flags
-    if: ${{ needs.pr-comment-flags.outputs.no-sonar != 'true' }}
-    uses: ./.github/workflows/sonarcloud-analysis.yml
-    secrets:
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-
   main-build:
-    needs: lint-check
+    needs: lint-clang
     name: ${{ matrix.target.name }}
     runs-on: ${{ matrix.target.runs-on }}
     container: ${{ matrix.target.container }}
@@ -133,7 +86,6 @@ jobs:
             runs-on: "windows-2022"
             timeout: 30
             config-args: "-G Ninja"
-            qt-version: 6.9.0
             vcpkg-triplet: x64-windows-release
             arch: "amd64"
 
@@ -141,21 +93,18 @@ jobs:
             runs-on: "windows-11-arm"
             timeout: 30
             config-args: "-G Ninja"
-            qt-version: 6.9.1
             vcpkg-triplet: arm64-windows
             arch: "arm64"
 
-          - name: "macos-14-arm64"
-            runs-on: "macos-14"
+          - name: "macos-arm64"
+            runs-on: macos-15
             timeout: 10
-            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"arm64\" -DCMAKE_OSX_SYSROOT=/Applications/Xcode_15.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
-            qt-version: 6.9.1
+            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-13-x64"
-            runs-on: macos-13
+          - name: "macos-x64"
+            runs-on: macos-15-intel
             timeout: 20
-            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"x86_64\" -DCMAKE_OSX_SYSROOT=/Applications/Xcode_15.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
-            qt-version: 6.9.1
+            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"
             runs-on: ubuntu-latest
@@ -171,6 +120,20 @@ jobs:
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
+          - name: "fedora-43-x86_64"
+            runs-on: ubuntu-latest
+            container: fedora:43
+            like: "fedora"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "fedora-43-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: fedora:43
+            like: "fedora"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
           - name: "fedora-42-x86_64"
             runs-on: ubuntu-latest
             container: fedora:42
@@ -199,7 +162,7 @@ jobs:
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "opensuse-x86_84"
+          - name: "opensuse-x86_64"
             runs-on: ubuntu-latest
             container: opensuse/tumbleweed:latest
             like: "suse"
@@ -213,7 +176,7 @@ jobs:
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "archlinux-x86_84"
+          - name: "archlinux-x86_64"
             runs-on: ubuntu-latest
             container: archlinux:latest
             like: "arch"
@@ -234,24 +197,38 @@ jobs:
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
+          - name: "ubuntu-25.10-x86_64"
+            runs-on: ubuntu-latest
+            container: ubuntu:25.10
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "ubuntu-25.10-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: ubuntu:25.10
+            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
         if: ${{ matrix.target.container }}
         shell: bash
-        run : |
-           if [ "${{matrix.target.like}}" == "debian" ]; then
-             apt update -qqq > /dev/null && apt install -qqq git devscripts > /dev/null
-           elif [ "${{matrix.target.like}}" == "fedora" ]; then
-             dnf install -y git
-           elif [ "${{matrix.target.like}}" == "suse" ]; then
-             zypper refresh
-             zypper install -y --force-resolution git
-           elif [ "${{matrix.target.like}}" == "arch" ]; then
-             pacman -Syu --noconfirm git
-           else
-             echo "Unknown: ${{matrix.target.like}}"
-           fi
+        run: |
+          if [ "${{matrix.target.like}}" == "debian" ]; then
+            apt update -qqq > /dev/null && apt install -qqq git devscripts > /dev/null
+          elif [ "${{matrix.target.like}}" == "fedora" ]; then
+            dnf install -y git
+          elif [ "${{matrix.target.like}}" == "suse" ]; then
+            zypper refresh
+            zypper install -y --force-resolution git
+          elif [ "${{matrix.target.like}}" == "arch" ]; then
+            pacman -Syu --noconfirm git
+          else
+            echo "Unknown: ${{matrix.target.like}}"
+          fi
       # Fancy checkout gets all the tags
       # it also makes sure we can use git --describe correctly
       - name: Fancy Checkout
@@ -265,12 +242,11 @@ jobs:
         with:
           arch: ${{matrix.target.arch}}
 
-
       - name: Install dependencies
         id: get-deps
         uses: ./.github/actions/install-dependencies
         with:
-          qt-version: ${{ matrix.target.qt-version }}
+          qt-version: 6.10.0
           vcpkg-triplet: ${{matrix.target.vcpkg-triplet}}
           like: ${{ matrix.target.like }}
 
@@ -318,7 +294,7 @@ jobs:
 
   # Technically, "unix" is a misnomer, but we use it here to mean "Unix-like BSD-derived".
   unix:
-    needs: lint-check
+    needs: lint-clang
     name: unix-${{ matrix.distro.name }}
     runs-on: ${{ vars.CI_UNIX_RUNNER || 'ubuntu-24.04' }}
     timeout-minutes: 20
@@ -350,7 +326,7 @@ jobs:
             export QT_QPA_PLATFORM=offscreen
             ./build/bin/unittests || true
   flatpak:
-    needs: lint-check
+    needs: lint-clang
     name: flatpak-${{matrix.flatpak.arch}}
     runs-on: ${{matrix.flatpak.runs-on}}
     timeout-minutes: 60
@@ -429,7 +405,7 @@ jobs:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           automatic_release_tag: "continuous"
           prerelease: true
-          title: 'Continuous Build'
+          title: "Continuous v${{env.DESKFLOW_VERSION}}"
           files: |
             deskflow-*
             sums.txt
@@ -443,7 +419,7 @@ jobs:
           files: |
             deskflow-*
             sums.txt
-            
+
   winget-publish:
     needs: release
     if: contains(github.ref, 'tags/v')

.github/workflows/sonarcloud-analysis.yml

@@ -1,14 +1,32 @@
 name: "SonarCloud Analysis"
 
+# This is best run as a standalone workflow, not as part of another workflow like CI
+# because of how GitHub understands the code scanning workflows in it's UI.
 on:
   workflow_dispatch:
-  workflow_call:
-    secrets:
-      SONAR_TOKEN:
-        required: true
+  pull_request:
+    paths:
+      - '.github/workflows/sonarcloud-analysis.yml'
+      - 'sonar-project.properties'
+      - 'cmake/Libraries.cmake'
+      - 'CMakeLists.txt'
+      - 'src/**'
+      - '!src/res/**'
+      - '!src/unittests/**'
+  push:
+    branches: [master]
+    paths:
+      - '.github/workflows/codeql-analysis.yml'
+      - 'cmake/Libraries.cmake'
+      - 'CMakeLists.txt'
+      - 'src/**'
+      - '!src/res/**'
+      - '!src/unittests/**'
 
 jobs:
-  sonarcloud-analysis:
+  sonar:
+    # This job would fail for contributors who open PRs as the workflow runs outside of our repo
+    # in this scenario. Having a var that only we set to true prevents this job from running.
     if: ${{ vars.SONAR_SCANNER_ENABLED }}
 
     runs-on: ubuntu-latest
@@ -16,10 +34,7 @@ jobs:
     timeout-minutes: 20
 
     env:
-      SONAR_SCANNER_VERSION: 6.1.0.4477
-      SONAR_SCANNER_OPTS: -server
-      SONAR_SCANNER_URL_BASE: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli
-      CPU_CORE_COUNT: ${{ vars.SONAR_SCANNER_CPU_COUNT || 4 }}
+      CPU_CORE_COUNT: 4
 
     steps:
       - name: Install container dependencies
@@ -35,8 +50,8 @@ jobs:
         with:
           like: "debian"
 
-      - name: Install sonar-scanner and build-wrapper
-        uses: sonarsource/sonarcloud-github-c-cpp@v3
+      - name: Install Build Wrapper
+        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v6
 
       - name: Configure
         run: |
@@ -71,11 +86,11 @@ jobs:
           fi
           echo "csv=$paths" >> $GITHUB_OUTPUT
 
-      - name: Run SonarScanner
-        run: |
-          export PATH=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux-x64/bin:$PATH
-          sonar-scanner \
-            -Dsonar.coverageReportPaths=${{ steps.coverage-paths.outputs.csv }} \
+      - name: SonarQube Scan
+        uses: SonarSource/sonarqube-scan-action@v6
+        with:
+          args: >
+            -Dsonar.coverageReportPaths=${{ steps.coverage-paths.outputs.csv }}
             -Dsonar.cfamily.threads=${{ env.CPU_CORE_COUNT }}
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.gitignore

@@ -25,6 +25,9 @@ deskflow-config.toml
 /*.user
 *.ui.autosave
 
+#Qt creator 18 user files
+/.qtcreator
+
 # generated vcpkg file
 vcpkg.json
 

CMakeLists.txt

@@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Fallback for when git can not be found
 set(DESKFLOW_VERSION_MAJOR 1)
-set(DESKFLOW_VERSION_MINOR 23)
+set(DESKFLOW_VERSION_MINOR 25)
 set(DESKFLOW_VERSION_PATCH 0)
 set(DESKFLOW_VERSION_TWEAK 0)
 
@@ -39,7 +39,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
       ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
-    if(GIT_TAG_COUNT EQUAL 0)
+    if(${GIT_TAG_COUNT} EQUAL 0)
       set(DESKFLOW_VERSION_TWEAK "9999")
     else()
       execute_process(
@@ -48,8 +48,8 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
         OUTPUT_VARIABLE GITREV
         ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
       )
-      string(FIND ${GITREV} "v" isRev)
-      if(NOT ifRev EQUAL -1)
+      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}")
@@ -82,13 +82,16 @@ project(
   deskflow
   VERSION "${DESKFLOW_VERSION_MAJOR}.${DESKFLOW_VERSION_MINOR}.${DESKFLOW_VERSION_PATCH}.${DESKFLOW_VERSION_TWEAK}"
   DESCRIPTION "Keyboard and mouse sharing utility"
-  LANGUAGES C CXX)
+  HOMEPAGE_URL "https://deskflow.org"
+  LANGUAGES C CXX
+)
 
 # 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_CONTACT "${CMAKE_PROJECT_PROPER_NAME} <maintainers@deskflow.org>")
+set(CMAKE_PROJECT_REV_FQDN "org.deskflow.deskflow")
 
 #Unset the vars used in the project call
 unset(DESKFLOW_VERSION_MAJOR)
@@ -105,6 +108,7 @@ set(REQUIRED_LIBPORTAL_VERSION 0.8)
 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
@@ -144,11 +148,6 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_definitions(-DNDEBUG)
 endif()
 
-# Set required macOS SDK
-if(APPLE)
-  set(CMAKE_OSX_DEPLOYMENT_TARGET 12)
-endif()
-
 # Set Output Folders
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
@@ -157,38 +156,48 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
 # Instead use Q_SIGNAL, Q_SLOT and Q_EMIT
 # prevents issues when used with glib for libportal
 add_definitions(-DQT_NO_KEYWORDS)
-include(cmake/Libraries.cmake)
-include(GNUInstallDirs)
 
+#Options for Linux platform support
+if(UNIX AND NOT APPLE)
+  option(BUILD_X11_SUPPORT "Build with x11 support" ON)
+elseif (APPLE)
+  option(BUILD_OSX_BUNDLE "Build mac os bundle" ON)
+endif()
+
+include(cmake/Libraries.cmake)
 configure_libs()
 
+# setup install paths
+include(GNUInstallDirs)
+if (WIN32)
+  set(CMAKE_INSTALL_BINDIR .)
+  set(CMAKE_INSTALL_LIBDIR .)
+  set(CMAKE_INSTALL_LICENSE_DIR .)
+  set(CMAKE_INSTALL_I18N_DIR translations)
+elseif(BUILD_OSX_BUNDLE)
+  set(CMAKE_INSTALL_BINDIR ${CMAKE_PROJECT_PROPER_NAME}.app/Contents/MacOS)
+  set(CMAKE_INSTALL_LICENSE_DIR ${CMAKE_PROJECT_PROPER_NAME}.app/Contents/Resources)
+else()
+  set(CMAKE_INSTALL_LICENSE_DIR ${CMAKE_INSTALL_DATADIR}/licenses/${CMAKE_PROJECT_NAME})
+  set(CMAKE_INSTALL_I18N_DIR ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/translations)
+endif()
+
 add_subdirectory(doc)
 add_subdirectory(src)
-
-# Install License, License is in the App Bundle on mac os (src/gui)
-if(WIN32)
-  install(
-    FILES ${PROJECT_SOURCE_DIR}/LICENSE
-    DESTINATION .
-  )
-  install(
-    FILES ${PROJECT_SOURCE_DIR}/LICENSES/LicenseRef-OpenSSL-Exception.txt
-    DESTINATION .
-    RENAME LICENSE_EXCEPTION
-  )
-elseif(UNIX AND NOT APPLE)
-  install(
-    FILES ${PROJECT_SOURCE_DIR}/LICENSE
-    DESTINATION share/licenses/deskflow
-  )
-  install(
-    FILES ${PROJECT_SOURCE_DIR}/LICENSES/LicenseRef-OpenSSL-Exception.txt
-    DESTINATION share/licenses/deskflow
-    RENAME LICENSE_EXCEPTION
-  )
-endif()
+add_subdirectory(translations)
 
 option(BUILD_INSTALLER "Build installer" ON)
 if(BUILD_INSTALLER)
     add_subdirectory(deploy)
 endif()
+
+install(
+  FILES ${PROJECT_SOURCE_DIR}/LICENSE
+  DESTINATION ${CMAKE_INSTALL_LICENSE_DIR}
+)
+
+install(
+  FILES ${PROJECT_SOURCE_DIR}/LICENSES/LicenseRef-OpenSSL-Exception.txt
+  DESTINATION ${CMAKE_INSTALL_LICENSE_DIR}
+  RENAME LICENSE_EXCEPTION
+)

README.md

@@ -22,6 +22,11 @@ TLS encryption is enabled by default. Wayland is supported. Clipboard sharing is
 
 [![Downloads: Stable Release](https://img.shields.io/github/downloads/deskflow/deskflow/latest/total?style=for-the-badge&logo=github&label=Download%20Stable)](https://github.com/deskflow/deskflow/releases/latest)      [![Downloads: Continuous Build](https://img.shields.io/github/downloads/deskflow/deskflow/continuous/total?style=for-the-badge&logo=github&label=Download%20Continuous)](https://github.com/deskflow/deskflow/releases/continuous)      [![Download From Flathub](https://img.shields.io/flathub/downloads/org.deskflow.deskflow?style=for-the-badge&logo=flathub&label=Download%20from%20flathub)](https://flathub.org/apps/org.deskflow.deskflow)
 
+> [!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)
+
 > [!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).
 
@@ -59,11 +64,6 @@ 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.
 
-> [!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)
-
 Windows 10 or higher is required.
 
 macOS 12 or higher is required.
@@ -115,11 +115,10 @@ mouse and keyboard sharing tools. We aim for idea sharing and interoperability.
 - [**Lan Mouse**](https://github.com/feschber/lan-mouse) -
   Rust implementation with the goal of having native front-ends and interoperability with
   Deskflow/Synergy.
-- [**Input Leap**](https://github.com/input-leap/input-leap) -
-  Deskflow/Synergy-derivative with the goal of continuing what Barrier started, after Barrier
-  became a dead fork.
 - [**Synergy**](https://symless.com/synergy) -
   Downstream commercial fork. Synergy sponsors Deskflow with financial support and contributes code ([learn more](https://github.com/deskflow/deskflow/wiki/Relationship-with-Synergy)).
+- [**Input Leap**](https://github.com/input-leap/input-leap) -
+  Inactive Deskflow/Synergy-derivative with the goal continuing Barrier development (now a dead fork).
 
 ## FAQ
 

REUSE.toml

@@ -26,8 +26,9 @@ path = [
  , "src/apps/deskflow-server/deskflow-server.exe.manifest"
  , "src/apps/res/manpage.txt"
  , "src/apps/res/deskflow.plist.in"
+ , "src/apps/res/entitlements-dev.plist"
+ , "translations/*.ts"
 ]
-precedence = "override"
 SPDX-FileCopyrightText = "Deskflow Developers"
 SPDX-License-Identifier = "MIT"
 
@@ -35,7 +36,7 @@ SPDX-License-Identifier = "MIT"
 path = [
    "deploy/mac/dmg-background.tiff"
  , "deploy/mac/dmg-volume.icns"
- , "deploy/linux/deskflow.png"
+ , "deploy/linux/org.deskflow.deskflow.png"
  , "deploy/windows/wix-banner.png"
  , "deploy/windows/wix-dialog.png"
  , "src/apps/res/icons/deskflow-**/apps/64/deskflow*.svg"
@@ -44,19 +45,16 @@ path = [
  , "src/apps/res/deskflow.ico"
  , "src/apps/res/deskflow.qrc"
 ]
-precedence = "override"
 SPDX-FileCopyrightText = "Deskflow Developers"
 SPDX-License-Identifier = "GPL-2.0-only"
 
 [[annotations]]
 path = "src/apps/res/icons/deskflow-**/**/**/**.svg"
-precedence = "override"
 SPDX-FileCopyrightText = "Kde Breeze Icons"
 SPDX-License-Identifier = "LGPL-2.1-only"
 
 [[annotations]]
 path = "src/apps/res/icons/deskflow-**/index.theme"
-precedence = "override"
 SPDX-FileCopyrightText = "Chris Rizzitello <sithlord48@gmail.com>"
 SPDX-License-Identifier = "LGPL-2.1-only"
 
@@ -65,6 +63,5 @@ path = [
    "src/lib/gui/MainWindow.ui"
  , "src/lib/gui/dialogs/*.ui"
 ]
-precedence = "override"
 SPDX-FileCopyrightText = "Deskflow Developers"
 SPDX-License-Identifier = "GPL-2.0-only WITH LicenseRef-OpenSSL-Exception"

cmake/Libraries.cmake

@@ -49,6 +49,20 @@ macro(configure_libs)
 
   message(STATUS "Qt version: ${Qt6_VERSION}")
 
+  # Check if <format> header is available
+  check_cxx_source_compiles("
+    #include <format>
+    int main() {
+        char buffer[100];
+        std::format_to_n(buffer, 100, \"test {}\", 42);
+        return 0;
+    }
+    " HAVE_FORMAT)
+
+  if(HAVE_FORMAT)
+    add_definitions(-DHAVE_FORMAT)
+  endif()
+
   option(ENABLE_COVERAGE "Enable test coverage" OFF)
   if(ENABLE_COVERAGE)
     message(STATUS "Enabling code coverage")
@@ -89,6 +103,7 @@ macro(configure_unix_libs)
   include(CheckIncludeFileCXX)
   include(CheckSymbolExists)
   include(CheckCSourceCompiles)
+  include(CheckCXXSourceCompiles)
 
   check_include_files(sys/socket.h HAVE_SYS_SOCKET_H)
   if (NOT HAVE_SYS_SOCKET_H)
@@ -102,30 +117,8 @@ macro(configure_unix_libs)
   endif()
 
   check_function_exists(sigwait HAVE_POSIX_SIGWAIT)
-  check_function_exists(inet_aton HAVE_INET_ATON)
-
-  # For some reason, the check_function_exists macro doesn't detect the
-  # inet_aton on some pure Unix platforms (e.g. sunos5). So we need to do a more
-  # detailed check and also include some extra libs.
-  if(NOT HAVE_INET_ATON)
-    set(CMAKE_REQUIRED_LIBRARIES nsl)
-
-    check_c_source_compiles(
-      "#include <arpa/inet.h>\n int main() { inet_aton (0, 0); }"
-      HAVE_INET_ATON_ADV)
-
-    set(CMAKE_REQUIRED_LIBRARIES)
-
-    if(HAVE_INET_ATON_ADV)
-      # Override the previous fail.
-      set(HAVE_INET_ATON 1)
-
-      # Assume that both nsl and socket will be needed, it seems safe to add
-      # socket on the back of nsl, since socket only ever needed when nsl is
-      # needed.
-      list(APPEND libs nsl socket)
-    endif()
-
+  if (NOT HAVE_POSIX_SIGWAIT)
+    message(FATAL_ERROR "Missing posix sigwait")
   endif()
 
   # pthread is used on both Linux and Mac
@@ -149,10 +142,12 @@ macro(configure_unix_libs)
       ${lib_Foundation} ${lib_Carbon} ${lib_UserNotifications}
     )
 
-    add_definitions(-DWINAPI_CARBON=1 -D_THREAD_SAFE)
+    add_definitions(-DWINAPI_CARBON=1)
   else()
 
-    configure_xorg_libs()
+    if (BUILD_X11_SUPPORT)
+      configure_xorg_libs()
+    endif()
 
     include(FindPkgConfig)
     find_package(PkgConfig)
@@ -162,6 +157,8 @@ macro(configure_unix_libs)
       find_library(LIBM m)
       include_directories(${LIBXKBCOMMON_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS}
                           ${LIBM_INCLUDE_DIRS})
+      
+      message(STATUS "xkbcommon version: ${LIBXKBCOMMON_VERSION}")
     else()
       message(WARNING "pkg-config not found, skipping wayland libraries")
     endif()

cspell.json

@@ -21,6 +21,7 @@
     "dotenv",
     "Evenson",
     "Feder",
+    "Flatpaks",
     "Fourdan",
     "gdrive",
     "Hadzhylov",
@@ -38,6 +39,7 @@
     "Kitware",
     "Kutytska",
     "Lanz",
+    "legacytests",
     "libei",
     "Libera",
     "libportal",
@@ -45,6 +47,7 @@
     "logonui",
     "Lysytsia",
     "macdeployqt",
+    "mojibake",
     "msvc",
     "noquote",
     "NOSONAR",
@@ -76,6 +79,8 @@
     "Serhii",
     "shemp",
     "SNAPPROCESS",
+    "sonarcloud",
+    "sonarqube",
     "Sorin",
     "subproject",
     "subprojects",
@@ -91,7 +96,9 @@
     "Volker",
     "whot",
     "winget",
+    "wismill",
     "writef",
+    "xkbcommon",
     "XWINDOWS"
   ],
   "ignoreWords": [],

deploy/linux/arch/PKGBUILD.in

@@ -2,15 +2,16 @@
 # SPDX-License-Identifier: MIT
 # Maintainer: Deskflow Developers
 
-pkgname=deskflow
+_basename=@CMAKE_PROJECT_NAME@
+pkgname=${_basename}-git
 pkgver=@CMAKE_PROJECT_VERSION@
 pkgrel=1
-pkgdesc="Mouse and keyboard sharing utility"
-url='https://deskflow.org'
+pkgdesc="@CMAKE_PROJECT_DESCRIPTION@"
+url="@CMAKE_PROJECT_HOMEPAGE_URL@"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 license=(LicenseRef-GPL-2.0-only-WITH-OpenSSL-Exception)
 conflicts=('synergy-git' 'synergy-1.6' 'synergy1-bin' 'synergy2-bin' 'synergy3-bin' 'synergy3-beta-bin' 'synergy3-stable-bin' 'barrier' 'barrier-git' 'barrier-headless' 'barrier-headless-git' 'input-leap' 'input-leap-git' 'input-leap-headless-git' 'input-leap-headless' 'waynergy' 'waynergy-git' 'qsynergy' 'slim-synergy' 'quicksynergy' 'deskflow')
-provides=("deskflow-git${pkgver}")
+provides=("$_basename")
 depends=(
   gcc-libs
   glib2
@@ -33,7 +34,7 @@ depends=(
   openssl
   qt6-base
   qt6-svg
-  tomlplusplus
+  qt6-translations
 )
 
 options=('!debug')

deploy/linux/deploy.cmake

@@ -7,21 +7,23 @@ set(MY_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 # Install our desktop file
 install(
-  FILES ${MY_DIR}/org.deskflow.deskflow.desktop
-  DESTINATION share/applications
+  FILES ${MY_DIR}/${CMAKE_PROJECT_REV_FQDN}.desktop
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
 )
 
 # Install our icon
+install(FILES ${MY_DIR}/org.deskflow.deskflow.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/512x512/apps/)
+
+# Install our symbolic icon
 install(
-  FILES ${MY_DIR}/deskflow.png
-  DESTINATION share/icons/hicolor/512x512/apps/
-  RENAME org.deskflow.deskflow.png
+  FILES ${CMAKE_SOURCE_DIR}/src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/symbolic/apps/
 )
 
 # Install our metainfo
 install(
-  FILES ${MY_DIR}/org.deskflow.deskflow.metainfo.xml
-  DESTINATION share/metainfo/
+  FILES ${MY_DIR}/${CMAKE_PROJECT_REV_FQDN}.metainfo.xml
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo/
 )
 
 # Prepare PKGBUILD for Arch Linux
@@ -31,7 +33,6 @@ configure_file(
   @ONLY
 )
 
-
 set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")

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

@@ -17,7 +17,6 @@ cleanup:
   - /lib/cmake
   - /lib/pkgconfig
   - /share/pkgconfig
-  - /share/tomlplusplus
   - /share/cmake
   - /share/doc
   - /share/gir-1.0
@@ -63,22 +62,6 @@ modules:
         commit: 8f5dc8d192f6e31dafe69e35219e3b707bde71ce
       - type: patch
         path: libportal-qt69.patch
-  - name: cli11
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DCLI11_BUILD_TESTS=OFF
-    sources:
-      - type: git
-        url: https://github.com/CLIUtils/CLI11
-        tag: v2.5.0
-        commit: 4160d259d961cd393fd8d67590a8c7d210207348
-  - name: tomlplusplus
-    buildsystem: cmake-ninja
-    sources:
-      - type: git
-        url: https://github.com/marzer/tomlplusplus
-        tag: v3.4.0
-        commit: 30172438cee64926dc41fdd9c11fb3ba5b2ba9de
   - name: gtest
     buildsystem: cmake-ninja
     sources:

deploy/linux/org.deskflow.deskflow.desktop

@@ -11,3 +11,9 @@ Icon=org.deskflow.deskflow
 Terminal=false
 Categories=Utility;
 Keywords=keyboard;mouse;sharing;network;share;
+Name[zh_CN]=Deskflow
+Comment[zh_CN]=键鼠共享工具
+Keywords[zh_CN]=键盘;鼠标;网络;共享;
+Name[ru]=Deskflow
+Comment[ru]=Приложения чтобы использовать одну мышку и клавиатуру с разными устройствами
+Keywords[ru]=Передача;Трансляция;barrier;input-leap;

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

@@ -8,10 +8,14 @@
 		<name>Deskflow Developers</name>
 	</developer>
 	<summary>Software Keyboard and mouse sharing</summary>
+	<summary xml:lang="zh_CN">用软件共享键鼠</summary>
 	<description>
 		<p>
 			Use the keyboard, mouse, or trackpad of one computer to control nearby computers, and work seamlessly between them.
 		</p>
+		<p xml:lang="zh_CN">
+			使用一台计算机的键盘、鼠标或触控板来控制附近的其它计算机，并在它们之间无缝工作。
+		</p>
 	</description>
 	<launchable type="desktop-id">org.deskflow.deskflow.desktop</launchable>
 	<url type="homepage">https://deskflow.org</url>
@@ -22,12 +26,28 @@
 	<url type="contribute">https://github.com/deskflow/deskflow/wiki/Contributing</url>
 	<screenshots>
 		<screenshot type="default">
-			<image>https://deskflow.org/screenshots/deskflow.png</image>
-			<caption>Deskflow's mainwindow on KDE</caption>
+			<image>https://deskflow.org/screenshots/deskflow-client.png</image>
+			<caption>Deskflow in client mode on KDE</caption>
 		</screenshot>
 		<screenshot>
-			<image>https://deskflow.org/screenshots/deskflow-dark.png</image>
-			<caption>Deskflow's mainwindow on KDE (dark mode)</caption>
+			<image>https://deskflow.org/screenshots/deskflow-server.png</image>
+			<caption>Deskflow in server mode on KDE</caption>
+		</screenshot>
+		<screenshot>
+			<image>https://deskflow.org/screenshots/deskflow-log.png</image>
+			<caption>Deskflow with the log visible on KDE</caption>
+		</screenshot>
+		<screenshot>
+			<image>https://deskflow.org/screenshots/deskflow-client-dark.png</image>
+			<caption>Deskflow in client mode on KDE (dark mode)</caption>
+		</screenshot>
+		<screenshot>
+			<image>https://deskflow.org/screenshots/deskflow-server-dark.png</image>
+			<caption>Deskflow in server mode on KDE (dark mode)</caption>
+		</screenshot>
+		<screenshot>
+			<image>https://deskflow.org/screenshots/deskflow-log-dark.png</image>
+			<caption>Deskflow with the log visible on KDE (dark mode)</caption>
 		</screenshot>
 	</screenshots>
 	<provides> <id>org.deskflow.deskflow.desktop</id> </provides>
@@ -35,8 +55,10 @@
 		<category>Utility</category>
 	</categories>
 	<keywords>
-		<keyword translate="no">Input</keyword>
-		<keyword translate="no">Sharing</keyword>
+		<keyword>Input</keyword>
+		<keyword xml:lang="zh_CN">输入</keyword>
+		<keyword>Sharing</keyword>
+		<keyword xml:lang="zh_CN">共享</keyword>
 		<keyword translate="no">KVM</keyword>
 		<keyword translate="no">Synergy</keyword>
 	</keywords>
@@ -46,6 +68,58 @@
 	</branding>
 	<content_rating type="oars-1.0" />
 	<releases>
+		<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>
+				<ul>
+					<li>Removed the ability to use toml config and env based config files</li>
+					<li>Set XDG app ID (app_id) on Wayland</li>
+					<li>Support symbolic icon deployment and recoloring</li>
+					<li>Added Spanish translation</li>
+					<li>Added Italian translation</li>
+					<li>Added Japanese translation</li>
+					<li>Added Simplified Chinese translation</li>
+					<li>Added Russian translation</li>
+					<li>Translate the GUI without needed to restart the application</li>
+					<li>Expose setting to adjust clients scroll speed</li>
+					<li>Expose setting to show the GUI debug messages in the log</li>
+					<li>Expose setting to allow use of wl-clipboard backend on Wayland</li>
+					<li>Fixed the port settings not being used from settings</li>
+					<li>Save the geometry info into a state file</li>
+					<li>The Core (deskflow-core) has a new CLI interface</li>
+					<li>Fixed Wayland sleep inhibit on client</li>
+					<li>Fixed XWindowsScreen: properly calculate xrandr/xinerama screens</li>
+					<li>Fixed XWindowsScreen: stop centering panned screens on client when leaving the screen</li>
+					<li>Fixed stop retying to launch the Core if its crashed</li>
+					<li>Fixed various input issues</li>
+					<li>Fixed apply scroll lock setting on initialization</li>
+					<li>Fixed crash caused by hostnames with invalid characters returned default value</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.25.0</url>
+		</release>
+		<release version="1.24.0" date="2025-09-11" urgency="high">
+			<description>
+				<p>This stable release fixes issues found in the previous version and adds a few new features. This release also uses more C++20 features. For the full changelog, see the release page.</p>
+				<ul>
+					<li>Fix: Less confusing fingerprint comparision dialog.</li>
+					<li>Fix: AltGr and other modifiers are generally detected better.</li>
+					<li>Fix: Big Endian test failures</li>
+					<li>Fix: Client scroll direction being ignored on wayland clients.</li>
+					<li>Feat: Unify deskflow-client and deskflow-server into one binary deskflow-core.</li>
+					<li>Feat: Prevent more than one instance of deskflow-core starting.</li>
+					<li>Feat: Remove defunct --no-xinitthreads option.</li>
+					<li>Feat: Ability to persist remote desktop access</li>
+					<li>Feat: Gui can show all log levels, upgrading users will want to reset their log level as the values have changed</li>
+					<li>Feat: Log can be detached or docked in the window</li>
+					<li>Refactor: Use more icons in places</li>
+					<li>Refactor: Update the Server Config Dialog's GUI</li>
+					<li>Chore: Continue to update codebase to use C++20 features.</li>
+					<li>Chore: Clean more sonar smells</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.24.0</url>
+		</release>
 		<release version="1.23.0" date="2025-07-23" urgency="high">
 			<description>
 				<p>This stable release fixes issues found in the previous version and adds a few new features. This release also uses more C++20 features. For the full changelog, see the release page.</p>

deploy/mac/deploy.cmake

@@ -4,17 +4,20 @@
 # HACK This is set when the files is included so its the real path
 # calling CMAKE_CURRENT_LIST_DIR after include would return the wrong scope var
 set(MY_DIR ${CMAKE_CURRENT_LIST_DIR})
-
-install(CODE "execute_process(COMMAND
-  ${DEPLOYQT}
-  \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_PROJECT_PROPER_NAME}.app\"
-  -timestamp -codesign=-
-)")
+set(OSX_BUNDLE ${BUILD_OSX_BUNDLE})
 
 set(OS_STRING "macos-${BUILD_ARCHITECTURE}")
-set(CPACK_PACKAGE_ICON "${MY_DIR}/dmg-volume.icns")
-set(CPACK_DMG_BACKGROUND_IMAGE "${MY_DIR}/dmg-background.tiff")
-set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${MY_DIR}/generate_ds_store.applescript")
-set(CPACK_DMG_VOLUME_NAME "${CMAKE_PROJECT_PROPER_NAME}")
-set(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE ON)
-set(CPACK_GENERATOR "DragNDrop")
+
+if (OSX_BUNDLE)
+  install(CODE "execute_process(COMMAND
+    ${DEPLOYQT}
+    \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_PROJECT_PROPER_NAME}.app\"
+    -timestamp -codesign=-
+  )")
+  set(CPACK_PACKAGE_ICON "${MY_DIR}/dmg-volume.icns")
+  set(CPACK_DMG_BACKGROUND_IMAGE "${MY_DIR}/dmg-background.tiff")
+  set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${MY_DIR}/generate_ds_store.applescript")
+  set(CPACK_DMG_VOLUME_NAME "${CMAKE_PROJECT_PROPER_NAME}")
+  set(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE ON)
+  set(CPACK_GENERATOR "DragNDrop")
+endif()

deploy/windows/deploy.cmake

@@ -6,7 +6,7 @@
 set(MY_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
-set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .)
+set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${CMAKE_INSTALL_LIBDIR})
 include(InstallRequiredSystemLibraries)
 
 configure_file(${MY_DIR}/pre-cpack.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pre-cpack.cmake @ONLY)

deploy/windows/wix-patch.xml.in

@@ -20,12 +20,9 @@
     <RemoveFile Id="RmOldLog" On="install" Name="deskflow-daemon.log"/>
   </CPackWiXFragment>
 
-  <CPackWiXFragment Id="CM_CP_deskflow_server.exe">
-    <firewall:FirewallException Id="ServerFirewallException" Name="Deskflow Server" Program="[INSTALL_ROOT]deskflow-server.exe" Scope="any"/>
-  </CPackWiXFragment>
-
-  <CPackWiXFragment Id="CM_CP_deskflow_client.exe">
-    <firewall:FirewallException Id="ClientFirewallException" Name="Deskflow Client" Program="[INSTALL_ROOT]deskflow-client.exe" Scope="any"/>
+  <CPackWiXFragment Id="CM_CP_deskflow_core.exe">
+    <firewall:FirewallException Id="ServerFirewallException" Name="Deskflow Server" Program="[INSTALL_ROOT]deskflow-core.exe" Scope="any"/>
+    <firewall:FirewallException Id="ClientFirewallException" Name="Deskflow Client" Program="[INSTALL_ROOT]deskflow-core.exe" Scope="any"/>
   </CPackWiXFragment>
 
   <CPackWiXFragment Id="#PRODUCT">

doc/CMakeLists.txt

@@ -12,6 +12,8 @@ if (DOXYGEN_FOUND)
   set(DOXYGEN_STRIP_FROM_PATH ${CMAKE_SOURCE_DIR})
   set(DOXYGEN_QUIET YES)
   set(DOXYGEN_PROJECT_NAME ${CMAKE_PROJECT_PROPER_NAME})
+  set(DOXYGEN_PROJECT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/deskflow-logo.png")
+  set(DOXYGEN_PROJECT_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/deskflow-logo.png")
 
   if (BUILD_USER_DOCS)
     add_subdirectory(user)

doc/dev/build.md

@@ -7,78 +7,104 @@ To build Deskflow you will a minimum of:
     - [libportal] 0.8+ (linux, bsd)
     - [libei] 1.3+ (linux, bsd)
     - [google_test] ^
-    - [tomlplusplus] ^
-    - [cli11] ^
 
 > ^ Will be fetched if not found on the host system.
 
 By default a build of Deskflow will: 
-     - The GUI application deskflow
-     - The Client application deskflow-client
-     - The Server application deskflow-server
+     - The GUI application `deskflow`
+     - The Core application `deskflow-core`
      - Documentation if [doxygen] was found on your system
-     - Tests that will be run as part of the build process.
+     - Tests that will be run as part of the build process
 
 ## Configuration
-Deskflow supports the following build options
 
-CMake options:
+Deskflow supports the following CMake options:
+
 |         Option           |            Description                  |   Default Value    | Additional requirements |
 :-------------------------:|:---------------------------------------:|:------------------:|:-----------------------:|
-| BUILD_GUI                | Build GUI                               | ON                 | |
 | BUILD_USER_DOCS          | Build user documentation                | DOXYGEN_FOUND      | `Doxygen` |
 | BUILD_DEV_DOCS           | Build development documentation         | OFF                | `Doxygen` |
 | BUILD_INSTALLER          | Build installers/packages               | ON                 | |
 | BUILD_TESTS              | Build unit tests and legacy tests       | ON                 | `gtest`|
-| BUILD_UNIFIED            | Build unified binary (client+server)    | OFF                | |
+| BUILD_X11_SUPPORT        | Build X11 backend (Linux and BSD only)  | ON                 | `x11 libs`|
+| BUILD_OSX_BUNDLE         | Build an app bundle (macOS only)        | ON                 | |
 | ENABLE_COVERAGE          | Enable test coverage                    | OFF                | `gcov` |
 | SKIP_BUILD_TESTS         | Skip running of tests at build time     | OFF                | |
-| VCPKG_QT                 | Build Qt w/ vcpkg (windows only)        | OFF                | |
+| VCPKG_QT                 | Build Qt w/ vcpkg (Windows only)        | OFF                | |
+| CLEAN_TRS                | Remove obsolete strings from tr files   | OFF                | |
+| APPLE_CODESIGN_DEV       | Apple codesign cert ID for development  | Not set            | | 
 
-Example cmake configuration.
+Example cmake configuration:
 `cmake -S. -Bbuild -DCMAKE_INSTALL_PREFIX=<INSTALLPREFIX>`
 
 ### Windows Configuration
+
  It is recommended to use vcpkg to install the dependencies. The first time you configure Deskflow, all dependencies other than Qt will be built. If you don't want to use vcpkg, you must manually setup the dependencies. However, that will not be covered by this document.
  
 #### Windows and Qt
+
  There are two ways you can install [Qt] on Windows (vcpkg or Qt online installer). The default configuration expects you to use the Qt online installer. You should not install Qt in both ways, as having both can cause some weird things to happen, like Qt getting libs from one install and plugins from the other. When switching between them, remove the previous install first.
  
 ##### System Qt
 
  1. Download and install the [Qt] online installer from their website.
- 2. Add the path of Qt's cmake files to your system path. (Skipping this may require you provide this path to cmake via `Qt6_DIR` at configure time)
-   - Often `C:\Qt\<version>\<msvcinfo>\lib\cmake`
+ 2. Add the path of Qt's cmake files to your system path (skipping this may require you provide this path to cmake via `Qt6_DIR` at configure time).
+   - Often: `C:\Qt\<version>\<msvcinfo>\lib\cmake`
  3. Add the path of Qt's binary tools to your system path.
-   - Often `C:\Qt\<version>\<msvcinfo>\bin`
+   - Often: `C:\Qt\<version>\<msvcinfo>\bin`
+
+##### vcpkg managed Qt
 
-##### Vcpkg managed Qt
  1. Add the option `-DVCPKG_QT=ON` to your cmake configuration command (i.e `cmake -S. -Bbuild -DVCPKG_QT=ON ...`) or if using an IDE, look for the option where you configure the project, have the IDE run cmake again.
  2. Once the configuration starts, you should see a lot more packages vcpkg will build. Building Qt takes a long time (potentially hours), so go find something else to do for a while.
  3. If you want to use the system Qt again, you must delete the `vcpkg.json` generated in the project root and the `build` folder and reconfigure the project from scratch.
 
+
+### macOS codesign
+
+The code signing option `APPLE_CODESIGN_DEV` is only for local development and not intended for distributed bundles. 
+
+Signing for local development and signing for the distribution bundle must be different because of development entitlements which are unlikely to be safe for use in production. It is impractical (i.e. very slow and cumbersome) to use the distribution bundle for local development. When developing locally, the app bundle is partial and does not contain dependencies and uses external libs, e.g. installed with Homebrew; the entitlements allow those external libs to be loaded which is not allowed by default.
+
+For development codesign:
+
+1. Install Xcode
+2. Go to Settings -> Accounts
+3. Add your account (requires a free Apple Developer ID)
+4. Manage certificates -> Add -> Apple Development
+5. To get your ID, run: `security find-identity -v -p codesigning login.keychain-db`
+6. Pass the ID to CMake, e.g. `-DAPPLE_CODESIGN_DEV=Apple Development: bob@exmaple.com (KLGSJHLFXY)`
+7. Configure and build
+8. To verify, run: `codesign -d -r- build/bin/Deskflow.app`
+
 ## Build
+
 After configuring you should be able to run make to build all targets.
 
 `cmake --build build`
 
 ## Install
- To test installation run `DESTDIR=<installDIR> cmake --install build` to install into `<installDir>/<CMAKE_INSTALL_PREFIX>` <br>
+
+ To test installation run `DESTDIR=<installDIR> cmake --install build` to install into `<installDir>/<CMAKE_INSTALL_PREFIX>`
+
  Running `cmake --install build` will install to the `CMAKE_INSTALL_PREFIX`
 
 ## Making Deskflow packages
- Deskflow can generate several packages using cpack.
- To generate packages build the `package` or `package_source` target.
- Example: ` cmake --build build --target package package_source` would generate both package and package source packages.
- Deskflow can generate several package types depending on the system. Archive-based packages should work on all platforms. On Linux deb and rpm info is set up, flatpaks can be generated from the included file in deploy/linux and a PKGBUILD for Arch linux is generated in the build folder. On macos a dmg file will be created and signed. For windows wix can be used to create an installer.
 
+ Deskflow can generate several packages using `cpack`.
+ 
+ To generate packages build the `package` or `package_source` target.
+
+ Example: ` cmake --build build --target package package_source` would generate both package and package source packages.
+ 
+ Deskflow can generate several package types depending on the system. 
+ 
+ Archive-based packages should work on all platforms. On Linux deb and rpm info is set up, Flatpaks can be generated from the included file in deploy/linux and a `PKGBUILD` for Arch linux is generated in the build folder. On macos a dmg file will be created and signed. For windows WiX can be used to create an installer.
  
 [Qt]:https://www.qt.io
 [doxygen]:http://www.stack.nl/~dimitri/doxygen/
 [cmake]:https://cmake.org/
 [openssl]:https://www.openssl.org/
 [google_test]:https://github.com/google/googletest
-[tomlplusplus]:https://github.com/marzer/tomlplusplus
-[cli11]:https://github.com/CLIUtils/CLI11
 [libei]:https://gitlab.freedesktop.org/libinput/libei
 [libportal]:https://github.com/flatpak/libportal

doc/user/configuration.md

@@ -3,45 +3,691 @@
  Deskflow will automatically figure out where to save settings and other files.
 
 
-## Unix Systems
- The search order for a setting file is:
- 1. `<XDG_CONFIG_HOME>/Deskflow/Deskflow.conf`
- 1. A user settings file
- 1. A system settings file
- 
- A new settings file will be created in the user path if no settings file is found.
- The path of the settings file will be used as the base for all other config files.
+## Search paths
+
+Deskflow will look for settings in several places depending on your operating system.
+The search order for a setting file depends on your operating system
 
 ### Linux
- - System: `/etc/Deskflow/Deskflow.conf`
- - User: `~/.config/Deskflow/Deskflow.conf`
+
+  1. `<XDG_CONFIG_HOME>/Deskflow/Deskflow.conf`
+  2. `~/.config/Deskflow/Deskflow.conf`
+  3. `/etc/Deskflow/Deskflow.conf`
  
+A new settings file will be created in the user path if no settings file is found.
+The path of the settings file will be used as the base for all other config files.
+
 ### macOS
- - System: `/Library/Deskflow/Deskflow.conf`
- - User: `~/Library/Deskflow/Deskflow.conf`
  
+  1. `~/Library/Deskflow/Deskflow.conf`
+  2. `/Library/Deskflow/Deskflow.conf`
+ 
+A new settings file will be created in the user path if no settings file is found.
+The path of the settings file will be used as the base for all other config files.
 
-## Windows
+### Windows
 
- The search order for a setting file is:
- 1. `<install-path>/settings/Deskflow.conf`
- 1. Windows Registry `HKCU\Software\Deskflow\Deskflow`
+  1. `<install-path>/settings/Deskflow.conf`
+  2. Windows Registry `HKCU\Software\Deskflow\Deskflow`
 
 Windows will save to the install dir if settings are loaded from there. If not, it saves any other config files in: `C:\ProgramData\Deskflow\`
 
 When using settings from the install dir, the service mode will not be available.
 
-# Server Config Examples
+## Valid GUI Keys
+
+The GUI config file contains several sections.
+Each section is formatted the same.
+Option-value pairs are only written if the value is not the default value.
+
+```
+[section]
+option=value
+```
+
+### Client
+
+This section contains options used when in client mode. 
+It will begin with `[client]`
+
+
+| Option                |    Valid Values    | Description |
+|:----------------------|:------------------:|:-----------|
+| binary                | Filename           | The filename of the binary to call for client mode. This binary exists in the same path as the GUI |
+| invertScrollDirection | `true` or `false`  | Invert scroll on this client [default: false] |
+| languageSync          | `true` or `false`  | Sync to server language [default: true] |
+| remoteHost            | `IP` or `hostname` | The remote host last connected to | 
+| 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]|
+| 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] |
+| startedBefore | `true` or `false `| Have we started client or server before. Used in logic when deciding to show some dialogs.
+| updateUrl     | URL               | The URL to use when checking for a new version number, it should return a version [default: https://api.deskflow.org/version]|
+
+### Daemon
+
+This section contains options used by the daemon on windows it will begin with `[daemon]`
+
+|Option | Valid Values|Description|
+|:----------|:-----------:|:-----------|
+| command   | Filename          | The filename of the binary the daemon. This binary exists in the same path as the deskflow GUI |
+| elevate   | `true` or `false` | Elevate the daemon app [default: true unless portable mode ] |
+| logFile   | Filepath          | Filepath of the daemon log |
+| logLevel  | valid log Level,  | Log Level  |
+
+### GUI
+
+This section contains options used by the GUI it will begin with `[gui]`
+
+|Option             | Valid Values      |Description|
+|:------------------|:-----------------:|:-----------|
+| 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] |
+| 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] |
+| symbolicTrayIcon  | `true` or `false` | When true use the monocolor (symbolic) icon false uses a colorful icon for the tray |
+| windowGeometry    | QRect             | Geometry of the window used to restore the window geometry after exiting the app |
+
+### Log
+
+This section contains options used by the application logging it will begin with `[log]`
+
+|Option |    Valid Values   |Description|
+|:------|:-----------------:|:-----------|
+| file   | Filepath          | The file to write the log into |
+| 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 |
+
+
+### Security
+
+This section contains options used by the application security it will begin with `[security]`
+
+|Option                 |   Valid Values    |Description|
+|:----------------------|:-----------------:|:-----------|
+| checkPeerFingerprints | `true` or `false` | When true peers will have their fingerprints confirmed by the user and stored [default: true] |
+| certificate           | Filepath          | Path to the certificate to use to encrypt messages.|
+| keySize               | `2048` OR `4096`  | Size of the TLS key to use [default: 2048]| 
+| tlsEnabled            | `true` or `false` | Are we using TLS encryption when communicating [default: true].|
+
+### Server
+
+This section contains options used when in server mode it will begin with `[server]`
+
+|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.|
+
+### InternalConfig
+
+This section contains options used when in server mode it will begin with `[internalConfig]`
+block of a server config file as seen below. This section is used by the GUI to generate a server configuration
+
+```
+[internalConfig]
+clipboardSharing=true
+clipboardSharingSize=@Variant(\0\0\0\x84\0\0\0\0\0\0<\0)
+disableLockToScreen=false
+hasHeartbeat=false
+hasSwitchDelay=false
+hasSwitchDoubleTap=false
+heartbeat=5000
+hotkeys\1\actions\1\activeOnRelease=false
+hotkeys\1\actions\1\hasScreens=true
+hotkeys\1\actions\1\keys\1\key=83
+hotkeys\1\actions\1\keys\size=1
+hotkeys\1\actions\1\lockCursorToScreen=0
+hotkeys\1\actions\1\restartServer=false
+hotkeys\1\actions\1\switchInDirection=0
+hotkeys\1\actions\1\switchScreenName=void
+hotkeys\1\actions\1\type=0
+hotkeys\1\actions\1\typeScreenNames\size=0
+hotkeys\1\actions\size=1
+hotkeys\1\keys\1\key=83
+hotkeys\1\keys\size=1
+hotkeys\size=1
+numColumns=5
+numRows=3
+protocol=1
+relativeMouseMoves=false
+screens\1\name=
+screens\10\aliasArray\size=0
+screens\10\fixArray\1\fix=false
+screens\10\fixArray\2\fix=false
+screens\10\fixArray\3\fix=false
+screens\10\fixArray\4\fix=false
+screens\10\fixArray\size=4
+screens\10\modifierArray\1\modifier=0
+screens\10\modifierArray\2\modifier=1
+screens\10\modifierArray\3\modifier=2
+screens\10\modifierArray\4\modifier=3
+screens\10\modifierArray\5\modifier=4
+screens\10\modifierArray\6\modifier=5
+screens\10\modifierArray\size=6
+screens\10\name=null
+screens\10\switchCornerArray\1\switchCorner=false
+screens\10\switchCornerArray\2\switchCorner=false
+screens\10\switchCornerArray\3\switchCorner=false
+screens\10\switchCornerArray\4\switchCorner=false
+screens\10\switchCornerArray\size=4
+screens\10\switchCornerSize=0
+screens\11\name=
+screens\12\name=
+screens\13\name=
+screens\14\name=
+screens\15\name=
+screens\2\name=
+screens\3\name=
+screens\4\name=
+screens\5\name=
+screens\6\name=
+screens\7\aliasArray\size=0
+screens\7\fixArray\1\fix=false
+screens\7\fixArray\2\fix=false
+screens\7\fixArray\3\fix=false
+screens\7\fixArray\4\fix=false
+screens\7\fixArray\size=4
+screens\7\modifierArray\1\modifier=0
+screens\7\modifierArray\2\modifier=1
+screens\7\modifierArray\3\modifier=2
+screens\7\modifierArray\4\modifier=3
+screens\7\modifierArray\5\modifier=4
+screens\7\modifierArray\6\modifier=5
+screens\7\modifierArray\size=6
+screens\7\name=void
+screens\7\switchCornerArray\1\switchCorner=false
+screens\7\switchCornerArray\2\switchCorner=false
+screens\7\switchCornerArray\3\switchCorner=false
+screens\7\switchCornerArray\4\switchCorner=false
+screens\7\switchCornerArray\size=4
+screens\7\switchCornerSize=0
+screens\8\aliasArray\size=0
+screens\8\fixArray\1\fix=false
+screens\8\fixArray\2\fix=false
+screens\8\fixArray\3\fix=false
+screens\8\fixArray\4\fix=false
+screens\8\fixArray\size=4
+screens\8\modifierArray\1\modifier=0
+screens\8\modifierArray\2\modifier=1
+screens\8\modifierArray\3\modifier=2
+screens\8\modifierArray\4\modifier=3
+screens\8\modifierArray\5\modifier=4
+screens\8\modifierArray\6\modifier=5
+screens\8\modifierArray\size=6
+screens\8\name=chris-Precision-5570
+screens\8\switchCornerArray\1\switchCorner=false
+screens\8\switchCornerArray\2\switchCorner=false
+screens\8\switchCornerArray\3\switchCorner=false
+screens\8\switchCornerArray\4\switchCorner=false
+screens\8\switchCornerArray\size=4
+screens\8\switchCornerSize=0
+screens\9\aliasArray\size=0
+screens\9\fixArray\1\fix=false
+screens\9\fixArray\2\fix=false
+screens\9\fixArray\3\fix=false
+screens\9\fixArray\4\fix=false
+screens\9\fixArray\size=4
+screens\9\modifierArray\1\modifier=0
+screens\9\modifierArray\2\modifier=1
+screens\9\modifierArray\3\modifier=2
+screens\9\modifierArray\4\modifier=3
+screens\9\modifierArray\5\modifier=4
+screens\9\modifierArray\6\modifier=5
+screens\9\modifierArray\size=6
+screens\9\name=abyss.lan
+screens\9\switchCornerArray\1\switchCorner=false
+screens\9\switchCornerArray\2\switchCorner=false
+screens\9\switchCornerArray\3\switchCorner=false
+screens\9\switchCornerArray\4\switchCorner=false
+screens\9\switchCornerArray\size=4
+screens\9\switchCornerSize=0
+screens\size=15
+switchCornerArray\1\switchCorner=false
+switchCornerArray\2\switchCorner=false
+switchCornerArray\3\switchCorner=false
+switchCornerArray\4\switchCorner=false
+switchCornerArray\size=4
+switchCornerSize=0
+switchDelay=250
+switchDoubleTap=250
+win32KeepForeground=false
+```
+
+
+# Server Config
 
 The `deskflow-server` command accepts the `-c` or `--config` option, which takes one argument,
-the path to a server configuration file. The format is non-standard but similar to YAML.
+the path to a server configuration file. When using the GUI the `internalConfig` section of the GUI settings will be exported as the server configuration.
+The configuration file is plain text and case-sensitive. The file is broken into sections, and each section has the form:
+```
+section: ''name''
+	''arg'' = ''value''
+end
+```
 
-Comments begin with the `#` character and continue to the end of line.
-Comments may appear anywhere the syntax permits.
+Comments are introduced by ''#'' and continue to the end of the line. ''name'' must be one of the following:
 
-Each `section` element must have a matching `end` element.
+* ''screens''
+* ''aliases''
+* ''links''
+* ''options''
 
-## Stacked Example
+The file is parsed top to bottom and names cannot be used before they've been defined in the <code>screens</code> or <code>aliases</code> sections. So the <code>links</code> and <code>aliases</code> must appear after the <code>screens</code> and <code>links</code> cannot refer to aliases unless the <code>aliases</code> appear before the <code>links</code>.
+
+### 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.
+
+```
+section: screens
+	moe:
+	larry:
+		halfDuplexCapsLock = true
+		halfDuplexNumLock = true
+	curly:
+		meta = alt
+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.
+
+#### screen options
+
+A screen 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.|
+|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.|
+|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.|
+|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
+|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|
+|ctrl  | shift ctrl alt meta super none | Map the server's ctrl 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 screen|
+|meta|  shift ctrl alt meta super none | Map the server's meta 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 screen|
+
+### 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.
+
+```
+section: aliases
+	larry:
+		larry.stooges.com
+	curly:
+		shemp
+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).
+
+### 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:
+```
+ {left|right|up|down}[<range>] = name[<range>]
+```
+
+A link indicates which screen 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.
+
+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
+	moe:
+		right        = larry
+		up(50,100)   = curly(0,50)
+	larry:
+		left         = moe
+		up(0,50)     = curly(50,100)
+	curly:
+		down(0,50)   = moe
+		down(50,100) = larry(0,50)
+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''.
+
+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.
+
+### options section
+
+''args'' is a list of lines of the form <code>name = value</code>. These set the global options.
+
+```
+section: options
+	protocol = barrier
+	heartbeat = 5000
+	switchDelay = 500
+end
+```
+
+#### List of options allowed in options section
+
+| Options | Value Values| Description|
+|:--------|:-----------:|:-----------|
+|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.|
+|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.|
+|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.|
+|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.|
+|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.|
+|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.|
+|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.|
+
+
+You can use both the ''switchDelay'' and ''switchDoubleTap'' options at the same time. Deskflow will switch when either requirement is satisfied.
+
+##### Actions
+
+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])`
+
+* `keyDown(key[,screens])`
+
+* `keyUp(key[,screens])`
+
+
+: 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.
+: ''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.)
+
+* `mousebutton(button)`
+* `mouseDown(button)`
+* `mouseUp(button)`
+: Synthesizes the modifiers and mouse button given in ''button'' which has the same form as described in the ''mousebutton'' option.
+: ''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.
+
+* `switchToScreen(screen)`
+: Jump to screen with name or alias ''screen''.
+
+* `switchInDirection(dir)`
+: Switch to the screen 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.
+
+##### Keynames
+Valid key names are:
+
+<details><summary>Valid Key Names</summary>
+* AppMail
+* AppMedia
+* AppUser1
+* AppUser2
+* AudioDown
+* AudioMute
+* AudioNext
+* AudioPlay
+* AudioPrev
+* AudioStop
+* AudioUp
+* BackSpace
+* Begin
+* Break
+* Cancel
+* CapsLock
+* Clear
+* Delete
+* Down
+* Eject
+* End
+* Escape
+* Execute
+* F1
+* F2
+* F3
+* F4
+* F5
+* F6
+* F7
+* F8
+* F9
+* F10
+* F11
+* F12
+* F13
+* F14
+* F15
+* F16
+* F17
+* F18
+* F19
+* F20
+* F21
+* F22
+* F23
+* F24
+* F25
+* F26
+* F27
+* F28
+* F29
+* F30
+* F31
+* F32
+* F33
+* F34
+* F35
+* Find
+* Help
+* Home
+* Insert
+* KP_0
+* KP_1
+* KP_2
+* KP_3
+* KP_4
+* KP_5
+* KP_6
+* KP_7
+* KP_8
+* KP_9
+* KP_Add
+* KP_Begin
+* KP_Decimal
+* KP_Delete
+* KP_Divide
+* KP_Down
+* KP_End
+* KP_Enter
+* KP_Equal
+* KP_F1
+* KP_F2
+* KP_F3
+* KP_F4
+* KP_Home
+* KP_Insert
+* KP_Left
+* KP_Multiply
+* KP_PageDown
+* KP_PageUp
+* KP_Right
+* KP_Separator
+* KP_Space
+* KP_Subtract
+* KP_Tab
+* KP_Up
+* Left
+* LeftTab
+* Linefeed
+* Menu
+* NumLock
+* PageDown
+* PageUp
+* Pause
+* Print
+* Redo
+* Return
+* Right
+* ScrollLock
+* Select
+* Sleep
+* Space
+* SysReq
+* Tab
+* Undo
+* Up
+* WWWBack
+* WWWFavorites
+* WWWForward
+* WWWHome
+* WWWRefresh
+* WWWSearch
+* WWWStop
+* Space
+* Exclaim
+* DoubleQuote
+* Number
+* Dollar
+* Percent
+* Ampersand
+* Apostrophe
+* ParenthesisL
+* ParenthesisR
+* Asterisk
+* Plus
+* Comma
+* Minus
+* Period
+* Slash
+* Colon
+* Semicolon
+* Less
+* Equal
+* Greater
+* Question
+* At
+* BracketL
+* Backslash
+* BracketR
+* Circumflex
+* Underscore
+* Grave
+* BraceL
+* Bar
+* BraceR
+* Tilde
+</details>
+
+Additionally, a name of the form `\uXXXX` where ''XXXX'' is a hexadecimal number is interpreted as a unicode character code. Key and modifier names are case-insensitive. Keys that don't exist on the keyboard or in the default keyboard layout will not work.
+
+### Example textual configuration file
+
+This example comes from doc/deskflow-basic.conf
+
+```
+# sample deskflow configuration file
+#
+# comments begin with the # character and continue to the end of
+# line.  comments may appear anywhere the syntax permits.
+# +-------+  +--------+ +---------+
+# |Laptop |  |Desktop1| |iMac     |
+# |       |  |        | |         |
+# +-------+  +--------+ +---------+
+
+section: screens
+	# three hosts named:  Laptop, Desktop1, and iMac
+	# These are the nice names of the hosts to make it easy to write the config file
+	# The aliases section below contain the "actual" names of the hosts (their hostnames)
+	Laptop:
+	Desktop1:
+	iMac:
+end
+
+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)
+		left  = Laptop
+		shift = shift (shift, alt, super, meta can be mapped to any of the others)
+	# Desktop1 is to the right of Laptop
+	Laptop:
+		right = Desktop1
+	# Desktop1 is to the left of iMac
+	iMac:
+		left  = Desktop1
+end
+section: aliases
+	# The "real" name of iMac is John-Smiths-iMac-3.local. 
+	# If we wanted we could remove this alias and instead use John-Smiths-iMac-3.local everywhere iMac is above. 
+	# Hopefully it should be easy to see why using an alias is nicer
+	iMac:
+		John-Smiths-iMac-3.local
+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.
+
+```
+# Physical monitor arrangement, with machine names as used by Deskflow.
+#  +----------+----------+
+#  | syn-serv | syn-cli  |
+#  |          |          |
+#  +----------+----------+ 
+ 
+section: screens
+	syn-serv:
+	syn-cli:
+end
+section: links
+	syn-serv:
+		left = syn-cli     # "wrapping" arrangement
+		right = syn-cli    # "normal" arrangement
+	syn-cli:
+		left = syn-serv    # "normal"
+		right = syn-serv   # "wrapping"
+end
+section: options
+		keystroke(control+super+right) = switchInDirection(right) # Switch screens on keypress 
+<!--		keystroke(control+super+left) = switchInDirection(left) -->
+end
+```
+
+### AltGr key
+
+The following screen config allows the mapping for ''Alt'' to ''AltGr''. Although this may not work, see [https://github.com/deskflow/deskflow-core/issues/4411 bug #4411].
+```
+section: screens
+	client1:
+		altgr = alt          # mapping to fix AltGr key not working on windows clients (e.g. @-Symbol etc.).
+end
+```
+
+See also: the man page for ''deskflow-core''.
+
+### Stacked Example
 
 Stack one computer's screen on top of another's.
 
@@ -85,7 +731,7 @@ section: aliases
 end
 ```
 
-## Horizontal Example
+### Horizontal Example
 
 Align all screens horizontally.
 
@@ -119,7 +765,7 @@ end
 
 ```
 
-## Span Example
+### Span Example
 
 Span two screens on one computer across the screens of two computers.
 
@@ -156,43 +802,3 @@ section: links
 		down  = larry
 end
 ```
-
-# Example file for `--config-toml` arg
-
-```
-[server.args]
-no-daemon = true
-no-tray = true
-debug = "DEBUG"
-name = "moe"
-address = ":24800"
-
-[client.args]
-no-daemon = true
-no-tray = true
-debug = "DEBUG2"
-name = "larry"
-_last = "moe:24800"
-```
-
-
-# Example  `.env` file
-
-
-```
-#
-# App
-#
-
-# Shows the test menu in the GUI (on by default in debug mode)
-# DESKFLOW_TEST_MENU=true
-
-# Version checker URL to use (useful for testing)
-# DESKFLOW_VERSION_URL="https://api.deskflow.org/version?fake=1.100.0"
-
-# Enable debug logging in the GUI (on by default in debug mode)
-# DESKFLOW_GUI_DEBUG=true
-
-# Enable verbose logging in the GUI (always off by default)
-# DESKFLOW_GUI_VERBOSE=true
-```

doc/user/mainpage.md

@@ -1,5 +1,3 @@
-![Deskflow](https://github.com/user-attachments/assets/f005b958-24df-4f4a-9bfd-4f834dae59d6)
-
 **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.

sonar-project.properties

@@ -2,8 +2,8 @@ sonar.organization=deskflow
 sonar.projectKey=deskflow_deskflow
 sonar.sources=src/apps,src/lib
 sonar.tests=src/unittests
-sonar.exclusions=subprojects/**,build/**
-sonar.coverage.exclusions=subprojects/**,src/unittests/**,src/apps/deskflow-gui/**,src/apps/res/**
+sonar.exclusions=subprojects/**,build/**,translations/**
+sonar.coverage.exclusions=subprojects/**,src/unittests/**,src/apps/deskflow-gui/**,src/apps/res/**,translations/**
 sonar.cpd.exclusions=**/*Test*.cpp
 sonar.host.url=https://sonarcloud.io
 sonar.cfamily.compile-commands=build/compile_commands.json

src/apps/CMakeLists.txt

@@ -28,18 +28,6 @@ function(generate_app_man TARGET NAME)
   endif()
 endfunction()
 
-option(BUILD_UNIFIED "Build unified binary" OFF)
-if(BUILD_UNIFIED)
-  add_subdirectory(deskflow-core)
-else()
-  add_subdirectory(deskflow-client)
-  add_subdirectory(deskflow-server)
-endif(BUILD_UNIFIED)
-
-## Only used on windows
-add_subdirectory(deskflow-daemon)
-
-option(BUILD_GUI "Build GUI" ON)
-if(BUILD_GUI)
-  add_subdirectory(deskflow-gui)
-endif(BUILD_GUI)
+add_subdirectory(deskflow-core)
+add_subdirectory(deskflow-daemon) #Only used on windows
+add_subdirectory(deskflow-gui)

src/apps/deskflow-client/CMakeLists.txt

@@ -1,65 +0,0 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
-# SPDX-License-Identifier: MIT
-
-set(target ${CMAKE_PROJECT_NAME}-client)
-
-if(WIN32)
-  # Generate rc file
-  set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} client application")
-
-  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)
-
-  set(PLATFORM_SOURCES
-    ${target}.exe.manifest
-    ${PROJECT_SOURCE_DIR}/src/apps/res/deskflow.ico
-    ${CMAKE_CURRENT_BINARY_DIR}/${target}.rc
-  )
-endif()
-
-add_executable(${target} ${PLATFORM_SOURCES} ${target}.cpp)
-
-target_link_libraries(
-  ${target}
-  arch
-  base
-  client
-  io
-  mt
-  net
-  platform
-  server
-  app
-  ${libs})
-
-if(APPLE)
-  set_target_properties(${target} PROPERTIES
-      BUILD_WITH_INSTALL_RPATH TRUE
-      INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
-      RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS
-  )
-elseif(UNIX)
-  install(TARGETS ${target} DESTINATION bin)
-  generate_app_man(${target} "${CMAKE_PROJECT_DESCRIPTION} \\(Client\\)")
-elseif(WIN32)
-  install(
-    TARGETS ${target}
-    RUNTIME_DEPENDENCY_SET clientDeps
-    DESTINATION .
-  )
-  install(RUNTIME_DEPENDENCY_SET clientDeps
-    PRE_EXCLUDE_REGEXES
-      "api-ms-win-.*"
-      "ext-ms-.*"
-      "^hvsifiletrust\\.dll$"
-    POST_EXCLUDE_REGEXES
-      ".*system32.*"
-    RUNTIME DESTINATION .
-  )
-endif()
-

src/apps/deskflow-client/deskflow-client.cpp

@@ -1,40 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
- * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "arch/Arch.h"
-#include "base/EventQueue.h"
-#include "base/Log.h"
-#include "deskflow/ClientApp.h"
-
-#if SYSAPI_WIN32
-#include "arch/win32/ArchMiscWindows.h"
-#include <QCoreApplication>
-#endif
-
-int main(int argc, char **argv)
-{
-#if SYSAPI_WIN32
-  // HACK to make sure settings gets the correct qApp path
-  QCoreApplication m(argc, argv);
-  m.deleteLater();
-
-  ArchMiscWindows::guardRuntimeVersion();
-
-  // record window instance for tray icon, etc
-  ArchMiscWindows::setInstanceWin32(GetModuleHandle(nullptr));
-#endif
-
-  Arch arch;
-  arch.init();
-
-  Log log;
-  EventQueue events;
-
-  ClientApp app(&events);
-  return app.run(argc, argv);
-}

src/apps/deskflow-client/deskflow-client.exe.manifest

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-    </windowsSettings>
-  </application>
-</assembly>

src/apps/deskflow-core/CMakeLists.txt

@@ -5,7 +5,13 @@
 
 set(target ${CMAKE_PROJECT_NAME}-core)
 
-add_executable(${target} "${target}.cpp")
+add_executable(${target}
+  "${target}.cpp"
+  CoreArgs.h
+  CoreArgParser.h
+  CoreArgParser.cpp
+)
+
 if(WIN32)
   # Generate rc file
   set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} combined server and client application")
@@ -32,21 +38,19 @@ target_link_libraries(
   app
   ${libs})
 
-if(APPLE)
+install(
+  TARGETS ${target}
+  RUNTIME_DEPENDENCY_SET coreDeps
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+if(BUILD_OSX_BUNDLE)
   set_target_properties(${target} PROPERTIES
     BUILD_WITH_INSTALL_RPATH TRUE
     INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
     RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS
   )
-elseif(UNIX)
-  install(TARGETS ${target} DESTINATION bin)
-  generate_app_man(${target} "${CMAKE_PROJECT_DESCRIPTION}")
-elseif(WIN32)
-  install(
-    TARGETS ${target}
-    RUNTIME_DEPENDENCY_SET coreDeps
-    DESTINATION .
-  )
+elseif (WIN32)
   install(RUNTIME_DEPENDENCY_SET coreDeps
     PRE_EXCLUDE_REGEXES
       "api-ms-win-.*"
@@ -54,6 +58,8 @@ elseif(WIN32)
       "^hvsifiletrust\\.dll$"
     POST_EXCLUDE_REGEXES
       ".*system32.*"
-    RUNTIME DESTINATION .
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
+else()
+  generate_app_man(${target} "${CMAKE_PROJECT_DESCRIPTION}")
 endif()

src/apps/deskflow-core/CoreArgParser.cpp

@@ -0,0 +1,104 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#include "CoreArgParser.h"
+#include "CoreArgs.h"
+#include "VersionInfo.h"
+
+#include "common/Constants.h"
+#include "common/ExitCodes.h"
+#include "common/Settings.h"
+#include "deskflow/ProtocolTypes.h"
+
+const QString CoreArgParser::s_headerText = QStringLiteral("%1: %2\n").arg(kCoreBinName, kDisplayVersion);
+
+CoreArgParser::CoreArgParser(const QStringList &args)
+{
+  m_parser.setApplicationDescription(kAppDescription);
+  m_parser.addPositionalArgument("coremode", "The mode to start in either: server or client", "coremode");
+
+  m_parser.addOptions(CoreArgs::options);
+  m_parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
+  m_parser.setOptionsAfterPositionalArgumentsMode(QCommandLineParser::ParseAsOptions);
+  m_parser.parse(args);
+
+  m_helpText = m_parser.helpText().replace("<executable_name>", kCoreBinName);
+  m_helpText.replace("[options] coremode", "coremode [options]");
+
+  m_singleInstance = !m_parser.isSet(CoreArgs::multiInstanceOption);
+}
+
+void CoreArgParser::parse()
+{
+  auto posArgs = m_parser.positionalArguments();
+  if (posArgs.isEmpty()) {
+    showHelpText();
+    exit(s_exitSuccess);
+  }
+
+  const QString mode = posArgs.takeFirst();
+  m_serverMode = (mode.compare("server", Qt::CaseInsensitive) == 0);
+  m_clientMode = (mode.compare("client", Qt::CaseInsensitive) == 0);
+
+  if ((!m_clientMode && !m_serverMode) || mode.isEmpty()) {
+    showHelpText();
+    exit(s_exitSuccess);
+  }
+
+  if (m_parser.isSet(CoreArgs::configOption)) {
+    Settings::setSettingsFile(m_parser.value(CoreArgs::configOption));
+  }
+}
+
+[[noreturn]] void CoreArgParser::showHelpText() const
+{
+  QTextStream(stdout) << helpText();
+  exit(s_exitSuccess);
+}
+
+QString CoreArgParser::helpText() const
+{
+  return QStringLiteral("%1%2").arg(s_headerText, m_helpText);
+}
+
+QString CoreArgParser::versionText() const
+{
+  const static auto vString = QStringLiteral("%1 v%2, protocol v%3.%4\n%5\n");
+  return vString.arg(
+      kCoreBinName, kDisplayVersion, QString::number(kProtocolMajorVersion), QString::number(kProtocolMinorVersion),
+      kCopyright
+  );
+}
+
+QString CoreArgParser::errorText() const
+{
+  return m_parser.errorText();
+}
+
+bool CoreArgParser::help() const
+{
+  return m_parser.isSet(CoreArgs::helpOption);
+}
+
+bool CoreArgParser::version() const
+{
+  return m_parser.isSet(CoreArgs::versionOption);
+}
+
+bool CoreArgParser::serverMode() const
+{
+  return m_serverMode;
+}
+
+bool CoreArgParser::clientMode() const
+{
+  return m_clientMode;
+}
+
+bool CoreArgParser::singleInstanceOnly() const
+{
+  return m_singleInstance;
+}

src/apps/deskflow-core/CoreArgParser.h

@@ -0,0 +1,46 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#pragma once
+#include <QCommandLineParser>
+
+/**
+ * @brief The CoreArgParser class
+ * This class processes the argments for the "core" app
+ */
+class CoreArgParser
+{
+public:
+  /**
+   * @brief CoreArgParser calling this funciton will parse apps and set the setting and version options
+   * For any other settings to be set you must call parse();
+   * @sa parse();
+   * @param args List of args to parse
+   */
+  explicit CoreArgParser(const QStringList &args = {});
+  /**
+   * @brief parse
+   * This method will parse all options other then help and version
+   */
+  void parse();
+  QString helpText() const;
+  QString versionText() const;
+  QString errorText() const;
+  bool help() const;
+  bool version() const;
+  bool serverMode() const;
+  bool clientMode() const;
+  bool singleInstanceOnly() const;
+
+private:
+  [[noreturn]] void showHelpText() const;
+  QCommandLineParser m_parser;
+  QString m_helpText;
+  bool m_clientMode = false;
+  bool m_serverMode = false;
+  bool m_singleInstance = true;
+  static const QString s_headerText;
+};

src/apps/deskflow-core/CoreArgs.h

@@ -0,0 +1,24 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#pragma once
+
+#include <QCommandLineOption>
+/**
+ * @brief The CoreArgs class
+ * This class contains args for the CoreArgParser
+ */
+struct CoreArgs
+{
+  inline static const auto helpOption = QCommandLineOption({"h", "help"}, "Display Help on the command line");
+  inline static const auto versionOption = QCommandLineOption({"v", "version"}, "Display version information");
+  inline static const auto multiInstanceOption =
+      QCommandLineOption("new-instance", "Skip the check for a running instance, always makes a new instance");
+  inline static const auto configOption =
+      QCommandLineOption({"s", "settings"}, "override configuration file to use", "configFile");
+
+  inline static const auto options = {helpOption, versionOption, multiInstanceOption, configOption};
+};

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

@@ -6,9 +6,13 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
+#include "CoreArgParser.h"
+
 #include "arch/Arch.h"
 #include "base/EventQueue.h"
 #include "base/Log.h"
+#include "common/Constants.h"
+#include "common/ExitCodes.h"
 #include "deskflow/ClientApp.h"
 #include "deskflow/ServerApp.h"
 
@@ -17,24 +21,13 @@
 #include <QCoreApplication>
 #endif
 
-#include <iostream>
+#include <QFileInfo>
+#include <QSharedMemory>
+#include <QTextStream>
 
-void showHelp()
+void showHelp(const CoreArgParser &parser)
 {
-  std::cout << "Usage: deskflow-core <server | client> [...options]" << std::endl;
-  std::cout << "server - start as a server (deskflow-server)" << std::endl;
-  std::cout << "client - start as a client (deskflow-client)" << std::endl;
-  std::cout << "use deskflow-core <server|client> --help for more information." << std::endl;
-}
-
-bool isServer(int argc, char **argv)
-{
-  return (argc > 1 && argv[1] == std::string("server"));
-}
-
-bool isClient(int argc, char **argv)
-{
-  return (argc > 1 && argv[1] == std::string("client"));
+  QTextStream(stdout) << parser.helpText();
 }
 
 int main(int argc, char **argv)
@@ -51,17 +44,58 @@ int main(int argc, char **argv)
   arch.init();
 
   Log log;
-  EventQueue events;
 
-  if (isServer(argc, argv)) {
-    ServerApp app(&events);
-    return app.run(argc, argv);
-  } else if (isClient(argc, argv)) {
-    ClientApp app(&events);
-    return app.run(argc, argv);
-  } else {
-    showHelp();
+  QStringList args;
+  for (int i = 0; i < argc; i++)
+    args.append(argv[i]);
+
+  CoreArgParser parser(args);
+
+  // Print any parser errors
+  if (!parser.errorText().isEmpty()) {
+    QTextStream(stdout) << parser.errorText() << "\n";
   }
 
-  return 0;
+  if (parser.help()) {
+    showHelp(parser);
+    return s_exitSuccess;
+  }
+
+  if (parser.version()) {
+    QTextStream(stdout) << parser.versionText();
+    return s_exitSuccess;
+  }
+
+  if (parser.singleInstanceOnly()) {
+    // Before we check any more args we need to check for a duplicate process.
+    // Create a shared memory segment with a unique key
+    // This is to prevent a new instance from running if one is already running
+    QSharedMemory sharedMemory(kCoreBinName);
+
+    // 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
+    if (sharedMemory.attach())
+      sharedMemory.detach();
+
+    // If we can create 1 byte of SHM we are the only instance
+    if (!sharedMemory.create(1)) {
+      LOG_WARN("an instance of deskflow core is already running");
+      return s_exitDuplicate;
+    }
+  }
+
+  parser.parse();
+
+  EventQueue events;
+  const auto processName = QFileInfo(argv[0]).fileName();
+
+  if (parser.serverMode()) {
+    ServerApp app(&events, processName);
+    return app.run();
+  } else if (parser.clientMode()) {
+    ClientApp app(&events, processName);
+    return app.run();
+  }
+
+  return s_exitSuccess;
 }

src/apps/deskflow-daemon/CMakeLists.txt

@@ -30,7 +30,7 @@ if(WIN32)
   install(
     TARGETS ${target}
     RUNTIME_DEPENDENCY_SET deamonDeps
-    DESTINATION .
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   )
   install(RUNTIME_DEPENDENCY_SET daemonDeps
     PRE_EXCLUDE_REGEXES
@@ -39,6 +39,6 @@ if(WIN32)
       "^hvsifiletrust\\.dll$"
     POST_EXCLUDE_REGEXES
       ".*system32.*"
-    RUNTIME DESTINATION .
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
 endif()

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

@@ -9,6 +9,7 @@
 #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 "deskflow/ipc/DaemonIpcServer.h"
@@ -58,12 +59,6 @@ int main(int argc, char **argv)
   const auto foregroundOption = QCommandLineOption({"f", "foreground"}, "Run in the foreground (show console)");
   parser.addOption(foregroundOption);
 
-  const auto installOption = QCommandLineOption({"i", "install"}, "Install as a Windows service");
-  parser.addOption(installOption);
-
-  const auto uninstallOption = QCommandLineOption({"u", "uninstall"}, "Uninstall the Windows service");
-  parser.addOption(uninstallOption);
-
   parser.process(app);
 
   if (parser.isSet(foregroundOption)) {
@@ -78,11 +73,11 @@ int main(int argc, char **argv)
   // useful for troubleshooting Windows services.
   // It's important to write the version number to the log file so we can be certain the old daemon
   // was uninstalled, since sometimes Windows services can get stuck and fail to be removed.
-  LOG_PRINT("%s v%s", QCoreApplication::applicationName().toStdString().c_str(), kDisplayVersion);
+  LOG_PRINT("%s v%s", qPrintable(QCoreApplication::applicationName()), kDisplayVersion);
 
   // Default log level to system setting (found in Registry).
   auto logLevel = Settings::value(Settings::Daemon::LogLevel).toString().toStdString();
-  if (logLevel != "") {
+  if (!logLevel.empty()) {
     CLOG->setFilter(logLevel.c_str());
     LOG_DEBUG("log level: %s", logLevel.c_str());
   }
@@ -96,16 +91,7 @@ int main(int argc, char **argv)
     }
 #endif
 
-    if (parser.isSet(installOption)) {
-      daemon.install();
-      return s_exitSuccess;
-    } else if (parser.isSet(uninstallOption)) {
-      daemon.uninstall();
-      return s_exitSuccess;
-    }
-
-    const auto ipcServer =
-        new ipc::DaemonIpcServer(&app, DaemonApp::logFilename().toStdString().c_str()); // NOSONAR - Qt managed
+    const auto ipcServer = new ipc::DaemonIpcServer(&app, qPrintable(DaemonApp::logFilename())); // NOSONAR - Qt managed
     ipcServer->listen();
     daemon.connectIpcServer(ipcServer);
 

src/apps/deskflow-gui/CMakeLists.txt

@@ -15,12 +15,12 @@ if(WIN32)
   set(EXE_ICON "IDI_ICON1 ICON DISCARDABLE \"${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico\" ")
   configure_file(${CMAKE_SOURCE_DIR}/src/apps/res/windows.rc.in deskflow.rc)
   set(platform_extra deskflow.rc)
-elseif(APPLE)
+elseif(BUILD_OSX_BUNDLE)
   #setup our bundle plist file
   set(BUNDLE_EXECUTABLE_NAME "${target}")
   set(BUNDLE_BUNDLE_NAME "${target}")
   set(BUNDLE_DISPLAY_NAME "${target}")
-  set(BUNDLE_GUI_IDENTIFIER "org.deskflow.deskflow")
+  set(BUNDLE_GUI_IDENTIFIER "${CMAKE_PROJECT_REV_FQDN}")
   set(BUNDLE_ICON_FILE ${target}.icns)
   set(BUNDLE_INFO_STRING "${CMAKE_PROJECT_DESCRIPTION}")
   set(BUNDLE_COPYRIGHT "${CMAKE_PROJECT_COPYRIGHT}")
@@ -31,13 +31,7 @@ elseif(APPLE)
     @ONLY
   )
 
-  file(COPY_FILE
-    ${PROJECT_SOURCE_DIR}/LICENSES/LicenseRef-OpenSSL-Exception.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/LICENSE_EXCEPTION
-    ONLY_IF_DIFFERENT
-  )
-
-  set(platform_extra ../res/Deskflow.icns ${CMAKE_SOURCE_DIR}/LICENSE ${CMAKE_CURRENT_BINARY_DIR}/LICENSE_EXCEPTION)
+  set(platform_extra ../res/Deskflow.icns)
   set_source_files_properties(${platform_extra} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 endif()
 
@@ -55,13 +49,16 @@ target_link_libraries(
   Qt6::Widgets
   Qt6::Network)
 
+install(
+  TARGETS ${target}
+  RUNTIME_DEPENDENCY_SET guiDeps
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  BUNDLE DESTINATION .
+)
+
 if(WIN32)
   set_target_properties(${target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
-  install(
-    TARGETS ${target}
-    RUNTIME_DEPENDENCY_SET guiDeps
-    DESTINATION .
-  )
+
   install(RUNTIME_DEPENDENCY_SET guiDeps
     PRE_EXCLUDE_REGEXES
       "api-ms-win-.*"
@@ -69,7 +66,7 @@ if(WIN32)
       "^hvsifiletrust\\.dll$"
     POST_EXCLUDE_REGEXES
       ".*system32.*"
-    RUNTIME DESTINATION .
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
 
   set(QT_DEPENDS_DIR ${CMAKE_BINARY_DIR}/qt-depends)
@@ -91,17 +88,46 @@ if(WIN32)
 
   install(
     DIRECTORY ${QT_DEPENDS_DIR}/
-    DESTINATION .
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
     PATTERN "dx*.dll" EXCLUDE
   )
 
 elseif(APPLE)
-  set_target_properties(${target} PROPERTIES
-    INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
-    MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/deskflow.plist"
-  )
-  install(TARGETS ${target} BUNDLE DESTINATION .)
+  if (BUILD_OSX_BUNDLE)
+    set_target_properties(${target} PROPERTIES
+      INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
+      MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/deskflow.plist"
+    )
+
+    # 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.
+    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)
+  endif()
 else()
-  install(TARGETS ${target} DESTINATION bin)
   generate_app_man(${target} "${CMAKE_PROJECT_DESCRIPTION} \\(GUI\\)")
 endif()

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

@@ -8,10 +8,11 @@
 
 #include "VersionInfo.h"
 #include "common/Constants.h"
+#include "common/ExitCodes.h"
+#include "common/I18N.h"
+#include "common/PlatformInfo.h"
 #include "common/UrlConstants.h"
 #include "gui/Diagnostic.h"
-#include "gui/DotEnv.h"
-#include "gui/Logger.h"
 #include "gui/MainWindow.h"
 #include "gui/Messages.h"
 #include "gui/StyleUtils.h"
@@ -22,7 +23,7 @@
 #include <QMessageBox>
 #include <QSharedMemory>
 
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
 #include <Carbon/Carbon.h>
 #include <cstdlib>
 #endif
@@ -31,9 +32,13 @@
 #include <QLoggingCategory>
 #endif
 
+#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI)
+#include "platform/XDGPortalRegistry.h"
+#endif
+
 using namespace deskflow::gui;
 
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
 bool checkMacAssistiveDevices();
 #endif
 
@@ -46,14 +51,21 @@ int main(int argc, char *argv[])
   QLoggingCategory::setFilterRules(QStringLiteral("*.debug=true\nqt.*=false"));
 #endif
 
+#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI)
+  deskflow::platform::setAppId();
+#endif
+
   QCoreApplication::setApplicationName(kAppName);
   QCoreApplication::setOrganizationName(kAppName);
   QCoreApplication::setApplicationVersion(kVersion);
   QCoreApplication::setOrganizationDomain(kOrgDomain); // used in prefix, can't be a url
-  QGuiApplication::setDesktopFileName(QStringLiteral("org.deskflow.deskflow"));
+  QGuiApplication::setDesktopFileName(kRevFqdnName);
 
   QApplication app(argc, argv);
 
+  // Ensure the I18N object is made before strings
+  QTextStream(stdout) << "initial language: " << I18N::currentLanguage() << '\n';
+
   // Add Command Line Options
   auto helpOption = QCommandLineOption({"h", "help"}, "Display Help on the command line");
   auto versionOption = QCommandLineOption({"v", "version"}, "Display version information");
@@ -68,23 +80,24 @@ int main(int argc, char *argv[])
 
   if (!parser.errorText().isEmpty()) {
     qCritical().noquote() << parser.errorText() << "\nUse --help for more information.";
-    return 1;
+    return s_exitArgs;
   }
 
   if (parser.isSet(helpOption)) {
     QTextStream(stdout) << kHeader << QStringLiteral("  %1\n\n").arg(kAppDescription)
                         << parser.helpText().replace(QApplication::applicationFilePath(), kAppId);
-    return 0;
+    return s_exitSuccess;
   }
 
   if (parser.isSet(versionOption)) {
     QTextStream(stdout) << kHeader << kCopyright << Qt::endl;
-    return 0;
+    return s_exitSuccess;
   }
 
+  const auto shmId = QStringLiteral("%1-gui").arg(kAppId);
   // Create a shared memory segment with a unique key
   // This is to prevent a new instance from running if one is already running
-  QSharedMemory sharedMemory("deskflow-gui");
+  QSharedMemory sharedMemory(shmId);
 
   // 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
@@ -95,38 +108,27 @@ int main(int argc, char *argv[])
   if (!sharedMemory.create(1)) {
     // Ping the running instance to have it show itself
     QLocalSocket socket;
-    socket.connectToServer("deskflow-gui", QLocalSocket::ReadOnly);
+    socket.connectToServer(shmId, QLocalSocket::ReadOnly);
     if (!socket.waitForConnected()) {
       // If we can't connect to the other instance tell the user its running.
       // This should never happen but just incase we should show something
-      QMessageBox::information(nullptr, QObject::tr("Deskflow"), QObject::tr("Deskflow is already running"));
+      QMessageBox::information(nullptr, kAppName, QObject::tr("%1 is already running").arg(kAppName));
     }
     socket.disconnectFromServer();
-    return 0;
+    return s_exitDuplicate;
   }
 
-#if !defined(Q_OS_MAC)
-  // causes dark mode to be used on some DE's
-  if (qEnvironmentVariable("XDG_CURRENT_DESKTOP") != QLatin1String("KDE")) {
+  if (!deskflow::platform::isMac() && qEnvironmentVariable("XDG_CURRENT_DESKTOP") != QLatin1String("KDE")) {
     QApplication::setStyle("fusion");
   }
-#endif
 
   // Sets the fallback icon path and fallback theme
-  const auto themeName = QStringLiteral("deskflow-%1").arg(iconMode());
-  if (QIcon::themeName().isEmpty())
-    QIcon::setThemeName(themeName);
-  else
-    QIcon::setFallbackThemeName(themeName);
-  QIcon::setFallbackSearchPaths({QStringLiteral(":/icons/%1").arg(themeName)});
+  updateIconTheme();
 
   qInstallMessageHandler(deskflow::gui::messages::messageHandler);
-  qInfo("%s v%s", kAppName, qPrintable(kVersion));
+  qInfo("%s v%s", kAppName, kDisplayVersion);
 
-  dotenv();
-  Logger::instance().loadEnvVars();
-
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
 
   if (app.applicationDirPath().startsWith("/Volumes/")) {
     QString msgBody = QStringLiteral(
@@ -153,7 +155,7 @@ int main(int argc, char *argv[])
   return QApplication::exec();
 }
 
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
 bool checkMacAssistiveDevices()
 {
   // new in mavericks, applications are trusted individually

src/apps/deskflow-server/CMakeLists.txt

@@ -1,64 +0,0 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
-# SPDX-License-Identifier: MIT
-
-set(target ${CMAKE_PROJECT_NAME}-server)
-
-if(WIN32)
-  # Generate rc file
-  set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} server application")
-
-  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)
-
-  set(PLATFORM_SOURCES
-    ${target}.exe.manifest
-    ${PROJECT_SOURCE_DIR}/src/apps/res/deskflow.ico
-    ${CMAKE_CURRENT_BINARY_DIR}/${target}.rc
-  )
-endif()
-
-add_executable(${target} ${PLATFORM_SOURCES} ${target}.cpp)
-
-target_link_libraries(
-  ${target}
-  arch
-  base
-  client
-  io
-  mt
-  net
-  platform
-  server
-  app
-  ${libs})
-
-if(APPLE)
-  set_target_properties(${target} PROPERTIES
-      BUILD_WITH_INSTALL_RPATH TRUE
-      INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
-      RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS
-  )
-elseif(UNIX)
-  install(TARGETS ${target} DESTINATION bin)
-  generate_app_man(${target} "${CMAKE_PROJECT_DESCRIPTION} \\(Server\\)")
-elseif(WIN32)
-  install(
-    TARGETS ${target}
-    RUNTIME_DEPENDENCY_SET serverDeps
-    DESTINATION .
-  )
-  install(RUNTIME_DEPENDENCY_SET serverDeps
-    PRE_EXCLUDE_REGEXES
-      "api-ms-win-.*"
-      "ext-ms-.*"
-      "^hvsifiletrust\\.dll$"
-    POST_EXCLUDE_REGEXES
-      ".*system32.*"
-    RUNTIME DESTINATION .
-  )
-endif()

src/apps/deskflow-server/deskflow-server.cpp

@@ -1,40 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
- * SPDX-FileCopyrightText: (C) 2012-2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "arch/Arch.h"
-#include "base/EventQueue.h"
-#include "base/Log.h"
-#include "deskflow/ServerApp.h"
-
-#if SYSAPI_WIN32
-#include "arch/win32/ArchMiscWindows.h"
-#include <QCoreApplication>
-#endif
-
-int main(int argc, char **argv)
-{
-#if SYSAPI_WIN32
-  // HACK to make sure settings gets the correct qApp path
-  QCoreApplication m(argc, argv);
-  m.deleteLater();
-
-  ArchMiscWindows::guardRuntimeVersion();
-
-  // record window instance for tray icon, etc
-  ArchMiscWindows::setInstanceWin32(GetModuleHandle(nullptr));
-#endif
-
-  Arch arch;
-  arch.init();
-
-  Log log;
-  EventQueue events;
-
-  ServerApp app(&events);
-  return app.run(argc, argv);
-}

src/apps/deskflow-server/deskflow-server.exe.manifest

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-    </windowsSettings>
-  </application>
-</assembly>

src/apps/res/deskflow.qrc

@@ -6,10 +6,15 @@
         <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/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/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>
+        <file>icons/deskflow-dark/actions/16/window-minimize-pip.svg</file>
+        <file>icons/deskflow-dark/actions/16/window-restore-pip.svg</file>
         <file>icons/deskflow-dark/actions/22/configure.svg</file>
         <file>icons/deskflow-dark/actions/22/edit-copy.svg</file>
         <file>icons/deskflow-dark/actions/22/document-edit.svg</file>
@@ -17,10 +22,15 @@
         <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/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/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>
+        <file>icons/deskflow-dark/actions/22/window-minimize-pip.svg</file>
+        <file>icons/deskflow-dark/actions/22/window-restore-pip.svg</file>
         <file>icons/deskflow-dark/actions/24/configure.svg</file>
         <file>icons/deskflow-dark/actions/24/edit-copy.svg</file>
         <file>icons/deskflow-dark/actions/24/document-edit.svg</file>
@@ -29,10 +39,15 @@
         <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>
+        <file>icons/deskflow-dark/actions/24/network-connect.svg</file>
+        <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/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>
+        <file>icons/deskflow-dark/actions/24/window-minimize-pip.svg</file>
+        <file>icons/deskflow-dark/actions/24/window-restore-pip.svg</file>
         <file>icons/deskflow-dark/actions/32/configure.svg</file>
         <file>icons/deskflow-dark/actions/32/application-exit.svg</file>
         <file>icons/deskflow-dark/actions/32/dialog-cancel.svg</file>
@@ -42,8 +57,8 @@
         <file>icons/deskflow-dark/actions/32/document-save-as.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/apps/64/deskflow.svg</file>
-        <file>icons/deskflow-dark/apps/64/deskflow-symbolic.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>
         <file>icons/deskflow-dark/places/64/user-trash.svg</file>
         <file>icons/deskflow-dark/status/32/software-updates-release.svg</file>
@@ -63,10 +78,15 @@
         <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/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/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>
+        <file>icons/deskflow-light/actions/16/window-minimize-pip.svg</file>
+        <file>icons/deskflow-light/actions/16/window-restore-pip.svg</file>
         <file>icons/deskflow-light/actions/22/configure.svg</file>
         <file>icons/deskflow-light/actions/22/edit-clear-all.svg</file>
         <file>icons/deskflow-light/actions/22/edit-copy.svg</file>
@@ -74,11 +94,16 @@
         <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/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/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>
+        <file>icons/deskflow-light/actions/22/window-minimize-pip.svg</file>
+        <file>icons/deskflow-light/actions/22/window-restore-pip.svg</file>
         <file>icons/deskflow-light/actions/24/configure.svg</file>
         <file>icons/deskflow-light/actions/24/edit-clear-all.svg</file>
         <file>icons/deskflow-light/actions/24/edit-copy.svg</file>
@@ -87,10 +112,15 @@
         <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/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/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>
+        <file>icons/deskflow-light/actions/24/window-minimize-pip.svg</file>
+        <file>icons/deskflow-light/actions/24/window-restore-pip.svg</file>
         <file>icons/deskflow-light/actions/32/configure.svg</file>
         <file>icons/deskflow-light/actions/32/application-exit.svg</file>
         <file>icons/deskflow-light/actions/32/dialog-cancel.svg</file>
@@ -100,8 +130,8 @@
         <file>icons/deskflow-light/actions/32/document-save-as.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/apps/64/deskflow.svg</file>
-        <file>icons/deskflow-light/apps/64/deskflow-symbolic.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>
         <file>icons/deskflow-light/status/32/software-updates-release.svg</file>
         <file>icons/deskflow-light/status/64/dialog-error.svg</file>

src/apps/res/entitlements-dev.plist

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0"><dict>
+  <key>com.apple.security.cs.disable-library-validation</key><true/>
+  <key>com.apple.security.get-task-allow</key><true/>
+  <key>com.apple.security.cs.allow-jit</key><true/>
+</dict></plist>

src/apps/res/icons/deskflow-dark/actions/16/network-connect.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 13.300781 2 L 10.650391 4.6503906 L 9.5859375 3.5859375 L 3.5859375 9.5859375 L 4.6503906 10.650391 L 2 13.300781 L 2.6992188 14 L 5.3496094 11.349609 L 6.4140625 12.414062 L 12.414062 6.4140625 L 11.349609 5.3496094 L 14 2.6992188 L 13.300781 2 z " class="ColorScheme-Text"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/16/network-disconnect.svg

@@ -0,0 +1,8 @@
+<?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-NegativeText { color: #da4453; } .ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 13.300781 2 L 10.650391 4.6503906 L 9.5859375 3.5859375 L 6.5859375 6.5859375 L 9.4140625 9.4140625 L 12.414062 6.4140625 L 11.349609 5.3496094 L 14 2.6992188 L 13.300781 2 z M 5.5859375 7.5859375 L 3.5859375 9.5859375 L 4.6503906 10.650391 L 2 13.300781 L 2.6992188 14 L 5.3496094 11.349609 L 6.4140625 12.414062 L 8.4140625 10.414062 L 5.5859375 7.5859375 z " class="ColorScheme-Text"/>
+   <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 9,9.83 10.667,11.497 9,13.164 9.833,13.997 11.5,12.33 13.167,13.997 14,13.164 12.333,11.497 14,9.83 13.167,8.997 11.5,10.664 9.833,8.997 Z" class="ColorScheme-NegativeText"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/16/view-close.svg

@@ -0,0 +1,8 @@
+<?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-NegativeText { color: #da4453; } .ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="m2 2v12h12v-12h-12m1 2h10v9h-10v-9" class="ColorScheme-Text"/>
+ <path d="m6.2 6l-.707.707 1.793 1.793-1.793 1.793.707.707 1.793-1.793 1.793 1.793.707-.707-1.793-1.793 1.793-1.793-.707-.707-1.793 1.793" style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/16/window-minimize-pip.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color: #fcfcfc; } </style>
+    </defs>
+    <path class="ColorScheme-Text" d="m2 2v12h6v-1h-5v-9h10v4h1v-6zm7 7v6h6v-6zm1 2h4v3h-4z" fill="currentColor"/>
+    <path class="ColorScheme-Text" d="m7.9999465 5.0002137-0.999893 2e-7v1.3423975l1e-6 0.9501754-2.8926898-2.882958-0.707107 0.7071067 2.8887423 2.8831185-0.9501364-7e-7 -1.3390969 7e-7 4.666e-4 0.9998928h1.3386313l2.6606688 5.32e-5 4.131e-4 -2.6573881z" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/16/window-restore-pip.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color: #fcfcfc; } </style>
+    </defs>
+    <path class="ColorScheme-Text" d="m2 2v12h6v-1h-5v-9h10v4h1v-6zm7 7v6h6v-6zm1 2h4v3h-4z" fill="currentColor"/>
+    <path class="ColorScheme-Text" d="M 4,8.999786 H 4.9999606 V 7.657389 L 4.9999596,6.707213 7.8928452,9.590171 8.6,8.883065 5.7110623,5.999946 l 0.9502006,1e-6 1.3391875,-1e-6 -4.666e-4,-0.999893 H 6.6612619 L 4.0004131,5 4,7.657388 Z" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/22/network-connect.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 18.292969 3 L 14.792969 6.5 L 13.292969 5 L 11.292969 7 L 8 10.292969 L 6 12.292969 L 7.5 13.792969 L 3 18.292969 L 3.7070312 19 L 8.2070312 14.5 L 9.7070312 16 L 11.707031 14 L 15 10.707031 L 17 8.7070312 L 15.5 7.2070312 L 19 3.7070312 L 18.292969 3 z " class="ColorScheme-Text"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/22/network-disconnect.svg

@@ -0,0 +1,8 @@
+<?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-NegativeText { color: #da4453; } .ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 18.292969 3 L 14.792969 6.5 L 13.292969 5 L 11.292969 7 L 9.5 8.7929688 L 11 10.292969 L 11.707031 11 L 13.207031 12.5 L 15 10.707031 L 17 8.7070312 L 15.5 7.2070312 L 19 3.7070312 L 18.292969 3 z M 8.7929688 9.5 L 8 10.292969 L 6 12.292969 L 7.5 13.792969 L 3 18.292969 L 3.7070312 19 L 8.2070312 14.5 L 9.7070312 16 L 11.707031 14 L 12.5 13.207031 L 11 11.707031 L 10.292969 11 L 8.7929688 9.5 z " class="ColorScheme-Text"/>
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 14.833984 14 L 14 14.833984 L 15.666016 16.5 L 14 18.166016 L 14.833984 19 L 16.5 17.333984 L 18.166016 19 L 19 18.166016 L 17.333984 16.5 L 19 14.833984 L 18.166016 14 L 16.5 15.666016 L 14.833984 14 z " class="ColorScheme-NegativeText"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/22/view-close.svg

@@ -0,0 +1,8 @@
+<?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-Accent { color: #3daee9; } .ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 3 3 L 3 19 L 19 19 L 19 3 L 3 3 z M 4 7 L 18 7 L 18 18 L 4 18 L 4 7 z " class="ColorScheme-Text"/>
+ <path style="fill:#da4453;fill-opacity:1;stroke:none" d="M 8.7070312 9 L 8 9.7070312 L 10.292969 12 L 8 14.292969 L 8.7070312 15 L 11 12.707031 L 13.292969 15 L 14 14.292969 L 11.707031 12 L 14 9.7070312 L 13.292969 9 L 11 11.292969 L 8.7070312 9 z "/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/22/window-minimize-pip.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color: #fcfcfc; } </style>
+    </defs>
+    <path class="ColorScheme-Text" d="m9.93907 8.0718026-0.999892 2e-7v3.2427472l-3.0355875-3.035587-0.707107 0.7071068 3.0355875 3.0355872h-3.2427475v0.999893h4.9497465v-0.292787z" fill="currentColor"/>
+    <path class="ColorScheme-Text" d="m3 3v16h8v-1h-7v-11h14v4h1v-8h-1zm9 9v4-1 5h8v-8h-3zm1 3h6v4h-6v-5z" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/22/window-restore-pip.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color: #fcfcfc; } </style>
+    </defs>
+    <path class="ColorScheme-Text" d="M 5,12.949747 H 5.999892 V 9.707 L 9.03548,12.742587 9.7425869,12.03548 6.706999,8.999893 H 9.9497469 V 8 H 5 v 0.292787 z" fill="currentColor"/>
+    <path class="ColorScheme-Text" d="m3 3v16h8v-1h-7v-11h14v4h1v-8h-1zm9 9v4-1 5h8v-8h-3zm1 3h6v4h-6v-5z" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/24/network-connect.svg

@@ -0,0 +1,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 18.292969 3 L 14.792969 6.5 L 13.292969 5 L 11.292969 7 L 8 10.292969 L 6 12.292969 L 7.5 13.792969 L 3 18.292969 L 3.7070312 19 L 8.2070312 14.5 L 9.7070312 16 L 11.707031 14 L 15 10.707031 L 17 8.7070312 L 15.5 7.2070312 L 19 3.7070312 L 18.292969 3 z " class="ColorScheme-Text"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-dark/actions/24/network-disconnect.svg

@@ -0,0 +1,9 @@
+<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-NegativeText { color: #da4453; } .ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 18.292969 3 L 14.792969 6.5 L 13.292969 5 L 11.292969 7 L 9.5 8.7929688 L 11 10.292969 L 11.707031 11 L 13.207031 12.5 L 15 10.707031 L 17 8.7070312 L 15.5 7.2070312 L 19 3.7070312 L 18.292969 3 z M 8.7929688 9.5 L 8 10.292969 L 6 12.292969 L 7.5 13.792969 L 3 18.292969 L 3.7070312 19 L 8.2070312 14.5 L 9.7070312 16 L 11.707031 14 L 12.5 13.207031 L 11 11.707031 L 10.292969 11 L 8.7929688 9.5 z " class="ColorScheme-Text"/>
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 14.833984 14 L 14 14.833984 L 15.666016 16.5 L 14 18.166016 L 14.833984 19 L 16.5 17.333984 L 18.166016 19 L 19 18.166016 L 17.333984 16.5 L 19 14.833984 L 18.166016 14 L 16.5 15.666016 L 14.833984 14 z " class="ColorScheme-NegativeText"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-dark/actions/24/view-close.svg

@@ -0,0 +1,9 @@
+<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-Accent { color: #3daee9; } .ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 3 3 L 3 19 L 19 19 L 19 3 L 3 3 z M 4 7 L 18 7 L 18 18 L 4 18 L 4 7 z " class="ColorScheme-Text"/>
+    <path style="fill:#da4453;fill-opacity:1;stroke:none" d="M 8.7070312 9 L 8 9.7070312 L 10.292969 12 L 8 14.292969 L 8.7070312 15 L 11 12.707031 L 13.292969 15 L 14 14.292969 L 11.707031 12 L 14 9.7070312 L 13.292969 9 L 11 11.292969 L 8.7070312 9 z "/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-dark/actions/24/window-minimize-pip.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 24 24" width="24" height="24">
+  <defs>
+    <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path class="ColorScheme-Text" d="m9.93907 8.0718026-0.999892 2e-7v3.2427472l-3.0355875-3.035587-0.707107 0.7071068 3.0355875 3.0355872h-3.2427475v0.999893h4.9497465v-0.292787z" fill="currentColor"/>
+    <path class="ColorScheme-Text" d="m3 3v16h8v-1h-7v-11h14v4h1v-8h-1zm9 9v4-1 5h8v-8h-3zm1 3h6v4h-6v-5z" fill="currentColor"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-dark/actions/24/window-restore-pip.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 24 24" width="24" height="24">
+  <defs>
+    <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path class="ColorScheme-Text" d="M 5,12.949747 H 5.999892 V 9.707 L 9.03548,12.742587 9.7425869,12.03548 6.706999,8.999893 H 9.9497469 V 8 H 5 v 0.292787 z" fill="currentColor"/>
+    <path class="ColorScheme-Text" d="m3 3v16h8v-1h-7v-11h14v4h1v-8h-1zm9 9v4-1 5h8v-8h-3zm1 3h6v4h-6v-5z" fill="currentColor"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-dark/apps/64/deskflow-symbolic.svg

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   height="400"
-   viewBox="0 -960 16000 16000"
-   width="400"
-   fill="#e8eaed"
-   version="1.1"
-   id="svg58"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs62" />
-  <g
-     id="g312"
-     transform="matrix(0.95521236,0,0,0.88584237,358.301,773.57086)">
-    <path
-       style="fill:#f2f2f2;fill-opacity:1;stroke-width:22.0314"
-       d="m 10822.775,14277.69 c -1480.6355,-205.266 -2703.2156,-1149.093 -4024.7185,-1775.333 -745.9215,-412.95 -1640.7516,-671.66 -2479.9222,-411.91 -844.9777,264.031 -1378.4045,1001.612 -1991.5999,1582.679 -747.0662,380.92 -732.8666,-1875.959 -957.1362,-1286.712 396.2288,-871.302 1186.3232,-1519.256 1987.7363,-2012.518 1172.4366,-680.7295 2625.6591,-459.9056 3774.9177,151.009 1203.0592,540.157 2286.8972,1374.106 3578.5308,1696.524 888.521,187.313 1759.981,-291.864 2291.813,-984.522 293.133,-563.979 1138.577,-1336.7036 1564.647,-433.065 320.451,648.351 -932.467,2288.278 -494.032,1806.312 -768.024,1006.215 -1931.603,1805.177 -3250.236,1667.536 z"
-       id="path3393" />
-    <path
-       style="fill:#f2f2f2;fill-opacity:1;stroke-width:26.9658"
-       d="M 10691.975,9232.2954 C 8846.2487,8912.0018 7433.3401,7506.5916 5652.3423,7010.2615 4761.8774,6790.4246 3822.1342,7124.1431 3186.0428,7766.5861 2779.8147,8179.8677 2076.0345,9244.1299 1514.3929,8423.1235 1079.2106,7830.3042 2354.0198,6103.9484 1854.8774,6562.2615 2749.3313,5511.0149 4101.33,4683.576 5528.9402,4933.985 c 1825.4065,308.1723 3248.3604,1635.6508 4981.4158,2196.167 786.252,212.7419 1654.268,-19.2507 2198.637,-635.8586 489.708,-366.0972 693.581,-1248.5159 1405.833,-1192.9521 749.104,302.2549 726.809,1381.0589 243.424,1914.1731 -761.756,1116.6719 -1965.665,2136.6365 -3401.044,2036.4798 l -140.36,-6.6924 -124.875,-13.0105 z"
-       id="path1767" />
-    <path
-       style="fill:#f2f2f2;fill-opacity:1;stroke-width:26.9658"
-       d="M 10576.744,4172.4544 C 8781.32,3857.6985 7413.9341,2483.8453 5681.7925,2001.6118 4813.0936,1790.1465 3885.6762,2059.0545 3243.5441,2676.9291 2755.2378,3026.8587 2296.4145,4124.678 1601.3049,3504.7347 718.55095,2717.1148 2282.4679,796.203 1795.7242,1592.2603 2696.3129,485.67774 4095.5242,-387.1285 5571.7883,-103.57995 7431.0096,214.26172 8850.9468,1625.9548 10643.731,2118.8133 c 1007.057,248.4056 1967.172,-377.7119 2523.479,-1176.70049 225.605,-637.03713 1128.579,-1020.154865 1434.5,-217.3221 318.499,687.05509 -995.822,2368.70809 -558.726,1862.82939 -805.909,1049.9999 -2097.781,1861.9671 -3466.24,1584.8343 z"
-       id="path970" />
-  </g>
-</svg>

src/apps/res/icons/deskflow-dark/apps/64/deskflow.svg

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="128.00002"
-   height="127.99999"
-   viewBox="0 0 33.866671 33.866665"
-   version="1.1"
-   id="svg1"
-   xml:space="preserve"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-     id="defs1" /><g
-     id="layer1"
-     transform="translate(-32.279167,-138.64166)"><g
-       style="fill:#e8eaed"
-       id="g1"
-       transform="matrix(0.00196863,0,0,0.00196863,33.463433,141.71593)"><g
-         id="g312"
-         transform="matrix(1.002973,0,0,0.93013448,-23.783992,460.24941)"><path
-           style="fill:#3366cc;fill-opacity:1;stroke-width:22.0314"
-           d="m 10822.775,14277.69 c -1195.5832,-143.508 -2220.2063,-841.148 -3268.3667,-1379.127 -718.8533,-355.301 -1431.1297,-838.976 -2251.4363,-896.085 -491.0057,-34.634 -993.9142,16.701 -1419.8658,282.946 -632.9097,323.689 -1041.4867,924.538 -1556.5718,1387.702 -543.283,324.938 -1024.416,-324.503 -999.9439,-831.854 -66.7515,-706.46 526.7775,-1215.106 971.4799,-1675.328 796.7042,-788.985 1908.9735,-1339.2985 3051.7899,-1198.3588 1348.2477,151.6528 2490.0786,954.1998 3671.9639,1551.7868 812.8473,430.368 1732.2728,937.309 2680.6698,656.999 865.182,-240.211 1345.317,-1049.536 1918.072,-1669.709 419.319,-369.53 999.56,99.027 1037.303,575.62 144.849,591.439 -228.81,1099.793 -584.858,1527.872 -674.991,878.758 -1646.404,1612.499 -2788.132,1678.492 -153.996,19.794 -308.698,6.257 -462.104,-10.956 z"
-           id="path3393" /><path
-           style="fill:#33b2cc;fill-opacity:1;stroke-width:26.9658"
-           d="M 10691.975,9232.2954 C 9345.1884,8998.8534 8209.7623,8175.6727 7013.3992,7567.553 6317.9006,7189.0731 5542.8247,6853.4818 4732.6528,6969.3648 3791.0852,7073.1473 3096.3863,7808.0894 2511.2819,8487.0616 2153.4997,8962.5979 1492.1857,8662.9151 1369.9995,8151.7319 1161.0166,7603.1278 1417.243,7018.9363 1804.1792,6620.924 2646.9373,5624.9864 3867.0135,4790.8306 5227.0245,4902.123 c 1538.2424,122.1926 2802.7979,1096.8978 4150.0464,1747.2218 689.4831,373.3537 1480.8271,695.5213 2275.6811,498.2159 843.443,-225.4675 1355.155,-986.6873 1874.463,-1625.928 303.839,-429.2412 935.004,-202.6984 1073.134,247.0946 229.503,525.6439 50.159,1127.049 -311.918,1545.1618 -731.881,1031.1947 -1847.889,1971.3437 -3180.435,1938.7364 -138.853,1.6775 -278.273,-1.5834 -416.021,-20.3301 z"
-           id="path1767" /><path
-           style="fill:#33cc99;fill-opacity:1;stroke-width:26.9658"
-           d="M 10576.744,4172.4544 C 8874.8637,3865.0547 7544.5841,2635.7395 5940.4635,2069.4233 5180.2383,1837.8115 4305.6379,1885.6382 3648.4341,2367.3105 c -522.046,315.7633 -870.3773,828.5536 -1307.695,1235.7633 -408.0241,287.6051 -882.8065,-100.3925 -976.5864,-516.0856 -207.011,-566.4578 84.2445,-1166.9024 491.559,-1564.2835 824.1797,-978.84256 2034.8379,-1776.07292 3363.7164,-1666.23087 1553.6459,128.553637 2838.511,1104.93638 4193.6746,1778.01277 748.5153,409.2855 1666.3233,736.8711 2500.3373,374.9559 742.862,-301.9425 1184.93,-1003.6082 1669.344,-1599.36398 390.513,-404.4477409 1011.637,22.50986 1078.781,494.20116 143.129,510.48212 -76.578,1022.79062 -407.346,1408.75032 -715.856,1002.3301 -1795.1,1907.7734 -3088.381,1906.4911 -197.264,2.2737 -394.6,-14.3348 -589.094,-47.0667 z"
-           id="path970" /></g></g></g></svg>

src/apps/res/icons/deskflow-dark/apps/64/org.deskflow.deskflow-symbolic.svg

@@ -0,0 +1,10 @@
+<svg version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
+    <defs id="defs62">
+      <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+    <g fill="currentColor" class="ColorScheme-Text">
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10822.775 14277.69c-1195.5832-143.508-2220.2063-841.148-3268.3667-1379.127-718.8533-355.301-1431.1297-838.976-2251.4363-896.085-491.0057-34.634-993.9142 16.701-1419.8658 282.946-632.9097 323.689-1041.4867 924.538-1556.5718 1387.702-543.283 324.938-1024.416-324.503-999.9439-831.854-66.7515-706.46 526.7775-1215.106 971.4799-1675.328 796.7042-788.985 1908.9735-1339.2985 3051.7899-1198.3588 1348.2477 151.6528 2490.0786 954.1998 3671.9639 1551.7868 812.8473 430.368 1732.2728 937.309 2680.6698 656.999 865.182-240.211 1345.317-1049.536 1918.072-1669.709 419.319-369.53 999.56 99.027 1037.303 575.62 144.849 591.439-228.81 1099.793-584.858 1527.872-674.991 878.758-1646.404 1612.499-2788.132 1678.492-153.996 19.794-308.698 6.257-462.104-10.956z"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10691.975 9232.2954c-1346.7866-233.442-2482.2127-1056.6227-3678.5758-1664.7424-695.4986-378.4799-1470.5745-714.0712-2280.7464-598.1882-941.5676 103.7825-1636.2665 838.7246-2221.3709 1517.6968-357.7822 475.5363-1019.0962 175.8535-1141.2824-335.3297-208.9829-548.6041 47.2435-1132.7956 434.1797-1530.8079 842.7581-995.9376 2062.8343-1830.0934 3422.8453-1718.801 1538.2424 122.1926 2802.7979 1096.8978 4150.0464 1747.2218 689.4831 373.3537 1480.8271 695.5213 2275.6811 498.2159 843.443-225.4675 1355.155-986.6873 1874.463-1625.928 303.839-429.2412 935.004-202.6984 1073.134 247.0946 229.503 525.6439 50.159 1127.049-311.918 1545.1618-731.881 1031.1947-1847.889 1971.3437-3180.435 1938.7364-138.853 1.6775-278.273-1.5834-416.021-20.3301z"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10576.744 4172.4544c-1701.8803-307.3997-3032.1599-1536.7149-4636.2805-2103.0311-760.2252-231.6118-1634.8256-183.7851-2292.0294 297.8872-522.046 315.7633-870.3773 828.5536-1307.695 1235.7633-408.0241 287.6051-882.8065-100.3925-976.5864-516.0856-207.011-566.4578 84.2445-1166.9024 491.559-1564.2835 824.1797-978.84256 2034.8379-1776.0729 3363.7164-1666.2309 1553.6459 128.55364 2838.511 1104.9364 4193.6746 1778.0128 748.5153 409.2855 1666.3233 736.8711 2500.3373 374.9559 742.862-301.9425 1184.93-1003.6082 1669.344-1599.364 390.513-404.44774 1011.637 22.50986 1078.781 494.20116 143.129 510.48212-76.578 1022.7906-407.346 1408.7503-715.856 1002.3301-1795.1 1907.7734-3088.381 1906.4911-197.264 2.2737-394.6-14.3348-589.094-47.0667z"/>
+    </g>
+</svg>

src/apps/res/icons/deskflow-dark/apps/64/org.deskflow.deskflow.svg

@@ -0,0 +1,7 @@
+<svg version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
+    <g>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10822.775 14277.69c-1195.5832-143.508-2220.2063-841.148-3268.3667-1379.127-718.8533-355.301-1431.1297-838.976-2251.4363-896.085-491.0057-34.634-993.9142 16.701-1419.8658 282.946-632.9097 323.689-1041.4867 924.538-1556.5718 1387.702-543.283 324.938-1024.416-324.503-999.9439-831.854-66.7515-706.46 526.7775-1215.106 971.4799-1675.328 796.7042-788.985 1908.9735-1339.2985 3051.7899-1198.3588 1348.2477 151.6528 2490.0786 954.1998 3671.9639 1551.7868 812.8473 430.368 1732.2728 937.309 2680.6698 656.999 865.182-240.211 1345.317-1049.536 1918.072-1669.709 419.319-369.53 999.56 99.027 1037.303 575.62 144.849 591.439-228.81 1099.793-584.858 1527.872-674.991 878.758-1646.404 1612.499-2788.132 1678.492-153.996 19.794-308.698 6.257-462.104-10.956z" fill="#36c"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10691.975 9232.2954c-1346.7866-233.442-2482.2127-1056.6227-3678.5758-1664.7424-695.4986-378.4799-1470.5745-714.0712-2280.7464-598.1882-941.5676 103.7825-1636.2665 838.7246-2221.3709 1517.6968-357.7822 475.5363-1019.0962 175.8535-1141.2824-335.3297-208.9829-548.6041 47.2435-1132.7956 434.1797-1530.8079 842.7581-995.9376 2062.8343-1830.0934 3422.8453-1718.801 1538.2424 122.1926 2802.7979 1096.8978 4150.0464 1747.2218 689.4831 373.3537 1480.8271 695.5213 2275.6811 498.2159 843.443-225.4675 1355.155-986.6873 1874.463-1625.928 303.839-429.2412 935.004-202.6984 1073.134 247.0946 229.503 525.6439 50.159 1127.049-311.918 1545.1618-731.881 1031.1947-1847.889 1971.3437-3180.435 1938.7364-138.853 1.6775-278.273-1.5834-416.021-20.3301z" fill="#33b2cc"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10576.744 4172.4544c-1701.8803-307.3997-3032.1599-1536.7149-4636.2805-2103.0311-760.2252-231.6118-1634.8256-183.7851-2292.0294 297.8872-522.046 315.7633-870.3773 828.5536-1307.695 1235.7633-408.0241 287.6051-882.8065-100.3925-976.5864-516.0856-207.011-566.4578 84.2445-1166.9024 491.559-1564.2835 824.1797-978.84256 2034.8379-1776.0729 3363.7164-1666.2309 1553.6459 128.55364 2838.511 1104.9364 4193.6746 1778.0128 748.5153 409.2855 1666.3233 736.8711 2500.3373 374.9559 742.862-301.9425 1184.93-1003.6082 1669.344-1599.364 390.513-404.44774 1011.637 22.50986 1078.781 494.20116 143.129 510.48212-76.578 1022.7906-407.346 1408.7503-715.856 1002.3301-1795.1 1907.7734-3088.381 1906.4911-197.264 2.2737-394.6-14.3348-589.094-47.0667z" fill="#3c9"/>
+    </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/16/network-connect.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 13.300781 2 L 10.650391 4.6503906 L 9.5859375 3.5859375 L 3.5859375 9.5859375 L 4.6503906 10.650391 L 2 13.300781 L 2.6992188 14 L 5.3496094 11.349609 L 6.4140625 12.414062 L 12.414062 6.4140625 L 11.349609 5.3496094 L 14 2.6992188 L 13.300781 2 z "
+     class="ColorScheme-Text"
+     />
+</svg>

src/apps/res/icons/deskflow-light/actions/16/network-disconnect.svg

@@ -0,0 +1,21 @@
+<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;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 13.300781 2 L 10.650391 4.6503906 L 9.5859375 3.5859375 L 6.5859375 6.5859375 L 9.4140625 9.4140625 L 12.414062 6.4140625 L 11.349609 5.3496094 L 14 2.6992188 L 13.300781 2 z M 5.5859375 7.5859375 L 3.5859375 9.5859375 L 4.6503906 10.650391 L 2 13.300781 L 2.6992188 14 L 5.3496094 11.349609 L 6.4140625 12.414062 L 8.4140625 10.414062 L 5.5859375 7.5859375 z "
+     class="ColorScheme-Text"
+     />
+   <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 9,9.83 10.667,11.497 9,13.164 9.833,13.997 11.5,12.33 13.167,13.997 14,13.164 12.333,11.497 14,9.83 13.167,8.997 11.5,10.664 9.833,8.997 Z" 
+     class="ColorScheme-NegativeText"
+     />
+</svg>

src/apps/res/icons/deskflow-light/actions/16/view-close.svg

@@ -0,0 +1,21 @@
+<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;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="m2 2v12h12v-12h-12m1 2h10v9h-10v-9" 
+     class="ColorScheme-Text"/>
+ <path 
+     d="m6.2 6l-.707.707 1.793 1.793-1.793 1.793.707.707 1.793-1.793 1.793 1.793.707-.707-1.793-1.793 1.793-1.793-.707-.707-1.793 1.793"
+      style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-NegativeText"
+    />
+</svg>

src/apps/res/icons/deskflow-light/actions/16/window-minimize-pip.svg

@@ -0,0 +1,9 @@
+<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
+        color:#232629;
+      }</style>
+    </defs>
+    <path class="ColorScheme-Text" d="m2 2v12h6v-1h-5v-9h10v4h1v-6zm7 7v6h6v-6zm1 2h4v3h-4z" fill="currentColor"/>
+    <path class="ColorScheme-Text" d="m7.9999465 5.0002137-0.999893 2e-7v1.3423975l1e-6 0.9501754-2.8926898-2.882958-0.707107 0.7071067 2.8887423 2.8831185-0.9501364-7e-7 -1.3390969 7e-7 4.666e-4 0.9998928h1.3386313l2.6606688 5.32e-5 4.131e-4 -2.6573881z" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/16/window-restore-pip.svg

@@ -0,0 +1,9 @@
+<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
+        color:#232629;
+      }</style>
+    </defs>
+    <path class="ColorScheme-Text" d="m2 2v12h6v-1h-5v-9h10v4h1v-6zm7 7v6h6v-6zm1 2h4v3h-4z" fill="currentColor"/>
+    <path class="ColorScheme-Text" d="M 4,8.999786 H 4.9999606 V 7.657389 L 4.9999596,6.707213 7.8928452,9.590171 8.6,8.883065 5.7110623,5.999946 l 0.9502006,1e-6 1.3391875,-1e-6 -4.666e-4,-0.999893 H 6.6612619 L 4.0004131,5 4,7.657388 Z" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/22/network-connect.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 18.292969 3 L 14.792969 6.5 L 13.292969 5 L 11.292969 7 L 8 10.292969 L 6 12.292969 L 7.5 13.792969 L 3 18.292969 L 3.7070312 19 L 8.2070312 14.5 L 9.7070312 16 L 11.707031 14 L 15 10.707031 L 17 8.7070312 L 15.5 7.2070312 L 19 3.7070312 L 18.292969 3 z "
+     class="ColorScheme-Text"
+     />
+</svg>

src/apps/res/icons/deskflow-light/actions/22/network-disconnect.svg

@@ -0,0 +1,22 @@
+<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;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 18.292969 3 L 14.792969 6.5 L 13.292969 5 L 11.292969 7 L 9.5 8.7929688 L 11 10.292969 L 11.707031 11 L 13.207031 12.5 L 15 10.707031 L 17 8.7070312 L 15.5 7.2070312 L 19 3.7070312 L 18.292969 3 z M 8.7929688 9.5 L 8 10.292969 L 6 12.292969 L 7.5 13.792969 L 3 18.292969 L 3.7070312 19 L 8.2070312 14.5 L 9.7070312 16 L 11.707031 14 L 12.5 13.207031 L 11 11.707031 L 10.292969 11 L 8.7929688 9.5 z "
+     class="ColorScheme-Text"
+     />
+    <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 14.833984 14 L 14 14.833984 L 15.666016 16.5 L 14 18.166016 L 14.833984 19 L 16.5 17.333984 L 18.166016 19 L 19 18.166016 L 17.333984 16.5 L 19 14.833984 L 18.166016 14 L 16.5 15.666016 L 14.833984 14 z "
+     class="ColorScheme-NegativeText"
+     />
+</svg>

src/apps/res/icons/deskflow-light/actions/22/view-close.svg

@@ -0,0 +1,21 @@
+<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;
+      }
+      .ColorScheme-Accent {
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 3 3 L 3 19 L 19 19 L 19 3 L 3 3 z M 4 7 L 18 7 L 18 18 L 4 18 L 4 7 z "
+     class="ColorScheme-Text"
+     />
+ <path 
+     style="fill:#da4453;fill-opacity:1;stroke:none" 
+     d="M 8.7070312 9 L 8 9.7070312 L 10.292969 12 L 8 14.292969 L 8.7070312 15 L 11 12.707031 L 13.292969 15 L 14 14.292969 L 11.707031 12 L 14 9.7070312 L 13.292969 9 L 11 11.292969 L 8.7070312 9 z "
+     />
+</svg>

src/apps/res/icons/deskflow-light/actions/22/window-minimize-pip.svg

@@ -0,0 +1,9 @@
+<svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
+        color:#232629;
+      }</style>
+    </defs>
+    <path class="ColorScheme-Text" d="m9.93907 8.0718026-0.999892 2e-7v3.2427472l-3.0355875-3.035587-0.707107 0.7071068 3.0355875 3.0355872h-3.2427475v0.999893h4.9497465v-0.292787z" fill="currentColor"/>
+    <path class="ColorScheme-Text" d="m3 3v16h8v-1h-7v-11h14v4h1v-8h-1zm9 9v4-1 5h8v-8h-3zm1 3h6v4h-6v-5z" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/22/window-restore-pip.svg

@@ -0,0 +1,9 @@
+<svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
+        color:#232629;
+      }</style>
+    </defs>
+    <path class="ColorScheme-Text" d="M 5,12.949747 H 5.999892 V 9.707 L 9.03548,12.742587 9.7425869,12.03548 6.706999,8.999893 H 9.9497469 V 8 H 5 v 0.292787 z" fill="currentColor"/>
+    <path class="ColorScheme-Text" d="m3 3v16h8v-1h-7v-11h14v4h1v-8h-1zm9 9v4-1 5h8v-8h-3zm1 3h6v4h-6v-5z" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/24/network-connect.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 18.292969 3 L 14.792969 6.5 L 13.292969 5 L 11.292969 7 L 8 10.292969 L 6 12.292969 L 7.5 13.792969 L 3 18.292969 L 3.7070312 19 L 8.2070312 14.5 L 9.7070312 16 L 11.707031 14 L 15 10.707031 L 17 8.7070312 L 15.5 7.2070312 L 19 3.7070312 L 18.292969 3 z " class="ColorScheme-Text"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/24/network-disconnect.svg

@@ -0,0 +1,16 @@
+<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;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 18.292969 3 L 14.792969 6.5 L 13.292969 5 L 11.292969 7 L 9.5 8.7929688 L 11 10.292969 L 11.707031 11 L 13.207031 12.5 L 15 10.707031 L 17 8.7070312 L 15.5 7.2070312 L 19 3.7070312 L 18.292969 3 z M 8.7929688 9.5 L 8 10.292969 L 6 12.292969 L 7.5 13.792969 L 3 18.292969 L 3.7070312 19 L 8.2070312 14.5 L 9.7070312 16 L 11.707031 14 L 12.5 13.207031 L 11 11.707031 L 10.292969 11 L 8.7929688 9.5 z " class="ColorScheme-Text"/>
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 14.833984 14 L 14 14.833984 L 15.666016 16.5 L 14 18.166016 L 14.833984 19 L 16.5 17.333984 L 18.166016 19 L 19 18.166016 L 17.333984 16.5 L 19 14.833984 L 18.166016 14 L 16.5 15.666016 L 14.833984 14 z " class="ColorScheme-NegativeText"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/24/view-close.svg

@@ -0,0 +1,16 @@
+<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;
+      }
+      .ColorScheme-Accent {
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 3 3 L 3 19 L 19 19 L 19 3 L 3 3 z M 4 7 L 18 7 L 18 18 L 4 18 L 4 7 z " class="ColorScheme-Text"/>
+    <path style="fill:#da4453;fill-opacity:1;stroke:none" d="M 8.7070312 9 L 8 9.7070312 L 10.292969 12 L 8 14.292969 L 8.7070312 15 L 11 12.707031 L 13.292969 15 L 14 14.292969 L 11.707031 12 L 14 9.7070312 L 13.292969 9 L 11 11.292969 L 8.7070312 9 z "/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/24/window-minimize-pip.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 24 24" width="24" height="24">
+  <defs>
+    <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
+        color:#232629;
+      }</style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path class="ColorScheme-Text" d="m9.93907 8.0718026-0.999892 2e-7v3.2427472l-3.0355875-3.035587-0.707107 0.7071068 3.0355875 3.0355872h-3.2427475v0.999893h4.9497465v-0.292787z" fill="currentColor"/>
+    <path class="ColorScheme-Text" d="m3 3v16h8v-1h-7v-11h14v4h1v-8h-1zm9 9v4-1 5h8v-8h-3zm1 3h6v4h-6v-5z" fill="currentColor"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/24/window-restore-pip.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 24 24" width="24" height="24">
+  <defs>
+    <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
+        color:#232629;
+      }</style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path class="ColorScheme-Text" d="M 5,12.949747 H 5.999892 V 9.707 L 9.03548,12.742587 9.7425869,12.03548 6.706999,8.999893 H 9.9497469 V 8 H 5 v 0.292787 z" fill="currentColor"/>
+    <path class="ColorScheme-Text" d="m3 3v16h8v-1h-7v-11h14v4h1v-8h-1zm9 9v4-1 5h8v-8h-3zm1 3h6v4h-6v-5z" fill="currentColor"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-light/apps/64/deskflow-symbolic.svg

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   height="400"
-   viewBox="0 -960 16000 16000"
-   width="400"
-   fill="#e8eaed"
-   version="1.1"
-   id="svg58"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs62" />
-  <g
-     id="g312"
-     transform="matrix(0.95521236,0,0,0.88584237,358.301,773.57086)">
-    <path
-       style="fill:#1a1a1a;fill-opacity:1;stroke-width:22.0314"
-       d="m 10822.775,14277.69 c -1195.5832,-143.508 -2220.2063,-841.148 -3268.3667,-1379.127 -718.8533,-355.301 -1431.1297,-838.976 -2251.4363,-896.085 -491.0057,-34.634 -993.9142,16.701 -1419.8658,282.946 -632.9097,323.689 -1041.4867,924.538 -1556.5718,1387.702 -543.283,324.938 -1024.416,-324.503 -999.9439,-831.854 -66.7515,-706.46 526.7775,-1215.106 971.4799,-1675.328 796.7042,-788.985 1908.9735,-1339.2985 3051.7899,-1198.3588 1348.2477,151.6528 2490.0786,954.1998 3671.9639,1551.7868 812.8473,430.368 1732.2728,937.309 2680.6698,656.999 865.182,-240.211 1345.317,-1049.536 1918.072,-1669.709 419.319,-369.53 999.56,99.027 1037.303,575.62 144.849,591.439 -228.81,1099.793 -584.858,1527.872 -674.991,878.758 -1646.404,1612.499 -2788.132,1678.492 -153.996,19.794 -308.698,6.257 -462.104,-10.956 z"
-       id="path3393" />
-    <path
-       style="fill:#1a1a1a;fill-opacity:1;stroke-width:26.9658"
-       d="M 10691.975,9232.2954 C 9345.1884,8998.8534 8209.7623,8175.6727 7013.3992,7567.553 6317.9006,7189.0731 5542.8247,6853.4818 4732.6528,6969.3648 3791.0852,7073.1473 3096.3863,7808.0894 2511.2819,8487.0616 2153.4997,8962.5979 1492.1857,8662.9151 1369.9995,8151.7319 1161.0166,7603.1278 1417.243,7018.9363 1804.1792,6620.924 2646.9373,5624.9864 3867.0135,4790.8306 5227.0245,4902.123 c 1538.2424,122.1926 2802.7979,1096.8978 4150.0464,1747.2218 689.4831,373.3537 1480.8271,695.5213 2275.6811,498.2159 843.443,-225.4675 1355.155,-986.6873 1874.463,-1625.928 303.839,-429.2412 935.004,-202.6984 1073.134,247.0946 229.503,525.6439 50.159,1127.049 -311.918,1545.1618 -731.881,1031.1947 -1847.889,1971.3437 -3180.435,1938.7364 -138.853,1.6775 -278.273,-1.5834 -416.021,-20.3301 z"
-       id="path1767" />
-    <path
-       style="fill:#1a1a1a;fill-opacity:1;stroke-width:26.9658"
-       d="M 10576.744,4172.4544 C 8874.8637,3865.0547 7544.5841,2635.7395 5940.4635,2069.4233 5180.2383,1837.8115 4305.6379,1885.6382 3648.4341,2367.3105 c -522.046,315.7633 -870.3773,828.5536 -1307.695,1235.7633 -408.0241,287.6051 -882.8065,-100.3925 -976.5864,-516.0856 -207.011,-566.4578 84.2445,-1166.9024 491.559,-1564.2835 824.1797,-978.84256 2034.8379,-1776.07292 3363.7164,-1666.23087 1553.6459,128.553637 2838.511,1104.93638 4193.6746,1778.01277 748.5153,409.2855 1666.3233,736.8711 2500.3373,374.9559 742.862,-301.9425 1184.93,-1003.6082 1669.344,-1599.36398 390.513,-404.4477409 1011.637,22.50986 1078.781,494.20116 143.129,510.48212 -76.578,1022.79062 -407.346,1408.75032 -715.856,1002.3301 -1795.1,1907.7734 -3088.381,1906.4911 -197.264,2.2737 -394.6,-14.3348 -589.094,-47.0667 z"
-       id="path970" />
-  </g>
-</svg>

src/apps/res/icons/deskflow-light/apps/64/deskflow.svg

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="128.00002"
-   height="127.99999"
-   viewBox="0 0 33.866671 33.866665"
-   version="1.1"
-   id="svg1"
-   xml:space="preserve"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-     id="defs1" /><g
-     id="layer1"
-     transform="translate(-32.279167,-138.64166)"><g
-       style="fill:#e8eaed"
-       id="g1"
-       transform="matrix(0.00196863,0,0,0.00196863,33.463433,141.71593)"><g
-         id="g312"
-         transform="matrix(1.002973,0,0,0.93013448,-23.783992,460.24941)"><path
-           style="fill:#3366cc;fill-opacity:1;stroke-width:22.0314"
-           d="m 10822.775,14277.69 c -1195.5832,-143.508 -2220.2063,-841.148 -3268.3667,-1379.127 -718.8533,-355.301 -1431.1297,-838.976 -2251.4363,-896.085 -491.0057,-34.634 -993.9142,16.701 -1419.8658,282.946 -632.9097,323.689 -1041.4867,924.538 -1556.5718,1387.702 -543.283,324.938 -1024.416,-324.503 -999.9439,-831.854 -66.7515,-706.46 526.7775,-1215.106 971.4799,-1675.328 796.7042,-788.985 1908.9735,-1339.2985 3051.7899,-1198.3588 1348.2477,151.6528 2490.0786,954.1998 3671.9639,1551.7868 812.8473,430.368 1732.2728,937.309 2680.6698,656.999 865.182,-240.211 1345.317,-1049.536 1918.072,-1669.709 419.319,-369.53 999.56,99.027 1037.303,575.62 144.849,591.439 -228.81,1099.793 -584.858,1527.872 -674.991,878.758 -1646.404,1612.499 -2788.132,1678.492 -153.996,19.794 -308.698,6.257 -462.104,-10.956 z"
-           id="path3393" /><path
-           style="fill:#33b2cc;fill-opacity:1;stroke-width:26.9658"
-           d="M 10691.975,9232.2954 C 9345.1884,8998.8534 8209.7623,8175.6727 7013.3992,7567.553 6317.9006,7189.0731 5542.8247,6853.4818 4732.6528,6969.3648 3791.0852,7073.1473 3096.3863,7808.0894 2511.2819,8487.0616 2153.4997,8962.5979 1492.1857,8662.9151 1369.9995,8151.7319 1161.0166,7603.1278 1417.243,7018.9363 1804.1792,6620.924 2646.9373,5624.9864 3867.0135,4790.8306 5227.0245,4902.123 c 1538.2424,122.1926 2802.7979,1096.8978 4150.0464,1747.2218 689.4831,373.3537 1480.8271,695.5213 2275.6811,498.2159 843.443,-225.4675 1355.155,-986.6873 1874.463,-1625.928 303.839,-429.2412 935.004,-202.6984 1073.134,247.0946 229.503,525.6439 50.159,1127.049 -311.918,1545.1618 -731.881,1031.1947 -1847.889,1971.3437 -3180.435,1938.7364 -138.853,1.6775 -278.273,-1.5834 -416.021,-20.3301 z"
-           id="path1767" /><path
-           style="fill:#33cc99;fill-opacity:1;stroke-width:26.9658"
-           d="M 10576.744,4172.4544 C 8874.8637,3865.0547 7544.5841,2635.7395 5940.4635,2069.4233 5180.2383,1837.8115 4305.6379,1885.6382 3648.4341,2367.3105 c -522.046,315.7633 -870.3773,828.5536 -1307.695,1235.7633 -408.0241,287.6051 -882.8065,-100.3925 -976.5864,-516.0856 -207.011,-566.4578 84.2445,-1166.9024 491.559,-1564.2835 824.1797,-978.84256 2034.8379,-1776.07292 3363.7164,-1666.23087 1553.6459,128.553637 2838.511,1104.93638 4193.6746,1778.01277 748.5153,409.2855 1666.3233,736.8711 2500.3373,374.9559 742.862,-301.9425 1184.93,-1003.6082 1669.344,-1599.36398 390.513,-404.4477409 1011.637,22.50986 1078.781,494.20116 143.129,510.48212 -76.578,1022.79062 -407.346,1408.75032 -715.856,1002.3301 -1795.1,1907.7734 -3088.381,1906.4911 -197.264,2.2737 -394.6,-14.3348 -589.094,-47.0667 z"
-           id="path970" /></g></g></g></svg>

src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg

@@ -0,0 +1,10 @@
+<svg version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
+    <defs id="defs62">
+      <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #232629; } </style>
+  </defs>
+    <g fill="currentColor" class="ColorScheme-Text">
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10822.775 14277.69c-1195.5832-143.508-2220.2063-841.148-3268.3667-1379.127-718.8533-355.301-1431.1297-838.976-2251.4363-896.085-491.0057-34.634-993.9142 16.701-1419.8658 282.946-632.9097 323.689-1041.4867 924.538-1556.5718 1387.702-543.283 324.938-1024.416-324.503-999.9439-831.854-66.7515-706.46 526.7775-1215.106 971.4799-1675.328 796.7042-788.985 1908.9735-1339.2985 3051.7899-1198.3588 1348.2477 151.6528 2490.0786 954.1998 3671.9639 1551.7868 812.8473 430.368 1732.2728 937.309 2680.6698 656.999 865.182-240.211 1345.317-1049.536 1918.072-1669.709 419.319-369.53 999.56 99.027 1037.303 575.62 144.849 591.439-228.81 1099.793-584.858 1527.872-674.991 878.758-1646.404 1612.499-2788.132 1678.492-153.996 19.794-308.698 6.257-462.104-10.956z"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10691.975 9232.2954c-1346.7866-233.442-2482.2127-1056.6227-3678.5758-1664.7424-695.4986-378.4799-1470.5745-714.0712-2280.7464-598.1882-941.5676 103.7825-1636.2665 838.7246-2221.3709 1517.6968-357.7822 475.5363-1019.0962 175.8535-1141.2824-335.3297-208.9829-548.6041 47.2435-1132.7956 434.1797-1530.8079 842.7581-995.9376 2062.8343-1830.0934 3422.8453-1718.801 1538.2424 122.1926 2802.7979 1096.8978 4150.0464 1747.2218 689.4831 373.3537 1480.8271 695.5213 2275.6811 498.2159 843.443-225.4675 1355.155-986.6873 1874.463-1625.928 303.839-429.2412 935.004-202.6984 1073.134 247.0946 229.503 525.6439 50.159 1127.049-311.918 1545.1618-731.881 1031.1947-1847.889 1971.3437-3180.435 1938.7364-138.853 1.6775-278.273-1.5834-416.021-20.3301z"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10576.744 4172.4544c-1701.8803-307.3997-3032.1599-1536.7149-4636.2805-2103.0311-760.2252-231.6118-1634.8256-183.7851-2292.0294 297.8872-522.046 315.7633-870.3773 828.5536-1307.695 1235.7633-408.0241 287.6051-882.8065-100.3925-976.5864-516.0856-207.011-566.4578 84.2445-1166.9024 491.559-1564.2835 824.1797-978.84256 2034.8379-1776.0729 3363.7164-1666.2309 1553.6459 128.55364 2838.511 1104.9364 4193.6746 1778.0128 748.5153 409.2855 1666.3233 736.8711 2500.3373 374.9559 742.862-301.9425 1184.93-1003.6082 1669.344-1599.364 390.513-404.44774 1011.637 22.50986 1078.781 494.20116 143.129 510.48212-76.578 1022.7906-407.346 1408.7503-715.856 1002.3301-1795.1 1907.7734-3088.381 1906.4911-197.264 2.2737-394.6-14.3348-589.094-47.0667z"/>
+    </g>
+</svg>

src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow.svg

@@ -0,0 +1,7 @@
+<svg version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
+    <g>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10822.775 14277.69c-1195.5832-143.508-2220.2063-841.148-3268.3667-1379.127-718.8533-355.301-1431.1297-838.976-2251.4363-896.085-491.0057-34.634-993.9142 16.701-1419.8658 282.946-632.9097 323.689-1041.4867 924.538-1556.5718 1387.702-543.283 324.938-1024.416-324.503-999.9439-831.854-66.7515-706.46 526.7775-1215.106 971.4799-1675.328 796.7042-788.985 1908.9735-1339.2985 3051.7899-1198.3588 1348.2477 151.6528 2490.0786 954.1998 3671.9639 1551.7868 812.8473 430.368 1732.2728 937.309 2680.6698 656.999 865.182-240.211 1345.317-1049.536 1918.072-1669.709 419.319-369.53 999.56 99.027 1037.303 575.62 144.849 591.439-228.81 1099.793-584.858 1527.872-674.991 878.758-1646.404 1612.499-2788.132 1678.492-153.996 19.794-308.698 6.257-462.104-10.956z" fill="#36c"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10691.975 9232.2954c-1346.7866-233.442-2482.2127-1056.6227-3678.5758-1664.7424-695.4986-378.4799-1470.5745-714.0712-2280.7464-598.1882-941.5676 103.7825-1636.2665 838.7246-2221.3709 1517.6968-357.7822 475.5363-1019.0962 175.8535-1141.2824-335.3297-208.9829-548.6041 47.2435-1132.7956 434.1797-1530.8079 842.7581-995.9376 2062.8343-1830.0934 3422.8453-1718.801 1538.2424 122.1926 2802.7979 1096.8978 4150.0464 1747.2218 689.4831 373.3537 1480.8271 695.5213 2275.6811 498.2159 843.443-225.4675 1355.155-986.6873 1874.463-1625.928 303.839-429.2412 935.004-202.6984 1073.134 247.0946 229.503 525.6439 50.159 1127.049-311.918 1545.1618-731.881 1031.1947-1847.889 1971.3437-3180.435 1938.7364-138.853 1.6775-278.273-1.5834-416.021-20.3301z" fill="#33b2cc"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10576.744 4172.4544c-1701.8803-307.3997-3032.1599-1536.7149-4636.2805-2103.0311-760.2252-231.6118-1634.8256-183.7851-2292.0294 297.8872-522.046 315.7633-870.3773 828.5536-1307.695 1235.7633-408.0241 287.6051-882.8065-100.3925-976.5864-516.0856-207.011-566.4578 84.2445-1166.9024 491.559-1564.2835 824.1797-978.84256 2034.8379-1776.0729 3363.7164-1666.2309 1553.6459 128.55364 2838.511 1104.9364 4193.6746 1778.0128 748.5153 409.2855 1666.3233 736.8711 2500.3373 374.9559 742.862-301.9425 1184.93-1003.6082 1669.344-1599.364 390.513-404.44774 1011.637 22.50986 1078.781 494.20116 143.129 510.48212-76.578 1022.7906-407.346 1408.7503-715.856 1002.3301-1795.1 1907.7734-3088.381 1906.4911-197.264 2.2737-394.6-14.3348-589.094-47.0667z" fill="#3c9"/>
+    </g>
+</svg>

src/apps/res/manpage.txt

@@ -1,5 +1,5 @@
 [SEE ALSO]
-deskflow(1), deskflow-client(1), deskflow-server(2)
+deskflow(1), deskflow-core(1)
 
 All documentation is on the web, so please point your browser at
 <https://github.com/deskflow/deskflow/wiki> and surf away.

src/lib/Config.h.in

@@ -7,12 +7,6 @@
 
 // clang-format off
 
-/* Define if you have the `inet_aton` function. */
-#cmakedefine HAVE_INET_ATON @HAVE_INET_ATON@
-
-/* Define if you have a POSIX `sigwait` function. */
-#cmakedefine HAVE_POSIX_SIGWAIT @HAVE_POSIX_SIGWAIT@
-
 /* Define to 1 if you have the <X11/extensions/Xrandr.h> header file. */
 #cmakedefine HAVE_X11_EXTENSIONS_XRANDR_H @HAVE_X11_EXTENSIONS_XRANDR_H@
 

src/lib/arch/Arch.cpp

@@ -1,5 +1,6 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 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
@@ -25,18 +26,13 @@ Arch::Arch()
   s_instance = this;
 }
 
-Arch::Arch(Arch *arch)
-{
-  s_instance = arch;
-}
-
+#if SYSAPI_WIN32
 void Arch::init()
 {
   ARCH_NETWORK::init();
-#if SYSAPI_WIN32
   ArchMiscWindows::init();
-#endif
 }
+#endif
 
 Arch *Arch::getInstance()
 {

src/lib/arch/Arch.h

@@ -1,5 +1,6 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 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
@@ -24,9 +25,6 @@
 
 #pragma once
 
-#include "arch/ArchString.h"
-#include "common/Common.h"
-
 #if SYSAPI_WIN32
 
 #include "arch/win32/ArchDaemonWindows.h"
@@ -36,7 +34,7 @@
 
 #elif SYSAPI_UNIX
 
-#include "arch/unix/ArchDaemonUnix.h"
+#include "arch/ArchDaemonNone.h"
 #include "arch/unix/ArchLogUnix.h"
 #include "arch/unix/ArchMultithreadPosix.h"
 #include "arch/unix/ArchNetworkBSD.h"
@@ -59,19 +57,20 @@ to each method to those implementations.  Clients should use the
 exactly one of these objects before attempting to call any method,
 typically at the beginning of \c main().
 */
-class Arch : public ARCH_DAEMON, public ARCH_LOG, public ARCH_MULTITHREAD, public ARCH_NETWORK, public ArchString
+class Arch : public ARCH_DAEMON, public ARCH_LOG, public ARCH_MULTITHREAD, public ARCH_NETWORK
 {
 public:
   Arch();
-  explicit Arch(Arch *arch);
   ~Arch() override = default;
 
+#if SYSAPI_WIN32
   //! Call init on other arch classes.
   /*!
   Some arch classes depend on others to exist first. When init is called
   these classes will have ARCH available for use.
   */
   void init() override;
+#endif
 
   //
   // accessors
@@ -84,11 +83,6 @@ public:
   */
   static Arch *getInstance();
 
-  static void setInstance(Arch *s)
-  {
-    s_instance = s;
-  }
-
   /**
    * @brief blocks calling thread for timout seconds
    * @param timeout - blocking time in seconds. if < 0 not blocked if == 0 then caller yields the CPU

src/lib/arch/ArchDaemonNone.cpp

@@ -1,54 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "arch/ArchDaemonNone.h"
-
-//
-// ArchDaemonNone
-//
-
-void ArchDaemonNone::installDaemon(const char *, const char *, const char *, const char *, const char *)
-{
-  // do nothing
-}
-
-void ArchDaemonNone::uninstallDaemon(const char *)
-{
-  // do nothing
-}
-
-int ArchDaemonNone::daemonize(const char *name, DaemonFunc const &func)
-{
-  // simply forward the call to func.  obviously, this doesn't
-  // do any daemonizing.
-  return func(1, &name);
-}
-
-bool ArchDaemonNone::canInstallDaemon(const char *)
-{
-  return false;
-}
-
-bool ArchDaemonNone::isDaemonInstalled(const char *)
-{
-  return false;
-}
-
-void ArchDaemonNone::installDaemon()
-{
-  // do nothing
-}
-
-void ArchDaemonNone::uninstallDaemon()
-{
-  // do nothing
-}
-
-std::string ArchDaemonNone::commandLine() const
-{
-  return "";
-}

src/lib/arch/ArchDaemonNone.h

@@ -1,5 +1,6 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 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
@@ -13,9 +14,8 @@
 
 //! Dummy implementation of IArchDaemon
 /*!
-This class implements IArchDaemon for a platform that does not have
-daemons.  The install and uninstall functions do nothing, the query
-functions return false, and \c daemonize() simply calls the passed
+This class implements IArchDaemon for a platform that does not have daemons.
+The query functions return false, and \c daemonize() simply calls the passed
 function and returns its result.
 */
 class ArchDaemonNone : public IArchDaemon
@@ -25,14 +25,14 @@ public:
   ~ArchDaemonNone() override = default;
 
   // IArchDaemon overrides
-  void installDaemon(
-      const char *name, const char *description, const char *pathname, const char *commandLine, const char *dependencies
-  ) override;
-  void uninstallDaemon(const char *name) override;
-  int daemonize(const char *name, DaemonFunc const &func) override;
-  bool canInstallDaemon(const char *name) override;
-  bool isDaemonInstalled(const char *name) override;
-  void installDaemon() override;
-  void uninstallDaemon() override;
-  std::string commandLine() const override;
+  int daemonize(DaemonFunc const &func) override
+  {
+    // simply forward the call to func.  obviously, this doesn't
+    // do any daemonizing.
+    return func();
+  }
+  QString commandLine() const override
+  {
+    return {};
+  }
 };

src/lib/arch/ArchException.h

@@ -0,0 +1,202 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 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
+ */
+
+#pragma once
+
+#include <stdexcept>
+
+//! Generic thread exception
+/*!
+Exceptions derived from this class are used by the multithreading
+library to perform stack unwinding when a thread terminates.  These
+exceptions must always be rethrown by clients when caught.
+*/
+class ThreadException : public std::exception
+{
+};
+
+//! Thread exception to cancel
+/*!
+Thrown to cancel a thread.  Clients must not throw this type, but
+must rethrow it if caught (by ThreadCancelException, ThreadException, or ...).
+*/
+class ThreadCancelException : public ThreadException
+{
+};
+
+/*!
+\def RETHROW_THREADEXCEPTION
+Convenience macro to rethrow an ThreadException exception but ignore other
+exceptions.  Put this in your catch (...) handler after necessary
+cleanup but before leaving or returning from the handler.
+*/
+#define RETHROW_THREADEXCEPTION                                                                                        \
+  try {                                                                                                                \
+    throw;                                                                                                             \
+  } catch (ThreadException &) {                                                                                        \
+    throw;                                                                                                             \
+  } catch (...) {                                                                                                      \
+  }
+
+//! Generic network exception
+/*!
+Exceptions derived from this class are used by the networking
+library to indicate various errors.
+*/
+class ArchNetworkException : public std::runtime_error
+{
+  using std::runtime_error::runtime_error;
+};
+
+//! Operation was interrupted
+class ArchNetworkInterruptedException : public ArchNetworkException
+{
+  using ArchNetworkException::ArchNetworkException;
+};
+
+//! Network insufficient permission
+class ArchNetworkAccessException : public ArchNetworkException
+{
+  using ArchNetworkException::ArchNetworkException;
+};
+
+//! Network insufficient resources
+class ArchNetworkResourceException : public ArchNetworkException
+{
+  using ArchNetworkException::ArchNetworkException;
+};
+
+//! No support for requested network resource/service
+class ArchNetworkSupportException : public ArchNetworkException
+{
+  using ArchNetworkException::ArchNetworkException;
+};
+
+//! Network I/O error
+class ArchNetworkIOException : public ArchNetworkException
+{
+  using ArchNetworkException::ArchNetworkException;
+};
+
+//! Network address is unavailable or not local
+class ArchNetworkNoAddressException : public ArchNetworkException
+{
+  using ArchNetworkException::ArchNetworkException;
+};
+
+//! Network address in use
+class ArchNetworkAddressInUseException : public ArchNetworkException
+{
+  using ArchNetworkException::ArchNetworkException;
+};
+
+//! No route to address
+class ArchNetworkNoRouteException : public ArchNetworkException
+{
+  using ArchNetworkException::ArchNetworkException;
+};
+
+//! Socket not connected
+class ArchNetworkNotConnectedException : public ArchNetworkException
+{
+  using ArchNetworkException::ArchNetworkException;
+};
+
+//! Remote read end of socket has closed
+class ArchNetworkShutdownException : public ArchNetworkException
+{
+  using ArchNetworkException::ArchNetworkException;
+};
+
+//! Remote end of socket has disconnected
+class ArchNetworkDisconnectedException : public ArchNetworkException
+{
+  using ArchNetworkException::ArchNetworkException;
+};
+
+//! Remote end of socket refused connection
+class ArchNetworkConnectionRefusedException : public ArchNetworkException
+{
+  using ArchNetworkException::ArchNetworkException;
+};
+
+//! Remote end of socket is not responding
+class ArchNetworkTimedOutException : public ArchNetworkException
+{
+  using ArchNetworkException::ArchNetworkException;
+};
+
+//! Generic network name lookup erros
+class ArchNetworkNameException : public ArchNetworkException
+{
+  using ArchNetworkException::ArchNetworkException;
+};
+
+//! The named host is unknown
+class ArchNetworkNameUnknownException : public ArchNetworkNameException
+{
+  using ArchNetworkNameException::ArchNetworkNameException;
+};
+
+//! The named host is known but has no address
+class ArchNetworkNameNoAddressException : public ArchNetworkNameException
+{
+  using ArchNetworkNameException::ArchNetworkNameException;
+};
+
+//! Non-recoverable name server error
+class ArchNetworkNameFailureException : public ArchNetworkNameException
+{
+  using ArchNetworkNameException::ArchNetworkNameException;
+};
+
+//! Temporary name server error
+class ArchNetworkNameUnavailableException : public ArchNetworkNameException
+{
+  using ArchNetworkNameException::ArchNetworkNameException;
+};
+
+//! The named host is known but no supported address
+class ArchNetworkNameUnsupportedException : public ArchNetworkNameException
+{
+  using ArchNetworkNameException::ArchNetworkNameException;
+};
+
+//! Generic daemon exception
+/*!
+Exceptions derived from this class are used by the daemon
+library to indicate various errors.
+*/
+class ArchDaemonException : public std::runtime_error
+{
+  using std::runtime_error::runtime_error;
+};
+
+//! Could not daemonize
+class ArchDaemonFailedException : public ArchDaemonException
+{
+  using ArchDaemonException::ArchDaemonException;
+};
+
+//! Could not install daemon
+class ArchDaemonInstallException : public ArchDaemonException
+{
+  using ArchDaemonException::ArchDaemonException;
+};
+
+//! Could not uninstall daemon
+class ArchDaemonUninstallFailedException : public ArchDaemonException
+{
+  using ArchDaemonException::ArchDaemonException;
+};
+
+//! Attempted to uninstall a daemon that was not installed
+class ArchDaemonUninstallNotInstalledException : public ArchDaemonFailedException
+{
+  using ArchDaemonFailedException::ArchDaemonFailedException;
+};

src/lib/arch/ArchString.cpp

@@ -1,163 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "arch/ArchString.h"
-
-#include <climits>
-#include <cstdlib>
-#include <cstring>
-#include <mutex>
-
-std::mutex s_mutex;
-
-//
-// use C library non-reentrant multibyte conversion with mutex
-//
-
-int ArchString::convStringWCToMB(char *dst, const wchar_t *src, uint32_t n, bool *errors) const
-{
-  std::scoped_lock lock{s_mutex};
-  ptrdiff_t len = 0;
-
-  bool dummyErrors;
-  if (errors == nullptr) {
-    errors = &dummyErrors;
-  }
-  *errors = false;
-
-  if (dst == nullptr) {
-    char dummy[MB_LEN_MAX];
-    const wchar_t *scan = src;
-    for (; n > 0; --n) {
-      ptrdiff_t mblen = wctomb(dummy, *scan);
-      if (mblen == -1) {
-        *errors = true;
-        mblen = 1;
-      }
-      len += mblen;
-      ++scan;
-    }
-    if (ptrdiff_t mblen = wctomb(dummy, L'\0'); mblen != -1) {
-      len += mblen - 1;
-    }
-  } else {
-    const char *dst0 = dst;
-    const wchar_t *scan = src;
-    for (; n > 0; --n) {
-      if (ptrdiff_t mblen = wctomb(dst, *scan); mblen == -1) {
-        *errors = true;
-        *dst++ = '?';
-      } else {
-        dst += mblen;
-      }
-      ++scan;
-    }
-    if (ptrdiff_t mblen = wctomb(dst, L'\0'); mblen != -1) {
-      // don't include nul terminator
-      dst += mblen - 1;
-    }
-    len = dst - dst0;
-  }
-
-  return static_cast<int>(len);
-}
-
-ArchString::EWideCharEncoding ArchString::getWideCharEncoding() const
-{
-#ifdef SYSAPI_WIN32
-  return EWideCharEncoding::kUTF16;
-#else
-  return EWideCharEncoding::kUCS4;
-#endif
-}
-
-int ArchString::convStringMBToWC(wchar_t *dst, const char *src, uint32_t n, bool *errors) const
-{
-  std::scoped_lock lock{s_mutex};
-  ptrdiff_t len = 0;
-  wchar_t dummy;
-
-  bool dummyErrors;
-  if (errors == nullptr) {
-    errors = &dummyErrors;
-  }
-  *errors = false;
-
-  if (dst == nullptr) {
-    const char *scan = src;
-    while (n > 0) {
-      switch (ptrdiff_t mblen = mbtowc(&dummy, scan, n); mblen) {
-      case -2:
-        // incomplete last character.  convert to unknown character.
-        *errors = true;
-        len += 1;
-        n = 0;
-        break;
-
-      case -1:
-        // invalid character.  count one unknown character and
-        // start at the next byte.
-        *errors = true;
-        len += 1;
-        scan += 1;
-        n -= 1;
-        break;
-
-      case 0:
-        len += 1;
-        scan += 1;
-        n -= 1;
-        break;
-
-      default:
-        // normal character
-        len += 1;
-        scan += static_cast<int>(mblen);
-        n -= static_cast<int>(mblen);
-        break;
-      }
-    }
-  } else {
-    const wchar_t *dst0 = dst;
-    const char *scan = src;
-    while (n > 0) {
-      switch (ptrdiff_t mblen = mbtowc(dst, scan, n); mblen) {
-      case -2:
-        // incomplete character.  convert to unknown character.
-        *errors = true;
-        *dst = (wchar_t)0xfffd;
-        n = 0;
-        break;
-
-      case -1:
-        // invalid character.  count one unknown character and
-        // start at the next byte.
-        *errors = true;
-        *dst = (wchar_t)0xfffd;
-        scan += 1;
-        n -= 1;
-        break;
-
-      case 0:
-        *dst = (wchar_t)0x0000;
-        scan += 1;
-        n -= 1;
-        break;
-
-      default:
-        // normal character
-        scan += static_cast<int>(mblen);
-        n -= static_cast<int>(mblen);
-        break;
-      }
-      ++dst;
-    }
-    len = dst - dst0;
-  }
-
-  return static_cast<int>(len);
-}

src/lib/arch/ArchString.h

@@ -1,58 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 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
- */
-
-#pragma once
-
-#include "common/Common.h"
-#include "common/IInterface.h"
-
-#include <stdarg.h>
-
-//! Interface for architecture dependent string operations
-/*!
-This interface defines the string operations required by
-deskflow.  Each architecture must implement this interface.
-*/
-class ArchString : public IInterface
-{
-public:
-  ArchString() = default;
-  ArchString(const ArchString &) = delete;
-  ArchString(ArchString &&) = delete;
-  ~ArchString() override = default;
-
-  ArchString &operator=(const ArchString &) = delete;
-  ArchString &operator=(ArchString &&) = delete;
-
-  //! Wide character encodings
-  /*!
-  The known wide character encodings
-  */
-  enum class EWideCharEncoding : uint8_t
-  {
-    kUCS2,  //!< The UCS-2 encoding
-    kUCS4,  //!< The UCS-4 encoding
-    kUTF16, //!< The UTF-16 encoding
-    kUTF32, //!< The UTF-32 encoding
-    kPlatformDetermined
-  };
-
-  //! @name manipulators
-  //@{
-
-  //! Convert multibyte string to wide character string
-  int convStringMBToWC(wchar_t *, const char *, uint32_t n, bool *errors) const;
-
-  //! Convert wide character string to multibyte string
-  int convStringWCToMB(char *, const wchar_t *, uint32_t n, bool *errors) const;
-
-  //! Return the architecture's native wide character encoding
-  EWideCharEncoding getWideCharEncoding() const;
-
-  //@}
-};

src/lib/arch/CMakeLists.txt

@@ -22,8 +22,6 @@ if(WIN32)
 
 elseif(UNIX)
   set(PLATFORM_CODE
-    unix/ArchDaemonUnix.cpp
-    unix/ArchDaemonUnix.h
     unix/ArchLogUnix.cpp
     unix/ArchLogUnix.h
     unix/ArchMultithreadPosix.cpp
@@ -38,17 +36,16 @@ endif()
 add_library(arch STATIC ${PLATFORM_CODE}
   Arch.cpp
   Arch.h
-  ArchDaemonNone.cpp
   ArchDaemonNone.h
+  ArchException.h
   IArchDaemon.h
   IArchLog.h
   IArchMultithread.h
   IArchNetwork.h
-  ArchString.cpp
-  ArchString.h
-  XArch.h
 )
 
+target_link_libraries (arch PUBLIC common)
+
 if(UNIX)
-  target_link_libraries(arch ${libs})
+  target_link_libraries(arch PUBLIC ${libs})
 endif()