Release v1.20.1

Indefinitely restarting the daemon is annoying as it makes problems harder to diagnose.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -22,12 +22,16 @@ body:
     validations:
       required: true
 
-  - type: input
+  - type: textarea
     id: version
     attributes:
-      label: Deskflow version number
-      description: You can find the Deskflow version number on the about screen.
-      placeholder: 1.2.3.4
+      label: Deskflow version info
+      description: You can find the Deskflow version number on the About screen.
+      placeholder: |
+        Deskflow: 1.2.3.4 (deadc0de)
+        Qt: 3.2.1
+        System: Hannah Montana Linux (Workstation Edition)
+        Session: Unity (Compiz)
     validations:
       required: true
 
@@ -51,7 +55,7 @@ body:
     id: os
     attributes:
       label: Operating systems (OS)
-      description: Which operating systems (OS) are you using?
+      description: Operating systems (OS) in use for all servers and clients
       options:
         - label: Windows
         - label: macOS
@@ -110,8 +114,7 @@ body:
       label: Deskflow configuration
       description: |
         Please provide a very brief description of your configuration.
-        Let us know the OS of the server/host/primary and the OS of the client/guest/secondary.
-        This will help us understand how you're using Deskflow.
+        Let us know what OS your server and client are running.
       placeholder: |
         - Windows 11 server, macOS 15 client
         - Each computer has a single monitor
@@ -122,9 +125,8 @@ body:
     attributes:
       label: What steps will reproduce the problem?
       description: |
-        Please list the steps to reproduce the issue.
+        Please list the _numbered steps_ to reproduce the issue.
         If you're not sure, please provide as much detail as possible.
-        This will help us understand the problem.
       placeholder: |
         1. Start Deskflow
         2. Click 'Configure Server'

.github/actions/init-python/action.yml

@@ -1,23 +0,0 @@
-# Important: Do not be tempted to cache the .venv dir (Python virtual environment).
-# When the runner environment changes (e.g. Python is upgraded), the venv will need to be
-# re-created. Trying to upgrade a venv can be complex and it's usually more practical re-create it.
-# We don't save much time anyway by caching the venv so it's not worth the added complexity.
-
-name: "Setup Python venv"
-description: "Creates a Python virtual environment (venv)"
-
-runs:
-  using: "composite"
-
-  steps:
-    - name: Setup Python venv
-      run: |
-        if [ "${{ runner.os }}" == "Windows" ]; then
-          python=python
-        else
-          python=python3
-        fi
-
-        echo "Setting up Python venv, bin=$python"
-        $python -m venv .venv
-      shell: bash

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

@@ -9,8 +9,12 @@ inputs:
     description: "Used only on linux distro type: debian, fedora, suse, arch"
     required: false
 
-  mac-qt-version:
-    description: "The verison of Qt to install on mac os"
+  qt-version:
+    description: "The version of Qt to install (Windows & macOS)"
+    required: false
+
+  qt-install-dir:
+    description: "The path to install Qt into (Windows & macOS)"
     required: false
 
 outputs:
@@ -67,13 +71,13 @@ runs:
       shell: bash
 
     - name: Install Qt
-      if: ${{runner.os == 'macOS' }}
+      if: ${{runner.os != 'Linux' }}
       uses: jurplel/install-qt-action@v4
       with:
-        dir: "/Users/runner"
-        version: ${{inputs.mac-qt-version}}
+        dir: ${{inputs.qt-install-dir}}
+        version: ${{inputs.qt-version}}
         cache: true
-        cache-key-prefix: ${{matrix.target.os}}-${{env.qt-version}}
+        cache-key-prefix: ${{matrix.target.os}}-${{inputs.qt-version}}
 
     # Install Ninja with an action instead of using Chocolatey, as it's more
     # reliable and faster. The Ninja install action is pretty good as it
@@ -87,7 +91,8 @@ runs:
       id: vcpkg
       uses: johnwason/vcpkg-action@v6
       with:
-        manifest-dir: ${{ github.workspace }}
+        pkgs: wintoast gtest pkgconf openssl
+        extra-args: --classic
         triplet: x64-windows-release
         token: ${{ github.token }}
         github-binarycache: true
@@ -95,6 +100,8 @@ runs:
     - name: Install Wix
       if: ${{ runner.os == 'Windows' }}
       run: |
-        dotnet tool install --global wix --version 4.0.4
-        wix extension add --global WixToolset.UI.wixext/4.0.4
+        dotnet tool install --global wix --version 5.0.2
+        wix extension add --global WixToolset.UI.wixext/5.0.2
+        wix extension add --global WixToolset.Util.wixext/5.0.2
+        wix extension add --global WixToolset.Firewall.wixext/5.0.2
       shell: pwsh

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

@@ -1,26 +1,21 @@
-name: "Lint error"
+name: "Lint Check"
 description: "Checks for lint errors and posts a helpful comment"
 
-inputs:
-  format-command:
-    description: "The command to run to fix lint errors"
-    required: true
-
-  format-tool:
-    description: "The name of the linting tool"
-    required: true
-
 runs:
   using: "composite"
   steps:
+    - name: Install Dependencies
+      run: pipx install --global clang_format
+      shell: bash
+
     - name: Run format command
-      run: ${{ inputs.format-command }}
+      run: find src/ -regex '.*\.\(cpp\|hpp\|cc\|cxx\|h\|c\|m\|mm\)' -exec clang-format -i {} \;
       shell: bash
 
     - name: Find changes
       id: changes
       run: |
-        file=${{ inputs.format-tool }}.diff
+        file=clang-format.diff
         diff=$(git diff | tee $file)
 
         if [ -z "$diff" ]; then
@@ -43,7 +38,7 @@ runs:
       if: steps.changes.outputs.diff
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ inputs.format-tool }}-diff
+        name: clang-format-diff
         path: ${{ steps.changes.outputs.file }}
         if-no-files-found: error
 
@@ -54,9 +49,9 @@ runs:
         code_block="\`\`\`"
 
         summary=$(cat<<EOF
-        ❌ \`${{ inputs.format-tool }}\`: It looks like your changes don't match our code style.
+        ❌ \`clang-format\`: It looks like your changes don't match our code style.
 
-        🛠️ Please either run \`${{ inputs.format-command }}\` or apply this patch with \`git apply\`:
+        🛠️ Please either run \`clang-format -i\` on the file or apply this patch with \`git apply\`:
 
         [\`${{ steps.changes.outputs.file }}\`](${{ steps.upload.outputs.artifact-url }})
         $code_block diff
@@ -67,7 +62,7 @@ runs:
         echo "$summary" >> $GITHUB_STEP_SUMMARY
 
         file="ci_summary.md"
-        echo "❌🛠️ \`${{ inputs.format-tool }}\`: Lint errors, fix available." >> $file
+        echo "❌🛠️ \`clang-format\`: Lint errors, fix available." >> $file
         echo "file=$file" >> $GITHUB_OUTPUT
       shell: bash
 
@@ -75,7 +70,7 @@ runs:
       if: steps.summary.outputs.file
       uses: actions/upload-artifact@v4
       with:
-        name: summary-${{ inputs.format-tool }}
+        name: summary-clang-format
         path: ${{ steps.summary.outputs.file }}
         if-no-files-found: error
 

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

@@ -1,21 +0,0 @@
-name: "Lint clang"
-description: "Lint with Clang formatter"
-
-runs:
-  using: "composite"
-
-  steps:
-    - name: Setup Python venv
-      uses: ./.github/actions/init-python
-
-    - name: Install dependencies
-      shell: bash
-      run: |
-        source .venv/bin/activate
-        pip install pyyaml clang_format
-
-    - name: Linting with Clang formatter
-      uses: ./.github/actions/lint-error
-      with:
-        format-command: ./scripts/lint_clang.py -f
-        format-tool: "clang-format"

.github/workflows/codeql-analysis.yml

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

.github/workflows/continuous-integration.yml

@@ -34,7 +34,7 @@ jobs:
   # Always run this job, even if not on PR, since other jobs need it.
   pr-comment-flags:
     runs-on: ubuntu-latest
-    needs: lint-clang
+    needs: lint-check
 
     outputs:
       no-sonar: ${{ steps.check.outputs.no-sonar }}
@@ -82,7 +82,18 @@ jobs:
       - name: Test summary
         uses: ./.github/actions/test-summary
 
-  lint-clang:
+  reuse-lint:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: REUSE Compliance Check
+        uses: fsfe/reuse-action@v4
+
+  lint-check:
+    needs: [reuse-lint]
     runs-on: ubuntu-latest
     timeout-minutes: 5
 
@@ -90,11 +101,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Linting Clang
-        uses: ./.github/actions/lint-clang
+      - name: Lint Checker
+        uses: ./.github/actions/lint-check
 
   analyse-valgrind:
-    needs: lint-clang
+    needs: lint-check
     if: ${{ github.event_name == 'pull_request' }}
     uses: ./.github/workflows/valgrind-analysis.yml
 
@@ -106,7 +117,7 @@ jobs:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
   main-build:
-    needs: lint-clang
+    needs: lint-check
     name: ${{ matrix.target.name }}
     runs-on: ${{ matrix.target.runs-on }}
     container: ${{ matrix.target.container }}
@@ -120,55 +131,100 @@ jobs:
         target:
           - name: "windows-2022-x64"
             runs-on: "windows-2022"
-            timeout: 120 #Windows can take while if it has to build vcpkg cache
+            timeout: 30
             config-args: "-G Ninja"
+            qt-install-dir: "C:"
 
           - name: "macos-14-arm64"
             runs-on: "macos-14"
             timeout: 10
             arch: arm64
-            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"arm64\" -DMACOSX_DEPLOYMENT_TARGET=12"
+            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"arm64\""
+            qt-install-dir: "/Users/runner"
 
           - name: "macos-13-x64"
             runs-on: macos-13
             timeout: 20
-            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"x86_64\" -DMACOSX_DEPLOYMENT_TARGET=12"
+            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"x86_64\""
+            qt-install-dir: "/Users/runner"
 
-          - name: "debian-13-amd64"
+          - name: "debian-13-x86_64"
             runs-on: ubuntu-latest
             container: debian:trixie-slim
             like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "fedora-41-amd64"
+          - name: "debian-13-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: debian:trixie-slim
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "fedora-41-x86_64"
             runs-on: ubuntu-latest
             container: fedora:41
             like: "fedora"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "fedora-40-amd64"
+          - name: "fedora-41-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: fedora:41
+            like: "fedora"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "fedora-40-x86_84"
             runs-on: ubuntu-latest
             container: fedora:40
             like: "fedora"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "opensuse-amd64"
+          - name: "fedora-40-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: fedora:40
+            like: "fedora"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "opensuse-x86_84"
             runs-on: ubuntu-latest
             container: opensuse/tumbleweed:latest
             like: "suse"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "archlinux-amd64"
+          - name: "opensuse-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: opensuse/tumbleweed:latest
+            like: "suse"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "archlinux-x86_84"
             runs-on: ubuntu-latest
             container: archlinux:latest
             like: "arch"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
+          - name: "ubuntu-25.04-x86_64"
+            runs-on: ubuntu-latest
+            container: ubuntu:25.04
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "ubuntu-25.04-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: ubuntu:25.04
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
     steps:
       # Make sure the container has git before we do anything else
       - name: Install Git on Container
@@ -190,7 +246,7 @@ jobs:
       # Fancy checkout gets all the tags
       # it also makes sure we can use git --describe correctly
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1.0.0
+        uses: sithlord48/fancy-checkout@v1
 
       # This effectively runs `vcvarsall.bat`, etc. It's not actually installing
       # VC++ as that's already pre-installed on the Windows runner.
@@ -202,29 +258,23 @@ jobs:
         id: get-deps
         uses: ./.github/actions/install-dependencies
         with:
-          mac-qt-version: 6.7.2
+          qt-version: 6.8.2
+          qt-install-dir: ${{matrix.target.qt-install-dir}}
           like: ${{ matrix.target.like }}
 
-      - name: Setup Python
-        if: ${{runner.os != 'Linux' }}
-        run: python ./scripts/setup_venv.py
-
       - name: Get version
         uses: ./.github/actions/get-version
 
       - name: Configure
-        run: ${{env.CMAKE_CONFIGURE}} ${{ matrix.target.config-args }} ${{ steps.get-deps.outputs.vcpkg-cmake-config }} -DPACKAGE_VERSION_LABEL=${{env.DESKFLOW_PACKAGE_VERSION}}
+        run: ${{env.CMAKE_CONFIGURE}} ${{ matrix.target.config-args }} ${{ steps.get-deps.outputs.vcpkg-cmake-config }} -DPACKAGE_VERSION_LABEL="${{env.DESKFLOW_PACKAGE_VERSION}}"
 
       - name: Build
         shell: bash
         run: |
-          if [[ "$RUNNER_OS" == "Linux" && "${{matrix.target.like}}" != "arch" ]]; then
-            cmake --build build -j8 --target package
+          if [[ "${{matrix.target.like}}" != "arch" ]]; then
+            cmake --build build --config Release -j8 --target package
           else
-            cmake --build build -j8
-          fi
-
-          if [ ${{ matrix.target.like }} == "arch" ];then
+            cmake --build build --config Release -j8
             useradd -m build
             sudo chown -R build build
             cd build
@@ -241,23 +291,6 @@ jobs:
         with:
           job: ${{ matrix.target.name }}
 
-
-      - name: Package
-        if: ${{ runner.os != 'Linux' }}
-        shell: bash
-        run: |
-          python ./scripts/package.py --package-version ${{env.DESKFLOW_PACKAGE_VERSION}}
-          mv dist/deskflow* build/
-        env:
-          WINDOWS_PFX_CERTIFICATE: ${{ secrets.WINDOWS_PFX }}
-          WINDOWS_PFX_PASSWORD: ${{ secrets.WINDOWS_PFX_PASS }}
-          APPLE_CODESIGN_ID: ${{ secrets.APPLE_CODESIGN_ID }}
-          APPLE_P12_CERTIFICATE: ${{ secrets.APPLE_P12_CERTIFICATE }}
-          APPLE_P12_PASSWORD: ${{ secrets.APPLE_P12_PASSWORD }}
-          APPLE_NOTARY_USER: ${{ secrets.APPLE_NOTARY_USER }}
-          APPLE_NOTARY_PASSWORD: ${{ secrets.APPLE_NOTARY_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
@@ -266,7 +299,7 @@ jobs:
 
   # Technically, "unix" is a misnomer, but we use it here to mean "Unix-like BSD-derived".
   unix:
-    needs: lint-clang
+    needs: lint-check
     name: unix-${{ matrix.distro.name }}
     runs-on: ${{ vars.CI_UNIX_RUNNER || 'ubuntu-24.04' }}
     timeout-minutes: 20
@@ -282,7 +315,7 @@ jobs:
       # Fancy checkout gets all the tags
       # it also makes sure we can use git --describe correctly
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1.0.0
+        uses: sithlord48/fancy-checkout@v1
 
       - name: Build on FreeBSD
         if: ${{ matrix.distro.name == 'freebsd' }}
@@ -299,32 +332,52 @@ jobs:
             ./build/bin/unittests
             ./build/bin/integtests || true
   flatpak:
-    needs: lint-clang
-    runs-on: ubuntu-latest
+    needs: lint-check
+    name: flatpak-${{matrix.flatpak.arch}}
+    runs-on: ${{matrix.flatpak.runs-on}}
+    timeout-minutes: 60
     container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-6.7
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8
       options: --privileged
+    strategy:
+      fail-fast: false
+      matrix:
+        flatpak:
+          - runs-on: ubuntu-latest
+            arch: x86_64
+          - runs-on: ubuntu-24.04-arm
+            arch: aarch64
     steps:
       - name: Check out repository
-        uses: sithlord48/fancy-checkout@v1.0.0
+        uses: sithlord48/fancy-checkout@v1
 
       - run: git config --global protocol.file.allow always
 
       - name: Get version
         uses: ./.github/actions/get-version
 
-      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-        name: "Build"
+      - name: Lint appsteam
+        run: flatpak-builder-lint appstream deploy/linux/org.deskflow.deskflow.metainfo.xml
+
+      - name: Lint manifest
+        run: flatpak-builder-lint manifest deploy/linux/flatpak/org.deskflow.deskflow.yml
+
+      - name: Build
+        uses: flathub-infra/flatpak-github-actions/flatpak-builder@53987ffa5f687586936d85fdce3f440848bea04d
         with:
-          bundle: deskflow-${{env.DESKFLOW_PACKAGE_VERSION}}-x86_64.flatpak
-          manifest-path: deploy/dist/flatpak/org.deskflow.deskflow.yml
-          cache-key: flatpak-builder-${{ github.sha }}
+          bundle: deskflow-${{env.DESKFLOW_PACKAGE_VERSION}}-linux-${{matrix.flatpak.arch}}.flatpak
+          manifest-path: deploy/linux/flatpak/org.deskflow.deskflow.yml
+          cache-key: flatpak-builder-${{matrix.flatpak.arch}}-2.0
+          arch: ${{matrix.flatpak.arch}}
           upload-artifact: false
 
+      - name: Validate build
+        run: flatpak-builder-lint --exceptions --user-exceptions deploy/linux/flatpak/ci-build-lint-exceptions.json repo repo
+
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: package-${{ env.PACKAGE_PREFIX }}-flatpak
+          name: package-${{ env.PACKAGE_PREFIX }}-flatpak-${{matrix.flatpak.arch}}
           path: ${{github.workspace}}/deskflow[-_]*.flatpak
 
   release:
@@ -334,7 +387,7 @@ jobs:
 
     steps:
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1.0.0
+        uses: sithlord48/fancy-checkout@v1
 
       - name: Get version
         uses: ./.github/actions/get-version
@@ -379,7 +432,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1.0.0
+        uses: sithlord48/fancy-checkout@v1
 
       - name: Get version
         uses: ./.github/actions/get-version

.github/workflows/sonarcloud-analysis.yml

@@ -28,7 +28,7 @@ jobs:
           apt install -qqq git curl unzip gcovr > /dev/null
 
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1.0.0
+        uses: sithlord48/fancy-checkout@v1
 
       - name: Install project dependencies
         uses: ./.github/actions/install-dependencies

.github/workflows/test-actions.yml

@@ -1,41 +0,0 @@
-name: Test actions
-
-# Intended to only be run manually for testing actions in isolation.
-on:
-  workflow_dispatch:
-
-jobs:
-  test-summary:
-    runs-on: ubuntu-latest
-    name: Test summary (${{ matrix.message.name }})
-
-    strategy:
-      matrix:
-        message:
-          - name: success
-            text: "|Success|✅|✅|"
-            expect: ""
-          - name: failure
-            text: "|Failure|❌|❌|"
-            expect: "❌🔬 Tests failed: 2"
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Generate
-        shell: bash
-        run: |
-          echo "${{ matrix.message.text }}" > test-result.md
-
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          path: test-result.md
-          name: test-result-${{ matrix.message.name }}
-
-      - name: Test
-        uses: ./.github/actions/test-summary
-        with:
-          download-pattern: test-result-${{ matrix.message.name }}
-          upload-name: summary-${{ matrix.message.name }}

.github/workflows/valgrind-analysis.yml

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

.gitignore

@@ -10,7 +10,6 @@
 /tmp
 /vcpkg
 /vcpkg_installed
-/scripts/**/*.pyc
 /.cache
 /.venv
 aqtinstall.log
@@ -34,3 +33,9 @@ CMakeLists.txt.user
 CMakeCache.txt
 CMakeUserPresets.json
 CMakeFiles/*
+
+# vscode folder
+/.vscode
+
+# scripts folder
+/scripts

.vscode/extensions.json

@@ -1,11 +0,0 @@
-{
-  "recommendations": [
-    "ms-vscode.cmake-tools",
-    "twxs.cmake",
-    "llvm-vs-code-extensions.vscode-clangd",
-    "ms-vscode.cpptools",
-    "vadimcn.vscode-lldb",
-    "cheshirekow.cmake-format",
-    "jacqueslucke.gcov-viewer"
-  ]
-}

.vscode/launch.json

@@ -1,135 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "unix - gui",
-      "type": "lldb",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/deskflow",
-      "preLaunchTask": "kill-build"
-    },
-    {
-      "name": "unix - unittests",
-      "type": "lldb",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/unittests",
-      "args": [ "${input:gtest-args}" ],
-      "preLaunchTask": "build"
-    },
-    {
-      "name": "unix - integtests",
-      "type": "lldb",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/integtests",
-      "args": [ "${input:gtest-args}" ],
-      "preLaunchTask": "build",
-    },
-    {
-      "name": "unix - server",
-      "type": "lldb",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/deskflow-server",
-      "args": ["--config-toml", "deskflow-config.toml"],
-      "preLaunchTask": "kill-build"
-    },
-    {
-      "name": "unix - client",
-      "type": "lldb",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/deskflow-client",
-      "args": ["--config-toml", "deskflow-config.toml"],
-      "preLaunchTask": "kill-build"
-    },
-    {
-      "name": "unix - attach",
-      "type": "lldb",
-      "request": "attach",
-      "pid": "${command:pickProcess}"
-    },
-    {
-      "name": "windows - gui",
-      "type": "cppvsdbg",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/deskflow",
-      "internalConsoleOptions": "openOnSessionStart",
-      "preLaunchTask": "kill-build"
-    },
-    {
-      "name": "windows - unittests",
-      "type": "cppvsdbg",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/unittests",
-      "args": [ "${input:gtest-args}" ],
-      "internalConsoleOptions": "openOnSessionStart",
-      "preLaunchTask": "build"
-    },
-    {
-      "name": "windows - integtests",
-      "type": "cppvsdbg",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/integtests",
-      "args": [ "${input:gtest-args}" ],
-      "internalConsoleOptions": "openOnSessionStart",
-      "preLaunchTask": "build"
-    },
-    {
-      "name": "windows - server",
-      "type": "cppvsdbg",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/deskflow-server",
-      "args": ["--config-toml", "deskflow-config.toml"],
-      "internalConsoleOptions": "openOnSessionStart",
-      "preLaunchTask": "kill-build"
-    },
-    {
-      "name": "windows - client",
-      "type": "cppvsdbg",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/deskflow-client",
-      "args": ["--config-toml", "deskflow-config.toml"],
-      "internalConsoleOptions": "openOnSessionStart",
-      "preLaunchTask": "kill-build"
-    },
-    {
-      "name": "windows - daemon",
-      "type": "cppvsdbg",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/deskflow-daemon",
-      "args": ["-f"],
-      "internalConsoleOptions": "openOnSessionStart",
-      "preLaunchTask": "build"
-    },
-    {
-      "name": "windows - attach",
-      "type": "cppvsdbg",
-      "request": "attach",
-      "processId": "${command:pickProcess}"
-    },
-    {
-      "name": "install_deps.py",
-      "type": "debugpy",
-      "request": "launch",
-      "program": "scripts/install_deps.py",
-      "console": "integratedTerminal"
-    }
-  ],
-  "inputs": [
-    {
-      "id": "gtest-args",
-      "type": "promptString",
-      "description": "Test arguments",
-      "default": "--gtest_filter=*"
-    }
-  ]
-}

.vscode/tasks.json

@@ -1,172 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "build",
-      "type": "cmake",
-      "command": "build",
-      "targets": ["all"],
-      "preset": "${command:cmake.activeBuildPresetName}",
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "problemMatcher": {
-        "base": "$gcc",
-        "fileLocation": ["absolute"]
-      }
-    },
-    {
-      "label": "clean",
-      "type": "cmake",
-      "command": "build",
-      "targets": ["clean"],
-      "preset": "${command:cmake.activeBuildPresetName}",
-      "group": "build"
-    },
-    {
-      "label": "clean-gcda",
-      "type": "shell",
-      "command": "find . -name '*.gcda' -delete",
-      "windows": {
-        "command": "$null"
-      },
-      "presentation": {
-        "reveal": "silent"
-      }
-    },
-    {
-      "label": "clean-qt",
-      "type": "shell",
-      "command": "rm -r build/src/gui build/src/lib/gui",
-      "windows": {
-        "command": "remove-item -recurse build/src/gui,build/src/lib/gui"
-      }
-    },
-    {
-      "label": "clean-config",
-      "type": "shell",
-      "linux": {
-        "command": "rm -r ~/.config/Deskflow/Deskflow.conf"
-      },
-      "windows": {
-        "command": "remove-item -recurse $env:APPDATA\\Deskflow\\Deskflow"
-      },
-      "osx": {
-        "command": "rm -r ~/Library/Application\\ Support/Deskflow/Deskflow"
-      }
-    },
-    {
-      "label": "tests",
-      "dependsOn": ["integtests", "unittests"],
-      "problemMatcher": []
-    },
-    {
-      "label": "kill",
-      "type": "shell",
-      "command": "killall deskflow; killall deskflow-client; killall deskflow-server || true",
-      "windows": {
-        "command": "taskkill /F /IM deskflow.exe /IM deskflow-client.exe /IM deskflow-client.exe; $true"
-      },
-      "presentation": {
-        "reveal": "silent"
-      }
-    },
-    {
-      "label": "kill-build",
-      "dependsOn": ["kill", "build"],
-      "problemMatcher": []
-    },
-    {
-      "label": "gui",
-      "type": "process",
-      "command": "${workspaceFolder}/build/bin/deskflow",
-      "dependsOn": ["build", "kill"],
-      "problemMatcher": [],
-      "windows": {
-        "command": "${workspaceFolder}/build/bin/deskflow.exe"
-      }
-    },
-    {
-      "label": "restart daemon",
-      "type": "shell",
-      "command": "python scripts/daemon.py --restart",
-      "dependsOn": ["build"]
-    },
-    {
-      "label": "reinstall daemon",
-      "type": "shell",
-      "command": "python scripts/daemon.py --reinstall",
-      "dependsOn": ["build"]
-    },
-    {
-      "label": "stop daemon",
-      "type": "shell",
-      "command": "python scripts/daemon.py --stop"
-    },
-    {
-      "label": "unittests (current)",
-      "type": "shell",
-      "command": "python",
-      "args": [
-        "./scripts/tests.py",
-        "--unit-tests",
-        "--ignore-return-code",
-        "--filter-file=${file}"
-      ],
-      "dependsOn": ["build", "clean-gcda"]
-    },
-    {
-      "label": "integtests (current)",
-      "type": "shell",
-      "command": "python",
-      "args": [
-        "./scripts/tests.py",
-        "--integ-tests",
-        "--ignore-return-code",
-        "--filter-file=${file}"
-      ],
-      "dependsOn": ["build", "clean-gcda"]
-    },
-    {
-      "label": "unittests",
-      "type": "shell",
-      "command": "python",
-      "args": ["./scripts/tests.py", "--unit-tests", "--ignore-return-code"],
-      "dependsOn": ["build", "clean-gcda"]
-    },
-    {
-      "label": "integtests",
-      "type": "shell",
-      "command": "python",
-      "args": ["./scripts/tests.py", "--integ-tests", "--ignore-return-code"],
-      "dependsOn": ["build", "clean-gcda"]
-    },
-    {
-      "label": "unittests (current, valgrind)",
-      "type": "shell",
-      "command": "python",
-      "args": [
-        "./scripts/tests.py",
-        "--unit-tests",
-        "--ignore-return-code",
-        "--filter-file=${file}",
-        "--valgrind"
-      ],
-      "dependsOn": ["build", "clean-gcda"]
-    },
-    {
-      "label": "integtests (current, valgrind)",
-      "type": "shell",
-      "command": "python",
-      "args": [
-        "./scripts/tests.py",
-        "--integ-tests",
-        "--ignore-return-code",
-        "--filter-file=${file}",
-        "--valgrind"
-      ],
-      "dependsOn": ["build", "clean-gcda"]
-    }
-  ]
-}

CMakeLists.txt

@@ -1,94 +1,149 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-# Copyright (C) 2009 Nick Bolton
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-FileCopyrightText: 2024 Deskflow Developers
+# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-License-Identifier: MIT
 
-# Why CMake 3.8?
-# This allows package maintainers to create reproducible builds:
-# > New in version 3.8: If the SOURCE_DATE_EPOCH environment variable is set,
-# > its value will be used instead of the current time.
-# > See https://reproducible-builds.org/specs/source-date-epoch/ for details.
 cmake_minimum_required(VERSION 3.24)
 
+# Link items by fill path
+cmake_policy(SET CMP0003 NEW)
+
+# Fix define escaping
+cmake_policy(SET CMP0005 NEW)
+
+# Set CXX Requirements
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 # Fallback for when git can not be found
 set(DESKFLOW_VERSION_MAJOR 1)
-set(DESKFLOW_VERSION_MINOR 17)
-set(DESKFLOW_VERSION_PATCH 2)
+set(DESKFLOW_VERSION_MINOR 20)
+set(DESKFLOW_VERSION_PATCH 1)
 set(DESKFLOW_VERSION_TWEAK 0)
 
 # Get the version from git if it's a git repository
-# cmake-format: off
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
   find_package(Git)
   if(GIT_FOUND)
     execute_process(
-      COMMAND ${GIT_EXECUTABLE} describe --long --match v* --always
+      COMMAND ${GIT_EXECUTABLE} rev-parse --short=8 HEAD
       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-      OUTPUT_VARIABLE GITREV
-      ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-    string(FIND ${GITREV} "v" isRev)
-    if(NOT ifRev EQUAL -1)
-      string(REGEX MATCH [0-9]+ MAJOR ${GITREV})
-      string(REGEX MATCH \\.[0-9]+ MINOR ${GITREV})
-      string(REPLACE "." "" MINOR "${MINOR}")
-      string(REGEX MATCH [0-9]+\- PATCH ${GITREV})
-      string(REPLACE "-" "" PATCH "${PATCH}")
-      string(REGEX MATCH \-[0-9]+\- TWEAK ${GITREV})
-      string(REPLACE "-" "" TWEAK "${TWEAK}")
-      set(DESKFLOW_VERSION_MAJOR ${MAJOR})
-      set(DESKFLOW_VERSION_MINOR ${MINOR})
-      set(DESKFLOW_VERSION_PATCH ${PATCH})
-      set(DESKFLOW_VERSION_TWEAK ${TWEAK})
-    elseif(NOT ${GITREV} STREQUAL "")
-      set(DESKFLOW_VERSION_TWEAK ${GITREV})
+      OUTPUT_VARIABLE GIT_SHA_SHORT
+      ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} rev-list --tags --count
+      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+      OUTPUT_VARIABLE GIT_TAG_COUNT
+      ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    if(GIT_TAG_COUNT EQUAL 0)
+      set(DESKFLOW_VERSION_TWEAK "9999")
+    else()
+      execute_process(
+        COMMAND ${GIT_EXECUTABLE} describe --long --match v* --always
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        OUTPUT_VARIABLE GITREV
+        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+      string(FIND ${GITREV} "v" isRev)
+      if(NOT ifRev EQUAL -1)
+        string(REGEX MATCH [0-9]+ MAJOR ${GITREV})
+        string(REGEX MATCH \\.[0-9]+ MINOR ${GITREV})
+        string(REPLACE "." "" MINOR "${MINOR}")
+        string(REGEX MATCH [0-9]+\- PATCH ${GITREV})
+        string(REPLACE "-" "" PATCH "${PATCH}")
+        string(REGEX MATCH \-[0-9]+\- TWEAK ${GITREV})
+        string(REPLACE "-" "" TWEAK "${TWEAK}")
+        set(DESKFLOW_VERSION_MAJOR ${MAJOR})
+        set(DESKFLOW_VERSION_MINOR ${MINOR})
+        set(DESKFLOW_VERSION_PATCH ${PATCH})
+        set(DESKFLOW_VERSION_TWEAK ${TWEAK})
+      elseif(NOT ${GITREV} STREQUAL "")
+        set(DESKFLOW_VERSION_TWEAK ${GITREV})
+      endif()
     endif()
   endif()
 endif()
-# cmake-format: on
-
-set(DESKFLOW_VERSION
-    "${DESKFLOW_VERSION_MAJOR}.${DESKFLOW_VERSION_MINOR}.${DESKFLOW_VERSION_PATCH}.${DESKFLOW_VERSION_TWEAK}"
-)
-set(DESKFLOW_VERSION_MS_CSV
-    "${DESKFLOW_VERSION_MAJOR},${DESKFLOW_VERSION_MINOR},${DESKFLOW_VERSION_PATCH},${DESKFLOW_VERSION_TWEAK}"
-)
-
-add_definitions(-DDESKFLOW_VERSION="${DESKFLOW_VERSION}")
 
 #Define our project
 project(
   deskflow
-  VERSION ${DESKFLOW_VERSION}
+  VERSION "${DESKFLOW_VERSION_MAJOR}.${DESKFLOW_VERSION_MINOR}.${DESKFLOW_VERSION_PATCH}.${DESKFLOW_VERSION_TWEAK}"
   DESCRIPTION "Mouse and keyboard sharing utility"
   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>")
+
+#Unset the vars used in the project call
+unset(DESKFLOW_VERSION_MAJOR)
+unset(DESKFLOW_VERSION_MINOR)
+unset(DESKFLOW_VERSION_PATCH)
+unset(DESKFLOW_VERSION_TWEAK)
+
 message(STATUS "Building ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
 
-include(cmake/Definitions.cmake)
-include(cmake/Build.cmake)
-include(cmake/Libraries.cmake)
-include(cmake/Packaging.cmake)
+# Set lib versions
+set(REQUIRED_OPENSSL_VERSION 3.0)
+set(REQUIRED_LIBEI_VERSION 1.3)
+set(REQUIRED_LIBPORTAL_VERSION 0.8)
+set(REQUIRED_QT_VERSION 6.7.0)
 
+# Control debug item visibility
+# When not set logging is forced to DEBUG and show code locations
+# Also exposes a test menu
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+  message(STATUS "Disabling debug build")
+  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")
+
+include(cmake/Libraries.cmake)
 include(GNUInstallDirs)
 
-configure_definitions()
-configure_build()
 configure_libs()
-configure_packaging()
 
 add_subdirectory(doc)
 add_subdirectory(src)
-add_subdirectory(deploy)
 
-post_config_all()
+# 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()
+
+option(BUILD_INSTALLER "Build installer" ON)
+if(BUILD_INSTALLER)
+    add_subdirectory(deploy)
+endif()

LICENSES/GPL-2.0-only.txt

@@ -0,0 +1,117 @@
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+     a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+     b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+     c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+     a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+     b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+     c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+     one line to give the program's name and an idea of what it does. Copyright (C) yyyy name of author
+
+     This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
+
+     Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
+
+     Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice

LICENSES/LGPL-2.1-only.txt

@@ -0,0 +1,176 @@
+GNU LESSER GENERAL PUBLIC LICENSE
+
+Version 2.1, February 1999
+
+Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.]
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.
+
+This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below.
+
+When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things.
+
+To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it.
+
+For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights.
+
+We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library.
+
+To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others.
+
+Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license.
+
+Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs.
+
+When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library.
+
+We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances.
+
+For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License.
+
+In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system.
+
+Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library.
+
+The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run.
+
+GNU LESSER GENERAL PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you".
+
+A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.
+
+The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".)
+
+"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does.
+
+1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+     a) The modified work must itself be a software library.
+
+     b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.
+
+     c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.
+
+     d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.
+
+(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices.
+
+Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.
+
+This option is useful when you wish to copy part of the code of the Library into a program that is not a library.
+
+4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.
+
+If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.
+
+5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.
+
+However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.
+
+When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law.
+
+If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.)
+
+Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.
+
+6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.
+
+You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:
+
+     a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)
+
+     b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.
+
+     c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.
+
+     d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.
+
+     e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy.
+
+For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.
+
+7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:
+
+     a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above.
+
+     b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
+
+8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.
+
+10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License.
+
+11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.
+
+14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Libraries
+
+If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License).
+
+To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+     one line to give the library's name and an idea of what it does.
+     Copyright (C) year  name of author
+
+     This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names:
+
+Yoyodyne, Inc., hereby disclaims all copyright interest in
+the library `Frob' (a library for tweaking knobs) written
+by James Random Hacker.
+
+signature of Ty Coon, 1 April 1990
+Ty Coon, President of Vice
+That's all there is to it!

LICENSES/MIT.txt

@@ -0,0 +1,18 @@
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
+associated documentation files (the "Software"), to deal in the Software without restriction, including 
+without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the 
+following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial 
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT 
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO 
+EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
+USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,13 +1,14 @@
 ![Deskflow](https://github.com/user-attachments/assets/f005b958-24df-4f4a-9bfd-4f834dae59d6)
 
-> [!NOTE]
-> **Deskflow** is the official upstream project for [Synergy](https://symless.com/synergy).
+> [!TIP]
+> [Synergy](https://symless.com/synergy) sponsors the Deskflow project by contributing code and providing financial support.
+> 
+> - [**Bounties**](https://github.com/deskflow/deskflow/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22%F0%9F%92%8E%20bounty%22) - Earn while contributing to open source
+> - [**Rewarded**](https://github.com/deskflow/deskflow/issues?q=label%3A%22%F0%9F%92%B0%20rewarded%22%20) - Issues with a rewarded bounty
+> 
+> **Deskflow** is the official upstream project for Synergy.
 > Purchasing a Synergy license is one way to support Deskflow’s growth and sustainability.
->
-> The Deskflow project was established to cultivate community-driven development where everyone can collaborate.
-> Synergy sponsors the Deskflow project by contributing code and providing financial support.
->
-> More info: [Relationship with Synergy](https://github.com/deskflow/deskflow/wiki/Relationship-with-Synergy)
+> Learn more: [Relationship with Synergy](https://github.com/deskflow/deskflow/wiki/Relationship-with-Synergy)
 
 **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,
@@ -15,7 +16,7 @@ and work seamlessly between them.
 It's like a software KVM (but without the video).
 TLS encryption is enabled by default. Wayland is supported. Clipboard sharing is supported.
 
-[![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)
+[![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)
 
 To use Deskflow you can use one of our [packages](https://github.com/deskflow/deskflow/releases), install `deskflow` (if available in your package repository), or [build it](#build-quick-start) yourself from source.
 
@@ -25,6 +26,7 @@ To use Deskflow you can use one of our [packages](https://github.com/deskflow/de
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/deskflow/deskflow?logo=github)](https://github.com/deskflow/deskflow/commits/master/)
 [![GitHub top language](https://img.shields.io/github/languages/top/deskflow/deskflow?logo=github)](https://github.com/deskflow/deskflow/commits/master/)
 [![GitHub License](https://img.shields.io/github/license/deskflow/deskflow?logo=github)](LICENSE)
+[![REUSE status](https://api.reuse.software/badge/github.com/deskflow/deskflow)](https://api.reuse.software/info/github.com/deskflow/deskflow)
 
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=deskflow_deskflow&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=deskflow_deskflow)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=deskflow_deskflow&metric=coverage)](https://sonarcloud.io/summary/new_code?id=deskflow_deskflow)
@@ -34,7 +36,6 @@ To use Deskflow you can use one of our [packages](https://github.com/deskflow/de
 [![CI](https://github.com/deskflow/deskflow/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/deskflow/deskflow/actions/workflows/continuous-integration.yml)
 [![CodeQL Analysis](https://github.com/deskflow/deskflow/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/deskflow/deskflow/actions/workflows/codeql-analysis.yml)
 [![SonarCloud Analysis](https://github.com/deskflow/deskflow/actions/workflows/sonarcloud-analysis.yml/badge.svg)](https://github.com/deskflow/deskflow/actions/workflows/sonarcloud-analysis.yml)
-
 ## Project Values
 
 - Motivated by the community interests (not business-driven)
@@ -63,8 +64,17 @@ 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.
 
-All Linux distributions are supported, primarily focusing on: 
-Debian, Ubuntu, Linux Mint, Fedora, RHEL, AlmaLinux, Rocky Linux, Arch Linux, openSUSE, Gentoo.
+> [!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)
+
+Windows 10 or higher is required. 
+
+macOS 12 or higher is required.
+
+Linux requires libei 1.3+ and libportal 0.8+ for the server/client. Additionally, Qt 6.7+ is required for the GUI.
+Linux users with systems not meeting these requirements should use flatpak in place of a native package.
 
 We officially support FreeBSD, and would also like to support: OpenBSD, NetBSD, DragonFly, Solaris.
 
@@ -131,12 +141,14 @@ Learn more: [Relationship with Synergy](https://github.com/deskflow/deskflow/wik
 Yes, Deskflow has network compatibility with all forks:
 - Requires Deskflow >= v1.17.0.96
 - Deskflow will *just work* with Input Leap and Barrier (server or client).
-- Connecting a Deskflow client to a Synergy server will also *just work*.
-- To connect a Synergy client, you need to select the Synergy protocol in the Deskflow server settings.
+- Connecting a Deskflow client to a Synergy 1 server will also *just work*.
+- To connect a Synergy 1 client, you need to select the Synergy protocol in the Deskflow server settings.
+
+_Note:_ Only Synergy 1 is compatible with Deskflow (Synergy 3 is not yet compatible).
 
 ### Is Deskflow compatible with Lan Mouse?
 
-We would love to see compatibility with Lan Mouse. This maybe quite an effort as currently they way they handle the generated input is very different.
+We would love to see compatibility with Lan Mouse. This may be quite an effort as currently the way they handle the generated input is very different.
 
 ### If I want to solve issues in Deskflow do I need to contribute to a fork?
 
@@ -160,6 +172,8 @@ who is the author of `libei`, a major contributor to `libportal`, and the author
 implementation in Deskflow. Others such as Olivier Fourdan and Povilas Kanapickas helped with the
 Wayland implementation.
 
+Some features _may_ be unavailable or broken on Wayland. Please see the [known Wayland issues](https://github.com/deskflow/deskflow/discussions/7499).
+
 ### Where did it all start?
 
 Deskflow was first created as Synergy in 2001 by Chris Schoeneman.
@@ -181,4 +195,4 @@ Deskflow is made by possible by these contributors.
 
 ## License
 
-This project is licensed under [GPL-2.0](LICENSE) with an [OpenSSL exception](LICENSE_EXCEPTION).
+This project is licensed under [GPL-2.0](LICENSE) with an [OpenSSL exception](LICENSES/LicenseRef-OpenSSL-Exception.txt).

REUSE.toml

@@ -0,0 +1,206 @@
+# SPDX-FileCopyrightText: 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-License-Identifier: MIT
+
+version = 1
+SPDX-PackageName = "deskflow"
+SPDX-PackageSupplier = "Deskflow Devs"
+SPDX-PackageDownloadLocation = "https://github.com/deskflow/deskflow"
+
+[[annotations]]
+path = ".github/**"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = ".clang-format"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = ".editorconfig"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = ".gitattributes"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = ".gitignore"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "cspell.json"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "README.md"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "SECURITY.md"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "sonar-project.properties"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "vcpkg.json"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "vcpkg-configuration.json"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "doc/**"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "deploy/mac/dmg-background.tiff"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "GPL-2.0-only"
+
+[[annotations]]
+path = "deploy/mac/dmg-volume.icns"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "GPL-2.0-only"
+
+[[annotations]]
+path = "deploy/linux/deskflow.png"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "GPL-2.0-only"
+
+[[annotations]]
+path = "deploy/linux/flatpak/**"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "deploy/linux/org.deskflow.deskflow.metainfo.xml"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+
+[[annotations]]
+path = "deploy/windows/wix-banner.png"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "GPL-2.0-only"
+
+[[annotations]]
+path = "deploy/windows/wix-dialog.png"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "GPL-2.0-only"
+
+[[annotations]]
+path = "deploy/windows/wix-patch.xml.in"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "src/apps/deskflow-client/deskflow-client.exe.manifest"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "src/apps/deskflow-core/deskflow-core.exe.manifest"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "src/apps/deskflow-server/deskflow-server.exe.manifest"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[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-**/apps/64/deskflow*.svg"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "GPL-2.0-only"
+
+[[annotations]]
+path = "src/apps/res/image/welcome.png"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "GPL-2.0-only"
+
+[[annotations]]
+path = "src/apps/res/Deskflow.icns"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "GPL-2.0-only"
+
+[[annotations]]
+path = "src/apps/res/deskflow.ico"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "GPL-2.0-only"
+
+[[annotations]]
+path = "src/apps/res/deskflow.plist.in"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "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-**/index.theme"
+precedence = "override"
+SPDX-FileCopyrightText = "Chris Rizzitello <sithlord48@gmail.com>"
+SPDX-License-Identifier = "LGPL-2.1-only"
+
+[[annotations]]
+path = "src/apps/deskflow-gui/MainWindow.ui"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "GPL-2.0-only WITH LicenseRef-OpenSSL-Exception"
+
+[[annotations]]
+path = "src/apps/deskflow-gui/dialogs/*.ui"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "GPL-2.0-only WITH LicenseRef-OpenSSL-Exception"

SECURITY.md

@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+The latest minor release is supported and receives security updates:
+https://github.com/deskflow/deskflow/releases
+
+## Reporting a Vulnerability
+
+Please report vulnerabilities on our issue tracker as bugs:
+https://github.com/deskflow/deskflow/issues

cmake/Build.cmake

@@ -1,104 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-macro(configure_build)
-
-  set(CMAKE_CXX_STANDARD 20)
-  set(CMAKE_CXX_EXTENSIONS OFF)
-  set(CMAKE_CXX_STANDARD_REQUIRED ON)
-  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
-  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
-
-  if(APPLE)
-    message(STATUS "Configuring for Apple")
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0")
-  endif()
-
-  set_build_date()
-  configure_file_shared()
-
-endmacro()
-
-macro(set_build_date)
-  # Since CMake 3.8.0, `string(TIMESTAMP ...)` respects `SOURCE_DATE_EPOCH` env var if set,
-  # which allows package maintainers to create reproducible builds.
-  # We require CMake 3.8.0 in the root `CMakeLists.txt` for this reason.
-  string(TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC)
-  message(STATUS "Build date: ${BUILD_DATE}")
-  add_definitions(-DBUILD_DATE="${BUILD_DATE}")
-endmacro()
-
-macro(configure_file_shared)
-  configure_file(${PROJECT_SOURCE_DIR}/src/lib/gui/gui_config.h.in
-                 ${PROJECT_BINARY_DIR}/config/gui_config.h)
-endmacro()
-
-macro(post_config)
-
-  # Build to a temp bin dir on Windows and then copy to the final bin dir
-  # (ignore copy fail). It is neccesary to do this. Since the binary may already
-  # be running and you can't write to a running binary (on Windows). It's common
-  # to use Deskflow to develop Deskflow (i.e. eating your own dog food immediately
-  # making it).
-  if(WIN32)
-
-    if(NOT target)
-      message(FATAL_ERROR "target not set")
-    endif()
-
-    set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-                                               ${BIN_TEMP_DIR})
-  endif()
-
-endmacro()
-
-macro(post_config_all)
-
-  if(WIN32)
-    # Always try to copy the files to the bin directory after every build and deliberatly ignore
-    # copy errors, usually the error is because a running process has locked the file.
-    #
-    # It is useful to copy every time because the copy may have failed last time due to the file
-    # being in use, and we'll usually want to try again (after killing the process).
-    #
-    # Yes, this looks like a ridiculous thing to do, but it really is necessary to
-    # use a Python script to copy files on Windows. Why? Two reasons:
-    #
-    #   1. Windows file locks (on running processes) creates a very painful development
-    #      experience; you can't overwrite the binary you're running it.
-    #      Why not just stop the process? Windows services are an abject PITA to manage,
-    #      and we don't always care about overwriting all binaries.
-    #
-    #   2. The Windows copy command is limited and gives vague/misleading errors.
-    #      The CMake copy command also has similar shortfalls.
-    #
-    # Patches welcome! :)
-    add_custom_target(
-      run_post_build ALL
-      COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/fancy_copy.py
-              ${BIN_TEMP_DIR} ${PROJECT_BINARY_DIR}/bin --ignore-errors
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-      VERBATIM
-      COMMENT "Copying files to bin dir")
-
-    add_dependencies(
-      run_post_build
-      deskflow
-      deskflow-client
-      deskflow-server
-      deskflow-daemon)
-  endif()
-
-endmacro()

cmake/CodeCoverage.cmake

@@ -1,72 +1,11 @@
 # SOURCE https://github.com/bilke/cmake-modules/blob/master/CodeCoverage.cmake
-# Copyright (c) 2012 - 2017, Lars Bilke
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors
-#    may be used to endorse or promote products derived from this software without
-#    specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# CHANGES:
-#
-# 2012-01-31, Lars Bilke
-# - Enable Code Coverage
-#
-# 2013-09-17, Joakim Söderberg
-# - Added support for Clang.
-# - Some additional usage instructions.
-#
-# 2016-02-03, Lars Bilke
-# - Refactored functions to use named parameters
-#
-# 2017-06-02, Lars Bilke
-# - Merged with modified version from github.com/ufz/ogs
-#
-# 2019-05-06, Anatolii Kurotych
-# - Remove unnecessary --coverage flag
-#
-# 2019-12-13, FeRD (Frank Dana)
-# - Deprecate COVERAGE_LCOVR_EXCLUDES and COVERAGE_GCOVR_EXCLUDES lists in favor
-#   of tool-agnostic COVERAGE_EXCLUDES variable, or EXCLUDE setup arguments.
-# - CMake 3.4+: All excludes can be specified relative to BASE_DIRECTORY
-# - All setup functions: accept BASE_DIRECTORY, EXCLUDE list
-# - Set lcov basedir with -b argument
-# - Add automatic --demangle-cpp in lcovr, if 'c++filt' is available (can be
-#   overridden with NO_DEMANGLE option in setup_target_for_coverage_lcovr().)
-# - Delete output dir, .info file on 'make clean'
-# - Remove Python detection, since version mismatches will break gcovr
-# - Minor cleanup (lowercase function names, update examples...)
-#
-# 2019-12-19, FeRD (Frank Dana)
-# - Rename Lcov outputs, make filtered file canonical, fix cleanup for targets
-#
-# 2020-01-19, Bob Apthorpe
-# - Added gfortran support
-#
-# 2020-02-17, FeRD (Frank Dana)
-# - Make all add_custom_target()s VERBATIM to auto-escape wildcard characters
-#   in EXCLUDEs, and remove manual escaping from gcovr targets
-#
+# SPDX-FileCopyrightText: 2020 Bob Apthrope
+# SPDX-FileCopyrightText: 2019 Anatolii Kurotych
+# SPDX-FileCopyrightText: 2019 - 2020 Frank Dana
+# SPDX-FileCopyrightText: 2013 Joakim Söderberg
+# SPDX-FileCopyrightText: 2012 - 2017 Lars Bilke
+# SPDX-License-Identifier: MIT
+
 # USAGE:
 #
 # 1. Copy this file into your cmake modules path.

cmake/Definitions.cmake

@@ -1,101 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2012-2024 Symless Ltd.
-# Copyright (C) 2009-2012 Nick Bolton
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-macro(configure_definitions)
-
-  configure_ninja()
-  configure_options()
-
-  set(INTEG_TESTS_BIN integtests)
-  set(UNIT_TESTS_BIN unittests)
-
-  if(NOT "$ENV{GIT_SHA}" STREQUAL "")
-    # Shorten the Git SHA to 8 chars for readability
-    string(SUBSTRING "$ENV{GIT_SHA}" 0 8 GIT_SHA_SHORT)
-    message(STATUS "Short Git SHA: ${GIT_SHA_SHORT}")
-    add_definitions(-DGIT_SHA_SHORT="${GIT_SHA_SHORT}")
-  endif()
-
-  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    message(STATUS "Disabling debug build")
-    add_definitions(-DNDEBUG)
-  endif()
-
-  # TODO: find out why we need these, and remove them if we don't.
-  if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0003 NEW)
-    cmake_policy(SET CMP0005 NEW)
-  endif()
-
-  # TODO: explain why we're adding headers to sources.
-  if(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
-    set(ADD_HEADERS_TO_SOURCES FALSE)
-  else()
-    set(ADD_HEADERS_TO_SOURCES TRUE)
-  endif()
-
-  set(BIN_TEMP_DIR ${PROJECT_BINARY_DIR}/temp/bin)
-
-endmacro()
-
-macro(configure_ninja)
-  # use response files so that ninja can compile on windows, otherwise you get
-  # an error when linking qt: "The input line is too long."
-  set(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-  set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-  set(CMAKE_C_RESPONSE_FILE_LINK_FLAG "@")
-  set(CMAKE_CXX_RESPONSE_FILE_LINK_FLAG "@")
-  set(CMAKE_NINJA_FORCE_RESPONSE_FILE
-      1
-      CACHE INTERNAL "")
-endmacro()
-
-macro(configure_options)
-
-  set(DEFAULT_BUILD_GUI ON)
-  set(DEFAULT_BUILD_INSTALLER ON)
-  set(DEFAULT_BUILD_TESTS ON)
-
-  # unified binary is off by default for now, for backwards compatibility.
-  set(DEFAULT_BUILD_UNIFIED OFF)
-
-  # coverage is off by default because it's GCC only and a developer preference.
-  set(DEFAULT_ENABLE_COVERAGE OFF)
-
-  if("$ENV{DESKFLOW_BUILD_MINIMAL}" STREQUAL "true")
-    set(DEFAULT_BUILD_GUI OFF)
-    set(DEFAULT_BUILD_INSTALLER OFF)
-  endif()
-
-  if("$ENV{DESKFLOW_BUILD_TESTS}" STREQUAL "false")
-    set(DEFAULT_BUILD_TESTS OFF)
-  endif()
-
-  if("$ENV{DESKFLOW_BUILD_UNIFIED}" STREQUAL "true")
-    set(DEFAULT_BUILD_UNIFIED ON)
-  endif()
-
-  if("$ENV{DESKFLOW_ENABLE_COVERAGE}" STREQUAL "true")
-    set(DEFAULT_ENABLE_COVERAGE ON)
-  endif()
-
-  option(BUILD_GUI "Build GUI" ${DEFAULT_BUILD_GUI})
-  option(BUILD_INSTALLER "Build installer" ${DEFAULT_BUILD_INSTALLER})
-  option(BUILD_TESTS "Build tests" ${DEFAULT_BUILD_TESTS})
-  option(BUILD_UNIFIED "Build unified binary" ${DEFAULT_BUILD_UNIFIED})
-  option(ENABLE_COVERAGE "Enable test coverage" ${DEFAULT_ENABLE_COVERAGE})
-
-endmacro()

cmake/Libraries.cmake

@@ -1,20 +1,6 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-set(LIBEI_MIN_VERSION 1.3)
-set(LIBPORTAL_MIN_VERSION 0.8)
+# SPDX-FileCopyrightText: 2024 - 2025 Deskflow Developers
+# SPDX-FileCopyrightText: 2024 Symless Ltd
+# SPDX-License-Identifier: MIT
 
 macro(configure_libs)
 
@@ -22,13 +8,66 @@ macro(configure_libs)
   if(UNIX)
     configure_unix_libs()
   elseif(WIN32)
-    configure_windows_libs()
-    find_package(Python REQUIRED QUIET)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD /O2 /Ob2")
+    list(APPEND libs Wtsapi32 Userenv Wininet comsuppw Shlwapi version)
+    add_definitions(
+      /DWIN32
+      /D_WINDOWS
+      /D_CRT_SECURE_NO_WARNINGS
+      /D_XKEYCHECK_H
+    )
   endif()
 
-  configure_qt()
-  configure_openssl()
-  configure_coverage()
+  find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Widgets Network)
+  if(UNIX AND NOT APPLE)
+      find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS DBus)
+  endif()
+
+  # Define the location of Qt deployment tool
+  if(WIN32)
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT VCPKG_INSTALL_DIR STREQUAL "")
+      find_program(DEPLOYQT windeployqt.debug.bat)
+    else()
+      find_program(DEPLOYQT windeployqt)
+    endif()
+  elseif(APPLE)
+      find_program(DEPLOYQT macdeployqt)
+  endif()
+
+  set(CMAKE_AUTOMOC ON)
+  set(CMAKE_AUTOUIC ON)
+  set(CMAKE_AUTORCC ON)
+
+  message(STATUS "Qt version: ${Qt6_VERSION}")
+
+  option(ENABLE_COVERAGE "Enable test coverage" OFF)
+  if(ENABLE_COVERAGE)
+    message(STATUS "Enabling code coverage")
+    include(cmake/CodeCoverage.cmake)
+    append_coverage_compiler_flags()
+    set(test_exclude subprojects/* build/* src/test/*)
+    set(test_src ${PROJECT_SOURCE_DIR}/src)
+
+    # Apparently solves the bug in gcov where it returns negative counts and confuses gcovr.
+    # > Got negative hit value in gcov line 'branch  2 taken -1' caused by a bug in gcov tool
+    # Bug report: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68080
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-update=atomic")
+
+    setup_target_for_coverage_gcovr_xml(
+      NAME coverage-integtests
+      EXECUTABLE integtests
+      BASE_DIRECTORY ${test_src}
+      EXCLUDE ${test_exclude}
+    )
+
+    setup_target_for_coverage_gcovr_xml(
+      NAME coverage-unittests
+      EXECUTABLE unittests
+      BASE_DIRECTORY ${test_src}
+      EXCLUDE ${test_exclude}
+    )
+  endif()
 
 endmacro()
 
@@ -54,15 +93,9 @@ macro(configure_unix_libs)
   check_include_file_cxx(ostream HAVE_OSTREAM)
   check_include_file_cxx(sstream HAVE_SSTREAM)
 
-  check_include_files(inttypes.h HAVE_INTTYPES_H)
   check_include_files(locale.h HAVE_LOCALE_H)
-  check_include_files(memory.h HAVE_MEMORY_H)
-  check_include_files(stdlib.h HAVE_STDLIB_H)
-  check_include_files(strings.h HAVE_STRINGS_H)
-  check_include_files(string.h HAVE_STRING_H)
   check_include_files(sys/select.h HAVE_SYS_SELECT_H)
   check_include_files(sys/socket.h HAVE_SYS_SOCKET_H)
-  check_include_files(sys/stat.h HAVE_SYS_STAT_H)
   check_include_files(sys/time.h HAVE_SYS_TIME_H)
   check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H)
   check_include_files(unistd.h HAVE_UNISTD_H)
@@ -72,8 +105,6 @@ macro(configure_unix_libs)
   check_function_exists(gmtime_r HAVE_GMTIME_R)
   check_function_exists(nanosleep HAVE_NANOSLEEP)
   check_function_exists(sigwait HAVE_POSIX_SIGWAIT)
-  check_function_exists(strftime HAVE_STRFTIME)
-  check_function_exists(vsnprintf HAVE_VSNPRINTF)
   check_function_exists(inet_aton HAVE_INET_ATON)
 
   # For some reason, the check_function_exists macro doesn't detect the
@@ -100,11 +131,6 @@ macro(configure_unix_libs)
 
   endif()
 
-  check_type_size(char SIZEOF_CHAR)
-  check_type_size(int SIZEOF_INT)
-  check_type_size(long SIZEOF_LONG)
-  check_type_size(short SIZEOF_SHORT)
-
   # pthread is used on both Linux and Mac
   check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
   if(HAVE_PTHREAD)
@@ -114,11 +140,35 @@ macro(configure_unix_libs)
   endif()
 
   if(APPLE)
-    configure_mac_libs()
+    set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
+    find_library(lib_ScreenSaver ScreenSaver)
+    find_library(lib_IOKit IOKit)
+    find_library(lib_ApplicationServices ApplicationServices)
+    find_library(lib_Foundation Foundation)
+    find_library(lib_Carbon Carbon)
+    find_library(lib_UserNotifications UserNotifications)
+    list(APPEND libs
+      ${lib_ScreenSaver} ${lib_IOKit} ${lib_ApplicationServices}
+      ${lib_Foundation} ${lib_Carbon} ${lib_UserNotifications}
+    )
+
+    add_definitions(-DWINAPI_CARBON=1 -D_THREAD_SAFE)
   else()
 
     configure_xorg_libs()
-    configure_wayland_libs()
+
+    include(FindPkgConfig)
+
+    if(PKG_CONFIG_FOUND)
+      pkg_check_modules(LIBXKBCOMMON REQUIRED xkbcommon)
+      pkg_check_modules(GLIB2 REQUIRED glib-2.0 gio-2.0)
+      find_library(LIBM m)
+      include_directories(${LIBXKBCOMMON_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS}
+                          ${LIBM_INCLUDE_DIRS})
+    else()
+      message(WARNING "pkg-config not found, skipping wayland libraries")
+    endif()
+
 
     find_package(pugixml REQUIRED)
 
@@ -140,17 +190,10 @@ macro(configure_unix_libs)
 
   # For config.h, set some static values; it may be a good idea to make these
   # values dynamic for non-standard UNIX compilers.
-  set(ACCEPT_TYPE_ARG3 socklen_t)
-  set(HAVE_CXX_BOOL 1)
-  set(HAVE_CXX_CASTS 1)
-  set(HAVE_CXX_EXCEPTIONS 1)
-  set(HAVE_CXX_MUTABLE 1)
-  set(HAVE_CXX_STDLIB 1)
   set(HAVE_PTHREAD_SIGNAL 1)
   set(SELECT_TYPE_ARG1 int)
   set(SELECT_TYPE_ARG234 " (fd_set *)")
   set(SELECT_TYPE_ARG5 " (struct timeval *)")
-  set(STDC_HEADERS 1)
   set(TIME_WITH_SYS_TIME 1)
   set(HAVE_SOCKLEN_T 1)
 
@@ -164,53 +207,6 @@ macro(configure_unix_libs)
 
 endmacro()
 
-#
-# Apple macOS
-#
-macro(configure_mac_libs)
-
-  set(CMAKE_CXX_FLAGS
-      "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1"
-  )
-
-  find_library(lib_ScreenSaver ScreenSaver)
-  find_library(lib_IOKit IOKit)
-  find_library(lib_ApplicationServices ApplicationServices)
-  find_library(lib_Foundation Foundation)
-  find_library(lib_Carbon Carbon)
-
-  list(
-    APPEND
-    libs
-    ${lib_ScreenSaver}
-    ${lib_IOKit}
-    ${lib_ApplicationServices}
-    ${lib_Foundation}
-    ${lib_Carbon})
-
-  find_library(lib_UserNotifications UserNotifications)
-  list(APPEND libs ${lib_UserNotifications})
-
-  add_definitions(-DWINAPI_CARBON=1 -D_THREAD_SAFE)
-
-endmacro()
-
-macro(configure_wayland_libs)
-
-  include(FindPkgConfig)
-
-  if(PKG_CONFIG_FOUND)
-    pkg_check_modules(LIBXKBCOMMON REQUIRED xkbcommon)
-    pkg_check_modules(GLIB2 REQUIRED glib-2.0 gio-2.0)
-    find_library(LIBM m)
-    include_directories(${LIBXKBCOMMON_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS}
-                        ${LIBM_INCLUDE_DIRS})
-  else()
-    message(WARNING "pkg-config not found, skipping wayland libraries")
-  endif()
-
-endmacro()
-
 #
 # X.org/X11 for Linux, BSD, etc
 #
@@ -229,8 +225,6 @@ macro(configure_xorg_libs)
                       HAVE_X11_EXTENSIONS_DPMS_H)
   check_include_files("X11/extensions/Xinerama.h"
                       HAVE_X11_EXTENSIONS_XINERAMA_H)
-  check_include_files("${XKBlib};X11/extensions/XKBstr.h"
-                      HAVE_X11_EXTENSIONS_XKBSTR_H)
   check_include_files("X11/extensions/XKB.h" HAVE_XKB_EXTENSION)
   check_include_files("X11/extensions/XTest.h" HAVE_X11_EXTENSIONS_XTEST_H)
   check_include_files("${XKBlib}" HAVE_X11_XKBLIB_H)
@@ -312,101 +306,3 @@ macro(configure_xorg_libs)
   add_definitions(-DWINAPI_XWINDOWS=1)
 
 endmacro()
-
-#
-# Windows
-#
-macro(configure_windows_libs)
-
-  set(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} /MP /D _BIND_TO_CURRENT_VCLIBS_VERSION=1")
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD /O2 /Ob2")
-
-  list(
-    APPEND
-    libs
-    Wtsapi32
-    Userenv
-    Wininet
-    comsuppw
-    Shlwapi)
-
-  add_definitions(
-    /DWIN32
-    /D_WINDOWS
-    /D_CRT_SECURE_NO_WARNINGS
-    /DDESKFLOW_VERSION=\"${DESKFLOW_VERSION}\"
-    /D_XKEYCHECK_H)
-
-  configure_openssl()
-
-endmacro()
-
-macro(configure_qt)
-
-  find_package(
-    Qt6
-    COMPONENTS Core Widgets Network
-    REQUIRED)
-
-  message(STATUS "Qt version: ${Qt6_VERSION}")
-
-endmacro()
-
-macro(configure_openssl)
-  # Apple has to use static libraries because "Use of the Apple-provided OpenSSL
-  # libraries by apps is strongly discouraged."
-  # https://developer.apple.com/library/archive/documentation/Security/Conceptual/cryptoservices/SecureNetworkCommunicationAPIs/SecureNetworkCommunicationAPIs.html
-  # TODO: How about bundling the OpenSSL .dylib files with the app so they can be updated?
-  if(APPLE)
-    set(OPENSSL_USE_STATIC_LIBS TRUE)
-  endif()
-
-  find_package(OpenSSL 3.0 REQUIRED COMPONENTS SSL Crypto)
-  if(WIN32) #Used for dev in TLS and WIX
-    cmake_path(SET OPENSSL_ROOT_DIR NORMALIZE "${OPENSSL_INCLUDE_DIR}/..")
-    message(VERBOSE "Set OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
-    set(OPENSSL_EXE_DIR "${OPENSSL_ROOT_DIR}/tools/openssl")
-    add_definitions(-DOPENSSL_EXE_DIR="${OPENSSL_EXE_DIR}")
-  endif()
-
-endmacro()
-
-macro(configure_coverage)
-
-  if(ENABLE_COVERAGE)
-    message(STATUS "Enabling code coverage")
-    include(cmake/CodeCoverage.cmake)
-    append_coverage_compiler_flags()
-    set(test_exclude subprojects/* build/* src/test/*)
-    set(test_src ${PROJECT_SOURCE_DIR}/src)
-
-    # Apparently solves the bug in gcov where it returns negative counts and confuses gcovr.
-    # > Got negative hit value in gcov line 'branch  2 taken -1' caused by a bug in gcov tool
-    # Bug report: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68080
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-update=atomic")
-
-    setup_target_for_coverage_gcovr_xml(
-      NAME
-      coverage-${INTEG_TESTS_BIN}
-      EXECUTABLE
-      ${INTEG_TESTS_BIN}
-      BASE_DIRECTORY
-      ${test_src}
-      EXCLUDE
-      ${test_exclude})
-
-    setup_target_for_coverage_gcovr_xml(
-      NAME
-      coverage-${UNIT_TESTS_BIN}
-      EXECUTABLE
-      ${UNIT_TESTS_BIN}
-      BASE_DIRECTORY
-      ${test_src}
-      EXCLUDE
-      ${test_exclude})
-
-  else()
-    message(STATUS "Code coverage is disabled")
-  endif()
-endmacro()

cmake/Packaging.cmake

@@ -1,235 +0,0 @@
-# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd.
-# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
-# SPDX-License-Identifier: MIT
-
-
-#
-# If enabled, configure packaging based on OS.
-#
-macro(configure_packaging)
-
-  message(VERBOSE "Configuring Packaging")
-  set(DESKFLOW_PROJECT_RES_DIR ${PROJECT_SOURCE_DIR}/res)
-
-  if(${BUILD_INSTALLER})
-    set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
-    set(CPACK_PACKAGE_CONTACT "Deskflow <maintainers@deskflow.org>")
-    set(CPACK_PACKAGE_DESCRIPTION ${CMAKE_PROJECT_DESCRIPTION})
-    set(CPACK_PACKAGE_VENDOR "Deskflow")
-    set(CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/LICENSE)
-
-    set(CPACK_PACKAGE_VERSION ${CMAKE_PROJECT_VERSION})
-
-    #Prevent this override from being written in the package
-    if(NOT PACKAGE_VERSION_LABEL)
-        set (PACKAGE_VERSION_LABEL "${CPACK_PACKAGE_VERSION}")
-    endif()
-
-    if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-      configure_windows_packaging()
-    elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-      configure_mac_packaging()
-    elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-      configure_linux_packaging()
-    elseif(${CMAKE_SYSTEM_NAME} MATCHES "|.*BSD")
-      message(STATUS "BSD packaging not yet supported")
-      set(OS_STRING ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
-    endif()
-
-    set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PACKAGE_VERSION_LABEL}-${OS_STRING}")
-    message(STATUS "Package Basename: ${CPACK_PACKAGE_FILE_NAME}")
-
-    include(CPack)
-  else()
-    message(STATUS "Not configuring installer")
-  endif()
-
-endmacro()
-
-#
-# Windows installer
-#
-macro(configure_windows_packaging)
-
-  cmake_path(SET QT_PATH NORMALIZE "${Qt6_DIR}../../")
-
-  set(DESKFLOW_MSI_64_GUID
-      "027D1C8A-E7A5-4754-BB93-B2D45BFDBDC8"
-      CACHE STRING "GUID for 64-bit MSI installer")
-
-  set(DESKFLOW_MSI_32_GUID
-      "8F57C657-BC87-45E6-840E-41242A93511C"
-      CACHE STRING "GUID for 32-bit MSI installer")
-
-  configure_files(${PROJECT_SOURCE_DIR}/deploy/dist/wix
-                  ${PROJECT_BINARY_DIR}/installer)
-
-  if(CMAKE_SYSTEM_PROCESSOR MATCHES AMD64)
-      set(OS_STRING "win-x64")
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ARM64)
-      set(OS_STRING "win-arm64")
-  else()
-      set(OS_STRING "win-${CMAKE_SYSTEM_PROCESSOR}")
-  endif()
-
-endmacro()
-
-#
-# macOS app bundle
-#
-macro(configure_mac_packaging)
-
-  set(CMAKE_INSTALL_RPATH
-      "@loader_path/../Libraries;@loader_path/../Frameworks")
-  set(DESKFLOW_BUNDLE_SOURCE_DIR
-      ${PROJECT_SOURCE_DIR}/deploy/dist/mac/bundle
-      CACHE PATH "Path to the macOS app bundle")
-  set(DESKFLOW_BUNDLE_DIR ${PROJECT_BINARY_DIR}/bundle/Deskflow.app)
-  set(DESKFLOW_BUNDLE_BINARY_DIR ${DESKFLOW_BUNDLE_DIR}/Contents/MacOS)
-
-  configure_files(${DESKFLOW_BUNDLE_SOURCE_DIR} ${DESKFLOW_BUNDLE_DIR})
-
-  set(OS_STRING "macos-${CMAKE_SYSTEM_PROCESSOR}")
-
-endmacro()
-
-#
-# Linux packages
-#
-
-macro(configure_linux_package_name)
-  # Get Distro name information
-  execute_process(
-    COMMAND bash "-c" "cat /etc/os-release | grep ^ID= | sed 's/ID=//g'"
-    OUTPUT_VARIABLE _DISTRO_NAME
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  string(REPLACE "\"" "" DISTRO_NAME "${_DISTRO_NAME}")
-  message(STATUS "Distro Name: ${DISTRO_NAME}")
-
-  execute_process(
-    COMMAND bash "-c"
-            "cat /etc/os-release | grep ^ID_LIKE= | sed 's/ID_LIKE=//g'"
-    OUTPUT_VARIABLE _DISTRO_LIKE
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  string(REPLACE "\"" "" DISTRO_LIKE "${_DISTRO_LIKE}")
-  message(STATUS "Distro Like: ${DISTRO_LIKE}")
-
-  execute_process(
-    COMMAND
-      bash "-c"
-      "cat /etc/os-release | grep ^VERSION_CODENAME= | sed 's/VERSION_CODENAME=//g'"
-    OUTPUT_VARIABLE _DISTRO_CODENAME
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  string(REPLACE "\"" "" DISTRO_CODENAME "${_DISTRO_CODENAME}")
-  message(STATUS "Distro Codename: ${DISTRO_CODENAME}")
-
-  execute_process(
-    COMMAND bash "-c"
-            "cat /etc/os-release | grep ^VERSION_ID= | sed 's/VERSION_ID=//g'"
-    OUTPUT_VARIABLE _DISTRO_VERSION_ID
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  string(REPLACE "\"" "" DISTRO_VERSION_ID "${_DISTRO_VERSION_ID}")
-  message(STATUS "Distro ID: ${DISTRO_VERSION_ID}")
-
-  # Check if Debian-link
-  string(REGEX MATCH debian|buntu DEBTYPE "${DISTRO_LIKE}")
-  if((NOT ("${DEBTYPE}" STREQUAL "")) OR ("${DISTRO_NAME}" STREQUAL "debian"))
-    set(CPACK_GENERATOR "DEB")
-  endif()
-
-  # Check if Rpm-like
-  string(REGEX MATCH suse|fedora|rhel RPMTYPE "${DISTRO_LIKE}")
-  string(REGEX MATCH fedora|suse|rhel RPMNAME "${DISTRO_NAME}")
-  if((NOT ("${RPMTYPE}" STREQUAL "")) OR (NOT ("${RPMNAME}" STREQUAL "")))
-      set(CPACK_GENERATOR "RPM")
-  endif()
-
-  # Disto specific name adjustments
-  if("${DISTRO_NAME}" STREQUAL "opensuse-tumbleweed")
-    set(DISTRO_NAME "opensuse")
-    set(DISTRO_CODENAME "tumbleweed")
-  elseif("${DISTRO_NAME}" STREQUAL "arch")
-    # Arch linux is rolling the version id reported is the date of last iso.
-    set(DISTRO_VERSION_ID "")
-  endif()
-
-  # Determain the code name to be used if any
-  if(NOT "${DISTRO_VERSION_ID}" STREQUAL "")
-    set(CN_STRING "${DISTRO_VERSION_ID}-")
-  endif()
-
-  if(NOT "${DISTRO_CODENAME}" STREQUAL "")
-    set(CN_STRING "${DISTRO_CODENAME}-")
-  endif()
-
-  set(OS_STRING "${DISTRO_NAME}-${CN_STRING}${CMAKE_SYSTEM_PROCESSOR}")
-
-endmacro()
-
-macro(configure_linux_packaging)
-
-  # Gather distro info
-  # This is used in package names
-  configure_linux_package_name()
-
-  set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
-  set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-
-  set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
-  set(CPACK_RPM_PACKAGE_GROUP "Applications/System")
-
-  # HACK: The GUI depends on the Qt6 QPA plugins package, but that's not picked
-  # up by shlibdeps on Ubuntu 22 (though not a problem on Ubuntu 24 and Debian
-  # 12), so we must add it manually.
-  set(CPACK_DEBIAN_PACKAGE_DEPENDS "qt6-qpa-plugins")
-
-endmacro()
-
-#
-# Same as the `configure_file` command but for directories recursively.
-#
-macro(configure_files srcDir destDir)
-
-  message(VERBOSE "Configuring directory ${destDir}")
-  make_directory(${destDir})
-
-  file(
-    GLOB_RECURSE sourceFiles
-    RELATIVE ${srcDir}
-    ${srcDir}/*)
-  file(
-    GLOB_RECURSE templateFiles
-    LIST_DIRECTORIES false
-    RELATIVE ${srcDir}
-    ${srcDir}/*.in)
-  list(REMOVE_ITEM sourceFiles ${templateFiles})
-
-  foreach(sourceFile ${sourceFiles})
-    set(sourceFilePath ${srcDir}/${sourceFile})
-    if(IS_DIRECTORY ${sourceFilePath})
-      message(VERBOSE "Copying directory ${sourceFile}")
-      make_directory(${destDir}/${sourceFile})
-    else()
-      message(VERBOSE "Copying file ${sourceFile}")
-      configure_file(${sourceFilePath} ${destDir}/${sourceFile} COPYONLY)
-    endif()
-
-  endforeach(sourceFile)
-
-  foreach(templateFile ${templateFiles})
-
-    set(sourceTemplateFilePath ${srcDir}/${templateFile})
-    string(REGEX REPLACE "\.in$" "" templateFile ${templateFile})
-    message(VERBOSE "Configuring file ${templateFile}")
-    configure_file(${sourceTemplateFilePath} ${destDir}/${templateFile} @ONLY)
-
-  endforeach(templateFile)
-
-endmacro(configure_files)
-
-macro(check_is_rpm)
-  # Check if RPM-like.
-
-endmacro()
-

cspell.json

@@ -11,9 +11,10 @@
     "codesigning",
     "Compat",
     "contribs",
+    "daemonized",
     "Daun",
-    "Devs",
     "Deskflow",
+    "Devs",
     "distro",
     "distros",
     "dmgbuild",
@@ -24,6 +25,7 @@
     "gdrive",
     "Hadzhylov",
     "Hetu",
+    "HINSTANCE",
     "hotspots",
     "Hutterer",
     "ifdef",
@@ -39,6 +41,7 @@
     "Libera",
     "libportal",
     "LLDB",
+    "logonui",
     "Lysytsia",
     "macdeployqt",
     "msvc",
@@ -48,6 +51,8 @@
     "Oleksandr",
     "Olena",
     "outputdir",
+    "outputter",
+    "outputters",
     "pacman",
     "Petroules",
     "Pixmap",
@@ -57,6 +62,7 @@
     "Priddy",
     "psutil",
     "pyproject",
+    "qobject",
     "qputenv",
     "readf",
     "Regen",
@@ -67,9 +73,11 @@
     "Schoeneman",
     "Serhii",
     "shemp",
+    "SNAPPROCESS",
     "Sorin",
     "subproject",
     "subprojects",
+    "Toolhelp",
     "trackpad",
     "Trixie",
     "unittests",

deploy/CMakeLists.txt

@@ -1,41 +1,41 @@
 # SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
-# Handle Pre install Items
-if(WIN32)
+# Copy License with txt ext for picky package creation tools
+file(COPY_FILE
+  ${CMAKE_SOURCE_DIR}/LICENSE
+  ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt
+  ONLY_IF_DIFFERENT
+)
 
-  # Configure the windows version rc file
-  configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/version.rc.in
-    ${PROJECT_BINARY_DIR}/src/version.rc @ONLY
-  )
 
-elseif(NOT APPLE)
+# Generic Package Items
+set(CPACK_STRIP_FILES TRUE)
+set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
+set(CPACK_PACKAGE_CONTACT ${CMAKE_PROJECT_CONTACT})
+set(CPACK_PACKAGE_DESCRIPTION ${CMAKE_PROJECT_DESCRIPTION})
+set(CPACK_PACKAGE_VENDOR ${CMAKE_PROJECT_VENDOR})
+set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt)
 
-  # Install our desktop file
-  install(
-    FILES ${CMAKE_CURRENT_LIST_DIR}/org.deskflow.deskflow.desktop
-    DESTINATION share/applications
-  )
-
-  # Install our icon
-  install(
-    FILES ${CMAKE_CURRENT_LIST_DIR}/deskflow.png
-    DESTINATION share/icons/hicolor/512x512/apps/
-    RENAME org.deskflow.deskflow.png
-  )
-
-  # Install our metainfo
-  install(
-    FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.deskflow.deskflow.metainfo.xml
-    DESTINATION share/metainfo/
-  )
-
-  # Prepare PKGBUILD for Arch Linux
-  configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/dist/arch/PKGBUILD.in
-    ${CMAKE_BINARY_DIR}/PKGBUILD
-    @ONLY
-  )
+set(CPACK_PACKAGE_VERSION ${CMAKE_PROJECT_VERSION})
 
+#Prevent this override from being written in the package
+if(NOT PACKAGE_VERSION_LABEL)
+    set (PACKAGE_VERSION_LABEL "${CPACK_PACKAGE_VERSION}")
 endif()
+
+if(WIN32)
+  include(windows/deploy.cmake)
+elseif(UNIX AND NOT APPLE)
+  include(linux/deploy.cmake)
+elseif(APPLE)
+  include(mac/deploy.cmake)
+else()
+  message(STATUS "UNKNOWN System: ${CMAKE_SYSTEM_NAME}")
+endif()
+
+# Always use "deskflow" for start of name
+set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PACKAGE_VERSION_LABEL}-${OS_STRING}")
+message(STATUS "Package Basename: ${CPACK_PACKAGE_FILE_NAME}")
+
+include(CPack)

deploy/dist/mac/bundle/Contents/Info.plist.in

@@ -1,31 +0,0 @@
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>CFBundleDevelopmentRegion</key>
-    <string>English</string>
-    <key>CFBundleDisplayName</key>
-    <string>Deskflow</string>
-    <key>CFBundleExecutable</key>
-    <string>deskflow</string>
-    <key>CFBundleIconFile</key>
-    <string>Deskflow.icns</string>
-    <key>CFBundleIdentifier</key>
-    <string>org.deskflow.deskflow</string>
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-    <key>CFBundleName</key>
-    <string>Deskflow</string>
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-    <key>CFBundleSignature</key>
-    <string>DFLW</string>
-    <key>CFBundleShortVersionString</key>
-    <string>@DESKFLOW_VERSION@</string>
-    <key>CFBundleVersion</key>
-    <string>@DESKFLOW_VERSION@</string>
-    <key>NSHumanReadableCopyright</key>
-    <string>© 2024 Deskflow Developers</string>
-    <key>LSMinimumSystemVersion</key>
-    <string>10.9.0</string>
-  </dict>
-</plist>

deploy/dist/mac/bundle/Contents/PkgInfo.in

@@ -1 +0,0 @@
-APPLDFLW

deploy/dist/mac/dmgbuild/settings.py

@@ -1,69 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Example: https://dmgbuild.readthedocs.io/en/latest/example.html
-
-from __future__ import unicode_literals
-
-import os.path
-
-app = defines.get("app")
-app_basename = os.path.basename(app)
-format = defines.get("format", "UDBZ")
-size = defines.get("size", None)
-files = [app]
-symlinks = {"Applications": "/Applications"}
-icon = os.path.join(app, "Contents/Resources/Volume.icns")
-icon_locations = {
-    app_basename: (144, 190),
-    "Applications": (455, 190),
-}
-background = os.path.join(app, "Contents/Resources/Background.tiff")
-show_status_bar = False
-show_tab_view = False
-show_toolbar = False
-show_pathbar = False
-show_sidebar = False
-sidebar_width = 180
-window_rect = ((200, 120), (620, 420))
-default_view = "icon-view"
-show_icon_preview = False
-include_icon_view_settings = "auto"
-include_list_view_settings = "auto"
-arrange_by = None
-grid_offset = (0, 0)
-grid_spacing = 100
-scroll_position = (0, 0)
-label_pos = "bottom"
-text_size = 16
-icon_size = 100
-list_icon_size = 16
-list_text_size = 12
-list_scroll_position = (0, 0)
-list_sort_by = "name"
-list_use_relative_dates = True
-list_calculate_all_sizes = (False,)
-list_columns = ("name", "date-modified", "size", "kind", "date-added")
-list_column_widths = {
-    "name": 300,
-    "date-modified": 181,
-    "date-created": 181,
-    "date-added": 181,
-    "date-last-opened": 181,
-    "size": 97,
-    "kind": 115,
-    "label": 100,
-    "version": 75,
-    "comments": 300,
-}
-list_column_sort_directions = {
-    "name": "ascending",
-    "date-modified": "descending",
-    "date-created": "descending",
-    "date-added": "descending",
-    "date-last-opened": "descending",
-    "size": "descending",
-    "kind": "ascending",
-    "label": "ascending",
-    "version": "ascending",
-    "comments": "ascending",
-}

deploy/dist/wix/AppBrowseDlg.wxs

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-   <Fragment>
-      <UI>
-         <Dialog Id="AppBrowseDlg" Width="370" Height="270" Title="!(loc.BrowseDlg_Title)">
-            <Control Id="PathEdit" Type="PathEdit" X="25" Y="202" Width="320" Height="18" Property="_BrowseProperty" Indirect="yes" />
-            <Control Id="OK" Type="PushButton" X="240" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUIOK)">
-               <Publish Event="SetTargetPath" Value="[_BrowseProperty]">1</Publish>
-               <Publish Event="EndDialog" Value="Return">1</Publish>
-            </Control>
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-               <Publish Event="Reset" Value="0">1</Publish>
-               <Publish Event="EndDialog" Value="Return">1</Publish>
-            </Control>
-            <Control Id="ComboLabel" Type="Text" X="25" Y="58" Width="44" Height="10" TabSkip="no" Text="!(loc.BrowseDlgComboLabel)" />
-            <Control Id="DirectoryCombo" Type="DirectoryCombo" X="70" Y="55" Width="220" Height="80" Property="_BrowseProperty" Indirect="yes" Fixed="yes" Remote="yes">
-               <Subscribe Event="IgnoreChange" Attribute="IgnoreChange" />
-            </Control>
-            <Control Id="WixUI_Bmp_Up" Type="PushButton" X="298" Y="55" Width="19" Height="19" ToolTip="!(loc.BrowseDlgWixUI_Bmp_UpTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="!(loc.BrowseDlgWixUI_Bmp_Up)">
-               <Publish Event="DirectoryListUp" Value="0">1</Publish>
-            </Control>
-            <Control Id="NewFolder" Type="PushButton" X="325" Y="55" Width="19" Height="19" ToolTip="!(loc.BrowseDlgNewFolderTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="!(loc.BrowseDlgNewFolder)">
-               <Publish Event="DirectoryListNew" Value="0">1</Publish>
-            </Control>
-            <Control Id="DirectoryList" Type="DirectoryList" X="25" Y="83" Width="320" Height="98" Property="_BrowseProperty" Sunken="yes" Indirect="yes" TabSkip="no" />
-            <Control Id="PathLabel" Type="Text" X="25" Y="190" Width="320" Height="10" TabSkip="no" Text="!(loc.BrowseDlgPathLabel)" />
-            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.BrowseDlgBannerBitmap)" />
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-            <Control Id="Title" Type="Text" X="15" Y="15" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.BrowseDlgTitle)" />
-         </Dialog>
-      </UI>
-   </Fragment>
-</Wix>

deploy/dist/wix/AppDlgSequence.wxs

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-First-time install dialog sequence:
- - WixUI_WelcomeDlg
- - WixUI_LicenseAgreementDlg
- - WixUI_InstallDirDlg
- - WixUI_VerifyReadyDlg
- - WixUI_DiskCostDlg
-Maintenance dialog sequence:
- - WixUI_MaintenanceWelcomeDlg
- - WixUI_MaintenanceTypeDlg
- - WixUI_InstallDirDlg
- - WixUI_VerifyReadyDlg
-Patch dialog sequence:
- - WixUI_WelcomeDlg
- - WixUI_VerifyReadyDlg
--->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Fragment>
-        <UI Id="AppDlgSequence">
-            <TextStyle Id="WixUI_Font_Normal" FaceName="Roboto" Size="9" />
-            <TextStyle Id="WixUI_Font_Bigger" FaceName="Roboto" Size="14" />
-            <TextStyle Id="WixUI_Font_Title" FaceName="Roboto" Size="12" Bold="yes"  Blue="255" Red="255" Green="255"/>
-
-            <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-            <Property Id="WixUI_Mode" Value="InstallDir" />
-
-            <DialogRef Id="BrowseDlg" />
-            <DialogRef Id="DiskCostDlg" />
-            <DialogRef Id="ErrorDlg" />
-            <DialogRef Id="FatalError" />
-            <DialogRef Id="FilesInUse" />
-            <DialogRef Id="MsiRMFilesInUse" />
-            <DialogRef Id="PrepareDlg" />
-            <DialogRef Id="ProgressDlg" />
-            <DialogRef Id="ResumeDlg" />
-            <DialogRef Id="UserExit" />
-            
-            <Publish Dialog="AppBrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
-            <Publish Dialog="AppBrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-
-            <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
-            <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="StartGui">NOT Installed</Publish>
-
-            <Publish Dialog="AppWelcome" Control="Next" Event="NewDialog" Value="AppInstallDirDlg" Order="1">1</Publish>
-            <Publish Dialog="AppWelcome" Control="Next" Event="NewDialog" Value="AppVerifyReadyDlg">Installed AND PATCH</Publish>
-
-            <Publish Dialog="AppInstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="AppInstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
-            <Publish Dialog="AppInstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-            <Publish Dialog="AppInstallDirDlg" Control="Next" Event="NewDialog" Value="AppVerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
-            <Publish Dialog="AppInstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="AppInstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="AppBrowseDlg" Order="2">1</Publish>
-            <Publish Dialog="AppInstallDirDlg" Control="Back" Event="NewDialog" Value="AppWelcome" Order="2">1</Publish>
-            
-            <Publish Dialog="AppVerifyReadyDlg" Control="Back" Event="NewDialog" Value="AppInstallDirDlg" Order="1">NOT Installed</Publish>
-            <Publish Dialog="AppVerifyReadyDlg" Control="Back" Event="NewDialog" Value="AppMaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
-            <Publish Dialog="AppVerifyReadyDlg" Control="Back" Event="NewDialog" Value="AppInstallDirDlg" Order="2">Installed AND PATCH</Publish>
-
-            <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="AppMaintenanceTypeDlg">1</Publish>
-
-            <Publish Dialog="AppMaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="AppVerifyReadyDlg">1</Publish>
-            <Publish Dialog="AppMaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="AppVerifyReadyDlg">1</Publish>
-            <Publish Dialog="AppMaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
-
-            <Property Id="ARPNOMODIFY" Value="1" />
-        </UI>
-
-        <UIRef Id="WixUI_Common" />
-    </Fragment>
-</Wix>

deploy/dist/wix/AppInstallDirDlg.wxs

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-   <?include Include.wxi?>
-   <Fragment>
-      <UI Id="AppInstallDirDlg">
-         <Dialog Id="AppInstallDirDlg" Width="370" Height="270" Title="!(loc.InstallDirDlg_Title)">
-            <Control Id="Title" Type="Text" X="15" Y="15" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgTitle)" />
-            
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-               <Publish Event="SpawnDialog" Value="CancelDlg" />
-            </Control>
-
-            <Control Id="InstallDirDlgBackground" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[CommonBackground]" />
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-
-            <Control Id="FolderLabel" Transparent="yes" Type="Text" X="20" Y="70" Width="290" Height="30" NoPrefix="yes" Text="!(loc.InstallDirDlgFolderLabel)" />
-            <Control Id="Folder" Type="PathEdit" X="20" Y="90" Width="320" Height="18" Property="WIXUI_INSTALLDIR" Indirect="yes" />
-            <Control Id="ChangeFolder" Type="PushButton" X="20" Y="112" Width="56" Height="17" Text="!(loc.InstallDirDlgChange)" />
-         </Dialog>
-      </UI>
-   </Fragment>
-</Wix>

deploy/dist/wix/AppMaintenanceTypeDlg.wxs

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) Microsoft Corporation.  All rights reserved.
-    
-    The use and distribution terms for this software are covered by the
-    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
-    which can be found in the file CPL.TXT at the root of this distribution.
-    By using this software in any fashion, you are agreeing to be bound by
-    the terms of this license.
-    
-    You must not remove this notice, or any other, from this software.
--->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-   <Fragment>
-      <UI>
-         <Dialog Id="AppMaintenanceTypeDlg" Width="370" Height="270" Title="!(loc.MaintenanceTypeDlg_Title)">
-            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[CommonBackground]" />
-            <Control Id="ChangeButton" Type="PushButton" X="40" Y="65" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgChangeButtonTooltip)" Default="yes" Text="!(loc.MaintenanceTypeDlgChangeButton)">
-               <Publish Property="WixUI_InstallMode" Value="Change">1</Publish>
-               <Condition Action="disable">ARPNOMODIFY</Condition>
-            </Control>
-            <Control Id="ChangeText" Transparent="yes" Type="Text" X="60" Y="85" Width="280" Height="20" Text="!(loc.MaintenanceTypeDlgChangeText)">
-               <Condition Action="hide">ARPNOMODIFY</Condition>
-            </Control>
-            <Control Id="ChangeDisabledText" Transparent="yes" Type="Text" X="60" Y="85" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgChangeDisabledText)" Hidden="yes">
-               <Condition Action="show">ARPNOMODIFY</Condition>
-            </Control>
-            <Control Id="RepairButton" Type="PushButton" X="40" Y="118" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgRepairButtonTooltip)" Text="!(loc.MaintenanceTypeDlgRepairButton)">
-               <Publish Property="WixUI_InstallMode" Value="Repair">1</Publish>
-               <Condition Action="disable">ARPNOREPAIR</Condition>
-            </Control>
-            <Control Id="RepairText" Transparent="yes" Type="Text" X="60" Y="138" Width="280" Height="30" Text="!(loc.MaintenanceTypeDlgRepairText)">
-               <Condition Action="hide">ARPNOREPAIR</Condition>
-            </Control>
-            <Control Id="RepairDisabledText" Transparent="yes" Type="Text" X="60" Y="138" Width="280" Height="30" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRepairDisabledText)" Hidden="yes">
-               <Condition Action="show">ARPNOREPAIR</Condition>
-            </Control>
-            <Control Id="RemoveButton" Type="PushButton" X="40" Y="171" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgRemoveButtonTooltip)" Text="!(loc.MaintenanceTypeDlgRemoveButton)">
-               <Publish Property="WixUI_InstallMode" Value="Remove">1</Publish>
-               <Condition Action="disable">ARPNOREMOVE</Condition>
-            </Control>
-            <Control Id="RemoveText" Transparent="yes" Type="Text" X="60" Y="191" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRemoveText)">
-               <Condition Action="hide">ARPNOREMOVE</Condition>
-            </Control>
-            <Control Id="RemoveDisabledText" Transparent="yes" Type="Text" X="60" Y="191" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRemoveDisabledText)" Hidden="yes">
-               <Condition Action="show">ARPNOREMOVE</Condition>
-            </Control>
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUINext)" />
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-               <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-            </Control>
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-            <Control Id="Title" Type="Text" X="15" Y="15" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgTitle)" />
-         </Dialog>
-      </UI>
-   </Fragment>
-</Wix>

deploy/dist/wix/AppVerifyReadyDlg.wxs

@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-   <?include Include.wxi?>
-   <Fragment>
-      <UI>
-         <Dialog Id="AppVerifyReadyDlg" Width="370" Height="270" Title="!(loc.VerifyReadyDlg_Title)" TrackDiskSpace="yes">
-            <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgInstall)">
-               <Condition Action="show">NOT Installed AND ALLUSERS</Condition>
-               <Condition Action="enable">NOT Installed</Condition>
-               <Condition Action="default">NOT Installed</Condition>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgInstall)">
-               <Condition Action="show">NOT Installed AND NOT ALLUSERS</Condition>
-               <Condition Action="enable">NOT Installed</Condition>
-               <Condition Action="default">NOT Installed</Condition>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="Change" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgChange)">
-               <Condition Action="show">WixUI_InstallMode = "Change" AND ALLUSERS AND (ADDLOCAL OR REMOVE)</Condition>
-               <Condition Action="enable">WixUI_InstallMode = "Change"</Condition>
-               <Condition Action="default">WixUI_InstallMode = "Change"</Condition>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="ChangeNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgChange)">
-               <Condition Action="show">WixUI_InstallMode = "Change" AND (NOT ALLUSERS OR (NOT ADDLOCAL AND NOT REMOVE))</Condition>
-               <Condition Action="enable">WixUI_InstallMode = "Change"</Condition>
-               <Condition Action="default">WixUI_InstallMode = "Change"</Condition>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="Repair" Type="PushButton" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRepair)">
-               <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
-               <Condition Action="enable">WixUI_InstallMode = "Repair"</Condition>
-               <Condition Action="default">WixUI_InstallMode = "Repair"</Condition>
-               <Publish Event="ReinstallMode" Value="ecmus"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="Reinstall" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="Remove" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRemove)">
-               <Condition Action="show">WixUI_InstallMode = "Remove" AND ALLUSERS</Condition>
-               <Condition Action="enable">WixUI_InstallMode = "Remove"</Condition>
-               <Publish Event="Remove" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="RemoveNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRemove)">
-               <Condition Action="show">WixUI_InstallMode = "Remove" AND NOT ALLUSERS</Condition>
-               <Condition Action="enable">WixUI_InstallMode = "Remove"</Condition>
-               <Publish Event="Remove" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="Update" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgUpdate)">
-               <Condition Action="show">WixUI_InstallMode = "Update" AND ALLUSERS</Condition>
-               <Condition Action="enable">WixUI_InstallMode = "Update"</Condition>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="UpdateNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgUpdate)">
-               <Condition Action="show">WixUI_InstallMode = "Update" AND NOT ALLUSERS</Condition>
-               <Condition Action="enable">WixUI_InstallMode = "Update"</Condition>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-
-            <Control Id="InstallTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="{\WixUI_Font_Title}Ready to install">
-               <Condition Action="show">NOT Installed</Condition>
-            </Control>
-            <Control Id="InstallText" Transparent="yes" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallText)">
-               <Condition Action="show">NOT Installed</Condition>
-            </Control>
-            <Control Id="ChangeTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgChangeTitle)">
-               <Condition Action="show">WixUI_InstallMode = "Change"</Condition>
-            </Control>
-            <Control Id="ChangeText" Transparent="yes" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgChangeText)">
-               <Condition Action="show">WixUI_InstallMode = "Change"</Condition>
-            </Control>
-            <Control Id="RepairTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgRepairTitle)">
-               <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
-            </Control>
-            <Control Id="RepairText" Transparent="yes" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgRepairText)">
-               <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
-            </Control>
-            <Control Id="RemoveTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgRemoveTitle)">
-               <Condition Action="show">WixUI_InstallMode = "Remove"</Condition>
-            </Control>
-            <Control Id="RemoveText" Transparent="yes" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgRemoveText)">
-               <Condition Action="show">WixUI_InstallMode = "Remove"</Condition>
-            </Control>
-            <Control Id="UpdateTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgUpdateTitle)">
-               <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
-            </Control>
-            <Control Id="UpdateText" Transparent="yes" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgUpdateText)">
-               <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
-            </Control>
-
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-               <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-            </Control>
-            <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)">
-               <Condition Action="default">WixUI_InstallMode = "Remove"</Condition>
-            </Control>
-            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[CommonBackground]" />
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-         </Dialog>
-      </UI>
-   </Fragment>
-</Wix>

deploy/dist/wix/AppWelcome.wxs

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-   <?include Include.wxi?>
-   <Fragment>
-      <UI Id="AppWelcome">
-         <Property Id="AppWelcomeBackground">welcome_background</Property>
-         <Binary Id="welcome_background" SourceFile="$(var.DeployResDir)\dist\wix\images\welcome_background.png"/>
-
-         <Dialog Id="AppWelcome" Width="370" Height="270" Title="!(loc.WelcomeDlg_Title)">
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
-               <Publish Property="WixUI_InstallMode" Value="Update">Installed AND PATCH</Publish>
-            </Control>
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-               <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-            </Control>
-            <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[AppWelcomeBackground]" />
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-         </Dialog>
-
-         <InstallUISequence>
-            <Show Dialog="AppWelcome" Before="ProgressDlg" Overridable="yes">NOT Installed OR PATCH</Show>
-         </InstallUISequence>
-      </UI>
-   </Fragment>
-</Wix>

deploy/dist/wix/DeskflowDlgSequence.wxs

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-First-time install dialog sequence:
- - WixUI_WelcomeDlg
- - WixUI_LicenseAgreementDlg
- - WixUI_InstallDirDlg
- - WixUI_VerifyReadyDlg
- - WixUI_DiskCostDlg
-Maintenance dialog sequence:
- - WixUI_MaintenanceWelcomeDlg
- - WixUI_MaintenanceTypeDlg
- - WixUI_InstallDirDlg
- - WixUI_VerifyReadyDlg
-Patch dialog sequence:
- - WixUI_WelcomeDlg
- - WixUI_VerifyReadyDlg
--->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Fragment>
-        <UI Id="DeskflowDlgSequence">
-            <TextStyle Id="WixUI_Font_Normal" FaceName="Roboto" Size="9" />
-            <TextStyle Id="WixUI_Font_Bigger" FaceName="Roboto" Size="14" />
-            <TextStyle Id="WixUI_Font_Title" FaceName="Roboto" Size="12" Bold="yes"  Blue="255" Red="255" Green="255"/>
-
-            <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-            <Property Id="WixUI_Mode" Value="InstallDir" />
-
-            <DialogRef Id="BrowseDlg" />
-            <DialogRef Id="DiskCostDlg" />
-            <DialogRef Id="ErrorDlg" />
-            <DialogRef Id="FatalError" />
-            <DialogRef Id="FilesInUse" />
-            <DialogRef Id="MsiRMFilesInUse" />
-            <DialogRef Id="PrepareDlg" />
-            <DialogRef Id="ProgressDlg" />
-            <DialogRef Id="ResumeDlg" />
-            <DialogRef Id="UserExit" />
-            
-            <Publish Dialog="DeskflowBrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
-            <Publish Dialog="DeskflowBrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-
-            <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
-            <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="StartGui">NOT Installed</Publish>
-
-            <Publish Dialog="DeskflowWelcome" Control="Next" Event="NewDialog" Value="DeskflowInstallDirDlg" Order="1">1</Publish>
-            <Publish Dialog="DeskflowWelcome" Control="Next" Event="NewDialog" Value="DeskflowVerifyReadyDlg">Installed AND PATCH</Publish>
-
-            <Publish Dialog="DeskflowInstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="DeskflowInstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
-            <Publish Dialog="DeskflowInstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-            <Publish Dialog="DeskflowInstallDirDlg" Control="Next" Event="NewDialog" Value="DeskflowVerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
-            <Publish Dialog="DeskflowInstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="DeskflowInstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="DeskflowBrowseDlg" Order="2">1</Publish>
-            <Publish Dialog="DeskflowInstallDirDlg" Control="Back" Event="NewDialog" Value="DeskflowWelcome" Order="2">1</Publish>
-            
-            <Publish Dialog="DeskflowVerifyReadyDlg" Control="Back" Event="NewDialog" Value="DeskflowInstallDirDlg" Order="1">NOT Installed</Publish>
-            <Publish Dialog="DeskflowVerifyReadyDlg" Control="Back" Event="NewDialog" Value="DeskflowMaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
-            <Publish Dialog="DeskflowVerifyReadyDlg" Control="Back" Event="NewDialog" Value="DeskflowInstallDirDlg" Order="2">Installed AND PATCH</Publish>
-
-            <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="DeskflowMaintenanceTypeDlg">1</Publish>
-
-            <Publish Dialog="DeskflowMaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="DeskflowVerifyReadyDlg">1</Publish>
-            <Publish Dialog="DeskflowMaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="DeskflowVerifyReadyDlg">1</Publish>
-            <Publish Dialog="DeskflowMaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
-
-            <Property Id="ARPNOMODIFY" Value="1" />
-        </UI>
-
-        <UIRef Id="WixUI_Common" />
-    </Fragment>
-</Wix>

deploy/dist/wix/Include.wxi.in

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Include>
-    <?define AppId="deskflow"?>
-    <?define Name="Deskflow"?>
-    <?define Version="@DESKFLOW_VERSION@"?>
-    <?define Author="Deskflow"?>
-    <?define BinDir="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"?>
-    <?define ProjectIcon="@CMAKE_SOURCE_DIR@/src/gui/src/deskflow.ico"?>
-    <?define DeployResDir="@CMAKE_SOURCE_DIR@/deploy"?>
-    <?define QtDir="@QT_PATH@"?>
-    <?define QtBinDir="$(var.QtDir)\bin"?>
-    <?if $(var.Platform) = "x64"?>
-    <?define ProgramFilesFolder="ProgramFiles64Folder"?>
-    <?define PlatformSimpleName="64-bit"?>
-    <?define UpgradeGuid="@DESKFLOW_MSI_64_GUID@"?>
-    <?else?>
-    <?define ProgramFilesFolder="ProgramFilesFolder"?>
-    <?define PlatformSimpleName="32-bit"?>
-    <?define UpgradeGuid="@DESKFLOW_MSI_32_GUID@"?>
-    <?endif?>
-    <?define QtPluginsPath="$(var.QtDir)\plugins"?>
-    <?define OpenSslExeDir="@OPENSSL_EXE_DIR@"?>
-    <?define OpenSslDllDir="@OPENSSL_ROOT_DIR@/bin"?>
-    <?define GuiBin="deskflow.exe"?>
-    <?define ServerBin="deskflow-server.exe"?>
-    <?define ClientBin="deskflow-client.exe"?>
-    <?define CoreBin="deskflow-core.exe"?>
-    <?define DaemonBin="deskflow-daemon.exe"?>
-</Include>

deploy/dist/wix/Installer.sln

@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29411.108
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Debug|x64 = Debug|x64
-		Release|x86 = Release|x86
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.ActiveCfg = Debug|x86
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.Build.0 = Debug|x86
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.ActiveCfg = Debug|x64
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.Build.0 = Debug|x64
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.ActiveCfg = Release|x86
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.Build.0 = Release|x86
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.ActiveCfg = Release|x64
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2E0AA1C9-0F14-4FE4-8F18-430484EFBACE}
-	EndGlobalSection
-EndGlobal

deploy/dist/wix/Installer.wixproj

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProductVersion>3.11</ProductVersion>
-    <ProjectGuid>{d4ba9f39-6a35-4c8f-9cb2-67fcbe5cab17}</ProjectGuid>
-    <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>Installer</OutputName>
-    <OutputType>Package</OutputType>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>wix\obj\$(Configuration)\</IntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(SolutionDir)/AppWelcome.wxs" />
-    <Compile Include="$(SolutionDir)/AppInstallDirDlg.wxs" />
-    <Compile Include="$(SolutionDir)/AppBrowseDlg.wxs" />
-    <Compile Include="$(SolutionDir)/AppVerifyReadyDlg.wxs" />
-    <Compile Include="$(SolutionDir)/AppMaintenanceTypeDlg.wxs" />
-    <Compile Include="$(SolutionDir)/AppDlgSequence.wxs" />
-    <Compile Include="$(SolutionDir)/Product.wxs" />
-    <Content Include="$(SolutionDir)/Include.wxi" />
-
-  </ItemGroup>
-  <ItemGroup>
-    <WixExtension Include="WixUtilExtension">
-      <HintPath>C:\Program Files (x86)\WiX Toolset v3.11\bin\WixUtilExtension.dll</HintPath>
-      <Name>WixUtilExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixUIExtension">
-      <HintPath>C:\Program Files (x86)\WiX Toolset v3.11\bin\WixUIExtension.dll</HintPath>
-      <Name>WixUIExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixFirewallExtension">
-      <HintPath>C:\Program Files (x86)\WiX Toolset v3.11\bin\WixFirewallExtension.dll</HintPath>
-      <Name>WixFirewallExtension</Name>
-    </WixExtension>
-  </ItemGroup>
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets"
-    Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
-</Project>

deploy/dist/wix/Product.wxs

@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-	<?include Include.wxi?>
-	<Product Id="*" Language="1033" Manufacturer="$(var.Author)" Name="$(var.Name) ($(var.PlatformSimpleName))" UpgradeCode="$(var.UpgradeGuid)" Version="$(var.Version)">
-		<Package Compressed="yes" InstallScope="perMachine" InstallerVersion="301"/>
-		<MajorUpgrade DowngradeErrorMessage="A newer version of $(var.Name) is already installed."/>
-		<MediaTemplate EmbedCab="yes"/>
-		<!-- causes ICE61 warning, but stops user from installing many instances from nightly builds. -->
-		<Upgrade Id="$(var.UpgradeGuid)">
-			<UpgradeVersion Minimum="0.0.0.0" Property="UPGRADE"/>
-		</Upgrade>
-		<Feature Id="ProductFeature" Title="$(var.Name)">
-			<ComponentGroupRef Id="ProductComponents"/>
-			<ComponentGroupRef Id="OpenSSLComponents"/>
-			<ComponentGroupRef Id="ProductQtStylesComponents"/>
-			<ComponentGroupRef Id="ProductQtPluginComponents"/>
-			<ComponentRef Id="RegistryEntries"/>
-			<MergeRef Id="VC_Redist"/>
-		</Feature>
-		<DirectoryRef Id="TARGETDIR">
-			<Component Guid="7CF3564D-1F8E-4D3D-9781-E1EE22D5BD67" Id="RegistryEntries">
-				<RegistryKey Id="$(var.AppId)_server" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" Root="HKLM">
-					<RegistryValue Name="[INSTALLFOLDER]$(var.ServerBin)" Type="string" Value="~ HIGHDPIAWARE WIN7RTM"/>
-				</RegistryKey>
-
-				<RegistryKey Id="$(var.AppId)_client" Root="HKLM"
-					Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"
-					ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-					<RegistryValue Type="string" Name="[INSTALLFOLDER]$(var.ClientBin)" Value="~ HIGHDPIAWARE WIN7RTM"/>
-				</RegistryKey>
-
-				<RegistryKey Id="$(var.AppId)" Root="HKLM"
-					Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"
-					ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-					<RegistryValue Type="string" Name="[INSTALLFOLDER]$(var.GuiBin)" Value="~ HIGHDPIAWARE WIN7RTM"/>
-				</RegistryKey>
-				<!-- Windows 8 and later only -->
-				<Condition><![CDATA[Installed OR (VersionNT >= 602)]]></Condition>
-			</Component>
-			<?if $(var.Platform) = x64 ?>
-				<Merge Id="VC_Redist" SourceFile="$(var.DeployResDir)\dist\wix\msm\Microsoft_VC142_CRT_x64.msm" DiskId="1" Language="0"/>
-			<?else ?>
-				<Merge Id="VC_Redist" SourceFile="$(var.DeployResDir)\dist\wix\msm\Microsoft_VC142_CRT_x86.msm" DiskId="1" Language="0"/>
-			<?endif ?>
-		</DirectoryRef>
-		<Property Id="CommonBackground">CommonBackground</Property>
-		<Binary Id="CommonBackground" SourceFile="$(var.DeployResDir)\dist\wix\images\common_background.png"/>
-		<Icon Id="AppIcon" SourceFile="$(var.ProjectIcon)"/>
-		<WixVariable Id="WixUIBannerBmp" Value="$(var.DeployResDir)\dist\wix\images\banner.png"/>
-		<WixVariable Id="WixUIDialogBmp" Value="$(var.DeployResDir)\dist\wix\images\dialog.png"/>
-		<Property Id="ARPPRODUCTICON" Value="AppIcon"/>
-		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
-		<Property Id="LEGACY_UNINSTALL_EXISTS">
-			<RegistrySearch Id="LegacyRegistrySearch" Key="SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\$(var.Name)" Name="UninstallString" Root="HKLM" Type="file" Win64="no">
-				<FileSearch Id="LegacyFileSearch" Name="uninstall.exe"/>
-			</RegistrySearch>
-		</Property>
-		<Condition Message="An existing installation of $(var.Name) was detected, please uninstall it before continuing.">NOT LEGACY_UNINSTALL_EXISTS
-		</Condition>
-		<CustomAction ExeCommand="" FileKey="GuiProgram" Id="StartGui" Return="asyncNoWait"/>
-		<UI>
-			<UIRef Id="AppDlgSequence" />
-		</UI>
-	</Product>
-	<Fragment>
-		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="$(var.ProgramFilesFolder)">
-				<Directory Id="INSTALLFOLDER" Name="$(var.Name)">
-					<Directory Id="OpenSSLDir" Name="OpenSSL"/>
-					<Directory Id="PlatformsDir" Name="Platforms"/>
-					<Directory Id="QTStylesDir" Name="styles"/>
-				</Directory>
-			</Directory>
-			<Directory Id="ProgramMenuFolder"/>
-		</Directory>
-	</Fragment>
-	<Fragment>
-		<ComponentGroup Directory="INSTALLFOLDER" Id="ProductComponents">
-			<Component Guid="EC9AD3B0-277C-4157-B5C8-5FD5B6A5F4AD" Id="Core">
-				<File KeyPath="yes" Source="$(var.BinDir)/$(var.DaemonBin)"/>
-				<ServiceInstall Description="Controls the $(var.Name) foreground processes." DisplayName="$(var.Name)" ErrorControl="normal" Id="ServiceInstall" Name="$(var.Name)" Start="auto" Type="ownProcess">
-					<util:ServiceConfig FirstFailureActionType="restart" ResetPeriodInDays="1" RestartServiceDelayInSeconds="1" SecondFailureActionType="restart" ThirdFailureActionType="restart"/>
-				</ServiceInstall>
-				<ServiceControl Id="ServiceControl" Name="$(var.Name)" Remove="uninstall" Start="install" Stop="both"/>
-				<File Source="$(var.BinDir)/$(var.ServerBin)">
-					<fire:FirewallException Id="ServerFirewallException" IgnoreFailure="yes" Name="$(var.Name) Server" Scope="any"/>
-				</File>
-				<File Source="$(var.BinDir)/$(var.ClientBin)">
-					<fire:FirewallException Id="ClientFirewallException" IgnoreFailure="yes" Name="$(var.Name) Client" Scope="any"/>
-				</File>
-				<?if $(var.Platform) = x64 ?>
-					<File Source="$(var.OpenSslDllDir)/libssl-3-x64.dll"/>
-					<File Source="$(var.OpenSslDllDir)/libcrypto-3-x64.dll"/>
-				<?else ?>
-					<File Source="$(var.OpenSslDllDir)/libssl-3.dll"/>
-					<File Source="$(var.OpenSslDllDir)/libcrypto-3.dll"/>
-				<?endif ?>
-			</Component>
-			<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
-				<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinDir)/$(var.GuiBin)">
-					<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="$(var.GuiBin)" Id="GuiShortcut" Name="$(var.Name)">
-						<Icon Id="$(var.GuiBin)" SourceFile="$(var.ProjectIcon)"/>
-					</Shortcut>
-					<fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
-				</File>
-				<?if $(var.Configuration) = "Debug" ?>
-				<File Source="$(var.BinDir)\Qt6Cored.dll"/>
-				<File Source="$(var.BinDir)\Qt6Guid.dll"/>
-				<File Source="$(var.BinDir)\Qt6Networkd.dll"/>
-				<File Source="$(var.BinDir)\Qt6Svgd.dll"/>
-				<File Source="$(var.BinDir)\Qt6Widgetsd.dll"/>
-				<File Source="$(var.BinDir)\styles\qmodernwindowsstyle.dll"/>
-				<!-- HACK: Normally the C++ redistributable solves this dependency, including it can cause problems -->
-				<File Source="C:\Program Files (x86)\Windows Kits\10\bin\$(var.Platform)\ucrt\ucrtbased.dll"/>
-				<?else ?>
-				<File Source="$(var.BinDir)\brotlicommon.dll"/>
-				<File Source="$(var.BinDir)\brotlidec.dll"/>
-				<File Source="$(var.BinDir)\bz2.dll"/>
-				<File Source="$(var.BinDir)\double-conversion.dll"/>
-				<File Source="$(var.BinDir)\freetype.dll"/>
-				<File Source="$(var.BinDir)\harfbuzz.dll"/>
-				<File Source="$(var.BinDir)\icudt74.dll"/>
-				<File Source="$(var.BinDir)\icuin74.dll"/>
-				<File Source="$(var.BinDir)\icuuc74.dll"/>
-				<File Source="$(var.BinDir)\libpng16.dll"/>
-				<File Source="$(var.BinDir)\pcre2-16.dll"/>
-				<File Source="$(var.BinDir)\Qt6Core.dll"/>
-				<File Source="$(var.BinDir)\Qt6Gui.dll"/>
-				<File Source="$(var.BinDir)\Qt6Network.dll"/>
-				<File Source="$(var.BinDir)\Qt6Svg.dll"/>
-				<File Source="$(var.BinDir)\Qt6Widgets.dll"/>
-				<File Source="$(var.BinDir)\zlib1.dll"/>
-				<File Source="$(var.BinDir)\zstd.dll"/>
-				<File Source="$(var.BinDir)\styles\qmodernwindowsstyle.dll"/>
-				<?endif ?>
-			</Component>
-		</ComponentGroup>
-		<ComponentGroup Directory="QTStylesDir" Id="ProductQtStylesComponents">
-			<Component Guid="96E0F8D8-64FD-4CE8-94D1-F6EDCBBB4995" Id="Styles">
-				<File Id="qmodernwindowsstyle" Source="$(var.BinDir)\styles\qmodernwindowsstyle.dll"/>
-			</Component>
-		</ComponentGroup>
-		<ComponentGroup Directory="PlatformsDir" Id="ProductQtPluginComponents">
-			<Component Guid="684EFA14-856B-440E-A5E6-E90E04E36B41" Id="QtPlatformPlugin">
-				<?if $(var.Configuration) = "Debug" ?>
-				<File Source="$(var.BinDir)\platforms\qwindowsd.dll"/>
-				<?else ?>
-				<File Source="$(var.BinDir)\platforms\qwindows.dll"/>
-				<?endif ?>
-			</Component>
-		</ComponentGroup>
-		<ComponentGroup Directory="OpenSSLDir" Id="OpenSSLComponents">
-			<Component Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1" Id="OpenSSL">
-				<?if $(var.Platform) = x64 ?>
-					<File Id="OpenSSLDll1" Source="$(var.OpenSslDllDir)/libcrypto-3-x64.dll"/>
-					<File Id="OpenSSLDll2" Source="$(var.OpenSslDllDir)/libssl-3-x64.dll"/>
-				<?else ?>
-					<File Id="OpenSSLDll1" Source="$(var.OpenSslDllDir)/libcrypto-3.dll"/>
-					<File Id="OpenSSLDll2" Source="$(var.OpenSslDllDir)/libssl-3.dll"/>
-				<?endif ?>
-				<File Source="$(var.OpenSslExeDir)/openssl.exe"/>			
-				<File Source="$(var.OpenSslExeDir)/openssl.cnf"/>
-			</Component>
-		</ComponentGroup>
-	</Fragment>
-</Wix>

deploy/linux/arch/PKGBUILD.in

@@ -1,12 +1,16 @@
+# SPDX-FileCopyrightText: 2024 Deskflow Developers
+# SPDX-License-Identifier: MIT
 # Maintainer: Deskflow Developers
 
 pkgname=deskflow
-pkgver=@DESKFLOW_VERSION@
+pkgver=@CMAKE_PROJECT_VERSION@
 pkgrel=1
 pkgdesc="Mouse and keyboard sharing utility"
 url='https://deskflow.org'
-arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
-license=('GPL-2.0-only')
+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}")
 depends=(
   'gcc-libs'
   'glibc'
@@ -28,7 +32,6 @@ depends=(
   'tomlplusplus'
   'cli11'
 )
-conflicts=('synergy-git' 'synergy1-bin' 'synergy2-bin' 'synergy3-bin')
 options=('!debug')
 
 package() {

deploy/linux/deploy.cmake

@@ -0,0 +1,108 @@
+# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-License-Identifier: MIT
+
+# 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 our desktop file
+install(
+  FILES ${MY_DIR}/org.deskflow.deskflow.desktop
+  DESTINATION share/applications
+)
+
+# Install our icon
+install(
+  FILES ${MY_DIR}/deskflow.png
+  DESTINATION share/icons/hicolor/512x512/apps/
+  RENAME org.deskflow.deskflow.png
+)
+
+# Install our metainfo
+install(
+  FILES ${MY_DIR}/org.deskflow.deskflow.metainfo.xml
+  DESTINATION share/metainfo/
+)
+
+# Prepare PKGBUILD for Arch Linux
+configure_file(
+  ${MY_DIR}/arch/PKGBUILD.in
+  ${CMAKE_BINARY_DIR}/PKGBUILD
+  @ONLY
+)
+
+
+set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
+set(CPACK_RPM_PACKAGE_GROUP "Applications/System")
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  # Get Distro name information
+  if(EXISTS "/etc/os-release")
+    FILE(STRINGS "/etc/os-release" RELEASE_FILE_CONTENTS)
+  else()
+    message(FATAL_ERROR "Unable to read file /etc/os-release")
+  endif()
+
+  foreach(LINE IN LISTS RELEASE_FILE_CONTENTS)
+    if( "${LINE}" MATCHES "^ID=")
+      string(REGEX REPLACE "^ID=" "" DISTRO_NAME ${LINE})
+      string(REGEX REPLACE "\"" "" DISTRO_NAME ${DISTRO_NAME})
+      message(DEBUG "Distro Name :${DISTRO_NAME}")
+    elseif( "${LINE}" MATCHES "^ID_LIKE=")
+      string(REGEX REPLACE "^ID_LIKE=" "" DISTRO_LIKE "${LINE}")
+      string(REGEX REPLACE "\"" "" DISTRO_LIKE ${DISTRO_LIKE})
+      message(DEBUG "Distro Like :${DISTRO_LIKE}")
+    elseif( "${LINE}" MATCHES "^VERSION_CODENAME=")
+      string(REGEX REPLACE "^VERSION_CODENAME=" "" DISTRO_CODENAME "${LINE}")
+      string(REGEX REPLACE "\"" "" DISTRO_CODENAME "${DISTRO_CODENAME}")
+      message(DEBUG "Distro Codename:${DISTRO_CODENAME}")
+    elseif( "${LINE}" MATCHES "^VERSION_ID=")
+      string(REGEX REPLACE "^VERSION_ID=" "" DISTRO_VERSION_ID "${LINE}")
+      string(REGEX REPLACE "\"" "" DISTRO_VERSION_ID "${DISTRO_VERSION_ID}")
+      message(DEBUG "Distro VersionID:${DISTRO_VERSION_ID}")
+    endif()
+  endforeach()
+
+  # Check if Debian-link
+  string(REGEX MATCH debian|buntu DEBTYPE "${DISTRO_LIKE}")
+  string(REGEX MATCH debian|deepin|uos DEBNAME "${DISTRO_NAME}")
+  if((NOT ("${DEBTYPE}" STREQUAL "")) OR (NOT ("${DEBNAME}" STREQUAL "")))
+    set(CPACK_GENERATOR "DEB")
+  endif()
+
+  # Check if Rpm-like
+  string(REGEX MATCH suse|fedora|rhel RPMTYPE "${DISTRO_LIKE}")
+  string(REGEX MATCH fedora|suse|rhel RPMNAME "${DISTRO_NAME}")
+  if((NOT ("${RPMTYPE}" STREQUAL "")) OR (NOT ("${RPMNAME}" STREQUAL "")))
+      set(CPACK_GENERATOR "RPM")
+  endif()
+
+  # Disto specific name adjustments
+  if("${DISTRO_NAME}" STREQUAL "opensuse-tumbleweed")
+    set(DISTRO_NAME "opensuse")
+    set(DISTRO_CODENAME "tumbleweed")
+  elseif("${DISTRO_NAME}" STREQUAL "arch")
+    # Arch linux is rolling the version id reported is the date of last iso.
+    set(DISTRO_VERSION_ID "")
+  endif()
+
+  # Determain the code name to be used if any
+  if(NOT "${DISTRO_VERSION_ID}" STREQUAL "")
+    set(CN_STRING "${DISTRO_VERSION_ID}-")
+  endif()
+
+  if(NOT "${DISTRO_CODENAME}" STREQUAL "")
+    set(CN_STRING "${DISTRO_CODENAME}-")
+  endif()
+
+  if("${DISTRO_NAME}" STREQUAL "")
+    set(DISTRO_NAME "linux")
+  endif()
+  set(OS_STRING "${DISTRO_NAME}-${CN_STRING}${CMAKE_SYSTEM_PROCESSOR}")
+
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "|.*BSD")
+  message(STATUS "BSD packaging not yet supported")
+  set(OS_STRING ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
+endif()

deploy/linux/flatpak/ci-build-lint-exceptions.json

@@ -0,0 +1,6 @@
+{
+    "org.deskflow.deskflow": [
+        "appstream-external-screenshot-url",
+        "appstream-screenshots-not-mirrored-in-ostree"
+    ]
+}

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

@@ -21,7 +21,6 @@ cleanup:
   - /share/cmake
   - /share/doc
   - /share/gir-1.0
-  - /lib/debug
   - /lib/girepository-1.0
 modules:
   - name: python3-attrs

deploy/linux/org.deskflow.deskflow.desktop

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2024 Deskflow Developers
+# SPDX-License-Identifier: MIT
+
 [Desktop Entry]
 Type=Application
 Version=1.0

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

@@ -4,11 +4,13 @@
 	<metadata_license>CC0-1.0</metadata_license>
 	<project_license>GPL-2.0+</project_license>
 	<name>Deskflow</name>
-	<developer_name>Deskflow Developers</developer_name>
+	<developer id="org.deskflow">
+		<name>Deskflow Developers</name>
+	</developer>
 	<summary>Software Keyboard and mouse sharing</summary>
 	<description>
 		<p>
-			Use your keyboard and mouse to control other machines on the network or be controle
+			Use the keyboard, mouse, or trackpad of one computer to control nearby computers, and work seamlessly between them.
 		</p>
 	</description>
 	<launchable type="desktop-id">org.deskflow.deskflow.desktop</launchable>
@@ -16,7 +18,12 @@
 	<url type="bugtracker">https://github.com/deskflow/deskflow/issues</url>
 	<screenshots>
 		<screenshot type="default">
-			<image>https://github.com/user-attachments/assets/883660dc-f3f5-4b69-8821-a079a58d3882</image>
+			<image>https://deskflow.org/screenshots/deskflow.png</image>
+			<caption>Deskflow's mainwindow on KDE</caption>
+		</screenshot>
+		<screenshot>
+			<image>https://deskflow.org/screenshots/deskflow-dark.png</image>
+			<caption>Deskflow's mainwindow on KDE (dark mode)</caption>
 		</screenshot>
 	</screenshots>
 	<provides> <id>org.deskflow.deskflow.desktop</id> </provides>
@@ -35,6 +42,72 @@
 	</branding>
 	<content_rating type="oars-1.0" />
 	<releases>
+		<release version="1.20.1" date="2025-03-07" urgency="low">
+			<description>
+				<p>This stable release introduces a Windows dependency requirement and fixes a macOS bug.</p>
+				<ul>
+					<li>Fix: macOS menu bar icon invisible when menu bar is light</li>
+					<li>Feature: Add Windows installer check for Visual C++ Redistributable</li>
+					<li>Feature: Prevent Windows binaries running if MSVC runtime too old</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.20.1</url>
+		</release>
+		<release version="1.20.0" date="2025-03-03" urgency="high">
+			<description>
+				<p>This stable release fixes a few security issues, additionally fixes several bugs and adds a few new features. For the full changelog see the release page.</p>
+				<ul>
+					<li>Feature: Peer Id Checking - Fixes CVE-2021-42072 and CVE-2021-42073</li>
+					<li>Feature: Use Sha256 fingerprints</li>
+					<li>Feature: Gui cleanup and improvements</li>
+					<li>Remove: Inverse connection option</li>
+					<li>Fix: Screen Corner option</li>
+					<li>Fix: Show new client dialog</li>
+					<li>Win32: Daemon Improvements</li>
+					<li>Win32: Fix clear settings</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.20.0</url>
+		</release>
+		<release version="1.19.0" date="2025-01-31" urgency="high">
+			<description>
+				<p>This stable release fixes several bugs and adds a few new features. For the full changelog see the release page.</p>
+				<ul>
+					<li>Feature: New Fallback icon theme</li>
+					<li>Feature: Allow only one gui instance</li>
+					<li>Fix: Modifier remapping on macOS</li>
+					<li>Fix: Show Screen icons again in the server settings</li>
+					<li>Fix: Show the TLS Label</li>
+					<li>Fix: Mainwindow restore </li>
+					<li>Fix: Hotkey with more then one action now work again</li>
+					<li>Better Detection of evdev on BSD</li>
+					<li>Better language detection on X11</li>
+					<li>Better deal with screen changes on wayland</li>
+					<li>Remove Legacy tray icons</li>
+					<li>Lots of Internal Cleanup</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.19.0</url>
+		</release>
+		<release version="1.18.0" date="2024-12-26" urgency="high">
+			<description>
+				<p>This stable release fixes a few security issues, additionally fixes several bugs and adds a few new features. For the full changelog see the release page.</p>
+				<ul>
+					<li>Fix CVE-2021-42075: Close connection on app-level handshake failure</li>
+					<li>Fix CVE-2021-42074: Handle SSL race conditions and segmentation fault</li>
+					<li>Fix CVE-2021-42076: Enforce maximum message length </li>
+					<li>Add a visiblity toggle for the log</li>
+					<li>Fix deskflow will now hide or show when the tray icon is clicked</li>
+					<li>Fix how Utf-16 surrogates are handled</li>
+					<li>Avoid encoding empty data to the clipboard on Windows</li>
+					<li>Create new Tray Icons for windows</li>
+					<li>Always show the tray menu entry for the restore action on macOS</li>
+					<li>Correctly restore window when hidden with command+H on macOS</li>
+					<li>Update the windows clipboard format listener to monitor the clipboard</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.18.0</url>
+		</release>
 		<release version="1.17.2" date="2024-11-20" urgency="medium">
 			<description>
 				<p>This stable Release contains alot of internal refactoring.</p>
@@ -87,11 +160,11 @@
 					<li>ci: build flatpaks</li>
 				</ul>
 			</description>
-		<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.2</url>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.2</url>
 		</release>
-		<release version="1.17.1" date="2024-11-7" urgency="high">
+		<release version="1.17.1" date="2024-11-07" urgency="high">
 			<description>
-				<p>This stable Release Has a very long chagelog some notable ones are.</p>
+				<p>This stable release has a very long changelog some notable ones are.</p>
 				<ul>
 					<li>Remove word 'beta' from Wayland message</li>
 					<li>docs: Update `README.md` with Matrix link</li>
@@ -204,11 +277,11 @@
 					<li>ci: adjust pacakge script to use the names we would like when in cpack</li>
 				</ul>
 			</description>
-		<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.1</url>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.1</url>
 		</release>
 		<release version="1.17.0" date="2024-10-02" urgency="low">
 			<description>
-				<p>This is the first Deskflow Release.</p>
+				<p>This is the first Deskflow release.</p>
 				<ul>
 					<li>Use Deskflow Name</li>
 					<li>fix: windows build typos</li>
@@ -254,7 +327,7 @@
 					<li>Use sonarsource/sonarcloud-github-c-cpp</li>
 				</ul>
 			</description>
-		<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.0</url>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.0</url>
 		</release>
 	</releases>
 </component>

deploy/mac/deploy.cmake

@@ -0,0 +1,20 @@
+# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-License-Identifier: MIT
+
+# 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(OS_STRING "macos-${CMAKE_SYSTEM_PROCESSOR}")
+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")

deploy/mac/generate_ds_store.applescript

@@ -0,0 +1,48 @@
+-- SPDX-FileCopyrightText: 2020 Chris Rizzitello <sithlord48@gmail.com>
+-- SPDX-License-Identifier: MIT
+
+on run argv
+  set image_name to item 1 of argv
+
+  tell application "Finder"
+  tell disk image_name
+
+    -- wait for the image to finish mounting
+    set open_attempts to 0
+    repeat while open_attempts < 5
+      try
+        open
+          delay 5
+          set open_attempts to 5
+        close
+      on error errStr number errorNumber
+        set open_attempts to open_attempts + 1
+        delay 10
+      end try
+    end repeat
+
+    -- open the image the first time and save a DS_Store with just
+    -- background and icon setup
+    open
+      set current view of container window to icon view
+      set theViewOptions to the icon view options of container window
+      set background picture of theViewOptions to file ".background:background.tiff"
+      set arrangement of theViewOptions to not arranged
+      set icon size of theViewOptions to 100
+      set text size of theViewOptions to 16
+    close
+
+    open
+      tell container window
+        set sidebar width to 0
+        set statusbar visible to false
+        set toolbar visible to false
+        set pathbar visible to false
+        set the bounds to { 200, 120, 800, 520 }
+        set position of item "Deskflow.app" to { 144, 190 }
+        set position of item "Applications" to { 455, 190 }
+      end tell
+    close
+  end tell
+end tell
+end run

deploy/version.rc.in

@@ -1,54 +0,0 @@
-/*
-Based on example from:
-https://learn.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource?redirectedfrom=MSDN
-*/
-
-#include <windows.h>
-#include <verrsrc.h>
-
-#define VER_FILEVERSION             @DESKFLOW_VERSION_MS_CSV@
-#define VER_FILEVERSION_STR         "@DESKFLOW_VERSION_MS@\0"
-
-#define VER_PRODUCTVERSION          @DESKFLOW_VERSION_MS_CSV@
-#define VER_PRODUCTVERSION_STR      "@DESKFLOW_VERSION@\0"
-
-#define VER_COMPANYNAME_STR         "Deskflow\0"
-#define VER_FILEDESCRIPTION_STR     "Deskflow\0"
-#define VER_INTERNALNAME_STR        "Deskflow\0"
-#define VER_LEGALCOPYRIGHT_STR      "© 2024 Deskflow Developers\0"
-#define VER_LEGALTRADEMARKS1_STR    "All Rights Reserved\0"
-#define VER_LEGALTRADEMARKS2_STR    "\0"
-#define VER_ORIGINALFILENAME_STR    "\0"
-#define VER_PRODUCTNAME_STR         "Deskflow\0"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION     VER_FILEVERSION
- PRODUCTVERSION  VER_PRODUCTVERSION
- FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
- FILEFLAGS       0 // No flags
- FILEOS          VOS__WINDOWS32
- FILETYPE        VFT_DLL
- FILESUBTYPE     VFT2_UNKNOWN
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "CompanyName",      VER_COMPANYNAME_STR
-            VALUE "FileDescription",  VER_FILEDESCRIPTION_STR
-            VALUE "FileVersion",      VER_FILEVERSION_STR
-            VALUE "InternalName",     VER_INTERNALNAME_STR
-            VALUE "LegalCopyright",   VER_LEGALCOPYRIGHT_STR
-            VALUE "LegalTrademarks1", VER_LEGALTRADEMARKS1_STR
-            VALUE "LegalTrademarks2", VER_LEGALTRADEMARKS2_STR
-            VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR
-            VALUE "ProductName",      VER_PRODUCTNAME_STR
-            VALUE "ProductVersion",   VER_PRODUCTVERSION_STR
-        END
-    END
-
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END

deploy/windows/deploy.cmake

@@ -0,0 +1,55 @@
+# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-License-Identifier: MIT
+
+# 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} --no-compiler-runtime --no-system-d3d-compiler --no-quick-import -network \"\${CMAKE_INSTALL_PREFIX}/deskflow.exe\"
+)")
+
+# Setup OS_STRING
+if(CMAKE_SYSTEM_PROCESSOR MATCHES AMD64)
+  set(OS_STRING "win-x64")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ARM64)
+  set(OS_STRING "win-arm64")
+else()
+  set(OS_STRING "win-${CMAKE_SYSTEM_PROCESSOR}")
+endif()
+
+# If Wix4+ is installed make a package
+find_program(WIX_APP wix)
+if (NOT "${WIX_APP}" STREQUAL "")
+  set(CPACK_WIX_VERSION 4)
+  list(APPEND CPACK_GENERATOR "WIX")
+endif()
+
+set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_PROPER_NAME}")
+
+# Menu Entry
+set(CPACK_WIX_PROGRAM_MENU_FOLDER "${CMAKE_PROJECT_PROPER_NAME}")
+set(CPACK_PACKAGE_EXECUTABLES "deskflow" "${CMAKE_PROJECT_PROPER_NAME}")
+
+# Default Install Path
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_PROPER_NAME}")
+
+# Wix Specific Values
+set(CPACK_WIX_UPGRADE_GUID "027D1C8A-E7A5-4754-BB93-B2D45BFDBDC8")
+set(CPACK_WIX_UI_BANNER "${MY_DIR}/wix-banner.png")
+set(CPACK_WIX_UI_DIALOG "${MY_DIR}/wix-dialog.png")
+
+# Required Extra Extenstions
+list(APPEND CPACK_WIX_EXTENSIONS "WixToolset.Util.wixext" "WixToolset.Firewall.wixext")
+
+# Make sure to also put the xmlns for the ext into the wix block on generated files
+list(APPEND CPACK_WIX_CUSTOM_XMLNS "util=http://wixtoolset.org/schemas/v4/wxs/util" "firewall=http://wixtoolset.org/schemas/v4/wxs/firewall")
+
+# The patch has to know the full path of our msm file
+configure_file(
+  ${MY_DIR}/wix-patch.xml.in
+  ${CMAKE_CURRENT_BINARY_DIR}/wix-patch.xml @ONLY
+)
+
+# This patch set ups filewall rules, the service and msm module
+set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/wix-patch.xml")

deploy/windows/wix-patch.xml.in

@@ -0,0 +1,51 @@
+<CPackWiXPatch>
+  <CPackWiXFragment Id="CM_CP_deskflow_daemon.exe">
+    <ServiceInstall
+      Id="ServiceInstall"
+      Name="Deskflow"
+      DisplayName="Deskflow"
+      Description="Runs the Core process on secure desktops (UAC prompts, login screen, etc)."
+      ErrorControl="normal"
+      Start="auto"
+      Type="ownProcess">
+      <util:ServiceConfig
+        ResetPeriodInDays="1"
+        RestartServiceDelayInSeconds="1"
+        FirstFailureActionType="restart"
+        SecondFailureActionType="restart"
+        ThirdFailureActionType="none"
+      />
+    </ServiceInstall>
+    <ServiceControl Id="ServiceControl" Name="Deskflow" Remove="uninstall" Start="install" Stop="both"/>
+  </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>
+
+  <CPackWiXFragment Id="#PRODUCT">
+    <Property Id="VC_REDIST_INSTALLED">
+      <RegistrySearch
+        Id="FindVCRedist"
+        Root="HKLM"
+        Key="SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64"
+        Name="Installed"
+        Type="raw" />
+    </Property>
+
+    <CustomAction Id="Run_Deskflow" ExeCommand="Deskflow" FileRef="CM_FP_deskflow.exe" Return="asyncNoWait"/>
+    
+    <CustomAction
+      Id="ShowVCRedistError"
+      Error="Latest Microsoft Visual C++ Redistributable is required. Please install it before proceeding."/>
+
+    <InstallExecuteSequence>
+      <Custom Action="ShowVCRedistError" Before="InstallServices" Condition="NOT Installed AND NOT VC_REDIST_INSTALLED"/>
+      <Custom Action="Run_Deskflow" OnExit="success" Condition="NOT Installed"/>
+    </InstallExecuteSequence>
+  </CPackWiXFragment>
+</CPackWiXPatch>

scripts/daemon.py

@@ -1,76 +0,0 @@
-#!/usr/bin/env python3
-
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import lib.env as env
-
-env.ensure_in_venv(__file__)
-
-import os, sys, argparse
-import lib.windows as windows
-import lib.colors as colors
-
-DEFAULT_SERVICE_ID = "deskflow"
-DEFAULT_BIN_NAME = "deskflow-daemon"
-DEFAULT_SOURCE_DIR = os.path.join("build", "temp", "bin")
-DEFAULT_TARGET_DIR = os.path.join("build", "bin")
-IGNORE_PROCESSES = ["deskflow.exe"]
-
-
-def main():
-    """Entry point for the script."""
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--reinstall", action="store_true")
-    parser.add_argument("--stop", action="store_true")
-    parser.add_argument("--restart", action="store_true")
-    parser.add_argument("--pause-on-exit", action="store_true")
-    parser.add_argument("--source-dir", default=DEFAULT_SOURCE_DIR)
-    parser.add_argument("--target-dir", default=DEFAULT_TARGET_DIR)
-    parser.add_argument("--bin-name", default=DEFAULT_BIN_NAME)
-    parser.add_argument("--ignore-processes", nargs="+", default=IGNORE_PROCESSES)
-    parser.add_argument("--service-id", default=DEFAULT_SERVICE_ID)
-    parser.add_argument("--verbose", action="store_true")
-    args = parser.parse_args()
-
-    if not env.is_windows():
-        print(
-            f"{colors.ERROR_TEXT} This script is only supported on Windows",
-            file=sys.stderr,
-        )
-        sys.exit(1)
-
-    service = windows.WindowsService(__file__, args)
-
-    try:
-        if args.reinstall:
-            service.reinstall()
-        elif args.stop:
-            service.stop()
-        elif args.restart:
-            service.restart()
-        else:
-            print("No action specified", file=sys.stderr)
-            exit(1)
-    except Exception as e:
-        print(f"{colors.ERROR_TEXT} {e}", file=sys.stderr)
-
-    if args.pause_on_exit:
-        input("Press enter to continue...")
-
-
-if __name__ == "__main__":
-    main()

scripts/fancy_copy.py

@@ -1,57 +0,0 @@
-#!/usr/bin/env python3
-
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import lib.env as env
-
-env.ensure_in_venv(__file__)
-
-import argparse
-import lib.file_utils as file_utils
-import lib.colors as colors
-
-
-def main():
-    """
-    Cross platform script to copy files and directories.
-    This script was mostly created beause the default `copy` command on Windows is too noisy.
-    If this becomes complex it must be replaced with a library.
-    """
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument("source", help="Source pattern to copy from")
-    parser.add_argument("target", help="Destination pattern to copy to")
-    parser.add_argument(
-        "--ignore-errors", action="store_true", help="Ignore errors when copying"
-    )
-    parser.add_argument(
-        "--verbose", action="store_true", help="Print more information to the console"
-    )
-    args = parser.parse_args()
-
-    options = file_utils.CopyOptions(args.ignore_errors, args.verbose)
-
-    try:
-        file_utils.copy(args.source, args.target, options)
-    except Exception as e:
-        if not args.ignore_errors:
-            raise e
-        else:
-            print(f"{colors.ERROR_TEXT} {e}")
-
-
-if __name__ == "__main__":
-    main()

scripts/lib/certificate.py

@@ -1,55 +0,0 @@
-import os, base64
-
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-temp_path = "tmp/certificate"
-
-
-class Certificate:
-    """
-    Installs a certificate from a base64 string, and returns the path to the certificate.
-    Once the context is exited, the certificate is removed from the filesystem.
-
-    Example usage:
-    with Certificate(base64) as cert_path:
-        print(f"Certificate path: {cert_path}")
-    """
-
-    def __init__(self, base64, file_ext):
-        self.base64 = base64
-        self.temp_filename = f"{temp_path}.{file_ext}"
-
-    def __enter__(self):
-        print(f"Decoding certificate to temporary path: {self.temp_filename}")
-        try:
-            cert_bytes = base64.b64decode(self.base64)
-        except Exception as e:
-            raise ValueError("Failed to decode certificate base64") from e
-
-        os.makedirs(os.path.dirname(self.temp_filename), exist_ok=True)
-        with open(self.temp_filename, "wb") as cert_file:
-            cert_file.write(cert_bytes)
-
-        return self.temp_filename
-
-    def __exit__(self, _exc_type, _exc_value, _traceback):
-        # not strictly necessary for ci, but when run on a dev machine, it reduces the risk
-        # that private keys are left on the filesystem
-        print(f"Removing temporary certificate file: {self.temp_filename}")
-        os.remove(self.temp_filename)
-
-        # propagate exceptions
-        return False

scripts/lib/cmd_utils.py

@@ -1,156 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import subprocess
-import sys
-import lib.env as env
-
-try:
-    import colorama  # type: ignore
-    from colorama import Fore  # type: ignore
-
-    colorama.init()
-except ImportError:
-
-    class Fore:
-        RESET = ""
-        YELLOW = ""
-
-
-def has_command(command):
-    platform = sys.platform
-    if platform == "win32":
-        cmd = f"where {command}"
-    else:
-        cmd = f"which {command}"
-    try:
-        subprocess.check_output(cmd, shell=True)
-        return True
-    except subprocess.CalledProcessError:
-        return False
-
-
-def strip_continuation_sequences(command, strip_newlines=True):
-    """
-    Remove the continuation sequences (\\) from a command.
-
-    To spread strings over multiple lines in YAML files, like in bash, a backslash is used at
-    the end of each line as continuation character.
-    """
-
-    if isinstance(command, list):
-        raise ValueError("List commands are not supported")
-
-    cmd_continuation = " \\"
-    command = command.replace(cmd_continuation, "")
-
-    # Some versions of pyyaml will remove the newlines already, so always stripping
-    # makes the output more consistent.
-    if strip_newlines:
-        command = command.replace("\n", " ")
-
-    return command
-
-
-def run(
-    command,
-    check=True,  # true by default to fail fast
-    shell=False,  # false by default for security
-    get_output=False,
-    print_cmd=False,  # false by default for security
-):
-    """
-    Convenience wrapper around `subprocess.run` to:
-    - print the command before running it (if `print_cmd` is True)
-
-    This differs to `subprocess.run` in that by default it:
-    - checks the return code by default
-    - prints list commands as a readable string on failure
-
-    This is the same as `subprocess.run` in that it:
-    - does not use shell by default for security (shell is less secure)
-
-    Args:
-        command (str or list): The command to run.
-        check (bool): Raise an exception if the command fails.
-        shell (bool): Run the command in a shell (false by default for security)
-        get_output (bool): Return the output of the command.
-        print_cmd (bool): Print the command before running it (false by default for security)
-    """
-
-    is_list_cmd = isinstance(command, list)
-
-    # create string version of list command, only for debugging purposes
-    command_str = command
-    if is_list_cmd:
-        command_str = " ".join(command)
-
-    if print_cmd:
-        print(f"Running: {command_str}")
-    else:
-        print("Running command...")
-        command_str = "***"
-
-    # TODO: You can definitely use a list command with shell=True on Windows,
-    # but can you use a string command with shell=False on Windows?
-    #
-    # The `subprocess.run` function has a little gotcha:
-    # - a string command must be used when `shell=True`
-    # - a list command must be used when shell isn't or `shell=False`
-    # however, it allows you to pass a string command when shell isn't used or `shell=False`
-    # then fails with a vague error message. same problem with list commands and `shell=True`
-    if not env.is_windows() and is_list_cmd and shell:
-        raise ValueError("List commands cannot be used when shell=True on Unix systems")
-    elif not is_list_cmd and not shell:
-        raise ValueError("String commands cannot be used when shell=False or not set")
-
-    # Flush the output to ensure the command is printed before the output of the command,
-    # which seems to happen in the GitHub runner logs.
-    sys.stdout.flush()
-    sys.stderr.flush()
-
-    try:
-        if get_output:
-            result = subprocess.run(
-                command,
-                shell=shell,
-                check=check,
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-                text=True,
-            )
-        else:
-            result = subprocess.run(command, check=check, shell=shell)
-
-    except subprocess.CalledProcessError as e:
-        # Take control of how failed commands are printed:
-        # - if `print_cmd` is false, it will print `***` instead of the command
-        # - if the command was a list, the command is printed as a readable string
-        raise RuntimeError(
-            f"Command exited with code {e.returncode}: {command_str}"
-        ) from None
-    except Exception:
-        # Take control of how failed commands are printed:
-        # - if `print_cmd` is false, it will print `***` instead of the command
-        # - if the command was a list, the command is printed as a readable string
-        raise RuntimeError(f"Command failed: {command_str}")
-
-    if result.returncode != 0:
-        print(
-            f"{Fore.YELLOW}Command exited with code {result.returncode}:{Fore.RESET} {command_str}",
-            file=sys.stderr,
-        )
-
-    return result

scripts/lib/colors.py

@@ -1,24 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import colorama  # type: ignore
-from colorama import Fore  # type: ignore
-
-colorama.init()
-
-SUCCESS_TEXT = f"{Fore.LIGHTGREEN_EX}Success:{Fore.RESET}"
-ERROR_TEXT = f"{Fore.LIGHTRED_EX}Error:{Fore.RESET}"
-WARNING_TEXT = f"{Fore.LIGHTYELLOW_EX}Warning:{Fore.RESET}"
-HINT_TEXT = f"{Fore.LIGHTBLUE_EX}Hint:{Fore.RESET}"

scripts/lib/env.py

@@ -1,269 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os, sys, subprocess
-import lib.cmd_utils as cmd_utils
-
-# The `.venv` dir seems to be most common for virtual environments.
-VENV_DIR = ".venv"
-
-
-def check_module(module):
-    try:
-        __import__(module)
-        return True
-    except ImportError:
-        print(f"Python is missing {module} module", file=sys.stderr)
-        return False
-
-
-def get_os():
-    """Detects the operating system."""
-    if sys.platform == "win32":
-        return "windows"
-    elif sys.platform == "darwin":
-        return "mac"
-    elif sys.platform.startswith("linux"):
-        return "linux"
-    else:
-        raise RuntimeError(f"Unsupported platform: {sys.platform}")
-
-
-def is_windows():
-    return get_os() == "windows"
-
-
-def is_mac():
-    return get_os() == "mac"
-
-
-def is_linux():
-    return get_os() == "linux"
-
-
-def get_linux_distro():
-    """Detects the Linux distro."""
-    os_file = "/etc/os-release"
-    name = None
-    name_like = None
-    version_id = None
-    version_codename = None
-
-    if os.path.isfile(os_file):
-        with open(os_file) as f:
-            for line in f:
-                if line.startswith("ID="):
-                    name = line.strip().split("=")[1].strip('"')
-                elif line.startswith("ID_LIKE="):
-                    name_like = line.strip().split("=")[1].strip('"')
-                elif line.startswith("VERSION_ID="):
-                    version_id = line.strip().split("=")[1].strip('"')
-                elif line.startswith("VERSION_CODENAME="):
-                    version_codename = line.strip().split("=")[1].strip('"')
-
-    return name, name_like, version_id or version_codename
-
-
-def get_env(name, required=True, default=None):
-    """
-    Returns an env var (stripped) or optionally raises an error if not set.
-
-    If `default` is set, it will be returned even if `required` is True.
-    """
-    value = os.getenv(name)
-    if value:
-        value = value.strip()
-
-    if not value:
-        if default:
-            return default
-        elif required:
-            raise ValueError(f"Required env var not set: {name}")
-
-    return value
-
-
-def get_env_bool(name, default=False):
-    """Returns a boolean value from an env var (stripped)."""
-    value = os.getenv(name)
-    if value:
-        value = value.strip()
-
-    if value is None:
-        return default
-
-    return value.lower() in ["true", "1", "yes"]
-
-
-def get_venv_executable(binary="python"):
-    if sys.platform == "win32":
-        return os.path.join(VENV_DIR, "Scripts", binary)
-    else:
-        return os.path.join(VENV_DIR, "bin", binary)
-
-
-def in_venv():
-    """Returns True if the script is running in a Python virtual environment."""
-    return sys.prefix != sys.base_prefix
-
-
-def ensure_in_venv(script_file, create_venv=False):
-    """
-    Ensures the script is running in a Python virtual environment (venv).
-    If the script is not running in a venv, it will create one and re-run the script in the venv.
-    """
-
-    check_dependencies(raise_error=True)
-    import venv
-
-    if in_venv():
-        print(f"Running in venv, executable: {sys.executable}", flush=True)
-        return
-
-    if create_venv and not os.path.exists(VENV_DIR):
-        print(f"Creating virtual environment at {VENV_DIR}")
-        venv.create(VENV_DIR, with_pip=True)
-
-    if os.path.exists(VENV_DIR):
-        script_file_abs = os.path.abspath(script_file)
-        print(f"Using virtual environment for: {script_file_abs}", flush=True)
-        python_executable = get_venv_executable()
-        result = subprocess.run([python_executable, script_file_abs] + sys.argv[1:])
-        sys.exit(result.returncode)
-    else:
-        print(
-            "The Python virtual environment (.venv) needs to be created before you can "
-            "run this script.\n"
-            "Please run: scripts/setup_venv.py"
-        )
-        sys.exit(1)
-
-
-def install_requirements():
-    """
-    Uses `pip` to install required Python modules from the `requirements.txt` file.
-    """
-
-    check_dependencies(raise_error=True)
-
-    print("Updating pip...")
-    cmd_utils.run(
-        [sys.executable, "-m", "pip", "install", "--upgrade", "pip"],
-        shell=False,
-        print_cmd=True,
-    )
-
-    print("Installing required modules...")
-    cmd_utils.run(
-        [sys.executable, "-m", "pip", "install", "-e", "scripts"],
-        shell=False,
-        print_cmd=True,
-    )
-
-
-def check_dependencies(raise_error=False):
-    """
-    Returns True if pip and venv are available.
-    """
-
-    has_pip = check_module("pip")
-    has_venv = check_module("venv")
-
-    if raise_error:
-        if not has_pip:
-            raise RuntimeError("Python is missing pip")
-        if not has_venv:
-            raise RuntimeError("Python is missing venv")
-    else:
-        return has_pip and has_venv
-
-
-def ensure_dependencies():
-    """
-    Ensures that pip and venv are available, and installs them if they are not.
-    This is normally only installs on Linux, as Windows and Mac usually come with pip and venv.
-    """
-
-    if check_dependencies():
-        return
-
-    print("Installing Python dependencies...")
-
-    os = get_os()
-    if os != "linux":
-        # should not be a problem, since windows and mac come with pip and venv
-        raise RuntimeError(f"Unable to install Python dependencies on {os}")
-
-    has_sudo = cmd_utils.has_command("sudo")
-    sudo = "sudo" if has_sudo else ""
-
-    distro, distro_like, _version = get_linux_distro()
-    if not distro_like:
-        distro_like = distro
-
-    update_cmd = None
-    install_cmd = None
-    if distro == "rhel" or "rhel" in distro_like:
-        update_cmd = "yum check-update"
-        install_cmd = "yum install -y python3-pip"  # rhel-like has venv already
-    elif "debian" in distro_like:
-        update_cmd = "apt update"
-        install_cmd = "apt install -y python3-pip python3-venv"
-    elif "fedora" in distro_like:
-        update_cmd = "dnf check-update"
-        install_cmd = "dnf install -y python3-pip python3-virtualenv"
-    elif "arch" in distro_like:
-        install_cmd = "pacman -Syu --noconfirm python-pip python-virtualenv"
-    elif "opensuse" in distro_like:
-        update_cmd = "zypper refresh"
-        install_cmd = "zypper install -y python3-pip python3-virtualenv"
-    else:
-        raise RuntimeError(f"Unable to install Python dependencies on {distro}")
-
-    if update_cmd:
-        # don't check the return code, as some package managers return non-zero exit codes
-        # under normal circumstances (e.g. dnf check-update returns 100 when there are
-        # updates available).
-        cmd_utils.run(
-            f"{sudo} {update_cmd}".strip(), check=False, shell=True, print_cmd=True
-        )
-
-    cmd_utils.run(f"{sudo} {install_cmd}".strip(), shell=True, print_cmd=True)
-
-
-def import_colors():
-    import lib.colors as colors
-
-    return colors
-
-
-def persist_lock_file(path):
-    """
-    Persists a lock file and ensures the directory part of the path exists.
-    """
-    dir_path = os.path.dirname(path)
-    if not os.path.exists(dir_path):
-        os.makedirs(dir_path, exist_ok=True)
-
-    with open(path, "w") as f:
-        f.write(str(os.getpid()))
-
-
-def remove_lock_file(path):
-    """
-    Removes a lock file if it exists.
-    """
-    if os.path.exists(path):
-        os.remove(path)

scripts/lib/file_utils.py

@@ -1,104 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import glob, os, shutil, sys
-import lib.env as env
-import lib.colors as colors
-
-
-class CopyOptions:
-    def __init__(self, ignore_errors, verbose):
-        self.ignore_errors = ignore_errors
-        self.verbose = verbose
-
-
-class CopyContext:
-    def __init__(self):
-        self.errors = 0
-        self.permission_error = False
-
-
-def copy(source, target, options):
-    """Copy files and directories from source to target."""
-
-    context = CopyContext()
-    if options.verbose:
-        print(f"Copying files from {source} to {target}")
-
-    try:
-        for match in glob.glob(source):
-
-            if os.path.isfile(match):
-                copy_file(match, target, options, context)
-            elif os.path.isdir(match):
-                copy_dir(match, target, options, context)
-            else:
-                raise RuntimeError(f"Path {match} is not a file or directory")
-    finally:
-        if context.errors and options.ignore_errors:
-            print(f"{colors.WARNING_TEXT} Ignored {context.errors} copy error(s)")
-
-        if context.permission_error and env.is_windows():
-            print(
-                f"{colors.HINT_TEXT} A Windows file permission error may mean that the file is in use"
-            )
-
-
-def copy_dir(match, target, options, context):
-    if options.verbose:
-        print(f"Copying directory {match} to {target}")
-
-    try:
-        shutil.copytree(match, target, dirs_exist_ok=True)
-    except Exception as e:
-        handle_all_copy_errors(e, options, context)
-
-
-def copy_file(match, target, options, context):
-    if options.verbose:
-        print(f"Copying file {match} to {target}")
-
-    try:
-        shutil.copy(match, target)
-    except Exception as e:
-        handle_all_copy_errors(e, options, context)
-
-
-def handle_all_copy_errors(error, options, context):
-
-    if isinstance(error, shutil.Error):
-        for _, _, file_error in error.args[0]:
-            handle_copy_error(file_error, options, context)
-    else:
-        handle_copy_error(error, options, context)
-
-    if not options.ignore_errors:
-        raise error
-
-
-def handle_copy_error(error, options, context):
-    if isinstance(error, PermissionError):
-        context.permission_error = True
-
-    if isinstance(error, str):
-        context.permission_error = error.startswith("[Errno 13] Permission denied")
-
-    context.errors += 1
-
-    if options.ignore_errors:
-        print(
-            f"{colors.WARNING_TEXT} Copy failed: {error}",
-            file=sys.stderr,
-        )

scripts/lib/fs.py

@@ -1,29 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os, fnmatch
-
-
-def find_files(search_dirs, include_files, exclude_dirs=[]):
-    """Recursively find files, excluding specified directories"""
-    matches = []
-    for dir in search_dirs:
-        for root, dirnames, filenames in os.walk(dir):
-            dirnames[:] = [d for d in dirnames if d not in exclude_dirs]
-
-            for pattern in include_files:
-                for filename in fnmatch.filter(filenames, pattern):
-                    matches.append(os.path.join(root, filename))
-    return matches

scripts/lib/mac.py

@@ -1,347 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import dmgbuild  # type: ignore
-import os, time, json, shutil, sys
-import lib.cmd_utils as cmd_utils
-import lib.env as env
-from lib.certificate import Certificate
-
-CERT_P12_ENV = "APPLE_P12_CERTIFICATE"
-NOTARY_USER_ENV = "APPLE_NOTARY_USER"
-CODESIGN_ENV = "APPLE_CODESIGN_ID"
-SHELL_RC = "~/.zshrc"
-SETTINGS_FILE = "deploy/dist/mac/dmgbuild/settings.py"
-SECURITY_PATH = "/usr/bin/security"
-SUDO_PATH = "/usr/bin/sudo"
-NOTARYTOOL_PATH = "/usr/bin/notarytool"
-CODESIGN_PATH = "/usr/bin/codesign"
-XCODE_SELECT_PATH = "/usr/bin/xcode-select"
-KEYCHAIN_PATH = "/Library/Keychains/System.keychain"
-
-
-def set_env_var(name, value):
-    """
-    Adds to an environment variable in the shell rc file.
-
-    Returns True if the variable was added, False if it already exists.
-    """
-    text = f'export {name}="{value}:${name}"'
-    file = os.path.expanduser(SHELL_RC)
-    if os.path.exists(file):
-        with open(file, "r") as f:
-            if text in f.read():
-                return False
-
-    print(f"Setting environment variable: {name}={name}")
-    with open(file, "a") as f:
-        f.write(f"\n{text}\n")
-        print(f"Appended to {SHELL_RC}: {text}")
-        return True
-
-
-def package(filename_base, source_dir, build_dir, dist_dir, product_name):
-    """
-    Package the application for macOS.
-    The app bundle must be signed, or an error will occur:
-    > EXC_BAD_ACCESS (SIGKILL (Code Signature Invalid))
-    An "Apple Development" certificate is sufficient for local development.
-    """
-
-    (
-        codesign_id,
-        cert_base64,
-        cert_password,
-        notary_user,
-        notary_password,
-        notary_team_id,
-    ) = package_env_vars()
-
-    if cert_base64:
-        install_certificate(cert_base64, cert_password)
-    else:
-        print(
-            f"Warning: Skipped certificate installation, env var {CERT_P12_ENV} not set",
-            file=sys.stderr,
-        )
-
-    bundle_source_dir = os.path.join(
-        build_dir, os.path.join("bundle", product_name + ".app")
-    )
-    build_bundle(bundle_source_dir)
-
-    if codesign_id:
-        sign_bundle(bundle_source_dir, codesign_id)
-    else:
-        print(
-            f"Warning: Skipped code signing, env var {CODESIGN_ENV} not set",
-            file=sys.stderr,
-        )
-
-    dmg_path = build_dmg(
-        bundle_source_dir, filename_base, source_dir, dist_dir, product_name
-    )
-
-    if notary_user:
-        notarize_package(dmg_path, notary_user, notary_password, notary_team_id)
-    else:
-        print(
-            f"Warning: Skipped notarization, env var {NOTARY_USER_ENV} not set",
-            file=sys.stderr,
-        )
-
-
-def package_env_vars():
-    codesign_id = env.get_env(CODESIGN_ENV, required=False)
-    cert_base64 = env.get_env(CERT_P12_ENV, required=False)
-    notary_user = env.get_env(NOTARY_USER_ENV, required=False)
-
-    if notary_user:
-        notary_password = env.get_env("APPLE_NOTARY_PASSWORD")
-        notary_team_id = env.get_env("APPLE_TEAM_ID")
-    else:
-        notary_password = None
-        notary_team_id = None
-
-    if cert_base64:
-        cert_password = env.get_env("APPLE_P12_PASSWORD")
-    else:
-        cert_password = None
-
-    return (
-        codesign_id,
-        cert_base64,
-        cert_password,
-        notary_user,
-        notary_password,
-        notary_team_id,
-    )
-
-
-def build_bundle(bundle_source_dir):
-
-    # it's important to build a new bundle every time, so that we catch bugs with fresh builds.
-    if os.path.exists(bundle_source_dir):
-        print(f"Bundle already exists, deleting: {bundle_source_dir}")
-        shutil.rmtree(bundle_source_dir)
-
-    print("Building bundle...")
-
-    # cmake build install target should run macdeployqt
-    cmd_utils.run("cmake --build build --target install", shell=True, print_cmd=True)
-
-
-def sign_bundle(bundle_source_dir, codesign_id):
-    print(f"Signing bundle {bundle_source_dir}...")
-
-    assert_certificate_installed(codesign_id)
-    cmd_utils.run(
-        [
-            CODESIGN_PATH,
-            "-f",
-            "--options",
-            "runtime",
-            "--deep",
-            "-s",
-            codesign_id,
-            bundle_source_dir,
-        ]
-    )
-
-
-def assert_certificate_installed(codesign_id):
-    print(f"Checking certificate: {codesign_id}")
-
-    installed = cmd_utils.run(
-        "security find-identity -v -p codesigning",
-        get_output=True,
-        shell=True,
-        print_cmd=True,
-    )
-
-    if codesign_id not in installed.stdout:
-        raise RuntimeError("Code signing certificate not installed or has expired")
-
-
-def build_dmg(bundle_source_dir, filename_base, source_dir, dist_dir, product_name):
-    settings_path = (
-        SETTINGS_FILE if source_dir is None else os.path.join(source_dir, SETTINGS_FILE)
-    )
-    settings_path_abs = os.path.abspath(settings_path)
-    app_path_abs = os.path.abspath(bundle_source_dir)
-
-    # cwd for dmgbuild, since setting the dmg filename to a path (include the dist dir) seems to
-    # make the dmg disappear and never writes to the specified path. the dmgbuild module also
-    # creates a temporary file in cwd, so it makes sense to change to the dist dir.
-    print(f"Changing directory to: {os.path.abspath(dist_dir)}")
-    cwd = os.getcwd()
-    os.makedirs(dist_dir, exist_ok=True)
-    os.chdir(dist_dir)
-
-    try:
-        dmg_filename = f"{filename_base}.dmg"
-        dmg_path = os.path.join(dist_dir, dmg_filename)
-        print(f"Building package {dmg_path}...")
-        dmgbuild.build_dmg(
-            dmg_filename,
-            product_name,
-            settings_file=settings_path_abs,
-            defines={
-                "app": app_path_abs,
-            },
-        )
-    finally:
-        print(f"Changing directory back to: {cwd}")
-        os.chdir(cwd)
-
-    return dmg_path
-
-
-def install_certificate(cert_base64, cert_password):
-    if not cert_base64:
-        raise ValueError("Certificate base 64 not provided")
-
-    if not cert_password:
-        raise ValueError("Certificate password not provided")
-
-    with Certificate(cert_base64, "p12") as cert_path:
-        print(f"Installing certificate: {cert_path}")
-
-        # WARNING: contains private key password, never print this command
-        cmd_utils.run(
-            [
-                SUDO_PATH,
-                SECURITY_PATH,
-                "import",
-                cert_path,
-                "-k",
-                KEYCHAIN_PATH,
-                "-P",
-                cert_password,
-                "-T",
-                CODESIGN_PATH,
-                "-T",
-                SECURITY_PATH,
-            ],
-        )
-
-
-def notarize_package(dmg_path, user, password, team_id):
-    print(f"Notarizing package {dmg_path}...")
-    notary_tool = NotaryTool()
-    notary_tool.store_credentials(user, password, team_id)
-    notary_tool.submit_and_wait(dmg_path)
-
-
-def get_xcode_path():
-    result = cmd_utils.run(
-        [XCODE_SELECT_PATH, "-p"], get_output=True, shell=False, print_cmd=True
-    )
-    return result.stdout.strip()
-
-
-class NotaryTool:
-    """
-    Provides a wrapper around the notarytool command line tool.
-    """
-
-    def __init__(self):
-        self.xcode_path = get_xcode_path()
-
-    def get_path(self):
-        return f"{self.xcode_path}{NOTARYTOOL_PATH}"
-
-    def store_credentials(self, user, password, team_id):
-        print("Storing credentials for notary tool...")
-        notarytool_path = self.get_path()
-
-        # WARNING: contains password, never print this command
-        cmd_utils.run(
-            [
-                notarytool_path,
-                "store-credentials",
-                "notarytool-password",
-                "--team-id",
-                team_id,
-                "--apple-id",
-                user,
-                "--password",
-                password,
-            ]
-        )
-
-    def submit_and_wait(self, dmg_filename):
-        print("Submitting notarization request...")
-        submit_result = self.run_submit_command(dmg_filename)
-        request_id = submit_result["id"]
-
-        print(f"Notary submitted, waiting for request: {request_id}")
-        start = time.time()
-        wait_result = self.run_wait_command(request_id)
-        status = wait_result["status"]
-
-        time_taken = time.time() - start
-        print(f"Notary complete in {time_taken:.2f}s, status: {status}")
-        if status == "Accepted":
-            print("Notarization successful.")
-        elif status == "Invalid" or status == "Rejected":
-            raise ValueError(f"Notarization failed, status: {status}")
-        else:
-            raise ValueError(f"Unknown status: {status}")
-
-    def run_submit_command(self, dmg_filename):
-        if not os.path.exists(dmg_filename):
-            raise FileNotFoundError(f"File not found: {dmg_filename}")
-
-        result = cmd_utils.run(
-            [
-                self.get_path(),
-                "submit",
-                dmg_filename,
-                "--keychain-profile",
-                "notarytool-password",
-                "--output-format",
-                "json",
-            ],
-            get_output=True,
-            shell=False,
-            print_cmd=True,
-        )
-
-        if result.stderr:
-            return json.loads(result.stderr)
-        else:
-            return json.loads(result.stdout)
-
-    def run_wait_command(self, request_id):
-        result = cmd_utils.run(
-            [
-                self.get_path(),
-                "wait",
-                request_id,
-                "--keychain-profile",
-                "notarytool-password",
-                "--output-format",
-                "json",
-            ],
-            get_output=True,
-            shell=False,
-            print_cmd=True,
-        )
-
-        if result.stderr:
-            return json.loads(result.stderr)
-        else:
-            return json.loads(result.stdout)

scripts/lib/windows.py

@@ -1,329 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import ctypes, sys, os, shutil, time, subprocess
-import xml.etree.ElementTree as ET
-import lib.cmd_utils as cmd_utils
-import lib.env as env
-import psutil  # type: ignore
-from lib.certificate import Certificate
-import lib.colors as colors
-import lib.file_utils as file_utils
-
-LOCK_FILE = "tmp/elevated.lock"
-MSBUILD_CMD = "msbuild"
-SIGNTOOL_CMD = "signtool"
-CERTUTIL_CMD = "certutil"
-RUNNER_TEMP_ENV = "RUNNER_TEMP"
-SERVICE_NOT_RUNNING_ERROR = 2
-ERROR_ACCESS_VIOLATION = 0xC0000005
-
-
-def run_elevated(script, args=None, use_sys_argv=True, wait_for_exit=False):
-    if not args and use_sys_argv:
-        args = " ".join(sys.argv[1:])
-
-    if wait_for_exit:
-        args += f" --lock-file {LOCK_FILE}"
-        env.persist_lock_file(LOCK_FILE)
-
-    command = f"{script} {args} --pause-on-exit"
-    print(f"Running script with elevated privileges: {command}")
-
-    WINDOW_HANDLE = None
-    OPERATION = "runas"
-    DIRECTORY = None
-    SHOW_CMD = 1
-    instance = ctypes.windll.shell32.ShellExecuteW(
-        WINDOW_HANDLE, OPERATION, sys.executable, command, DIRECTORY, SHOW_CMD
-    )
-
-    ERROR_ACCESS_DENIED = 5
-    if instance == ERROR_ACCESS_DENIED:
-        raise RuntimeError(
-            f"Failed to run script with elevated privileges, access denied (code {instance})"
-        )
-
-    ERROR_MAX = 32
-    if instance <= ERROR_MAX:
-        raise RuntimeError(
-            f"Failed to run script with elevated privileges, error code: {instance}"
-        )
-
-    print("Script is running with elevated privileges")
-
-    if wait_for_exit:
-        with open(LOCK_FILE, "r") as f:
-            pid = f.read()
-
-        print(f"Waiting for elevated process to exit: {pid}")
-        while os.path.exists(LOCK_FILE):
-            # Intentionally wait forever, since this code should not run where a developer
-            # has no control, such as in a CI environment.
-            pass
-
-
-def is_admin():
-    """Returns True if the current process has admin privileges."""
-    try:
-        return ctypes.windll.shell32.IsUserAnAdmin()
-    except ctypes.WinError:
-        return False
-
-
-def set_env_var(name, value):
-    """
-    Sets or updates an environment variable. Appends the value if it doesn't already exist.
-
-    Args:
-    name (str): The name of the environment variable.
-    value (str): The value of the environment variable.
-    """
-
-    current_value = os.getenv(name, "")
-
-    if value not in current_value:
-        new_value = f"{current_value}{os.pathsep}{value}" if current_value else value
-        os.environ[name] = new_value
-        print(f"Setting environment variable: {name}={value}")
-        cmd_utils.run(["setx", name, new_value], check=True, shell=True, print_cmd=True)
-
-
-def package(filename_base, build_dir, dist_dir):
-    cert_env_key = "WINDOWS_PFX_CERTIFICATE"
-    cert_base64 = env.get_env(cert_env_key, required=False)
-    packager = WindowsPackager(filename_base, build_dir, dist_dir)
-
-    if cert_base64:
-        cert_password = env.get_env("WINDOWS_PFX_PASSWORD")
-        packager.sign_binaries(cert_base64, cert_password)
-
-    packager.build_msi()
-
-    if cert_base64:
-        packager.sign_msi(cert_base64, cert_password)
-    else:
-        print(f"Skipped code signing, env var not set: {cert_env_key}")
-
-
-def assert_vs_cmd(cmd):
-    has_cmd = cmd_utils.has_command(cmd)
-    if not has_cmd:
-        raise RuntimeError(
-            f"The '{cmd}' command was not found, "
-            "re-run from 'Developer Command Prompt for VS'"
-        )
-
-
-def run_codesign(path, cert_base64, cert_password):
-    time_server = "http://timestamp.digicert.com"
-    hashing_algorithm = "SHA256"
-
-    with Certificate(cert_base64, "pfx") as cert_path:
-        print("Signing MSI installer...")
-        assert_vs_cmd(SIGNTOOL_CMD)
-
-        # WARNING: contains private key password, never print this command
-        cmd_utils.run(
-            [
-                SIGNTOOL_CMD,
-                "sign",
-                "/f",
-                cert_path,
-                "/p",
-                cert_password,
-                "/t",
-                time_server,
-                "/fd",
-                hashing_algorithm,
-                path,
-            ]
-        )
-
-
-class WindowsPackager:
-
-    def __init__(self, filename_base, build_dir, dist_dir):
-        self.filename_base = filename_base
-        self.build_dir = build_dir
-        self.dist_dir = dist_dir
-        self.wix_file = f"{build_dir}/installer/Installer.sln"
-        self.msi_file = f"{build_dir}/installer/bin/Release/Installer.msi"
-
-    def build_msi(self):
-        print("Building MSI installer...")
-        configuration = "Release"
-        platform = "x64"
-
-        assert_vs_cmd(MSBUILD_CMD)
-        cmd_utils.run(
-            [
-                MSBUILD_CMD,
-                self.wix_file,
-                f"/p:Configuration={configuration}",
-                f"/p:Platform={platform}",
-            ],
-            shell=True,
-            print_cmd=True,
-        )
-
-        path = self.get_package_path()
-        print(f"Copying MSI installer to {self.dist_dir}")
-        os.makedirs(self.dist_dir, exist_ok=True)
-        shutil.copy(self.msi_file, path)
-
-    def get_package_path(self):
-        return f"{self.dist_dir}/{self.filename_base}.msi"
-
-    def sign_binaries(self, cert_base64, cert_password):
-        exe_pattern = f"{self.build_dir}/bin/*.exe"
-        run_codesign(exe_pattern, cert_base64, cert_password)
-
-    def sign_msi(self, cert_base64, cert_password):
-        path = self.get_package_path()
-        run_codesign(path, cert_base64, cert_password)
-
-
-class WindowsService:
-    def __init__(self, script, args):
-        self.script = script
-        self.verbose = args.verbose
-        self.bin_name = args.bin_name
-        self.source_dir = os.path.abspath(args.source_dir)
-        self.target_dir = os.path.abspath(args.target_dir)
-        self.service_id = args.service_id
-        self.ignore_processes = args.ignore_processes
-
-    def print_verbose(self, message):
-        if self.verbose:
-            print(message)
-
-    def ensure_admin(self):
-        if not is_admin():
-            run_elevated(self.script)
-            sys.exit()
-
-    def restart(self):
-        """Stops the daemon service, copies files, and restarts the daemon service."""
-
-        self.ensure_admin()
-        self.stop()
-        self.copy_files()
-        self.start()
-
-    def reinstall(self):
-        """Stops and uninstalls daemon service, copies files, and reinstalls the daemon service."""
-
-        self.ensure_admin()
-        self.stop()
-
-        source_bin_path = f"{os.path.join(self.source_dir, self.bin_name)}.exe"
-
-        self.copy_files()
-
-        print("Removing old daemon service")
-        try:
-            subprocess.run([source_bin_path, "/uninstall"], shell=True, check=True)
-        except subprocess.CalledProcessError as e:
-            self.check_access_violation(e.returncode, source_bin_path)
-            if e.returncode != 0:
-                print(
-                    f"{colors.WARNING_TEXT} Uninstall failed, return code: {e.returncode}",
-                    file=sys.stderr,
-                )
-
-        target_bin_path = os.path.join(self.target_dir, self.bin_name + ".exe")
-
-        try:
-            print("Installing daemon service")
-            subprocess.run([target_bin_path, "/install"], shell=True, check=True)
-        except subprocess.CalledProcessError as e:
-            self.check_access_violation(e.returncode, target_bin_path)
-            if e.returncode != 0:
-                print(
-                    f"{colors.WARNING_TEXT} Install failed, return code: {e.returncode}"
-                )
-
-    def copy_files(self):
-        options = file_utils.CopyOptions(ignore_errors=True, verbose=False)
-        print(f"Copying files from {self.source_dir} to {self.target_dir}")
-        file_utils.copy(f"{self.source_dir}/*", self.target_dir, options)
-
-    def stop(self):
-        self.ensure_admin()
-        print("Stopping daemon service")
-        try:
-            subprocess.run(["net", "stop", self.service_id], shell=True, check=True)
-        except subprocess.CalledProcessError as e:
-            if e.returncode == SERVICE_NOT_RUNNING_ERROR:
-                self.print_verbose("Daemon service not running")
-            else:
-                raise e
-
-        # Wait for Windows to release the file handles after process termination.
-        self.wait_for_stop()
-
-    def start(self):
-        self.ensure_admin()
-        print("Starting daemon service")
-        subprocess.run(["net", "start", self.service_id], shell=True, check=True)
-
-    def wait_for_stop(self):
-        if self.is_any_process_running(self.target_dir):
-            print("Waiting for file handles to release...", end="", flush=True)
-            while self.is_any_process_running(self.target_dir):
-                if not self.verbose:
-                    print(".", end="", flush=True)
-                time.sleep(1)
-            if not self.verbose:
-                print()
-
-    def check_access_violation(self, return_code, bin_path):
-        if return_code == ERROR_ACCESS_VIOLATION:
-            print(
-                f"{colors.WARNING_TEXT} Process crashed with memory access violation: {bin_path}",
-                file=sys.stderr,
-            )
-
-    def is_ignored_process(self, exe):
-        for ignore_process in self.ignore_processes:
-            if exe.endswith(ignore_process):
-                return True
-        return False
-
-    def is_any_process_running(self, dir):
-        """Check if there is any running process that contains the given directory."""
-
-        self.print_verbose(f"Checking if any process is running in: {dir}")
-
-        for proc in psutil.process_iter(attrs=["name", "exe"]):
-            exe = proc.info["exe"]
-
-            if not exe:
-                self.print_verbose(f"Skipping process with no exe: {proc}")
-                continue
-
-            if self.is_ignored_process(exe):
-                self.print_verbose(f"Ignoring process: {exe}")
-                continue
-
-            try:
-                if dir.lower() in exe.lower():
-                    self.print_verbose(f"Process found: {exe}")
-                    return True
-            except (psutil.NoSuchProcess, psutil.AccessDenied):
-                pass
-
-        return False

scripts/lint_clang.py

@@ -1,74 +0,0 @@
-#!/usr/bin/env python3
-
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import lib.env as env
-
-env.ensure_in_venv(__file__)
-
-import argparse, sys
-import lib.fs as fs
-from clang_format import clang_format  # type: ignore
-
-include_files = [
-    "*.h",
-    "*.c",
-    "*.hpp",
-    "*.cpp",
-]
-
-dirs = ["src"]
-
-
-def main():
-    """
-    Cross-platform equivalent of using find and xargs with clang-format.
-    Lints by performing a dry run (--dry-run) which fails when formatting is needed.
-    """
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "-f",
-        "--format",
-        action="store_true",
-        help="In-place format all files",
-    )
-    args = parser.parse_args()
-
-    cmd_args = ["-i"] if args.format else ["--dry-run", "--Werror"]
-    files_recursive = fs.find_files(dirs, include_files)
-
-    if args.format:
-        print("Formatting files with Clang formatter:")
-    else:
-        print("Checking files with Clang formatter:")
-
-    for file in files_recursive:
-        print(file)
-
-    if files_recursive:
-        sys.argv = [""] + cmd_args + files_recursive
-        result = clang_format()
-        if result == 0:
-            print("Clang lint passed")
-
-        sys.exit(result)
-    else:
-        print("No files for Clang to process", file=sys.stderr)
-        sys.exit(0)
-
-
-if __name__ == "__main__":
-    main()

scripts/package.py

@@ -1,109 +0,0 @@
-#!/usr/bin/env python3
-
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import lib.env as env
-
-env.ensure_in_venv(__file__)
-
-import argparse
-import platform
-from dotenv import load_dotenv  # type: ignore
-
-ENV_FILE = ".env"
-DEFAULT_PRODUCT_NAME = "Deskflow"
-DEFAULT_FILENAME_BASE = "deskflow"
-DEFAULT_PROJECT_BUILD_DIR = "build"
-DEFAULT_DIST_DIR = "dist"
-DEFAULT_PACKAGE_NAME = "deskflow"
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "--package-version",
-        help="Set the Package Version",
-        required=True)
-    parser.add_argument(
-        "--leave-test-installed",
-        action="store_true",
-        help="Leave test package installed",
-    )
-    args = parser.parse_args()
-
-    load_dotenv(dotenv_path=ENV_FILE)
-
-    package(
-        DEFAULT_FILENAME_BASE,
-        DEFAULT_PROJECT_BUILD_DIR,
-        DEFAULT_DIST_DIR,
-        DEFAULT_PRODUCT_NAME,
-        version=args.package_version,
-    )
-
-def package(
-    filename_prefix,
-    project_build_dir,
-    dist_dir,
-    product_name,
-    version,
-    source_dir=None,
-):
-    filename_base = get_filename_base(version, filename_prefix)
-    print(f"Package filename base: {filename_base}")
-
-    if env.is_windows():
-        windows_package(filename_base, project_build_dir, dist_dir)
-    elif env.is_mac():
-        mac_package(
-            filename_base, source_dir, project_build_dir, dist_dir, product_name
-        )
-    else:
-        raise RuntimeError(f"Unsupported platform: {env.get_os()}")
-
-
-def get_filename_base(version, prefix):
-    os = env.get_os()
-    machine = platform.machine().lower()
-    os_part = os
-
-    if os == "windows":
-        # Some Windows users get confused by 'amd64' and think it's 'arm64',
-        # so we'll use Intel's 'x64' branding (even though it's wrong).
-        # Also replace 'x86_64' with 'x64' for consistency.
-        os_part= "win"
-        if machine == "amd64" or machine == "x86_64":
-            machine = "x64"
-    elif os == "mac":
-            os_part = "macos"
-    # Add '-' between our name parts we do not want spaces in the filename
-    return f"{prefix}-{version}-{os_part}-{machine}"
-
-
-
-def windows_package(filename_base, project_build_dir, dist_dir):
-    import lib.windows as windows
-
-    windows.package(filename_base, project_build_dir, dist_dir)
-
-
-def mac_package(filename_base, source_dir, project_build_dir, dist_dir, product_name):
-    import lib.mac as mac
-
-    mac.package(filename_base, source_dir, project_build_dir, dist_dir, product_name)
-
-if __name__ == "__main__":
-    main()

scripts/pyproject.toml

@@ -1,14 +0,0 @@
-[project]
-name = "scripts"
-version = "0.0.1"
-description = "Scripts to assist with development of Deskflow"
-requires-python = ">=3.9"
-dependencies = [
-  "clang-format",
-  "python-dotenv",
-  "pyyaml",
-  "dmgbuild; sys_platform == 'darwin'",
-  "colorama",
-  "gitpython",
-  "psutil",
-]

scripts/setup_venv.py

@@ -1,25 +0,0 @@
-#!/usr/bin/env python3
-
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import lib.env as env
-
-env.ensure_in_venv(__file__, create_venv=True)
-env.install_requirements()
-
-import lib.colors as colors
-
-print(colors.SUCCESS_TEXT, "Python virtual environment is ready.")

sonar-project.properties

@@ -1,12 +1,15 @@
 sonar.organization=deskflow
 sonar.projectKey=deskflow_deskflow
-sonar.sources=scripts,src/cmd,src/gui,src/lib
+sonar.sources=src/apps,src/lib
 sonar.tests=src/test
 sonar.exclusions=subprojects/**,build/**
-sonar.coverage.exclusions=subprojects/**,scripts/**,src/test/**,src/gui/**
+sonar.coverage.exclusions=subprojects/**,src/test/**,src/apps/deskflow-gui/**,src/apps/res/**
 sonar.cpd.exclusions=**/*Test*.cpp
 sonar.host.url=https://sonarcloud.io
-sonar.coverageReportPaths=${{ steps.coverage-paths.outputs.csv }}
 sonar.cfamily.compile-commands=build/compile_commands.json
-sonar.cfamily.threads=${{ env.CPU_CORE_COUNT }}
 sonar.python.version=3.10
+
+# Allow use of `new` which is idiomatic for Qt code.
+sonar.issue.ignore.multicriteria=e1
+sonar.issue.ignore.multicriteria.e1.ruleKey=cpp:S5025
+sonar.issue.ignore.multicriteria.e1.resourceKey=**

src/CMakeLists.txt

@@ -1,29 +1,15 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2012-2024 Symless Ltd.
-# Copyright (C) 2009-2012 Nick Bolton
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-FileCopyrightText: 2024 Deskflow Developers
+# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-License-Identifier: MIT
 
 include_directories(./lib)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/lib)
 
 add_subdirectory(lib)
-add_subdirectory(cmd)
-
-if(BUILD_GUI)
-  add_subdirectory(gui)
-endif(BUILD_GUI)
+add_subdirectory(apps)
 
+option(BUILD_TESTS "Build tests" ON)
 if(BUILD_TESTS)
   add_subdirectory(test)
 endif()

src/apps/CMakeLists.txt

@@ -0,0 +1,20 @@
+# SPDX-FileCopyrightText: 2024 Deskflow Developers
+# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-License-Identifier: MIT
+
+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)

src/apps/deskflow-client/CMakeLists.txt

@@ -0,0 +1,64 @@
+# 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)
+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

@@ -0,0 +1,35 @@
+/*
+ * 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"
+#endif
+
+int main(int argc, char **argv)
+{
+#if SYSAPI_WIN32
+  ArchMiscWindows::guardRuntimeVersion();
+
+  // record window instance for tray icon, etc
+  ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
+#endif
+
+  Arch arch;
+  arch.init();
+
+  Log log;
+  EventQueue events;
+
+  ClientApp app(&events);
+  return app.run(argc, argv);
+}

src/apps/deskflow-core/CMakeLists.txt

@@ -0,0 +1,58 @@
+# 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}-core)
+
+add_executable(${target} "${target}.cpp")
+if(WIN32)
+  # Generate rc file
+  set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} combined server and 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)
+
+  target_sources(${target} PRIVATE
+    ${target}.exe.manifest
+    ${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico
+    ${CMAKE_CURRENT_BINARY_DIR}/${target}.rc
+  )
+endif()
+
+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)
+elseif(WIN32)
+  install(
+    TARGETS ${target}
+    RUNTIME_DEPENDENCY_SET coreDeps
+    DESTINATION .
+  )
+  install(RUNTIME_DEPENDENCY_SET coreDeps
+    PRE_EXCLUDE_REGEXES
+      "api-ms-win-.*"
+      "ext-ms-.*"
+      "^hvsifiletrust\\.dll$"
+    POST_EXCLUDE_REGEXES
+      ".*system32.*"
+    RUNTIME DESTINATION .
+  )
+endif()

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

@@ -0,0 +1,62 @@
+/*
+ * 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"
+#include "deskflow/ServerApp.h"
+
+#if SYSAPI_WIN32
+#include "arch/win32/ArchMiscWindows.h"
+#endif
+
+#include <iostream>
+
+void showHelp()
+{
+  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"));
+}
+
+int main(int argc, char **argv)
+{
+#if SYSAPI_WIN32
+  ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
+#endif
+
+  Arch arch;
+  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();
+  }
+
+  return 0;
+}

src/apps/deskflow-daemon/CMakeLists.txt

@@ -0,0 +1,44 @@
+# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-License-Identifier: MIT
+
+# Daemon is only needed on Windows for elevating processes to deal with UAC.
+if(WIN32)
+  set(target ${CMAKE_PROJECT_NAME}-daemon)
+
+  # Generate rc file
+  set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} Daemon for handling secure desktops (UAC prompts, login screen, etc)")
+  set(EXE_ICON "IDI_DESKFLOW ICON DISCARDABLE \"${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico\"")
+  configure_file(${CMAKE_SOURCE_DIR}/src/apps/res/windows.rc.in ${target}.rc)
+
+  add_executable(${target} WIN32 ${target}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${target}.rc)
+
+  target_link_libraries(
+    ${target}
+    arch
+    base
+    io
+    mt
+    net
+    platform
+    app
+    common
+    ${libs}
+    Qt6::Core)
+
+  install(
+    TARGETS ${target}
+    RUNTIME_DEPENDENCY_SET deamonDeps
+    DESTINATION .
+  )
+  install(RUNTIME_DEPENDENCY_SET daemonDeps
+    PRE_EXCLUDE_REGEXES
+      "api-ms-win-.*"
+      "ext-ms-.*"
+      "^hvsifiletrust\\.dll$"
+    POST_EXCLUDE_REGEXES
+      ".*system32.*"
+    RUNTIME DESTINATION .
+  )
+endif()

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

@@ -0,0 +1,147 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2012 - 2016, 2025 Symless Ltd.
+ * SPDX-FileCopyrightText: (C) 2012 Nick Bolton
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#include "arch/Arch.h"
+#include "base/EventQueue.h"
+#include "base/Log.h"
+#include "common/constants.h"
+#include "deskflow/DaemonApp.h"
+#include "deskflow/ipc/DaemonIpcServer.h"
+
+#if SYSAPI_WIN32
+
+#include "arch/win32/ArchMiscWindows.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+#endif
+
+#include <QCoreApplication>
+#include <QThread>
+
+using namespace deskflow::core;
+
+void handleError(const char *message);
+
+int main(int argc, char **argv)
+{
+#if SYSAPI_WIN32
+  ArchMiscWindows::guardRuntimeVersion();
+
+  // Save window instance for later use, e.g. `GetModuleFileName` which is used when installing the daemon.
+  ArchMiscWindows::setInstanceWin32(GetModuleHandle(nullptr));
+#endif
+
+  Arch arch;
+  arch.init();
+
+  Log log;
+  EventQueue events;
+
+  auto &daemon = DaemonApp::instance();
+  DaemonApp::InitResult initResult;
+  try {
+    initResult = daemon.init(&events, argc, argv);
+  } catch (std::exception &e) {
+    handleError(e.what());
+    return kExitFailed;
+  } catch (...) {
+    handleError("Unrecognized error.");
+    return kExitFailed;
+  }
+
+  // Important: Log the app name and version number to the log file after the daemon app init
+  // because the file log outputter is created there. Logging before would only log to stdout
+  // which is not 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 Daemon v%s", kAppName, kDisplayVersion);
+
+  switch (initResult) {
+    using enum DaemonApp::InitResult;
+
+  case StartDaemon: {
+    LOG_INFO("starting daemon");
+    QCoreApplication app(argc, argv);
+
+    QThread daemonThread;
+    daemon.moveToThread(&daemonThread);
+
+    QObject::connect(&daemonThread, &QThread::started, [&daemon, &daemonThread]() {
+      LOG_DEBUG("daemon thread started");
+      daemon.run();
+      daemonThread.quit();
+      LOG_DEBUG("daemon thread finished");
+    });
+    QObject::connect(&daemonThread, &QThread::finished, &app, &QCoreApplication::quit);
+
+    ipc::DaemonIpcServer ipcServer(&app, QString::fromStdString(daemon.logFilename()));
+
+    // Use direct connection as the daemon app is on it's own thread, and so is on a different event loop.
+    QObject::connect(
+        &ipcServer, &ipc::DaemonIpcServer::logLevelChanged, &daemon, &DaemonApp::saveLogLevel, //
+        Qt::DirectConnection
+    );
+    QObject::connect(
+        &ipcServer, &ipc::DaemonIpcServer::elevateModeChanged, &daemon, &DaemonApp::setElevate, //
+        Qt::DirectConnection
+    );
+    QObject::connect(
+        &ipcServer, &ipc::DaemonIpcServer::commandChanged, &daemon, &DaemonApp::setCommand, //
+        Qt::DirectConnection
+    );
+    QObject::connect(
+        &ipcServer, &ipc::DaemonIpcServer::startProcessRequested, &daemon, &DaemonApp::applyWatchdogCommand, //
+        Qt::DirectConnection
+    );
+    QObject::connect(
+        &ipcServer, &ipc::DaemonIpcServer::stopProcessRequested, &daemon, &DaemonApp::clearWatchdogCommand, //
+        Qt::DirectConnection
+    );
+    QObject::connect(
+        &ipcServer, &ipc::DaemonIpcServer::clearSettingsRequested, &daemon, &DaemonApp::clearSettings, //
+        Qt::DirectConnection
+    );
+
+    daemonThread.start();
+    const auto exitCode = QCoreApplication::exec();
+    daemonThread.wait();
+
+    LOG_DEBUG("daemon exited, code: %d", exitCode);
+    return exitCode;
+  }
+
+  case FatalError:
+    return kExitFailed;
+
+  default:
+    return kExitSuccess;
+  }
+}
+
+#if SYSAPI_WIN32
+
+// Win32 subsystem entry point (simply forwards to main).
+// We need this because using regular main under the Win32 subsystem results in empty args.
+int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
+{
+  return main(__argc, __argv);
+}
+
+#endif
+
+void handleError(const char *message)
+{
+  // Always print error to stdout in case run as CLI program.
+  LOG_ERR("%s", message);
+
+#if SYSAPI_WIN32
+  // Show a message box for when run from MSI in Win32 subsystem.
+  MessageBoxA(nullptr, message, "Deskflow daemon error", MB_OK | MB_ICONERROR);
+#endif
+}

src/apps/deskflow-gui/Action.cpp

@@ -0,0 +1,115 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
+ * SPDX-FileCopyrightText: (C) 2008 Volker Lanz <vl@fidra.de>
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#include "Action.h"
+
+#include <QSettings>
+#include <QTextStream>
+
+QString Action::text() const
+{
+  QString text = QString(m_actionTypeNames.at(keySequence().isMouseButton() ? type() + 6 : type()));
+
+  switch (type()) {
+  case keyDown:
+  case keyUp:
+  case keystroke: {
+    QString commandArgs = keySequence().toString();
+
+    if (!keySequence().isMouseButton()) {
+      const QStringList &screens = typeScreenNames();
+      if (haveScreens() && !screens.isEmpty()) {
+        QString screenList;
+        for (int i = 0; i < screens.size(); i++) {
+          screenList.append(screens[i]);
+          if (i != screens.size() - 1)
+            screenList.append(QStringLiteral(":"));
+        }
+        commandArgs.append(QStringLiteral(",%1").arg(screenList));
+      } else
+        commandArgs.append(QStringLiteral(",*"));
+    }
+    text.append(m_commandTemplate.arg(commandArgs));
+  } break;
+
+  case switchToScreen:
+    text.append(m_commandTemplate.arg(m_switchScreenName));
+    break;
+
+  case switchInDirection:
+    text.append(m_commandTemplate.arg(m_switchDirectionNames.at(m_switchDirection)));
+    break;
+
+  case lockCursorToScreen:
+    text.append(m_commandTemplate.arg(m_lockCursorModeNames.at(m_lockCursorMode)));
+    break;
+
+  default:
+    break;
+  }
+
+  return text;
+}
+
+void Action::loadSettings(QSettings &settings)
+{
+  keySequence().loadSettings(settings);
+  setType(settings.value(SettingsKeys::ActionType, keyDown).toInt());
+
+  typeScreenNames().clear();
+  int numTypeScreens = settings.beginReadArray(SettingsKeys::ScreenNames);
+  for (int i = 0; i < numTypeScreens; i++) {
+    settings.setArrayIndex(i);
+    typeScreenNames().append(settings.value(SettingsKeys::ScreenName).toString());
+  }
+  settings.endArray();
+
+  setSwitchScreenName(settings.value(SettingsKeys::SwitchToScreen).toString());
+  setSwitchDirection(settings.value(SettingsKeys::SwitchDirection, switchLeft).toInt());
+  setLockCursorMode(settings.value(SettingsKeys::LockToScreen, lockCursorToggle).toInt());
+  setActiveOnRelease(settings.value(SettingsKeys::ActiveOnRelease, false).toBool());
+  setHaveScreens(settings.value(SettingsKeys::HasScreens, false).toBool());
+  setRestartServer(settings.value(SettingsKeys::RestartServer, false).toBool());
+}
+
+void Action::saveSettings(QSettings &settings) const
+{
+  keySequence().saveSettings(settings);
+  settings.setValue(SettingsKeys::ActionType, type());
+
+  settings.beginWriteArray(SettingsKeys::ScreenNames);
+  for (int i = 0; i < typeScreenNames().size(); i++) {
+    settings.setArrayIndex(i);
+    settings.setValue(SettingsKeys::ScreenName, typeScreenNames()[i]);
+  }
+  settings.endArray();
+
+  settings.setValue(SettingsKeys::SwitchToScreen, switchScreenName());
+  settings.setValue(SettingsKeys::SwitchDirection, switchDirection());
+  settings.setValue(SettingsKeys::LockToScreen, lockCursorMode());
+  settings.setValue(SettingsKeys::ActiveOnRelease, activeOnRelease());
+  settings.setValue(SettingsKeys::HasScreens, haveScreens());
+  settings.setValue(SettingsKeys::RestartServer, restartServer());
+}
+
+bool Action::operator==(const Action &a) const
+{
+  return m_keySequence == a.m_keySequence && m_type == a.m_type && m_typeScreenNames == a.m_typeScreenNames &&
+         m_switchScreenName == a.m_switchScreenName && m_switchDirection == a.m_switchDirection &&
+         m_lockCursorMode == a.m_lockCursorMode && m_activeOnRelease == a.m_activeOnRelease &&
+         m_hasScreens == a.m_hasScreens && m_restartServer == a.m_restartServer;
+}
+
+QTextStream &operator<<(QTextStream &outStream, const Action &action)
+{
+  if (action.activeOnRelease())
+    outStream << ";";
+
+  outStream << action.text();
+
+  return outStream;
+}

src/apps/deskflow-gui/Action.h

@@ -0,0 +1,184 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
+ * SPDX-FileCopyrightText: (C) 2008 Volker Lanz <vl@fidra.de>
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#pragma once
+
+#include "KeySequence.h"
+
+#include <QList>
+#include <QString>
+#include <QStringList>
+
+class ActionDialog;
+class QSettings;
+class QTextStream;
+
+namespace SettingsKeys {
+inline static const QString ActionType = QStringLiteral("type");
+inline static const QString ScreenNames = QStringLiteral("typeScreenNames");
+inline static const QString ScreenName = QStringLiteral("typeScreenName");
+inline static const QString SwitchToScreen = QStringLiteral("switchScreenName");
+inline static const QString SwitchDirection = QStringLiteral("switchInDirection");
+inline static const QString LockToScreen = QStringLiteral("lockCursorToScreen");
+inline static const QString ActiveOnRelease = QStringLiteral("activeOnRelease");
+inline static const QString HasScreens = QStringLiteral("hasScreens");
+inline static const QString RestartServer = QStringLiteral("restartServer");
+}; // namespace SettingsKeys
+
+class Action
+{
+  friend class ActionDialog;
+  friend QTextStream &operator<<(QTextStream &outStream, const Action &action);
+
+public:
+  enum ActionType
+  {
+    keyDown,
+    keyUp,
+    keystroke,
+    switchToScreen,
+    switchInDirection,
+    lockCursorToScreen,
+    restartAllConnections,
+    mouseDown,
+    mouseUp,
+    mousebutton,
+  };
+  enum SwitchDirection
+  {
+    switchLeft,
+    switchRight,
+    switchUp,
+    switchDown
+  };
+  enum LockCursorMode
+  {
+    lockCursorToggle,
+    lockCursonOn,
+    lockCursorOff
+  };
+
+public:
+  Action() = default;
+
+public:
+  QString text() const;
+  const KeySequence &keySequence() const
+  {
+    return m_keySequence;
+  }
+  void loadSettings(QSettings &settings);
+  void saveSettings(QSettings &settings) const;
+  int type() const
+  {
+    return m_type;
+  }
+  const QStringList &typeScreenNames() const
+  {
+    return m_typeScreenNames;
+  }
+  const QString &switchScreenName() const
+  {
+    return m_switchScreenName;
+  }
+  int switchDirection() const
+  {
+    return m_switchDirection;
+  }
+  int lockCursorMode() const
+  {
+    return m_lockCursorMode;
+  }
+  bool activeOnRelease() const
+  {
+    return m_activeOnRelease;
+  }
+  bool haveScreens() const
+  {
+    return m_hasScreens;
+  }
+  bool restartServer() const
+  {
+    return m_restartServer;
+  }
+
+  bool operator==(const Action &a) const;
+
+protected:
+  KeySequence &keySequence()
+  {
+    return m_keySequence;
+  }
+  void setKeySequence(const KeySequence &seq)
+  {
+    m_keySequence = seq;
+  }
+  void setType(int t)
+  {
+    m_type = t;
+  }
+  QStringList &typeScreenNames()
+  {
+    return m_typeScreenNames;
+  }
+  void setSwitchScreenName(const QString &n)
+  {
+    m_switchScreenName = n;
+  }
+  void setSwitchDirection(int d)
+  {
+    m_switchDirection = d;
+  }
+  void setLockCursorMode(int m)
+  {
+    m_lockCursorMode = m;
+  }
+  void setActiveOnRelease(bool b)
+  {
+    m_activeOnRelease = b;
+  }
+  void setHaveScreens(bool b)
+  {
+    m_hasScreens = b;
+  }
+  void setRestartServer(bool b)
+  {
+    m_restartServer = b;
+  }
+
+private:
+  KeySequence m_keySequence;
+  int m_type = keystroke;
+  QStringList m_typeScreenNames = QStringList();
+  QString m_switchScreenName = QString();
+  int m_switchDirection = switchLeft;
+  int m_lockCursorMode = lockCursorToggle;
+  bool m_activeOnRelease = false;
+  bool m_hasScreens = false;
+  bool m_restartServer;
+
+  inline static const QString m_commandTemplate = QStringLiteral("(%1)");
+  inline static const QStringList m_actionTypeNames{
+      QStringLiteral("keyDown"),           QStringLiteral("keyUp"),
+      QStringLiteral("keystroke"),         QStringLiteral("switchToScreen"),
+      QStringLiteral("switchInDirection"), QStringLiteral("lockCursorToScreen"),
+      QStringLiteral("restartServer"),     QStringLiteral("mouseDown"),
+      QStringLiteral("mouseUp"),           QStringLiteral("mousebutton")
+  };
+
+  inline static const QStringList m_switchDirectionNames{
+      QStringLiteral("left"), QStringLiteral("right"), QStringLiteral("up"), QStringLiteral("down")
+  };
+
+  inline static const QStringList m_lockCursorModeNames{
+      QStringLiteral("toggle"), QStringLiteral("on"), QStringLiteral("off")
+  };
+};
+
+using ActionList = QList<Action>;
+
+QTextStream &operator<<(QTextStream &outStream, const Action &action);

src/apps/deskflow-gui/CMakeLists.txt

@@ -0,0 +1,140 @@
+# SPDX-FileCopyrightText: 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: 2024 Symless Ltd
+# SPDX-License-Identifier: MIT
+
+if(APPLE)
+  set(target Deskflow)
+else()
+  set(target deskflow)
+endif()
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+if(WIN32)
+  set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} GUI configuration tool")
+  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)
+  #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_ICON_FILE ${target}.icns)
+  set(BUNDLE_INFO_STRING "${CMAKE_PROJECT_DESCRIPTION}")
+  set(BUNDLE_COPYRIGHT "${CMAKE_PROJECT_COPYRIGHT}")
+
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/../res/deskflow.plist.in
+    ${CMAKE_CURRENT_BINARY_DIR}/deskflow.plist
+    @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_source_files_properties(${platform_extra} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+endif()
+
+add_executable(${target} WIN32 MACOSX_BUNDLE
+  ${platform_extra}
+  ../res/deskflow.qrc
+  Action.cpp
+  Action.h
+  DataDownloader.cpp
+  DataDownloader.h
+  Hotkey.cpp
+  Hotkey.h
+  KeySequence.cpp
+  KeySequence.h
+  main.cpp
+  MainWindow.cpp
+  MainWindow.h
+  MainWindow.ui
+  ProcessorArch.h
+  QUtility.cpp
+  QUtility.h
+  ScreenSetupModel.cpp
+  ScreenSetupModel.h
+  ServerConfig.cpp
+  ServerConfig.h
+  VersionChecker.cpp
+  VersionChecker.h
+  dialogs/AboutDialog.cpp
+  dialogs/AboutDialog.h
+  dialogs/AboutDialog.ui
+  dialogs/ActionDialog.cpp
+  dialogs/ActionDialog.h
+  dialogs/ActionDialog.ui
+  dialogs/AddClientDialog.cpp
+  dialogs/AddClientDialog.h
+  dialogs/AddClientDialog.ui
+  dialogs/FingerprintDialog.h
+  dialogs/FingerprintDialog.cpp
+  dialogs/HotkeyDialog.cpp
+  dialogs/HotkeyDialog.h
+  dialogs/HotkeyDialog.ui
+  dialogs/ScreenSettingsDialog.cpp
+  dialogs/ScreenSettingsDialog.h
+  dialogs/ScreenSettingsDialog.ui
+  dialogs/ServerConfigDialog.cpp
+  dialogs/ServerConfigDialog.h
+  dialogs/ServerConfigDialog.ui
+  dialogs/SettingsDialog.cpp
+  dialogs/SettingsDialog.h
+  dialogs/SettingsDialog.ui
+  widgets/FingerprintPreview.h
+  widgets/FingerprintPreview.cpp
+  widgets/KeySequenceWidget.cpp
+  widgets/KeySequenceWidget.h
+  widgets/NewScreenWidget.h
+  widgets/NewScreenWidget.cpp
+  widgets/ScreenSetupView.cpp
+  widgets/ScreenSetupView.h
+  widgets/TrashScreenWidget.cpp
+  widgets/TrashScreenWidget.h
+)
+
+target_link_libraries(
+  ${target}
+  gui
+  common
+  Qt6::Core
+  Qt6::Widgets
+  Qt6::Network)
+
+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-.*"
+      "ext-ms-.*"
+      "^hvsifiletrust\\.dll$"
+    POST_EXCLUDE_REGEXES
+      ".*system32.*"
+    RUNTIME DESTINATION .
+  )
+
+  add_custom_command(
+    TARGET ${target} POST_BUILD
+      COMMAND ${DEPLOYQT} --no-compiler-runtime --no-system-d3d-compiler --no-quick-import -network $<TARGET_FILE:${target}>
+  )
+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 .)
+else()
+  install(TARGETS ${target} DESTINATION bin)
+endif()

src/apps/deskflow-gui/DataDownloader.cpp

@@ -1,18 +1,7 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2014-2016 Symless Ltd.
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-FileCopyrightText: (C) 2014 - 2016 Symless Ltd.
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
 #include "DataDownloader.h"

src/apps/deskflow-gui/DataDownloader.h

@@ -1,18 +1,7 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2014-2016 Symless Ltd.
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-FileCopyrightText: (C) 2014 - 2016 Symless Ltd.
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
 #pragma once

src/apps/deskflow-gui/Hotkey.cpp

@@ -0,0 +1,73 @@
+/*
+ * 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) 2008 Volker Lanz <vl@fidra.de>
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#include "Hotkey.h"
+
+#include <QSettings>
+
+Hotkey::Hotkey() : m_keySequence{}, m_actions{}
+{
+}
+
+QString Hotkey::text() const
+{
+  return m_keySequence.isMouseButton() ? kMousebutton.arg(m_keySequence.toString())
+                                       : kKeystroke.arg(m_keySequence.toString());
+}
+
+void Hotkey::loadSettings(QSettings &settings)
+{
+  m_keySequence.loadSettings(settings);
+
+  m_actions.clear();
+  int num = settings.beginReadArray(kSectionActions);
+  for (int i = 0; i < num; i++) {
+    settings.setArrayIndex(i);
+    Action a;
+    a.loadSettings(settings);
+    m_actions.append(a);
+  }
+
+  settings.endArray();
+}
+
+void Hotkey::saveSettings(QSettings &settings) const
+{
+  m_keySequence.saveSettings(settings);
+
+  settings.beginWriteArray(kSectionActions);
+  for (int i = 0; i < m_actions.size(); i++) {
+    settings.setArrayIndex(i);
+    m_actions.at(i).saveSettings(settings);
+  }
+  settings.endArray();
+}
+
+bool Hotkey::operator==(const Hotkey &hk) const
+{
+  return m_keySequence == hk.keySequence() && m_actions == hk.actions();
+}
+
+QTextStream &operator<<(QTextStream &outStream, const Hotkey &hotkey)
+{
+  // Don't write a config if there is no actions
+  if (hotkey.actions().size() == 0)
+    return outStream;
+
+  QString outText = QStringLiteral("\t%1 = ").arg(hotkey.text());
+  for (int i = 0; i < hotkey.actions().size(); i++) {
+    outText.append(hotkey.actions().at(i).text());
+    if (i != hotkey.actions().size() - 1) {
+      outText.append(QStringLiteral(", "));
+    }
+  }
+  outText.append(QStringLiteral("\n"));
+
+  outStream << outText;
+  return outStream;
+}

src/apps/deskflow-gui/Hotkey.h

@@ -1,20 +1,11 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
+ * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
+ * SPDX-FileCopyrightText: (C) 2008 Volker Lanz <vl@fidra.de>
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
+
 #pragma once
 
 #include <QList>
@@ -41,11 +32,11 @@ public:
   QString text() const;
   const KeySequence &keySequence() const
   {
-    return m_KeySequence;
+    return m_keySequence;
   }
   const ActionList &actions() const
   {
-    return m_Actions;
+    return m_actions;
   }
 
   void loadSettings(QSettings &settings);
@@ -56,22 +47,25 @@ public:
 protected:
   KeySequence &keySequence()
   {
-    return m_KeySequence;
+    return m_keySequence;
   }
   void setKeySequence(const KeySequence &seq)
   {
-    m_KeySequence = seq;
+    m_keySequence = seq;
   }
   ActionList &actions()
   {
-    return m_Actions;
+    return m_actions;
   }
 
 private:
-  KeySequence m_KeySequence;
-  ActionList m_Actions;
+  KeySequence m_keySequence;
+  ActionList m_actions;
+  inline static const QString kSectionActions = QStringLiteral("actions");
+  inline static const QString kMousebutton = QStringLiteral("mousebutton(%1)");
+  inline static const QString kKeystroke = QStringLiteral("keystroke(%1)");
 };
 
-typedef QList<Hotkey> HotkeyList;
+using HotkeyList = QList<Hotkey>;
 
 QTextStream &operator<<(QTextStream &outStream, const Hotkey &hotkey);

src/apps/deskflow-gui/KeySequence.cpp

@@ -1,19 +1,8 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
+ * SPDX-FileCopyrightText: (C) 2008 Volker Lanz <vl@fidra.de>
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
 #include "KeySequence.h"

src/apps/deskflow-gui/KeySequence.h

@@ -1,19 +1,8 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
+ * SPDX-FileCopyrightText: (C) 2008 Volker Lanz <vl@fidra.de>
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
 #pragma once

src/apps/deskflow-gui/MainWindow.h

@@ -0,0 +1,234 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithord48@gmail.com>
+ * SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd.
+ * SPDX-FileCopyrightText: (C) 2008 Volker Lanz <vl@fidra.de>
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#pragma once
+
+#include <QMainWindow>
+#include <QMutex>
+#include <QProcess>
+#include <QRegularExpression>
+#include <QSettings>
+#include <QSystemTrayIcon>
+#include <QThread>
+
+#include "ServerConfig.h"
+#include "VersionChecker.h"
+#include "gui/config/AppConfig.h"
+#include "gui/config/ConfigScopes.h"
+#include "gui/config/ServerConfigDialogState.h"
+#include "gui/core/ClientConnection.h"
+#include "gui/core/CoreProcess.h"
+#include "gui/core/ServerConnection.h"
+#include "gui/core/WaylandWarnings.h"
+#include "gui/tls/TlsUtility.h"
+
+#ifdef Q_OS_MAC
+#include "gui/OSXHelpers.h"
+#endif
+
+class QAction;
+class QMenu;
+class QLabel;
+class QLineEdit;
+class QGroupBox;
+class QPushButton;
+class QTextEdit;
+class QComboBox;
+class QTabWidget;
+class QToolButton;
+class QCheckBox;
+class QRadioButton;
+class QMessageBox;
+class QAbstractButton;
+class QLocalServer;
+
+class DeskflowApplication;
+
+namespace Ui {
+class MainWindow;
+}
+
+namespace deskflow::gui::ipc {
+class DaemonIpcClient;
+}
+
+class MainWindow : public QMainWindow
+{
+  using CoreMode = deskflow::gui::CoreProcess::Mode;
+  using CoreProcess = deskflow::gui::CoreProcess;
+
+  Q_OBJECT
+
+  friend class DeskflowApplication;
+  friend class SettingsDialog;
+
+public:
+  enum class LogLevel
+  {
+    Error,
+    Info
+  };
+
+public:
+  explicit MainWindow(deskflow::gui::ConfigScopes &configScopes, AppConfig &appConfig);
+  ~MainWindow() override;
+
+  CoreMode coreMode() const
+  {
+    return m_coreProcess.mode();
+  }
+  QString address() const;
+  void open();
+  ServerConfig &serverConfig()
+  {
+    return m_serverConfig;
+  }
+  void autoAddScreen(const QString name);
+
+  void hide();
+
+signals:
+  void shown();
+
+private:
+  void toggleLogVisible(bool visible);
+
+  void firstShown();
+
+  void configScopesSaving();
+  void appConfigTlsChanged();
+  void coreProcessStarting();
+  void coreProcessError(CoreProcess::Error error);
+  void coreConnectionStateChanged(CoreProcess::ConnectionState state);
+  void coreProcessStateChanged(CoreProcess::ProcessState state);
+  void versionCheckerUpdateFound(const QString &version);
+  void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
+  void serverConnectionConfigureClient(const QString &clientName);
+
+  void clearSettings();
+  void openAboutDialog();
+  void openHelpUrl() const;
+  void openGetNewVersionUrl() const;
+  void openSettings();
+  void startCore();
+  void stopCore();
+  bool saveConfig();
+  void testFatalError() const;
+  void testCriticalError() const;
+  void resetCore();
+
+  void showMyFingerprint();
+  void updateSecurityIcon(bool visible);
+
+  void coreModeToggled();
+  void updateModeControls(bool serverMode);
+
+  std::unique_ptr<Ui::MainWindow> ui;
+
+  void updateSize();
+  AppConfig &appConfig()
+  {
+    return m_appConfig;
+  }
+  AppConfig const &appConfig() const
+  {
+    return m_appConfig;
+  }
+  void createMenuBar();
+  void setupTrayIcon();
+  void applyConfig();
+  void setIcon();
+  bool checkForApp(int which, QString &app);
+  void setStatus(const QString &status);
+  void updateFromLogLine(const QString &line);
+  QString getIPAddresses() const;
+  void enableServer(bool enable);
+  void enableClient(bool enable);
+  void checkConnected(const QString &line);
+  void checkFingerprint(const QString &line);
+  QString getTimeStamp() const;
+  void showEvent(QShowEvent *) override;
+  void closeEvent(QCloseEvent *event) override;
+  void secureSocket(bool secureSocket);
+  void windowStateChanged();
+  void connectSlots();
+  void updateWindowTitle();
+  void handleLogLine(const QString &line);
+  void updateLocalFingerprint();
+  void updateScreenName();
+  void saveSettings();
+  QString configFilename();
+  void showConfigureServer(const QString &message);
+  void restoreWindow();
+  void setupControls();
+  void showFirstConnectedMessage();
+  void updateStatus();
+  void showAndActivate();
+  void showHostNameEditor();
+  void setHostName();
+
+  QString getTlsPath();
+
+  /**
+   * @brief localFingerprintDb
+   * @return The path to the local fingerprint file
+   */
+  QString localFingerprintDb();
+
+  /**
+   * @brief trustedFingerprintDb get the fingerprintDb for the trusted clients or trusted servers.
+   * @return The path to the trusted fingerprint file
+   */
+  QString trustedFingerprintDb();
+
+  // Generate prints if they are missing
+  // Returns true if successful
+  bool regenerateLocalFingerprints();
+
+  inline static const auto m_guiSocketName = QStringLiteral("deskflow-gui");
+  inline static const auto m_nameRegEx = QRegularExpression(QStringLiteral("^[\\w\\-_\\.]{0,255}$"));
+
+  VersionChecker m_versionChecker;
+  bool m_secureSocket = false;
+  deskflow::gui::config::ServerConfigDialogState m_serverConfigDialogState;
+  bool m_saveOnExit = true;
+  deskflow::gui::core::WaylandWarnings m_waylandWarnings;
+  deskflow::gui::ConfigScopes &m_configScopes;
+  AppConfig &m_appConfig;
+  ServerConfig m_serverConfig;
+  deskflow::gui::CoreProcess m_coreProcess;
+  deskflow::gui::ServerConnection m_serverConnection;
+  deskflow::gui::ClientConnection m_clientConnection;
+  deskflow::gui::TlsUtility m_tlsUtility;
+  QSize m_expandedSize = QSize();
+  QStringList m_checkedClients;
+  QStringList m_checkedServers;
+  QSystemTrayIcon *m_trayIcon = nullptr;
+  QLocalServer *m_guiDupeChecker = nullptr;
+  deskflow::gui::ipc::DaemonIpcClient *m_daemonIpcClient = nullptr;
+
+  QLabel *m_lblSecurityStatus = nullptr;
+  QLabel *m_lblStatus = nullptr;
+  QToolButton *m_btnFingerprint = nullptr;
+  QPushButton *m_btnUpdate = nullptr;
+
+  // Window Actions
+  QAction *m_actionAbout = nullptr;
+  QAction *m_actionClearSettings = nullptr;
+  QAction *m_actionReportBug = nullptr;
+  QAction *m_actionMinimize = nullptr;
+  QAction *m_actionQuit = nullptr;
+  QAction *m_actionTrayQuit = nullptr;
+  QAction *m_actionRestore = nullptr;
+  QAction *m_actionSave = nullptr;
+  QAction *m_actionSettings = nullptr;
+  QAction *m_actionStartCore = nullptr;
+  QAction *m_actionStopCore = nullptr;
+  QAction *m_actionTestCriticalError = nullptr;
+  QAction *m_actionTestFatalError = nullptr;
+};