fix: adjust command line size to allow expanding

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

.github/CODEOWNERS

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

.github/CODE_OF_CONDUCT.md

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

.github/CONTRIBUTING.md

@@ -0,0 +1,13 @@
+# Contributing to Deskflow
+
+Thanks for your interest in contributing to Deskflow! We welcome all kinds of contributions — bug reports, feature suggestions, documentation improvements, and code.
+
+## Read the Full Guidelines
+
+To keep this repository clean and contribution-friendly, we've outlined our full contributing guidelines on the Deskflow Wiki:
+
+👉 [How to Contribute to Deskflow](https://github.com/deskflow/deskflow/wiki/Contributing)
+
+Please take a moment to read through the page before opening an issue or submitting a pull request.
+
+Thanks again for helping make Deskflow better!

.github/ISSUE_TEMPLATE/bug_report.yml

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,6 +1,6 @@
 name: Feature request
 description: Had an idea how to improve Deskflow? Share it with us.
-labels: ["enhancement", "triage", "unanswered"]
+type: "Triage [feature]"
 body:
   - type: markdown
     attributes:
@@ -14,3 +14,14 @@ body:
         Please describe the feature you have in mind.
     validations:
       required: true
+
+  - type: textarea
+    id: votes
+    attributes:
+      label: Voting Instructions
+      description: Do not modify these instructions
+      value: |
+        React with :+1: or :-1: to vote on this request
+    validations:
+      required: true
+

.github/README.md

@@ -1,14 +1,8 @@
-![Deskflow](https://github.com/user-attachments/assets/f005b958-24df-4f4a-9bfd-4f834dae59d6)
-
-> [!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.
-> Learn more: [Relationship with Synergy](https://github.com/deskflow/deskflow/wiki/Relationship-with-Synergy)
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="https://github.com/deskflow/deskflow-artwork/blob/main/logo/deskflow-logo-dark-200px.png?raw=true">
+  <source media="(prefers-color-scheme: light)" srcset="https://github.com/deskflow/deskflow-artwork/blob/main/logo/deskflow-logo-light-200px.png?raw=true">
+  <img alt="Deskflow" src="https://github.com/user-attachments/assets/f005b958-24df-4f4a-9bfd-4f834dae59d6">
+</picture>
 
 **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,
@@ -16,12 +10,30 @@ 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.
 
+> [!TIP]
+>
+> **Chat with us**
+>
+> - Main discussion on Matrix: [`#deskflow:matrix.org`](https://matrix.to/#/#deskflow:matrix.org) ([Matrix clients](https://matrix.org/ecosystem/clients/))
+> - Discussion also happens on IRC: `#deskflow` or `#deskflow-dev` on [Libera Chat](https://libera.chat/)
+> - Start a [new discussion](https://github.com/deskflow/deskflow/discussions) on our GitHub project.
+
+## Download
+
 [![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)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![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)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![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.
+> [!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/vc14/vc_redist.x64.exe) [`vc_redist.arm64.exe`](https://aka.ms/vc14/vc_redist.arm64.exe)
 
 > [!TIP]
 > For macOS users, the easiest way to install and stay up to date is to use [Homebrew](https://brew.sh) with our [homebrew-tap](https://github.com/deskflow/homebrew-tap).
+> macOS reports unsigned apps as damaged. This occurs because we do not use an Apple certificate for notarization. Clear the quarantine attribute to run the app: `xattr -c Deskflow.app`
+
+To use Deskflow, download one of our [packages](https://github.com/deskflow/deskflow/releases), install `deskflow` (from your package repository), or [build it](https://github.com/deskflow/deskflow/wiki/Building) from source.
+
+## Stats
 
 [![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/)
@@ -36,27 +48,16 @@ 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)
-- Privacy by default (e.g. update check is off by default)
-- Leading edge releases (we don't focus on supporting older systems)
-- Decisions are discussed and documented publicly with majority rule
-- Have fun; we don't need to worry about impressing anyone
+## Contribute
 
-## Ways to get involved
+[![Good first issues](https://img.shields.io/github/issues/deskflow/deskflow/good%20first%20issue?label=good%20first%20issues&color=%2344cc11)](https://github.com/deskflow/deskflow/labels/good%20first%20issue)
 
-> [!TIP]
-> Join us! Real-time discussion on Matrix: [`#deskflow:matrix.org`](https://matrix.to/#/#deskflow:matrix.org)
->
-> Alternatively, we have [other ways](https://github.com/deskflow/deskflow/wiki/Chat-with-us) to communicate.
-> 
-Here are a few ways to join in with the project and get involved:
-* Build the latest `master` version (see below) and [report a bug](https://github.com/deskflow/deskflow/issues)
-* [Submit a PR](https://github.com/deskflow/deskflow/wiki/Contributing) (pull request) with a bug fix or improvement
-* [Let us know](https://github.com/deskflow/deskflow/issues) if you have an idea for an improvement
+There are many ways to contribute to the Deskflow project.
 
-## Build Quick Start
+We're a friendly, active, and welcoming community focused on building a great app.
+
+Read our [Contributing](https://github.com/deskflow/deskflow/wiki/Contributing) page to get started.
 
 For instructions on building Deskflow, use the wiki page: [Building](https://github.com/deskflow/deskflow/wiki/Building)
 
@@ -64,14 +65,9 @@ For instructions on building Deskflow, use the wiki page: [Building](https://git
 
 We support all major operating systems, including Windows, macOS, Linux, and Unix-like BSD-derived.
 
-> [!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 v1809 or higher is required.
 
-Windows 10 or higher is required. 
-
-macOS 12 or higher is required.
+macOS 13 or higher is required to use our CI builds for Apple Silicon machines. macOS 12 or higher is required for Intel macs or local builds.
 
 Linux requires libei 1.3+ and libportal 0.8+ for the server/client. Additionally, Qt 6.7+ is required for the GUI.
 Linux users with systems not meeting these requirements should use flatpak in place of a native package.
@@ -85,8 +81,6 @@ versions across them and gathering other information.
 
 [![Repology](https://repology.org/badge/vertical-allrepos/deskflow.svg?exclude_unsupported=1)](https://repology.org/project/deskflow/versions)
 
-**Note:** We are working with package maintainers to have our new package name adopted.
-
 ## Installing on macOS
 
 When you install Deskflow on macOS, you need to allow accessibility access (Privacy & Security) to both the `Deskflow` app and the `deskflow` process.
@@ -99,49 +93,41 @@ on the allowed list you will need to manually remove them before accessibility a
 
 macOS users who download directly from releases may need to run `xattr -c /Applications/Deskflow.app` after copying the app to the `Applications` dir.
 
-It is recommend to install Deskflow using [Homebrew](https://brew.sh) from our [homebrew-tap](https://github.com/deskflow/homebrew-tap)
+It is recommended to install Deskflow using [Homebrew](https://brew.sh) from our [homebrew-tap](https://github.com/deskflow/homebrew-tap)
 
 To add our tap, run:
+
 ```
-brew tap deskflow/homebrew-tap
+brew tap deskflow/tap
 ```
+
 Then install either:
+
 - Stable: `brew install deskflow`
 - Continuous: `brew install deskflow-dev`
 
-
-
-## Collaborative Projects
+## Similar Projects
 
 In the open source developer community, similar projects collaborate for the improvement of all
 mouse and keyboard sharing tools. We aim for idea sharing and interoperability.
 
-* [**Lan Mouse**](https://github.com/feschber/lan-mouse) -
+- [**Lan Mouse**](https://github.com/feschber/lan-mouse) -
   Rust implementation with the goal of having native front-ends and interoperability with
   Deskflow/Synergy.
-* [**Input Leap**](https://github.com/input-leap/input-leap) -
-  Deskflow/Synergy-derivative with the goal of continuing what Barrier started, after Barrier
-  became a dead fork.
-* [**Synergy**](https://github.com/deskflow/deskflow/wiki/Relationship-with-Synergy) -
-  Downstream commercial fork and Deskflow sponsor, geared toward adapting to customer
-  needs, offering business and enterprise licensing.
+- [**Synergy**](https://symless.com/synergy) -
+  Downstream commercial fork. Synergy sponsors Deskflow with financial support and contributes code ([learn more](https://github.com/deskflow/deskflow/wiki/Relationship-with-Synergy)).
+- [**Input Leap**](https://github.com/input-leap/input-leap) -
+  Inactive Deskflow/Synergy-derivative with the goal continuing Barrier development (now a dead fork).
 
 ## FAQ
 
-### What is the relationship with Synergy?
-
-[![Sponsored by: Synergy](https://raw.githubusercontent.com/deskflow/deskflow-artwork/b2c72a3e60a42dee793bd47efc275b5ee0bdaa5f/misc/synergy-sponsor.svg)](https://github.com/deskflow/deskflow/wiki/Relationship-with-Synergy)
-
-Synergy sponsors the Deskflow project by contributing code and providing financial support while maintaining its customer-oriented code downstream.
-
-Learn more: [Relationship with Synergy](https://github.com/deskflow/deskflow/wiki/Relationship-with-Synergy)
-
 ### Is Deskflow compatible with Synergy, Input Leap, or Barrier?
 
 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 1 server will also *just work*.
+- Deskflow will _just work_ with Input Leap and Barrier (server or client).
+- 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).
@@ -184,9 +170,12 @@ wiki.
 
 ![Meow'Dib](https://github.com/user-attachments/assets/726f695c-3dfb-4abd-875d-ed658f6c610f)
 
-
 ## Deskflow Contributors
 
+[![Sponsored by Synergy](https://raw.githubusercontent.com/deskflow/deskflow-artwork/b2c72a3e60a42dee793bd47efc275b5ee0bdaa5f/misc/synergy-sponsor.svg)](https://symless.com/synergy)
+
+[Synergy](https://symless.com/synergy) sponsors the Deskflow project by contributing code and providing financial support ([learn more](https://github.com/deskflow/deskflow/wiki/Relationship-with-Synergy)).
+
 Deskflow is made by possible by these contributors.
 
  <a href = "https://github.com/deskflow/deskflow/graphs/contributors">
@@ -195,4 +184,4 @@ Deskflow is made by possible by these contributors.
 
 ## License
 
-This project is licensed under [GPL-2.0](LICENSE) with an [OpenSSL exception](LICENSES/LicenseRef-OpenSSL-Exception.txt).
+This project is licensed under [GPL-2.0](LICENSE) with an [OpenSSL exception](../LICENSES/LicenseRef-OpenSSL-Exception.txt).

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

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

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

@@ -13,8 +13,8 @@ inputs:
     description: "The version of Qt to install (Windows & macOS)"
     required: false
 
-  qt-install-dir:
-    description: "The path to install Qt into (Windows & macOS)"
+  vcpkg-triplet:
+    description: "vcpkg triplet to use (Windows)"
     required: false
 
 outputs:
@@ -27,11 +27,10 @@ runs:
 
   steps:
     - name: Install Depends
+      if: ${{ runner.os != 'Windows' }}
       run: |
-          if [ "$RUNNER_OS" == "Windows" ]; then
-            echo "Window not supported yet"
-          elif [ "$RUNNER_OS" == "macOS" ]; then
-            brew install cmake googletest ninja openssl --quiet
+          if [ "$RUNNER_OS" == "macOS" ]; then
+            brew install googletest openssl doxygen --quiet
           elif [ "$RUNNER_OS" == "Linux" ]; then
             if [ ${{inputs.like}} == "debian" ]; then
               apt update -qqq > /dev/null
@@ -39,25 +38,22 @@ runs:
                 xorg-dev libx11-dev libxtst-dev libssl-dev \
                 libglib2.0-dev libxkbfile-dev qt6-base-dev qt6-tools-dev \
                 libgtk-3-dev libgtest-dev libgmock-dev \
-                libei-dev libportal-dev libtomlplusplus-dev libcli11-dev -y >/dev/null
+                libei-dev libportal-dev help2man doxygen -y >/dev/null
             elif [ ${{inputs.like}} == "fedora" ]; then
-              dnf install -y cmake make ninja-build gcc-c++ \
-                rpm-build openssl-devel glib2-devel \
-                libXtst-devel libxkbfile-devel qt6-qtbase-devel qt6-qttools-devel \
-                gtk3-devel gtest-devel gmock-devel \
-                libei-devel libportal-devel tomlplusplus-devel \
-                cli11-devel
+              dnf install -y cmake make ninja-build gcc-c++ rpm-build openssl-devel \
+                glib2-devel libXtst-devel libxkbfile-devel qt6-qtbase-devel qt6-qttools-devel \
+                gtk3-devel gtest-devel gmock-devel libei-devel libportal-devel help2man doxygen
             elif [ ${{inputs.like}} == "suse" ]; then
               zypper refresh
               zypper install -y --force-resolution \
                 cmake make ninja gcc-c++ rpm-build libopenssl-devel \
-                glib2-devel libXtst-devel libxkbfile-devel qt6-base-devel qt6-tools-devel gtk3-devel \
-                googletest-devel googlemock-devel libei-devel \
-                libportal-devel tomlplusplus-devel cli11-devel
+                glib2-devel libXtst-devel libxkbfile-devel qt6-base-devel qt6-tools-devel \
+                qt6-linguist-devel gtk3-devel doxygen \
+                googletest-devel googlemock-devel libei-devel libportal-devel help2man
             elif [ ${{ inputs.like }} == "arch" ]; then
               pacman -Syu --noconfirm base-devel cmake ninja \
                 gcc openssl glib2 libxtst libxkbfile gtest libei libportal \
-                qt6-base qt6-tools gtk3 tomlplusplus cli11
+                qt6-base qt6-tools qt6-svg qt6-translations qt6-declarative gtk3 help2man doxygen graphviz rsync
             else
               echo "Unknown like"
             fi
@@ -69,29 +65,39 @@ runs:
     - name: Install Qt
       if: ${{runner.os != 'Linux' }}
       uses: jurplel/install-qt-action@v4
+      env:
+        AQT_CONFIG: ${{ github.workspace }}/.github/actions/install-dependencies/aqt.ini
       with:
-        dir: ${{inputs.qt-install-dir}}
         version: ${{inputs.qt-version}}
         cache: true
         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
-    # downloads directly from the `ninja-build` GitHub project releases.
-    - name: Install Ninja
-      if: ${{ runner.os == 'Windows' }}
-      uses: seanmiddleditch/gha-setup-ninja@master
-
     - name: Build and cache vcpkg
       if: ${{ runner.os == 'Windows' }}
       id: vcpkg
-      uses: johnwason/vcpkg-action@v6
+      uses: johnwason/vcpkg-action@v7
       with:
         pkgs: gtest openssl
-        extra-args: --classic
-        triplet: x64-windows-release
+        extra-args: --classic --host-triplet=${{inputs.vcpkg-triplet}}
+        triplet: ${{inputs.vcpkg-triplet}}
         token: ${{ github.token }}
-        github-binarycache: true
+        revision: master
+
+    - name: Cache Chocolatey
+      id: cache-choco
+      if: (runner.os == 'Windows')
+      uses: actions/cache@v4
+      with:
+        path: |
+            C:/ProgramData/chocolatey/bin/
+            C:/ProgramData/chocolatey/lib/doxygen.install
+            C:/Program*/doxygen/
+        key: cache-chocolatey${{ matrix.config.arch }}-doxygen
+
+    - name: Install doxygen (windows)
+      if: ((runner.os == 'Windows') && (steps.cache-choco.outputs.cache-hit != 'true'))
+      shell: bash
+      run: choco install doxygen.install
 
     - name: Install Wix
       if: ${{ runner.os == 'Windows' }}
@@ -101,3 +107,4 @@ runs:
         wix extension add --global WixToolset.Util.wixext/5.0.2
         wix extension add --global WixToolset.Firewall.wixext/5.0.2
       shell: pwsh
+

.github/actions/install-dependencies/aqt.ini

@@ -0,0 +1,14 @@
+[aqt]
+# Using this mirror instead of download.qt.io because of timeouts in CI
+baseurl: https://qt.mirror.constant.com
+
+[requests]
+hash_algorithm: sha1
+
+[mirrors]
+trusted_mirrors:
+    https://qt.mirror.constant.com
+fallbacks:
+    https://qt.mirror.constant.com
+    https://mirrors.ocf.berkeley.edu
+    https://download.qt.io

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

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

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

@@ -15,12 +15,12 @@ runs:
   using: "composite"
 
   steps:
-    - name: Unit tests
-      id: unittests
+    - name: Unit Tests
+      id: unit-tests
       env:
         QT_QPA_PLATFORM: offscreen
       run: |
-        ./${{ inputs.bin-dir }}/unittests
+        ctest --test-dir  "build/src/unittests" --output-on-failure
         result=$?
 
         if [ $result -ne 0 ]; then
@@ -29,16 +29,16 @@ runs:
       shell: bash
       continue-on-error: true
 
-    - name: Integration tests
-      id: integtests
+    - name: Legacy Tests
+      id: legacy-tests
       env:
         QT_QPA_PLATFORM: offscreen
       run: |
-        ./${{ inputs.bin-dir }}/integtests
+        ./${{ inputs.bin-dir }}/legacytests
         result=$?
 
         if [ $result -ne 0 ]; then
-          echo "Integration tests failed with code: $result" >> $GITHUB_STEP_SUMMARY
+          echo "Legacy tests failed with code: $result" >> $GITHUB_STEP_SUMMARY
         fi
       shell: bash
       continue-on-error: true
@@ -48,12 +48,12 @@ runs:
       run: |
         pass="✅ Pass"
         fail="❌ Fail"
-        unittests_outcome="${{ steps.unittests.outcome }}"
-        integtests_outcome="${{ steps.integtests.outcome }}"
-        unittests=$( [ "$unittests_outcome" = "success" ] && echo $pass || echo $fail )
-        integtests=$( [ "$integtests_outcome" = "success" ] && echo $pass || echo $fail )
-        echo "unittests=$unittests" >> $GITHUB_OUTPUT
-        echo "integtests=$integtests" >> $GITHUB_OUTPUT
+        unit_tests_outcome="${{ steps.unit-tests.outcome }}"
+        legacy_tests_outcome="${{ steps.legacy-tests.outcome }}"
+        unit_tests=$( [ "$unit_tests_outcome" = "success" ] && echo $pass || echo $fail )
+        legacy_tests=$( [ "$legacy_tests_outcome" = "success" ] && echo $pass || echo $fail )
+        echo "unit-tests=$unit_tests" >> $GITHUB_OUTPUT
+        echo "legacy-tests=$legacy_tests" >> $GITHUB_OUTPUT
       shell: bash
 
     - name: Summary row
@@ -63,8 +63,8 @@ runs:
 
         row=""
         row+="| ${{ inputs.job }} "
-        row+="| ${{ steps.results.outputs.unittests }} "
-        row+="| ${{ steps.results.outputs.integtests }} |"
+        row+="| ${{ steps.results.outputs.unit-tests }} "
+        row+="| ${{ steps.results.outputs.legacy-tests }} "
         echo "$row" > $file
 
         echo "file=$file" > $GITHUB_OUTPUT
@@ -77,8 +77,8 @@ runs:
         path: ${{ steps.row.outputs.file }}
 
     - name: Check test outcome
-      if: steps.unittests.outcome == 'failure'
+      if: (steps.unit-tests.outcome != 'success' || steps.legacy-tests.outcome != 'success')
       run: |
-        echo "Unit tests failed"
+        echo "Tests failed"
         exit 1
       shell: bash

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

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

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

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

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

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

.github/pull_request_template.md

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

.github/workflows/ci-comment.yml

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

.github/workflows/codeql-analysis.yml

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

.github/workflows/continuous-integration.yml

@@ -8,63 +8,34 @@ on:
   push:
     branches: [master]
     tags:
-      - 'v*'
+      - "v*"
   pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
-    paths-ignore:
-      - '**/*.md'
-      - '.github/ISSUE_TEMPLATE/**'
-      - '.editorconfig'
-      - '.env-example'
-      - '.gitignore'
-      - '.gitattributes'
-      - 'cspell.json'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   GIT_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
   PACKAGE_PREFIX: "deskflow"
   PACKAGE_PATH: ./dist
-  CMAKE_CONFIGURE: "cmake -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_COMPILE_WARNING_AS_ERROR=ON"
+  CMAKE_CONFIGURE: "cmake -Bbuild -DCMAKE_BUILD_TYPE=Release -DSKIP_BUILD_TESTS=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON"
 
 jobs:
-  # Always run this job, even if not on PR, since other jobs need it.
-  pr-comment-flags:
-    runs-on: ubuntu-latest
-    needs: lint-check
-
-    outputs:
-      no-sonar: ${{ steps.check.outputs.no-sonar }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Check PR comment for flags
-        if: ${{ github.event_name == 'pull_request' }}
-        id: check
-        env:
-          PR_BODY: ${{ github.event.pull_request.body }}
-        run: |
-          no_sonar="{no-sonar}"
-
-          if echo $PR_BODY | grep -q "$no_sonar"; then
-            echo "Flag $no_sonar found in PR body."
-            echo "no-sonar=true" >> $GITHUB_OUTPUT
-          else
-            echo "No $no_sonar flag found in PR body."
-          fi
-
   # Quality gate to allow PR merge, used in the branch protection rules.
   ci-passed:
     runs-on: ubuntu-latest
-    needs: [test-results, unix, flatpak]
+    needs: [main-build, test-results, unix, flatpak]
+    if: always()
 
     steps:
-      - run: echo "✅ CI passed" > $GITHUB_STEP_SUMMARY
+      - name: Check all steps passed
+        run: |
+          if [[ ${{needs.main-build.result}} == 'success' && ${{needs.test-results.result}} == 'success' && ${{needs.unix.result}} == 'success' && ${{needs.flatpak.result}} == 'success' ]]; then
+            echo "✅ CI passed" > $GITHUB_STEP_SUMMARY
+          else
+            exit 1
+          fi
 
   # Summary of test results, combined from test result artifacts.
   # Runs even if the tests fail to provide a summary of the failures.
@@ -72,52 +43,45 @@ jobs:
     needs: main-build
     if: always() && needs.main-build.result != 'skipped'
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     timeout-minutes: 5
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Test summary
         uses: ./.github/actions/test-summary
 
-  reuse-lint:
+  lint-reuse:
     runs-on: ubuntu-latest
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: REUSE Compliance Check
-        uses: fsfe/reuse-action@v4
+        uses: fsfe/reuse-action@v5
 
-  lint-check:
-    needs: [reuse-lint]
-    runs-on: ubuntu-latest
+  lint-clang:
+    needs: [lint-reuse]
+    runs-on: ubuntu-slim
     timeout-minutes: 5
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Lint Checker
-        uses: ./.github/actions/lint-check
+        uses: ./.github/actions/lint-clang
 
-  analyse-valgrind:
-    needs: lint-check
+  analyze-valgrind:
+    needs: lint-clang
     if: ${{ github.event_name == 'pull_request' }}
     uses: ./.github/workflows/valgrind-analysis.yml
 
-  analyse-sonarcloud:
-    needs: pr-comment-flags
-    if: ${{ needs.pr-comment-flags.outputs.no-sonar != 'true' }}
-    uses: ./.github/workflows/sonarcloud-analysis.yml
-    secrets:
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-
   main-build:
-    needs: lint-check
+    needs: lint-clang
     name: ${{ matrix.target.name }}
     runs-on: ${{ matrix.target.runs-on }}
     container: ${{ matrix.target.container }}
@@ -133,64 +97,87 @@ jobs:
             runs-on: "windows-2022"
             timeout: 30
             config-args: "-G Ninja"
-            qt-install-dir: "C:"
+            vcpkg-triplet: x64-windows-release
+            arch: "amd64"
+            qt-version: 6.10.2
 
-          - name: "macos-14-arm64"
-            runs-on: "macos-14"
+          - name: "windows-2022-arm64"
+            runs-on: "windows-11-arm"
+            timeout: 30
+            config-args: "-G Ninja"
+            vcpkg-triplet: arm64-windows
+            arch: "arm64"
+            qt-version: 6.10.2
+
+          - name: "macos-arm64"
+            runs-on: macos-15
             timeout: 10
-            arch: arm64
-            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"arm64\""
-            qt-install-dir: "/Users/runner"
+            qt-version: 6.10.2
+            config-args: '-DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET=14 -DCMAKE_OSX_SYSROOT=/Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'
 
-          - name: "macos-13-x64"
-            runs-on: macos-13
+          - name: "macos-x64"
+            runs-on: macos-15-intel
             timeout: 20
-            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"x86_64\""
-            qt-install-dir: "/Users/runner"
+            qt-version: 6.9.3
+            config-args: '-DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET=12 -DCMAKE_OSX_SYSROOT=/Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'
 
-          - name: "debian-13-x86_64"
+          - name: "debian-x86_64"
             runs-on: ubuntu-latest
-            container: debian:trixie-slim
+            container: debian:stable-slim
             like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "debian-13-arm64"
+          - name: "debian-arm64"
             runs-on: ubuntu-24.04-arm
-            container: debian:trixie-slim
+            container: debian:stable-slim
             like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "fedora-41-x86_64"
+          - name: "debian-testing-x86_64"
             runs-on: ubuntu-latest
-            container: fedora:41
-            like: "fedora"
+            container: debian:testing-slim
+            like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "fedora-41-arm64"
+          - name: "debian-testing-arm64"
             runs-on: ubuntu-24.04-arm
-            container: fedora:41
-            like: "fedora"
+            container: debian:testing-slim
+            like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "fedora-40-x86_84"
+          - name: "fedora-42-x86_64"
             runs-on: ubuntu-latest
-            container: fedora:40
+            container: fedora:42
             like: "fedora"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "fedora-40-arm64"
+          - name: "fedora-42-arm64"
             runs-on: ubuntu-24.04-arm
-            container: fedora:40
+            container: fedora:42
             like: "fedora"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "opensuse-x86_84"
+          - name: "fedora-43-x86_64"
+            runs-on: ubuntu-latest
+            container: fedora:43
+            like: "fedora"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "fedora-43-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: fedora:43
+            like: "fedora"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "opensuse-x86_64"
             runs-on: ubuntu-latest
             container: opensuse/tumbleweed:latest
             like: "suse"
@@ -204,23 +191,37 @@ jobs:
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "archlinux-x86_84"
+          - name: "archlinux-x86_64"
             runs-on: ubuntu-latest
             container: archlinux:latest
             like: "arch"
             timeout: 20
-            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DEV_DOCS=ON"
 
-          - name: "ubuntu-25.04-x86_64"
+          - name: "ubuntu-25.10-x86_64"
             runs-on: ubuntu-latest
-            container: ubuntu:25.04
+            container: ubuntu:25.10
             like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "ubuntu-25.04-arm64"
+          - name: "ubuntu-25.10-arm64"
             runs-on: ubuntu-24.04-arm
-            container: ubuntu:25.04
+            container: ubuntu:25.10
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "ubuntu-26.04-x86_64"
+            runs-on: ubuntu-latest
+            container: ubuntu:26.04
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "ubuntu-26.04-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: ubuntu:26.04
             like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
@@ -246,25 +247,32 @@ jobs:
       # Fancy checkout gets all the tags
       # it also makes sure we can use git --describe correctly
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       # This effectively runs `vcvarsall.bat`, etc. It's not actually installing
       # VC++ as that's already pre-installed on the Windows runner.
       - name: Setup VC++ environment
         if: ${{ runner.os == 'Windows' }}
         uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{matrix.target.arch}}
 
       - name: Install dependencies
         id: get-deps
         uses: ./.github/actions/install-dependencies
         with:
-          qt-version: 6.8.2
-          qt-install-dir: ${{matrix.target.qt-install-dir}}
+          qt-version: ${{matrix.target.qt-version}}
+          vcpkg-triplet: ${{matrix.target.vcpkg-triplet}}
           like: ${{ matrix.target.like }}
 
       - name: Get version
         uses: ./.github/actions/get-version
 
+      - name: Update Windows Paths
+        if: (runner.os == 'Windows')
+        shell: pwsh
+        run: echo "C:\Program Files\doxygen\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
       - name: Configure
         run: ${{env.CMAKE_CONFIGURE}} ${{ matrix.target.config-args }} ${{ steps.get-deps.outputs.vcpkg-cmake-config }} -DPACKAGE_VERSION_LABEL="${{env.DESKFLOW_PACKAGE_VERSION}}"
 
@@ -272,7 +280,21 @@ jobs:
         shell: bash
         run: |
           if [[ "${{matrix.target.like}}" != "arch" ]]; then
+            if [ "$RUNNER_OS" != "macOS" ]; then
               cmake --build build --config Release -j8 --target package
+            else
+              cmake --build build --config Release -j8
+              for i in $(seq 1 5); do
+                cmake --build build --config Release -j8 --target package 2>&1
+                if [ $? -eq 0 ]; then
+                  echo "Package successful"
+                  break
+                else
+                  echo "Package attempt $i failed"
+                  sleep 1
+                fi
+              done
+            fi
           else
             cmake --build build --config Release -j8
             useradd -m build
@@ -285,12 +307,32 @@ jobs:
             cd ..
           fi
 
+      - name: Check for unexpected repo changes
+        shell: bash
+        run: |
+          if [[ `git status --porcelain` ]]; then
+            echo "Unexpected changes to the repo, Often caused by forgetting to commit the updated translation files"
+            exit 1
+          fi
+
       - name: Tests
         uses: ./.github/actions/run-tests
         timeout-minutes: 2
         with:
           job: ${{ matrix.target.name }}
 
+      - name: Test package
+        uses: ./.github/actions/test-package
+        with:
+          like: ${{ matrix.target.like }}
+
+      - name: Update Development Documentation
+        if: matrix.target.like == 'arch' && github.ref == 'refs/heads/master'
+        uses: JamesIves/github-pages-deploy-action@v4.7.3
+        with:
+          branch: gh-pages
+          folder: build/docs/dev/html
+
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
@@ -299,7 +341,7 @@ jobs:
 
   # Technically, "unix" is a misnomer, but we use it here to mean "Unix-like BSD-derived".
   unix:
-    needs: lint-check
+    needs: lint-clang
     name: unix-${{ matrix.distro.name }}
     runs-on: ${{ vars.CI_UNIX_RUNNER || 'ubuntu-24.04' }}
     timeout-minutes: 20
@@ -315,29 +357,28 @@ jobs:
       # Fancy checkout gets all the tags
       # it also makes sure we can use git --describe correctly
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
-
+        uses: sithlord48/fancy-checkout@v2
       - name: Build on FreeBSD
         if: ${{ matrix.distro.name == 'freebsd' }}
         uses: vmactions/freebsd-vm@v1
         with:
           usesh: true
           run: |
-            ./scripts/install_deps.sh
+            pkg install -y cmake ninja gmake gcc12 openssl glib \
+            libX11 libXtst libxkbfile qt6-base qt6-tools gtk3 \
+            googletest pkgconf libei libportal doxygen
             ${{env.CMAKE_CONFIGURE}} -G Ninja
             cmake --build build -j16
-            
             # Integration tests are flakey by nature, make them optional.
             export QT_QPA_PLATFORM=offscreen
-            ./build/bin/unittests
-            ./build/bin/integtests || true
+            ./build/bin/unittests || true
   flatpak:
-    needs: lint-check
+    needs: lint-clang
     name: flatpak-${{matrix.flatpak.arch}}
     runs-on: ${{matrix.flatpak.runs-on}}
     timeout-minutes: 60
     container:
-      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.10
       options: --privileged
     strategy:
       fail-fast: false
@@ -349,7 +390,7 @@ jobs:
             arch: aarch64
     steps:
       - name: Check out repository
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       - run: git config --global protocol.file.allow always
 
@@ -363,7 +404,7 @@ jobs:
         run: flatpak-builder-lint manifest deploy/linux/flatpak/org.deskflow.deskflow.yml
 
       - name: Build
-        uses: flathub-infra/flatpak-github-actions/flatpak-builder@53987ffa5f687586936d85fdce3f440848bea04d
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
           bundle: deskflow-${{env.DESKFLOW_PACKAGE_VERSION}}-linux-${{matrix.flatpak.arch}}.flatpak
           manifest-path: deploy/linux/flatpak/org.deskflow.deskflow.yml
@@ -387,7 +428,7 @@ jobs:
 
     steps:
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       - name: Get version
         uses: ./.github/actions/get-version
@@ -411,7 +452,7 @@ jobs:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           automatic_release_tag: "continuous"
           prerelease: true
-          title: 'Continuous Build'
+          title: "Continuous v${{env.DESKFLOW_VERSION}}"
           files: |
             deskflow-*
             sums.txt
@@ -426,19 +467,12 @@ jobs:
             deskflow-*
             sums.txt
 
-  winget-publish:
-    needs: release
-    if: contains(github.ref, 'tags/v')
-    runs-on: windows-latest
-    steps:
-      - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
-
-      - name: Get version
-        uses: ./.github/actions/get-version
-
-      - name: Submit
-        uses: ./.github/actions/winget-publish
-        with:
-          release-version: ${{env.DESKFLOW_PACKAGE_VERSION}}
-          token: ${{ secrets.WINGET_DEPLOY_TOKEN }}
+      - name: Update Homebrewtap
+        shell: bash
+        run: |
+          curl -L -X POST \
+          -H "Accept: application/vnd.github+json" \
+          -H "Authorization: Bearer ${{ secrets.DF_TAP_TOKEN }}" \
+          -H "X-GitHub-Api-Version: 2022-11-28" \
+          https://api.github.com/repos/deskflow/homebrew-tap/dispatches \
+          -d '{"event_type":"update_tap"}'

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

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

.github/workflows/sonarcloud-analysis.yml

@@ -1,14 +1,36 @@
 name: "SonarCloud Analysis"
 
+# This is best run as a standalone workflow, not as part of another workflow like CI
+# because of how GitHub understands the code scanning workflows in it's UI.
 on:
   workflow_dispatch:
-  workflow_call:
-    secrets:
-      SONAR_TOKEN:
-        required: true
+  pull_request:
+    paths:
+      - '.github/workflows/sonarcloud-analysis.yml'
+      - 'sonar-project.properties'
+      - 'cmake/Libraries.cmake'
+      - 'CMakeLists.txt'
+      - 'src/**'
+      - '!src/res/**'
+      - '!src/unittests/**'
+  push:
+    branches: [master]
+    paths:
+      - '.github/workflows/codeql-analysis.yml'
+      - 'cmake/Libraries.cmake'
+      - 'CMakeLists.txt'
+      - 'src/**'
+      - '!src/res/**'
+      - '!src/unittests/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  sonarcloud-analysis:
+  sonar:
+    # This job would fail for contributors who open PRs as the workflow runs outside of our repo
+    # in this scenario. Having a var that only we set to true prevents this job from running.
     if: ${{ vars.SONAR_SCANNER_ENABLED }}
 
     runs-on: ubuntu-latest
@@ -16,10 +38,7 @@ jobs:
     timeout-minutes: 20
 
     env:
-      SONAR_SCANNER_VERSION: 6.1.0.4477
-      SONAR_SCANNER_OPTS: -server
-      SONAR_SCANNER_URL_BASE: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli
-      CPU_CORE_COUNT: ${{ vars.SONAR_SCANNER_CPU_COUNT || 4 }}
+      CPU_CORE_COUNT: 4
 
     steps:
       - name: Install container dependencies
@@ -28,15 +47,15 @@ jobs:
           apt install -qqq git curl unzip gcovr > /dev/null
 
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       - name: Install project dependencies
         uses: ./.github/actions/install-dependencies
         with:
           like: "debian"
 
-      - name: Install sonar-scanner and build-wrapper
-        uses: sonarsource/sonarcloud-github-c-cpp@v3
+      - name: Install Build Wrapper
+        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v6
 
       - name: Configure
         run: |
@@ -44,39 +63,38 @@ jobs:
             -G "Ninja" \
             -DCMAKE_BUILD_TYPE="Debug" \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+            -DSKIP_BUILD_TESTS=ON \
             -DENABLE_COVERAGE=ON
 
       - name: Build
         run: |
           build-wrapper-linux-x86-64 --out-dir bw-output cmake --build build -j${CPU_CORE_COUNT}
 
-      - name: Unit tests coverage
+      - name: Test coverage
+        shell: bash
         env:
           QT_QPA_PLATFORM: offscreen
-        run: cmake --build build --target coverage-unittests
-
-      - name: Integration tests coverage
-        env:
-          QT_QPA_PLATFORM: offscreen
-        run: cmake --build build --target coverage-integtests
+        run: |
+          tests=(`cmake --build build  --target help | grep -o "^coverage-[^:]*"`)
+          for i in "${tests[@]}"; do
+            cmake --build build --target "$i"
+          done
 
       - name: Get coverage report paths
         id: coverage-paths
         run: |
-          unittests=$(find build -name coverage-unittests.xml)
-          integtests=$(find build -name coverage-integtests.xml)
-          paths="${unittests}${integtests:+,$integtests}"
+          paths=$(ls -w 0 -m build/coverage-*.xml | sed 's/ //g')
           if [ -z "$paths" ]; then
             echo "Error: No coverage files found"
             exit 1
           fi
           echo "csv=$paths" >> $GITHUB_OUTPUT
 
-      - name: Run SonarScanner
-        run: |
-          export PATH=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux-x64/bin:$PATH
-          sonar-scanner \
-            -Dsonar.coverageReportPaths=${{ steps.coverage-paths.outputs.csv }} \
+      - name: SonarQube Scan
+        uses: SonarSource/sonarqube-scan-action@v6
+        with:
+          args: >
+            -Dsonar.coverageReportPaths=${{ steps.coverage-paths.outputs.csv }}
             -Dsonar.cfamily.threads=${{ env.CPU_CORE_COUNT }}
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/valgrind-analysis.yml

@@ -17,7 +17,7 @@ jobs:
           apt install -qqq git valgrind > /dev/null
 
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       - name: Install dependencies
         uses: ./.github/actions/install-dependencies
@@ -31,16 +31,10 @@ jobs:
         run: cmake --build build -j8
 
       - name: Valgrind unit tests
-        id: unittests
+        id: legacytests
         uses: ./.github/actions/run-valgrind
         with:
-          executable: ./build/bin/unittests
-
-      - name: Valgrind integration tests
-        id: integtests
-        uses: ./.github/actions/run-valgrind
-        with:
-          executable: ./build/bin/integtests
+          executable: ./build/bin/legacytests
 
       - name: Set job summary
         run: |
@@ -48,14 +42,9 @@ jobs:
           message=$(cat <<EOF
           ## Valgrind summary
 
-          ### Unit tests
+          ### legacytests Unit tests
           $backticks
-          ${{ steps.unittests.outputs.summary }}
-          $backticks
-
-          ### Integration tests
-          $backticks
-          ${{ steps.integtests.outputs.summary }}
+          ${{ steps.legacytests.outputs.summary }}
           $backticks
           EOF
           )

.gitignore

@@ -25,6 +25,12 @@ deskflow-config.toml
 /*.user
 *.ui.autosave
 
+#Qt creator 18 user files
+/.qtcreator
+
+# generated vcpkg file
+vcpkg.json
+
 #Generic linux files
 **/*.directory
 
@@ -39,3 +45,7 @@ CMakeFiles/*
 
 # scripts folder
 /scripts
+
+# Ai helperfilers
+**/[cC]laude.[mM][dD]
+**/CLAUDE.[mM][dD]

CMakeLists.txt

@@ -1,6 +1,6 @@
-# SPDX-FileCopyrightText: 2024 Deskflow Developers
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2024 - 2026 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
 cmake_minimum_required(VERSION 3.24)
@@ -11,6 +11,11 @@ cmake_policy(SET CMP0003 NEW)
 # Fix define escaping
 cmake_policy(SET CMP0005 NEW)
 
+# De-duplicate libraries on linker calls
+if(POLICY CMP0156)
+  cmake_policy(SET CMP0156 NEW)
+endif()
+
 # Set CXX Requirements
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -18,7 +23,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Fallback for when git can not be found
 set(DESKFLOW_VERSION_MAJOR 1)
-set(DESKFLOW_VERSION_MINOR 21)
+set(DESKFLOW_VERSION_MINOR 26)
 set(DESKFLOW_VERSION_PATCH 0)
 set(DESKFLOW_VERSION_TWEAK 0)
 
@@ -32,24 +37,14 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
       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(FIND "${GITREV}" "v" isRev)
+    if(NOT ${isRev} EQUAL -1)
       string(REGEX MATCH [0-9]+ MAJOR ${GITREV})
       string(REGEX MATCH \\.[0-9]+ MINOR ${GITREV})
       string(REPLACE "." "" MINOR "${MINOR}")
@@ -61,25 +56,37 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
       set(DESKFLOW_VERSION_MINOR ${MINOR})
       set(DESKFLOW_VERSION_PATCH ${PATCH})
       set(DESKFLOW_VERSION_TWEAK ${TWEAK})
-      elseif(NOT ${GITREV} STREQUAL "")
-        set(DESKFLOW_VERSION_TWEAK ${GITREV})
+    else()
+      set(DESKFLOW_VERSION_TWEAK "9999")
+    endif()
+    unset(GITREV)
   endif()
 endif()
+
+#generate vcpkg file if needed
+if(WIN32)
+    option (VCPKG_QT "Use Qt from VCPKG" OFF)
+    if(VCPKG_QT)
+        set(QT_LIBS ", \"qttranslations\", \"qtsvg\"")
     endif()
+    configure_file(cmake/vcpkg.json.in ${CMAKE_SOURCE_DIR}/vcpkg.json @ONLY)
 endif()
 
 #Define our project
 project(
   deskflow
   VERSION "${DESKFLOW_VERSION_MAJOR}.${DESKFLOW_VERSION_MINOR}.${DESKFLOW_VERSION_PATCH}.${DESKFLOW_VERSION_TWEAK}"
-  DESCRIPTION "Mouse and keyboard sharing utility"
-  LANGUAGES C CXX)
+  DESCRIPTION "Keyboard and mouse sharing utility"
+  HOMEPAGE_URL "https://deskflow.org"
+  LANGUAGES C CXX
+)
 
 # Define Additional "PROJECT" vars for packaging and metadata
 set(CMAKE_PROJECT_PROPER_NAME "Deskflow")
 set(CMAKE_PROJECT_VENDOR "${CMAKE_PROJECT_PROPER_NAME} Devs")
-set(CMAKE_PROJECT_COPYRIGHT "(C) 2024-2025 ${CMAKE_PROJECT_VENDOR}")
+set(CMAKE_PROJECT_COPYRIGHT "(C) 2024-2026 ${CMAKE_PROJECT_VENDOR}")
 set(CMAKE_PROJECT_CONTACT "${CMAKE_PROJECT_PROPER_NAME} <maintainers@deskflow.org>")
+set(CMAKE_PROJECT_REV_FQDN "org.deskflow.deskflow")
 
 #Unset the vars used in the project call
 unset(DESKFLOW_VERSION_MAJOR)
@@ -92,9 +99,25 @@ message(STATUS "Building ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
 # Set lib versions
 set(REQUIRED_OPENSSL_VERSION 3.0)
 set(REQUIRED_LIBEI_VERSION 1.3)
-set(REQUIRED_LIBPORTAL_VERSION 0.8)
+set(REQUIRED_LIBPORTAL_VERSION 0.9.1)
 set(REQUIRED_QT_VERSION 6.7.0)
 
+if (WIN32)
+  # VSCMD_ARG_TGT_ARCH is set on CI
+  if ("$ENV{VSCMD_ARG_TGT_ARCH}" STREQUAL "")
+    # NOT on CI
+    if (CMAKE_SYSTEM_PROCESSOR MATCHES "[Aa][Rr][Mm]64")
+      set(BUILD_ARCHITECTURE arm64)
+    else()
+      set(BUILD_ARCHITECTURE x64)
+    endif()
+  else()
+    set (BUILD_ARCHITECTURE $ENV{VSCMD_ARG_TGT_ARCH})
+  endif()
+else()
+  set (BUILD_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
+endif()
+
 if (MSVC)
   # On Windows, require that the same MSVC runtime is used as on the host.
   # Mitigates things like access violations caused by accidental ABI-compatibility breakage.
@@ -102,7 +125,7 @@ if (MSVC)
   cmake_host_system_information(
     RESULT REQUIRED_MSVC_RUNTIME_MINOR
     QUERY WINDOWS_REGISTRY
-    "HKLM/SOFTWARE/Microsoft/VisualStudio/${REQUIRED_MSVC_RUNTIME_MAJOR}.0/VC/Runtimes/x64"
+    "HKLM/SOFTWARE/Microsoft/VisualStudio/${REQUIRED_MSVC_RUNTIME_MAJOR}.0/VC/Runtimes/${BUILD_ARCHITECTURE}"
     VALUE "Minor")
   if (REQUIRED_MSVC_RUNTIME_MINOR)
     message(STATUS "MSVC runtime: ${REQUIRED_MSVC_RUNTIME_MAJOR}.${REQUIRED_MSVC_RUNTIME_MINOR}")
@@ -119,47 +142,64 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_definitions(-DNDEBUG)
 endif()
 
-# Set required macOS SDK
-if(APPLE)
-  set(CMAKE_OSX_DEPLOYMENT_TARGET 12)
-endif()
-
 # Set Output Folders
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
 
-include(cmake/Libraries.cmake)
-include(GNUInstallDirs)
+# disables the use of signals,slots and emit
+# Instead use Q_SIGNAL, Q_SLOT and Q_EMIT
+# prevents issues when used with glib for libportal
+add_definitions(-DQT_NO_KEYWORDS)
 
+#Options for Linux platform support
+if(UNIX AND NOT APPLE)
+  option(BUILD_X11_SUPPORT "Build with x11 support" ON)
+elseif (APPLE)
+  option(BUILD_OSX_BUNDLE "Build mac os bundle" ON)
+endif()
+
+include(cmake/Libraries.cmake)
 configure_libs()
 
-add_subdirectory(doc)
-add_subdirectory(src)
-
-# Install License, License is in the App Bundle on mac os (src/gui)
-if(WIN32)
-  install(
-    FILES ${PROJECT_SOURCE_DIR}/LICENSE
-    DESTINATION .
-  )
-  install(
-    FILES ${PROJECT_SOURCE_DIR}/LICENSES/LicenseRef-OpenSSL-Exception.txt
-    DESTINATION .
-    RENAME LICENSE_EXCEPTION
-  )
-elseif(UNIX AND NOT APPLE)
-  install(
-    FILES ${PROJECT_SOURCE_DIR}/LICENSE
-    DESTINATION share/licenses/deskflow
-  )
-  install(
-    FILES ${PROJECT_SOURCE_DIR}/LICENSES/LicenseRef-OpenSSL-Exception.txt
-    DESTINATION share/licenses/deskflow
-    RENAME LICENSE_EXCEPTION
-  )
+if(BUILD_OSX_BUNDLE AND APPLE_CODESIGN_DEV)
+  include(cmake/MacCodesign.cmake)
 endif()
 
+# setup install paths
+include(GNUInstallDirs)
+if (WIN32)
+  set(CMAKE_INSTALL_BINDIR .)
+  set(CMAKE_INSTALL_LIBDIR .)
+  set(CMAKE_INSTALL_DOCDIR docs)
+  set(CMAKE_INSTALL_LICENSE_DIR .)
+  set(CMAKE_INSTALL_I18N_DIR translations)
+elseif(BUILD_OSX_BUNDLE)
+  set(CMAKE_INSTALL_BINDIR ${CMAKE_PROJECT_PROPER_NAME}.app/Contents/MacOS)
+  set(CMAKE_INSTALL_LICENSE_DIR ${CMAKE_PROJECT_PROPER_NAME}.app/Contents/Resources)
+else()
+  set(CMAKE_INSTALL_LICENSE_DIR ${CMAKE_INSTALL_DATADIR}/licenses/${CMAKE_PROJECT_NAME})
+  set(CMAKE_INSTALL_I18N_DIR ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/translations)
+endif()
+
+add_subdirectory(docs)
+
+# build translations before source, I18N unit tests fail if they are missing
+add_subdirectory(translations)
+
+add_subdirectory(src)
+
 option(BUILD_INSTALLER "Build installer" ON)
 if(BUILD_INSTALLER)
     add_subdirectory(deploy)
 endif()
+
+install(
+  FILES ${PROJECT_SOURCE_DIR}/LICENSE
+  DESTINATION ${CMAKE_INSTALL_LICENSE_DIR}
+)
+
+install(
+  FILES ${PROJECT_SOURCE_DIR}/LICENSES/LicenseRef-OpenSSL-Exception.txt
+  DESTINATION ${CMAKE_INSTALL_LICENSE_DIR}
+  RENAME LICENSE_EXCEPTION
+)

REUSE.toml

@@ -7,200 +7,61 @@ SPDX-PackageSupplier = "Deskflow Devs"
 SPDX-PackageDownloadLocation = "https://github.com/deskflow/deskflow"
 
 [[annotations]]
-path = ".github/**"
-precedence = "override"
+path = [
+   ".github/**"
+ , ".clang-format"
+ , ".editorconfig"
+ , ".gitattributes"
+ , ".gitignore"
+ , "cspell.json"
+ , "sonar-project.properties"
+ , "cmake/vcpkg.json.in"
+ , "**/*.md"
+ , "docs/**"
+ , "deploy/linux/flatpak/**"
+ , "deploy/linux/org.deskflow.deskflow.metainfo.xml"
+ , "deploy/windows/wix-patch.xml.in"
+ , "src/apps/deskflow-client/deskflow-client.exe.manifest"
+ , "src/apps/deskflow-core/deskflow-core.exe.manifest"
+ , "src/apps/deskflow-server/deskflow-server.exe.manifest"
+ , "src/apps/res/manpage.txt"
+ , "src/apps/res/deskflow.plist.in"
+ , "src/apps/res/entitlements-dev.plist"
+ , "translations/*.ts"
+]
 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"
+path = [
+   "deploy/mac/dmg-background.tiff"
+ , "deploy/mac/dmg-volume.icns"
+ , "deploy/linux/org.deskflow.deskflow.png"
+ , "deploy/windows/wix-banner.png"
+ , "deploy/windows/wix-dialog.png"
+ , "src/apps/res/icons/deskflow-**/apps/64/deskflow*.svg"
+ , "src/apps/res/image/welcome.png"
+ , "src/apps/res/Deskflow.icns"
+ , "src/apps/res/deskflow.ico"
+ , "src/apps/res/deskflow.qrc"
+]
 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"
+path = [
+   "src/lib/gui/MainWindow.ui"
+ , "src/lib/gui/dialogs/*.ui"
+]
 SPDX-FileCopyrightText = "Deskflow Developers"
 SPDX-License-Identifier = "GPL-2.0-only WITH LicenseRef-OpenSSL-Exception"

cmake/CodeCoverage.cmake

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

cmake/Libraries.cmake

@@ -1,5 +1,5 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Deskflow Developers
-# SPDX-FileCopyrightText: 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2024 - 2025 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2024 Symless Ltd
 # SPDX-License-Identifier: MIT
 
 macro(configure_libs)
@@ -26,13 +26,21 @@ macro(configure_libs)
 
   # 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)
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND VCPKG_QT)
+      set(DEPLOY_TOOL windeployqt.debug.bat)
     else()
-      find_program(DEPLOYQT windeployqt)
+      set(DEPLOY_TOOL windeployqt)
     endif()
   elseif(APPLE)
-      find_program(DEPLOYQT macdeployqt)
+      set(DEPLOY_TOOL macdeployqt)
+  endif()
+
+  if (WIN32 OR APPLE)
+    find_program(DEPLOYQT ${DEPLOY_TOOL})
+    if(DEPLOYQT STREQUAL "DEPLOYQT-NOTFOUND")
+      message(FATAL_ERROR "Unable to locate the Qt Deploy Tool: \"${DEPLOY_TOOL}\"")
+    endif()
+    unset(DEPLOY_TOOL)
   endif()
 
   set(CMAKE_AUTOMOC ON)
@@ -41,12 +49,26 @@ macro(configure_libs)
 
   message(STATUS "Qt version: ${Qt6_VERSION}")
 
+  # Check if <format> header is available
+  check_cxx_source_compiles("
+    #include <format>
+    int main() {
+        char buffer[100];
+        std::format_to_n(buffer, 100, \"test {}\", 42);
+        return 0;
+    }
+    " HAVE_FORMAT)
+
+  if(HAVE_FORMAT)
+    add_definitions(-DHAVE_FORMAT)
+  endif()
+
   option(ENABLE_COVERAGE "Enable test coverage" OFF)
   if(ENABLE_COVERAGE)
     message(STATUS "Enabling code coverage")
     include(cmake/CodeCoverage.cmake)
     append_coverage_compiler_flags()
-    set(test_exclude subprojects/* build/* src/test/*)
+    set(test_exclude subprojects/* build/* src/unittests/*)
     set(test_src ${PROJECT_SOURCE_DIR}/src)
 
     # Apparently solves the bug in gcov where it returns negative counts and confuses gcovr.
@@ -55,15 +77,8 @@ macro(configure_libs)
     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
+      NAME coverage-legacytests
+      EXECUTABLE legacytests
       BASE_DIRECTORY ${test_src}
       EXCLUDE ${test_exclude}
     )
@@ -88,38 +103,22 @@ macro(configure_unix_libs)
   include(CheckIncludeFileCXX)
   include(CheckSymbolExists)
   include(CheckCSourceCompiles)
+  include(CheckCXXSourceCompiles)
 
-  check_include_files(sys/select.h HAVE_SYS_SELECT_H)
   check_include_files(sys/socket.h HAVE_SYS_SOCKET_H)
-  check_include_files(sys/time.h HAVE_SYS_TIME_H)
-  check_include_files(unistd.h HAVE_UNISTD_H)
-
-  check_function_exists(nanosleep HAVE_NANOSLEEP)
-  check_function_exists(sigwait HAVE_POSIX_SIGWAIT)
-  check_function_exists(inet_aton HAVE_INET_ATON)
-
-  # For some reason, the check_function_exists macro doesn't detect the
-  # inet_aton on some pure Unix platforms (e.g. sunos5). So we need to do a more
-  # detailed check and also include some extra libs.
-  if(NOT HAVE_INET_ATON)
-    set(CMAKE_REQUIRED_LIBRARIES nsl)
-
-    check_c_source_compiles(
-      "#include <arpa/inet.h>\n int main() { inet_aton (0, 0); }"
-      HAVE_INET_ATON_ADV)
-
-    set(CMAKE_REQUIRED_LIBRARIES)
-
-    if(HAVE_INET_ATON_ADV)
-      # Override the previous fail.
-      set(HAVE_INET_ATON 1)
-
-      # Assume that both nsl and socket will be needed, it seems safe to add
-      # socket on the back of nsl, since socket only ever needed when nsl is
-      # needed.
-      list(APPEND libs nsl socket)
+  if (NOT HAVE_SYS_SOCKET_H)
+    message(FATAL_ERROR "Missing header: sys/socket.h")
   endif()
 
+
+  check_include_files(unistd.h HAVE_UNISTD_H)
+  if (NOT HAVE_UNISTD_H)
+    message(FATAL_ERROR "Missing unistd.h")
+  endif()
+
+  check_function_exists(sigwait HAVE_POSIX_SIGWAIT)
+  if (NOT HAVE_POSIX_SIGWAIT)
+    message(FATAL_ERROR "Missing posix sigwait")
   endif()
 
   # pthread is used on both Linux and Mac
@@ -142,11 +141,11 @@ macro(configure_unix_libs)
       ${lib_ScreenSaver} ${lib_IOKit} ${lib_ApplicationServices}
       ${lib_Foundation} ${lib_Carbon} ${lib_UserNotifications}
     )
-
-    add_definitions(-DWINAPI_CARBON=1 -D_THREAD_SAFE)
   else()
 
+    if (BUILD_X11_SUPPORT)
       configure_xorg_libs()
+    endif()
 
     include(FindPkgConfig)
     find_package(PkgConfig)
@@ -156,28 +155,12 @@ macro(configure_unix_libs)
       find_library(LIBM m)
       include_directories(${LIBXKBCOMMON_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS}
                           ${LIBM_INCLUDE_DIRS})
+      
+      message(STATUS "xkbcommon version: ${LIBXKBCOMMON_VERSION}")
     else()
       message(WARNING "pkg-config not found, skipping wayland libraries")
     endif()
   endif()
-
-  # For config.h, set some static values; it may be a good idea to make these
-  # values dynamic for non-standard UNIX compilers.
-  set(HAVE_PTHREAD_SIGNAL 1)
-  set(SELECT_TYPE_ARG1 int)
-  set(SELECT_TYPE_ARG234 " (fd_set *)")
-  set(SELECT_TYPE_ARG5 " (struct timeval *)")
-  set(TIME_WITH_SYS_TIME 1)
-  set(HAVE_SOCKLEN_T 1)
-
-  # Unix only: For config.h, save the results based on a template (config.h.in).
-  # Note that this won't work on Windows because filenames are not case sensitive,
-  # and we have header files named "Config.h" (upper case 'C').
-  configure_file(${CMAKE_SOURCE_DIR}/src/lib/Config.h.in
-                 ${CMAKE_BINARY_DIR}/src/lib/Config.h @ONLY)
-
-  add_definitions(-DSYSAPI_UNIX=1 -DHAVE_CONFIG_H)
-
 endmacro()
 
 #
@@ -203,11 +186,6 @@ macro(configure_xorg_libs)
   check_include_files("${XKBlib}" HAVE_X11_XKBLIB_H)
   check_include_files("X11/extensions/XInput2.h" HAVE_XI2)
 
-  if(HAVE_X11_EXTENSIONS_DPMS_H)
-    # Assume that function prototypes declared, when include exists.
-    set(HAVE_DPMS_PROTOTYPES 1)
-  endif()
-
   if(NOT HAVE_X11_XKBLIB_H)
     message(FATAL_ERROR "Missing header: " ${XKBlib})
   endif()

cmake/MacCodesign.cmake

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

cmake/vcpkg.json.in

@@ -0,0 +1,12 @@
+{
+  "$comment": "Generated file do not hand edit",
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+  "name": "deskflow",
+  "version": "@DESKFLOW_VERSION_MAJOR@.@DESKFLOW_VERSION_MINOR@.@DESKFLOW_VERSION_PATCH@.@DESKFLOW_VERSION_TWEAK@",
+  "builtin-baseline": "d5ec528843d29e3a52d745a64b469f810b2cedbf",
+  "dependencies": [
+    "gtest",
+    "openssl"
+    @QT_LIBS@
+  ]
+}

cspell.json

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

deploy/CMakeLists.txt

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

deploy/linux/arch/PKGBUILD.in

@@ -1,35 +1,42 @@
-# SPDX-FileCopyrightText: 2024 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2024 Deskflow Developers
 # SPDX-License-Identifier: MIT
 # Maintainer: Deskflow Developers
 
-pkgname=deskflow
+_basename=@CMAKE_PROJECT_NAME@
+pkgname=${_basename}-git
 pkgver=@CMAKE_PROJECT_VERSION@
 pkgrel=1
-pkgdesc="Mouse and keyboard sharing utility"
-url='https://deskflow.org'
+pkgdesc="@CMAKE_PROJECT_DESCRIPTION@"
+url="@CMAKE_PROJECT_HOMEPAGE_URL@"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 license=(LicenseRef-GPL-2.0-only-WITH-OpenSSL-Exception)
 conflicts=('synergy-git' 'synergy-1.6' 'synergy1-bin' 'synergy2-bin' 'synergy3-bin' 'synergy3-beta-bin' 'synergy3-stable-bin' 'barrier' 'barrier-git' 'barrier-headless' 'barrier-headless-git' 'input-leap' 'input-leap-git' 'input-leap-headless-git' 'input-leap-headless' 'waynergy' 'waynergy-git' 'qsynergy' 'slim-synergy' 'quicksynergy' 'deskflow')
-provides=("deskflow-git${pkgver}")
+provides=("$_basename")
 depends=(
-  'gcc-libs'
-  'glibc'
-  'openssl'
-  'libx11'
-  'libxi'
-  'libxkbfile'
-  'libxext'
-  'libxtst'
-  'libxinerama'
-  'libxkbcommon-x11'
-  'hicolor-icon-theme'
-  'qt6-base'
-  'qt6-tools'
-  'libei'
-  'libportal'
-  'tomlplusplus'
-  'cli11'
+  gcc-libs
+  glib2
+  glibc
+  hicolor-icon-theme
+  libei
+  libglvnd
+  libice
+  libportal
+  libsm
+  libx11
+  libxext
+  libxi
+  libxinerama
+  libxkbcommon
+  libxkbcommon-x11
+  libxkbfile
+  libxrandr
+  libxtst
+  openssl
+  qt6-base
+  qt6-svg
+  qt6-translations
 )
+
 options=('!debug')
 
 package() {

deploy/linux/deploy.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 # HACK This is set when the files is included so its the real path
@@ -7,21 +7,23 @@ set(MY_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 # Install our desktop file
 install(
-  FILES ${MY_DIR}/org.deskflow.deskflow.desktop
-  DESTINATION share/applications
+  FILES ${MY_DIR}/${CMAKE_PROJECT_REV_FQDN}.desktop
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
 )
 
 # Install our icon
+install(FILES ${MY_DIR}/org.deskflow.deskflow.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/512x512/apps/)
+
+# Install our symbolic icon
 install(
-  FILES ${MY_DIR}/deskflow.png
-  DESTINATION share/icons/hicolor/512x512/apps/
-  RENAME org.deskflow.deskflow.png
+  FILES ${CMAKE_SOURCE_DIR}/src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/symbolic/apps/
 )
 
 # Install our metainfo
 install(
-  FILES ${MY_DIR}/org.deskflow.deskflow.metainfo.xml
-  DESTINATION share/metainfo/
+  FILES ${MY_DIR}/${CMAKE_PROJECT_REV_FQDN}.metainfo.xml
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo/
 )
 
 # Prepare PKGBUILD for Arch Linux
@@ -31,9 +33,9 @@ configure_file(
   @ONLY
 )
 
-
 set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "qt6-svg-plugins")
 set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
 set(CPACK_RPM_PACKAGE_GROUP "Applications/System")
 
@@ -100,9 +102,9 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   if("${DISTRO_NAME}" STREQUAL "")
     set(DISTRO_NAME "linux")
   endif()
-  set(OS_STRING "${DISTRO_NAME}-${CN_STRING}${CMAKE_SYSTEM_PROCESSOR}")
+  set(OS_STRING "${DISTRO_NAME}-${CN_STRING}${BUILD_ARCHITECTURE}")
 
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "|.*BSD")
   message(STATUS "BSD packaging not yet supported")
-  set(OS_STRING ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
+  set(OS_STRING ${CMAKE_SYSTEM_NAME}-${BUILD_ARCHITECTURE})
 endif()

deploy/linux/flatpak/libportal-qt69.patch

@@ -0,0 +1,41 @@
+From 796053d2eebe4532aad6bd3fd80cdf3b197806ec Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich@redhat.com>
+Date: Thu, 27 Mar 2025 09:38:10 +0100
+Subject: [PATCH] qt6: fix build against Qt 6.9+
+
+QGenericUnixServices was renamed to QDesktopUnixServices in Qt 6.9.
+
+Upstream change: https://codereview.qt-project.org/c/qt/qtbase/+/609639
+---
+ libportal/portal-qt6.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/libportal/portal-qt6.cpp b/libportal/portal-qt6.cpp
+index d38a4e30..34f0d72a 100644
+--- a/libportal/portal-qt6.cpp
++++ b/libportal/portal-qt6.cpp
+@@ -31,8 +31,12 @@
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+ #include <qpa/qplatformintegration.h>
+ #include <private/qguiapplication_p.h>
++#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
++#include <private/qdesktopunixservices_p.h>
++#else
+ #include <private/qgenericunixservices_p.h>
+ #endif
++#endif
+ 
+ static gboolean
+ _xdp_parent_export_qt (XdpParent *parent,
+@@ -45,7 +49,11 @@ _xdp_parent_export_qt (XdpParent *parent,
+   }
+ 
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
++#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
++  if (const auto services = dynamic_cast<QDesktopUnixServices*>(QGuiApplicationPrivate::platformIntegration()->services()))
++#else
+   if (const auto services = dynamic_cast<QGenericUnixServices*>(QGuiApplicationPrivate::platformIntegration()->services()))
++#endif
+     {
+       g_autofree char *handle = g_strdup(services->portalWindowIdentifier(w).toUtf8().constData());
+ 

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

@@ -1,6 +1,6 @@
 app-id: org.deskflow.deskflow
 runtime: org.kde.Platform
-runtime-version: "6.8"
+runtime-version: "6.10"
 sdk: org.kde.Sdk
 command: deskflow
 finish-args:
@@ -17,7 +17,6 @@ cleanup:
   - /lib/cmake
   - /lib/pkgconfig
   - /share/pkgconfig
-  - /share/tomlplusplus
   - /share/cmake
   - /share/doc
   - /share/gir-1.0
@@ -30,8 +29,12 @@ modules:
         --prefix=${FLATPAK_DEST} --no-build-isolation Jinja2
     sources:
       - type: file
-        url: https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl
-        sha256: 7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa
+        url: https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl
+        sha256: 85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67
+        x-checker-data:
+          type: pypi
+          name: Jinja2
+          packagetype: bdist_wheel
       - type: file
         url: https://files.pythonhosted.org/packages/87/5b/aae44c6655f3801e81aa3eef09dbbf012431987ba564d7231722f68df02d/MarkupSafe-2.1.5.tar.gz
         sha256: d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b
@@ -46,8 +49,11 @@ modules:
     sources:
         - type: git
           url: https://gitlab.freedesktop.org/libinput/libei
-          tag: 1.4.0
-          commit: 5d6d8e6590df210b75559a889baa9459c68d9366
+          tag: 1.5.0
+          commit: 19b64535408aa47abbc8151bc2c925afd6583851
+          x-checker-data:
+            type: git
+            tag-pattern: ^([\\d.]+)$
   - name: libportal
     buildsystem: meson
     config-opts:
@@ -61,29 +67,18 @@ modules:
         url: https://github.com/flatpak/libportal.git
         tag: 0.9.1
         commit: 8f5dc8d192f6e31dafe69e35219e3b707bde71ce
-  - name: cli11
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DCLI11_BUILD_TESTS=OFF
-    sources:
-      - type: git
-        url: https://github.com/CLIUtils/CLI11
-        tag: v2.4.2
-        commit: 6c7b07a878ad834957b98d0f9ce1dbe0cb204fc9
-  - name: tomlplusplus
-    buildsystem: cmake-ninja
-    sources:
-      - type: git
-        url: https://github.com/marzer/tomlplusplus
-        tag: v3.4.0
-        commit: 30172438cee64926dc41fdd9c11fb3ba5b2ba9de
+      - type: patch
+        path: libportal-qt69.patch
   - name: gtest
     buildsystem: cmake-ninja
     sources:
       - type: git
         url: https://github.com/google/googletest.git
-        tag: v1.15.2
-        commit: b514bdc898e2951020cbdca1304b75f5950d1f59
+        tag: v1.17.0
+        commit: 52eb8108c5bdec04579160ae17225d66034bd723
+        x-checker-data:
+          type: git
+          tag-pattern: ^([\\d.]+)$
     cleanup:
       - '*'
   - name: deskflow

deploy/linux/org.deskflow.deskflow.desktop

@@ -11,3 +11,12 @@ Icon=org.deskflow.deskflow
 Terminal=false
 Categories=Utility;
 Keywords=keyboard;mouse;sharing;network;share;
+Name[zh_CN]=Deskflow
+Comment[zh_CN]=键鼠共享工具
+Keywords[zh_CN]=键盘;鼠标;网络;共享;
+Name[ru]=Deskflow
+Comment[ru]=Приложения чтобы использовать одну мышку и клавиатуру с разными устройствами
+Keywords[ru]=Передача;Трансляция;barrier;input-leap;
+Name[ko]=Deskflow
+Comment[ko]=마우스 및 키보드 공유 유틸리티
+Keywords[ko]=키보드;마우스;공유;네트워크;

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

@@ -2,28 +2,56 @@
 <component type="desktop-application">
 	<id>org.deskflow.deskflow</id>
 	<metadata_license>CC0-1.0</metadata_license>
-	<project_license>GPL-2.0+</project_license>
+	<project_license>GPL-2.0-only</project_license>
 	<name>Deskflow</name>
 	<developer id="org.deskflow">
 		<name>Deskflow Developers</name>
 	</developer>
 	<summary>Software Keyboard and mouse sharing</summary>
+	<summary xml:lang="zh_CN">用软件共享键鼠</summary>
+	<summary xml:lang="ko">키보드 및 마우스 공유 소프트웨어</summary>
 	<description>
 		<p>
 			Use the keyboard, mouse, or trackpad of one computer to control nearby computers, and work seamlessly between them.
 		</p>
+		<p xml:lang="zh_CN">
+			使用一台计算机的键盘、鼠标或触控板来控制附近的其它计算机，并在它们之间无缝工作。
+		</p>
+		<p xml:lang="ko">
+			한 대의 컴퓨터에 연결된 키보드, 마우스 또는 트랙패드로 주변의 다른 컴퓨터를 제어하고, 컴퓨터 사이를 끊김 없이 오가며 작업할 수 있습니다.
+		</p>
 	</description>
 	<launchable type="desktop-id">org.deskflow.deskflow.desktop</launchable>
 	<url type="homepage">https://deskflow.org</url>
 	<url type="bugtracker">https://github.com/deskflow/deskflow/issues</url>
+	<url type="faq">https://github.com/deskflow/deskflow/wiki/Project-FAQ</url>
+	<url type="help">https://github.com/deskflow/deskflow/wiki#user-guides</url>
+	<url type="vcs-browser">https://github.com/deskflow/deskflow</url>
+	<url type="contribute">https://github.com/deskflow/deskflow/wiki/Contributing</url>
 	<screenshots>
 		<screenshot type="default">
-			<image>https://deskflow.org/screenshots/deskflow.png</image>
-			<caption>Deskflow's mainwindow on KDE</caption>
+			<image>https://deskflow.org/screenshots/deskflow-client.png</image>
+			<caption>Deskflow in client mode on KDE</caption>
 		</screenshot>
 		<screenshot>
-			<image>https://deskflow.org/screenshots/deskflow-dark.png</image>
-			<caption>Deskflow's mainwindow on KDE (dark mode)</caption>
+			<image>https://deskflow.org/screenshots/deskflow-server.png</image>
+			<caption>Deskflow in server mode on KDE</caption>
+		</screenshot>
+		<screenshot>
+			<image>https://deskflow.org/screenshots/deskflow-log.png</image>
+			<caption>Deskflow with the log visible on KDE</caption>
+		</screenshot>
+		<screenshot>
+			<image>https://deskflow.org/screenshots/deskflow-client-dark.png</image>
+			<caption>Deskflow in client mode on KDE (dark mode)</caption>
+		</screenshot>
+		<screenshot>
+			<image>https://deskflow.org/screenshots/deskflow-server-dark.png</image>
+			<caption>Deskflow in server mode on KDE (dark mode)</caption>
+		</screenshot>
+		<screenshot>
+			<image>https://deskflow.org/screenshots/deskflow-log-dark.png</image>
+			<caption>Deskflow with the log visible on KDE (dark mode)</caption>
 		</screenshot>
 	</screenshots>
 	<provides> <id>org.deskflow.deskflow.desktop</id> </provides>
@@ -31,8 +59,12 @@
 		<category>Utility</category>
 	</categories>
 	<keywords>
-		<keyword translate="no">Input</keyword>
-		<keyword translate="no">Sharing</keyword>
+		<keyword>Input</keyword>
+		<keyword xml:lang="zh_CN">输入</keyword>
+		<keyword xml:lang="ko">입력</keyword>
+		<keyword>Sharing</keyword>
+		<keyword xml:lang="zh_CN">共享</keyword>
+		<keyword xml:lang="ko">공유</keyword>
 		<keyword translate="no">KVM</keyword>
 		<keyword translate="no">Synergy</keyword>
 	</keywords>
@@ -42,6 +74,163 @@
 	</branding>
 	<content_rating type="oars-1.0" />
 	<releases>
+		<release version="1.26.0" date="2026-02-16" urgency="high">
+			<description>
+				<p>This stable release fixes known issues and adds a few new features, For the full changelog, see the release page.</p>
+				<ul>
+					<li>New: Korean(ko) translation</li>
+					<li>New: Option to start in the "locked to computer" state</li>
+					<li>New: Option to show the version in the windows title</li>
+					<li>New: Clients can now use a list hostnames or ips for the server address</li>
+					<li>New: Client options are in a new client configuration dialog</li>
+					<li>New: Provide a more accurate suggested IP, Update as network info changes if needed.</li>
+					<li>New: Add a simple search to the log</li>
+					<li>New: Lookup host name with IP4 or IP6</li>
+					<li>New: Replace broken scroll speed with a scroll scaling options</li>
+					<li>Fix: Horizontal scrolling is working again on all platforms</li>
+					<li>Fix: Key repeat events are now sent as repeat not press and release</li>
+					<li>Fix: Deskflow-core correctly blocks new instances when run without the `--new-instance` option</li>
+					<li>Fix: Server Mode, Only use the external config path if the option is enabled</li>
+					<li>Fix: Allow comma and semicolon to be used in the hotkey configuration</li>
+					<li>Fix: Gui can crash when clearing settings in debug mode</li>
+					<li>Fix: Mouse Back and Forward buttons are now working (again) on all platforms</li>
+					<li>Fix: macOS, crash when the log is opened and the gui minimized</li>
+					<li>Fix: macOS, restore Preferences menu entry when the application is using non english language</li>
+					<li>Fix: macOS, try icon was not showing when in `Colorful` mode</li>
+					<li>Fix: macOS, do not allow the os to kill deskflow for memory reasons</li>
+					<li>Fix: macOS, possible server crash when a client disconnects abruptly</li>
+					<li>Fix: macOS, possible crash on screen wake / screen saver activation</li>
+					<li>Fix: macOS, Wrong keys send when using "RIME" input method</li>
+					<li>Fix: Windows, possible crash when the daemon is started for the first time</li>
+					<li>Use `Computer` in place of `Screen` to indicate we work with Computers display layout and not individual screens attached</li>
+					<li>Clean and update the settings when starting up.</li>
+					<li>Do not show client connection error messages dialogs if the gui is hidden</li>
+					<li>Use Qt 6.9.3 for Intel Mac builds.</li>
+					<li>Windows: Use ICU dlls from the host system</li>
+					<li>Code continues to be cleaned of unused methods and updated to modern C++</li>
+					<li>Consolidate Debug levels to remove DEBUG3-5 levels</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.26.0</url>
+		</release>
+		<release version="1.25.0" date="2025-11-21" urgency="high">
+			<description>
+				<p>This stable release fixes known issues and adds a few new features. Most notable symbolic icon support, I18N support and experimental support for wl-clipboard to access clipboards on wayland. This release also continues our trend of cleaning up the codebase. For the full changelog, see the release page.</p>
+				<ul>
+					<li>Removed the ability to use toml config and env based config files</li>
+					<li>Set XDG app ID (app_id) on Wayland</li>
+					<li>Support symbolic icon deployment and recoloring</li>
+					<li>Added Spanish translation</li>
+					<li>Added Italian translation</li>
+					<li>Added Japanese translation</li>
+					<li>Added Simplified Chinese translation</li>
+					<li>Added Russian translation</li>
+					<li>Translate the GUI without needed to restart the application</li>
+					<li>Expose setting to adjust clients scroll speed</li>
+					<li>Expose setting to show the GUI debug messages in the log</li>
+					<li>Expose setting to allow use of wl-clipboard backend on Wayland</li>
+					<li>Fixed the port settings not being used from settings</li>
+					<li>Save the geometry info into a state file</li>
+					<li>The Core (deskflow-core) has a new CLI interface</li>
+					<li>Fixed Wayland sleep inhibit on client</li>
+					<li>Fixed XWindowsScreen: properly calculate xrandr/xinerama screens</li>
+					<li>Fixed XWindowsScreen: stop centering panned screens on client when leaving the screen</li>
+					<li>Fixed stop retying to launch the Core if its crashed</li>
+					<li>Fixed various input issues</li>
+					<li>Fixed apply scroll lock setting on initialization</li>
+					<li>Fixed crash caused by hostnames with invalid characters returned default value</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.25.0</url>
+		</release>
+		<release version="1.24.0" date="2025-09-11" urgency="high">
+			<description>
+				<p>This stable release fixes issues found in the previous version and adds a few new features. This release also uses more C++20 features. For the full changelog, see the release page.</p>
+				<ul>
+					<li>Fix: Less confusing fingerprint comparision dialog.</li>
+					<li>Fix: AltGr and other modifiers are generally detected better.</li>
+					<li>Fix: Big Endian test failures</li>
+					<li>Fix: Client scroll direction being ignored on wayland clients.</li>
+					<li>Feat: Unify deskflow-client and deskflow-server into one binary deskflow-core.</li>
+					<li>Feat: Prevent more than one instance of deskflow-core starting.</li>
+					<li>Feat: Remove defunct --no-xinitthreads option.</li>
+					<li>Feat: Ability to persist remote desktop access</li>
+					<li>Feat: Gui can show all log levels, upgrading users will want to reset their log level as the values have changed</li>
+					<li>Feat: Log can be detached or docked in the window</li>
+					<li>Refactor: Use more icons in places</li>
+					<li>Refactor: Update the Server Config Dialog's GUI</li>
+					<li>Chore: Continue to update codebase to use C++20 features.</li>
+					<li>Chore: Clean more sonar smells</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.24.0</url>
+		</release>
+		<release version="1.23.0" date="2025-07-23" urgency="high">
+			<description>
+				<p>This stable release fixes issues found in the previous version and adds a few new features. This release also uses more C++20 features. For the full changelog, see the release page.</p>
+				<ul>
+					<li>Fix: Core app not running when app starts minimized.</li>
+					<li>Fix: Several items in the server configuration dialog being enabled at the wrong time.</li>
+					<li>Fix: Use the correct license in our appstream data (GPL2.0 only).</li>
+					<li>Fix: Apps saved size could grow over time on desktops using client side decorations.</li>
+					<li>Fix: Use the system monospace font in the log area, instead of forcing one that may not be on the system.</li>
+					<li>Fix: Issue with incorrect borders being set for libEI, causing issues on edges without neighbors.</li>
+					<li>Feat: Add Restart action for the core process.</li>
+					<li>Feat: Remove defunct --no-xinitthreads option.</li>
+					<li>Feat: Make 2048 the minimum encryption key size.</li>
+					<li>Feat: Provide additional connection information in the status area.</li>
+					<li>Chore: Continue to update codebase to use C++20 features.</li>
+					<li>Chore: Clean more sonar smells</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.23.0</url>
+		</release>
+		<release version="1.22.0" date="2025-05-28" urgency="high">
+			<description>
+				<p>This stable release fixes a issues found in the previous version. For the full changelog see the release page.</p>
+				<ul>
+					<li>Remove: Broken drag and drop file transfer support</li>
+					<li>Remove: DESKFLOW_RESET_ALL and --no-reset. reset settings is now done by passing the --reset option instead</li>
+					<li>Continue migration to Qt by using more Qt classes in more places</li>
+					<li>Retire SHA1 generation and use SHA256 always to compare</li>
+					<li>Add missing accelerators for gui controls</li>
+					<li>unittests binary is now legacytests</li>
+					<li>integtests have been remove and replaced with Qt based tests run during build</li>
+					<li>Fix: Potential XDG-Portal release issue</li>
+					<li>Fix: Issue where the first start dialog could hang in the background</li>
+					<li>Fix: Edge cases that could cause incorrect settings causing client / server process to crash</li>
+					<li>Fix: Default server config file is Deskflow-server.conf</li>
+					<li>Backport: Event Types from downstream</li>
+					<li>Backport: Cleaner error handling from downstream</li>
+					<li>Improve Windows Daemon</li>
+					<li>Better detection of arm on windows, in build and installer</li>
+					<li>Chore: Clean up sonar scan code smells</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.22.0</url>
+		</release>
+		<release version="1.21.2" date="2025-04-07" urgency="high">
+			<description>
+				<p>This stable release fixes a few critical bugs in 1.21.1. For the full changelog see the release page.</p>
+				<ul>
+					<li>Fix: Crash with Qt 6.9</li>
+					<li>Fix: Windows settings in wrong locations</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.21.2</url>
+		</release>
+		<release version="1.21.1" date="2025-03-31" urgency="high">
+			<description>
+				<p>This stable release fixes a few critical bugs in 1.21.0. For the full changelog see the release page.</p>
+				<ul>
+					<li>Fix: Flatpak can't save settings'</li>
+					<li>Fix: Crash on localfingerprint dialog</li>
+					<li>Fix: Check for updates settings reading from wrong value</li>
+					<li>Fix: Windows settings saving blocked for non admin users </li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.21.1</url>
+		</release>
 		<release version="1.21.0" date="2025-03-27" urgency="high">
 			<description>
 				<p>This stable release removes some dependencies, additionally fixes several bugs. For the full changelog see the release page.</p>

deploy/mac/deploy.cmake

@@ -1,20 +1,23 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 # HACK This is set when the files is included so its the real path
 # calling CMAKE_CURRENT_LIST_DIR after include would return the wrong scope var
 set(MY_DIR ${CMAKE_CURRENT_LIST_DIR})
+set(OSX_BUNDLE ${BUILD_OSX_BUNDLE})
 
+set(OS_STRING "macos-${BUILD_ARCHITECTURE}")
+
+if (OSX_BUNDLE)
   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")
+endif()

deploy/windows/cpack-options.cmake.in

@@ -0,0 +1,6 @@
+#SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
+#SPDX-License-Identifier: MIT
+
+if(CPACK_GENERATOR MATCHES 7Z|ZIP)
+  set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}-portable)
+endif()

deploy/windows/deploy.cmake

@@ -1,27 +1,29 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 # HACK This is set when the files is included so its the real path
 # 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\"
-)")
+set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
+set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${CMAKE_INSTALL_LIBDIR})
+include(InstallRequiredSystemLibraries)
 
-# 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()
+configure_file(${MY_DIR}/pre-cpack.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pre-cpack.cmake @ONLY)
+set(CPACK_PRE_BUILD_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/pre-cpack.cmake)
+
+configure_file(${MY_DIR}/cpack-options.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cpack-options.cmake @ONLY)
+set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/cpack-options.cmake)
+
+set(OS_STRING "win-${BUILD_ARCHITECTURE}")
+
+list(APPEND CPACK_GENERATOR "7Z")
 
 # If Wix4+ is installed make a package
 find_program(WIX_APP wix)
 if (NOT "${WIX_APP}" STREQUAL "")
   set(CPACK_WIX_VERSION 4)
+  set(CPACK_WIX_ARCHITECTURE ${BUILD_ARCHITECTURE})
   list(APPEND CPACK_GENERATOR "WIX")
 endif()
 

deploy/windows/pre-cpack.cmake.in

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-License-Identifier: MIT
+
+if(CPACK_GENERATOR MATCHES 7Z|ZIP)
+  string(REPLACE " " "*" _TEMP_LIST "@CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS@")
+  set(${PORTABLE_LIBS} "")
+  foreach(ITEM ${_TEMP_LIST})
+    string(REPLACE "*" " " _ITEM ${ITEM})
+    file(COPY ${_ITEM} DESTINATION ${CPACK_TEMPORARY_INSTALL_DIRECTORY})
+  endforeach()
+  file(WRITE ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/settings/Deskflow.conf " ")
+  file(REMOVE ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/deskflow-daemon.exe)
+  file(WRITE ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/README.txt
+" Portable Deskflow: @CMAKE_PROJECT_VERSION@
+
+  The portable version must have the settings/Deskflow.conf file to save settings, or it will try to use the system settings location.
+  The portable version does not include the daemon, so the client will not work at UAC prompts or the login screen.
+")
+endif()

deploy/windows/wix-custom.cpp

@@ -34,7 +34,7 @@ static std::string s_logMessageBuffer; // NOSONAR - Must be mutable.
 
 extern "C" __declspec(dllexport) UINT __stdcall CheckVCRedist(MSIHANDLE hInstall)
 {
-  const auto kKeyName = TEXT("SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\x64");
+  const auto kKeyName = TEXT(kRegKey);
   const auto kValueName = TEXT("Minor");
   const auto kProperty = "VC_REDIST_VERSION_OK";
 

deploy/windows/wix-custom.h.in

@@ -7,6 +7,7 @@
 #pragma once
 
 const auto kAppId = "@CMAKE_PROJECT_NAME@";
+const auto kRegKey = "SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\@BUILD_ARCHITECTURE@";
 
 // clang-format off
 const auto kWindowsRuntimeMajor = @REQUIRED_MSVC_RUNTIME_MAJOR@;

deploy/windows/wix-patch.xml.in

@@ -17,14 +17,12 @@
       />
     </ServiceInstall>
     <ServiceControl Id="ServiceControl" Name="Deskflow" Remove="uninstall" Start="install" Stop="both"/>
+    <RemoveFile Id="RmOldLog" On="install" Name="deskflow-daemon.log"/>
   </CPackWiXFragment>
 
-  <CPackWiXFragment Id="CM_CP_deskflow_server.exe">
-    <firewall:FirewallException Id="ServerFirewallException" Name="Deskflow Server" Program="[INSTALL_ROOT]deskflow-server.exe" Scope="any"/>
-  </CPackWiXFragment>
-
-  <CPackWiXFragment Id="CM_CP_deskflow_client.exe">
-    <firewall:FirewallException Id="ClientFirewallException" Name="Deskflow Client" Program="[INSTALL_ROOT]deskflow-client.exe" Scope="any"/>
+  <CPackWiXFragment Id="CM_CP_deskflow_core.exe">
+    <firewall:FirewallException Id="ServerFirewallException" Name="Deskflow Server" Program="[INSTALL_ROOT]deskflow-core.exe" Scope="any"/>
+    <firewall:FirewallException Id="ClientFirewallException" Name="Deskflow Client" Program="[INSTALL_ROOT]deskflow-core.exe" Scope="any"/>
   </CPackWiXFragment>
 
   <CPackWiXFragment Id="#PRODUCT">
@@ -32,13 +30,22 @@
       <RegistrySearch
         Id="FindVCRedist"
         Root="HKLM"
-        Key="SOFTWARE\Microsoft\VisualStudio\@REQUIRED_MSVC_RUNTIME_MAJOR@.0\VC\Runtimes\x64"
+        Key="SOFTWARE\Microsoft\VisualStudio\@REQUIRED_MSVC_RUNTIME_MAJOR@.0\VC\Runtimes\@BUILD_ARCHITECTURE@"
         Name="Installed"
         Type="raw" />
     </Property>
 
     <Binary Id="CustomDLL" SourceFile="@CMAKE_CURRENT_BINARY_DIR@/wix-custom.dll" />
 
+    <UI>
+       <Publish Dialog="ExitDialog"
+           Control="Finish"
+           Event="DoAction"
+           Value="RunDeskflow"
+           Condition= "WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed" />
+       <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1" />
+       <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Run Deskflow when finished" />
+    </UI>
     <CustomAction
       Id="CheckVCRedist"
       BinaryRef="CustomDLL"
@@ -51,8 +58,10 @@
 
     <CustomAction
       Id="RunDeskflow"
-      ExeCommand="Deskflow"
-      FileRef="CM_FP_deskflow.exe"
+      ExeCommand="[INSTALL_ROOT]deskflow.exe"
+      Directory="INSTALL_ROOT"
+      Execute="immediate"
+      Impersonate="yes"
       Return="asyncNoWait" />
 
     <InstallExecuteSequence>
@@ -64,10 +73,6 @@
         Action="ShowVCRedistError"
         Before="InstallInitialize"
         Condition="NOT Installed AND (NOT VC_REDIST_INSTALLED OR NOT VC_REDIST_VERSION_OK)" />
-      <Custom
-        Action="RunDeskflow"
-        OnExit="success"
-        Condition="NOT Installed" />
     </InstallExecuteSequence>
   </CPackWiXFragment>
 </CPackWiXPatch>

doc/CMakeLists.txt

@@ -1,31 +0,0 @@
-# SPDX-FileCopyrightText: 2019 - 2024 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-License-Identifier: MIT
-
-find_package(Doxygen QUIET)
-option(BUILD_DOCS "Build and install documents" ${DOXYGEN_FOUND})
-
-if (BUILD_DOCS AND DOXYGEN_FOUND)
-
-  set(DOXYGEN_EXTRACT_ALL YES)
-  set(DOXYGEN_STRIP_FROM_PATH ${CMAKE_SOURCE_DIR})
-  set(DOXYGEN_USE_MDFILE_AS_MAINPAGE mainpage.md)
-  set(DOXYGEN_QUIET YES)
-
-  # Files used to make our documents
-  # User facing documents will not include doxy comments in source code
-  doxygen_add_docs(user-docs ${CMAKE_SOURCE_DIR}/doc COMMENT "Generating user documentation" ALL)
-
-  # HACK Only these will show in your IDE
-  target_sources(user-docs PRIVATE
-    mainpage.md
-    configuration.md
-  )
-
-  install(
-    DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html"
-    DESTINATION ${CMAKE_INSTALL_DOCDIR}
-    COMPONENT deskflow_docs)
-
-else()
-  message(STATUS "Doxygen not found, skipping docs build")
-endif()

doc/configuration.md

@@ -1,168 +0,0 @@
-# Server Config Examples
-
-The `deskflow-server` command accepts the `-c` or `--config` option, which takes one argument,
-the path to a server configuration file. The format is non-standard but similar to YAML.
-
-Comments begin with the `#` character and continue to the end of line.
-Comments may appear anywhere the syntax permits.
-
-Each `section` element must have a matching `end` element.
-
-## Stacked Example
-
-Stack one computer's screen on top of another's.
-
-```
-#           +-------+
-#           | curly |
-#           |       |
-#           +-------+
-# +-------+ +-------+
-# | moe   | | larry |
-# |       | |       |
-# +-------+ +-------+
-
-section: screens
-	# three hosts named: moe, larry, and curly
-	moe:
-	larry:
-	curly:
-end
-
-section: links
-	# larry is to the right of moe and curly is above moe.
-	moe:
-		right = larry
-		up    = curly
-
-	# moe is to the left of larry and curly is above larry.
-	larry:
-		left  = moe
-		up    = curly
-
-	# larry is below curly.
-	curly:
-		down  = larry
-end
-
-section: aliases
-	# curly is also known as shemp
-	curly:
-		shemp
-end
-```
-
-## Horizontal Example
-
-Align all screens horizontally.
-
-```
-# +-------+ +-------+ +-------+
-# | moe   | | larry | | curly |
-# |       | |       | |       |
-# +-------+ +-------+ +-------+
-
-section: screens
-	# three hosts named: moe, larry, and curly
-	moe:
-	larry:
-	curly:
-end
-
-section: links
-	# curly is to the right of larry and moe is to the left of larry.
-	larry:
-		right = curly
-		left  = moe
-
-	# larry is to the right of moe.
-	moe:
-		right = larry
-
-	# larry is to the left of curly.
-	curly:
-		left  = larry
-end
-
-```
-
-## Span Example
-
-Span two screens on one computer across the screens of two computers.
-
-```
-# +-------+ +-------+
-# | curly | | curly |
-# |       | |       |
-# +-------+ +-------+
-# +-------+ +-------+
-# | moe   | | larry |
-# |       | |       |
-# +-------+ +-------+
-
-section: screens
-	# three hosts named: moe, larry, and curly
-	moe:
-	larry:
-	curly:
-end
-
-section: links
-	# larry is to the right of moe and curly is above moe.
-	moe:
-		right = larry
-		up    = curly
-
-	# moe is to the left of larry and curly is above larry.
-	larry:
-		left  = moe
-		up    = curly
-
-	# larry is below curly.
-	curly:
-		down  = larry
-end
-```
-
-# Example file for `--config-toml` arg
-
-```
-[server.args]
-no-daemon = true
-no-tray = true
-debug = "DEBUG"
-name = "moe"
-address = ":24800"
-
-[client.args]
-no-daemon = true
-no-tray = true
-debug = "DEBUG2"
-name = "larry"
-_last = "moe:24800"
-```
-
-
-# Example  `.env` file
-
-
-```
-#
-# App
-#
-
-# Shows the test menu in the GUI (on by default in debug mode)
-# DESKFLOW_TEST_MENU=true
-
-# Version checker URL to use (useful for testing)
-# DESKFLOW_VERSION_URL="https://api.deskflow.org/version?fake=1.100.0"
-
-# Enable debug logging in the GUI (on by default in debug mode)
-# DESKFLOW_GUI_DEBUG=true
-
-# Enable verbose logging in the GUI (always off by default)
-# DESKFLOW_GUI_VERBOSE=true
-
-# Reset all settings and delete all data on startup
-# DESKFLOW_RESET_ALL=true
-```

docs/CMakeLists.txt

@@ -0,0 +1,35 @@
+# SPDX-FileCopyrightText: (C) 2019 - 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-License-Identifier: MIT
+
+find_package(Doxygen QUIET)
+option(BUILD_USER_DOCS "Build and install user documentation" ${DOXYGEN_FOUND})
+option(BUILD_DEV_DOCS "Build and install developer documentation" OFF)
+
+if (DOXYGEN_FOUND)
+  # Generic Doxygen options
+  set(DOXYGEN_EXTRACT_ALL YES)
+  set(DOXYGEN_EXTRACT_STATIC YES)
+  set(DOXYGEN_STRIP_FROM_PATH ${CMAKE_SOURCE_DIR})
+  set(DOXYGEN_QUIET YES)
+  set(DOXYGEN_PROJECT_NAME ${CMAKE_PROJECT_PROPER_NAME})
+  set(DOXYGEN_PROJECT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/deskflow-logo.png")
+  set(DOXYGEN_PROJECT_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/deskflow-logo.png")
+
+  if (BUILD_USER_DOCS)
+    add_subdirectory(user)
+  endif()
+  if (BUILD_DEV_DOCS)
+    add_subdirectory(dev)
+  endif()
+else()
+  message(STATUS "Doxygen not found, skipping docs build")
+endif()
+
+# Show our documents in the IDE
+add_custom_target(docs
+  SOURCES
+    Readme.md
+    Security.md
+)
+
+install(FILES Security.md Readme.md DESTINATION ${CMAKE_INSTALL_DOCDIR})

docs/Readme.md

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

docs/dev/CMakeLists.txt

@@ -0,0 +1,22 @@
+# SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-License-Identifier: MIT
+
+set(DOXYGEN_USE_MDFILE_AS_MAINPAGE mainpage.md)
+set(DOXYGEN_EXCLUDE_PATTERNS "*unittests/*")
+set(DOXYGEN_DOT_GRAPH_MAX_NODES 100)
+
+# Files used to make our documents
+doxygen_add_docs(dev-docs
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  COMMENT "Generating developer documentation" ALL)
+
+# HACK Only these will show in your IDE
+target_sources(dev-docs PRIVATE
+  mainpage.md
+  contributing.md
+  build.md
+  protocol_reference.md
+)
+
+# missing install target is intended generate a local copy

docs/dev/build.md

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

docs/dev/contributing.md

@@ -0,0 +1,13 @@
+# Contributing to Deskflow {#contributing_guide}
+
+Thanks for your interest in contributing to Deskflow! We welcome all kinds of contributions — bug reports, feature suggestions, documentation improvements, and code.
+
+## Read the Full Guidelines
+
+To keep this repository clean and contribution-friendly, we've outlined our full contributing guidelines on the Deskflow Wiki:
+
+👉 [How to Contribute to Deskflow](https://github.com/deskflow/deskflow/wiki/Contributing)
+
+Please take a moment to read through the page before opening an issue or submitting a pull request.
+
+Thanks again for helping make Deskflow better!

docs/dev/mainpage.md

@@ -0,0 +1,55 @@
+**Deskflow** is a free and open source keyboard and mouse sharing app.
+Use the keyboard, mouse, or trackpad of one computer to control nearby computers,
+and work seamlessly between them.
+
+Deskflow acts as a software KVM (without video) that allows you to:
+- Share keyboard and mouse input across multiple computers
+- Synchronize clipboard content between machines
+- Work seamlessly across different operating systems (Windows, macOS, Linux, BSD)
+
+Deskflow software consists of a **server** (primary computer) that shares its input devices and **clients** (secondary computers) that receive and execute the input commands over a TCP network connection.
+
+### Architecture Overview
+
+Deskflow is built with a modular, cross-platform architecture:
+
+```
+┌─────────────────┐    Network Protocol    ┌─────────────────┐
+│   Server App    │◄──────────────────────►│  Client App     │
+│                 │     (Port 24800)       │   (Windows)     │
+│ ┌─────────────┐ │                        │ ┌─────────────┐ │
+│ │   Screen    │ │                        │ │   Screen    │ │
+│ │  Platform   │ │                        │ │  Platform   │ │
+│ │   Layer     │ │                        │ │   Layer     │ │
+│ └─────────────┘ │                        │ └─────────────┘ │
+└─────────────────┘                        └─────────────────┘
+┌───────┐ ┌───────┐
+│ Keyb. │ │ Mouse │
+└───────┘ └───────┘
+
+                                           ┌─────────────────┐
+                                           │  Client App     │
+                                           │    (macOS)      │
+                                           │ ┌─────────────┐ │
+                                           │ │   Screen    │ │
+                                           │ │  Platform   │ │
+                                           │ │   Layer     │ │
+                                           │ └─────────────┘ │
+                                           └─────────────────┘
+
+                                           ┌─────────────────┐
+                                           │  Client App     │
+                                           │   (Custom)      │
+                                           │ ┌─────────────┐ │
+                                           │ │   Screen    │ │
+                                           │ │  Platform   │ │
+                                           │ │   Layer     │ │
+                                           │ └─────────────┘ │
+                                           └─────────────────┘
+```
+
+### More info
+
+For more info, see our [Wiki](https://github.com/deskflow/deskflow/wiki).
+
+Check out our [Building guide](build.md) or our general @ref contributing_guide "Contributing section". We also have a detailed [Protocol Reference](protocol_reference.md).

docs/dev/protocol_reference.md

@@ -0,0 +1,532 @@
+# Protocol Reference {#protocol_reference}
+
+This document provides a comprehensive reference for the Deskflow network protocol. It is the primary source of information for developers implementing Deskflow clients or extending the protocol.
+
+## Protocol Overview
+
+The Deskflow protocol enables keyboard and mouse sharing between multiple computers over a TCP network connection. The protocol uses two distinct sets of terminology to describe the roles of the computers involved:
+
+- **Network Role (Client/Server)**: This describes the connection architecture.
+  - **Server**: The machine that listens for incoming TCP connections.
+  - **Client**: The machine that initiates the TCP connection to the server.
+
+- **Input Control Role (Primary/Secondary)**: This describes the flow of keyboard and mouse events.
+  - **Primary**: The computer whose keyboard and mouse are currently being used to control other computers.
+  - **Secondary**: A computer that is being controlled by the Primary's keyboard and mouse.
+
+In a typical setup, the Primary computer (the one whose keyboard and mouse are shared) also acts as the Server. However, the protocol is flexible and allows these roles to be separate. For example, a Primary machine can act as a Client to connect to a Secondary machine that is configured as a Server. This can be useful for navigating restrictive network environments like firewalls.
+
+Throughout the documentation, message direction is often described using the Primary/Secondary roles to clarify the input control flow, while Client/Server roles are used when discussing the underlying network connection.
+
+### Key Implementation Files
+
+- **[ProtocolTypes.h](@ref ProtocolTypes.h)** – Complete protocol specification
+- **[ProtocolUtil.h](@ref ProtocolUtil.h)** – Message formatting utilities
+- **[ClientInfo](@ref ClientInfo)** – Screen information structure
+
+The protocol is designed to be:
+- Lightweight and efficient
+- Cross-platform compatible
+- Extensible for new features
+- Backward compatible with older versions
+
+## Protocol Architecture
+
+
+```
+┌─────────────────┐    TCP/IP Network    ┌─────────────────┐
+│   Primary       │◄────────────────────►│   Secondary     │
+│   (Server)      │     Port 24800       │   (Client)      │
+│                 │                      │                 │
+│ • Shares input  │                      │ • Receives input│
+│ • Manages layout│                      │ • Reports info  │
+│ • Coordinates   │                      │ • Executes cmds │
+└─────────────────┘                      └─────────────────┘
+```
+
+The protocol operates over a standard TCP connection on port 24800. In protocol versions 1.4 and later, TLS encryption is supported for secure communications.
+
+## Protocol State Machine
+
+The client's connection lifecycle is defined by five primary states:
+
+
+```
+                         ┌──────────────────┐
+                         │      START       │
+                         └────────┬─────────┘
+                                  │
+                                  ▼
+                         ┌────────┴─────────┐
+                         │   DISCONNECTED   │
+                         │   (Initial &     │◄───────────────────┐
+                         │   Final State)   │                    │
+                         └────────┬─────────┘                    │
+                                  │                              │
+                                  ▼                              │
+                         ┌──────────────────┐                    │
+                         │    CONNECTING    │  TCP Failure       │
+                         │  (TCP handshake) ├───────────────────►┤
+                         └────────┬─────────┘                    │
+                                  │                              │
+                      TCP Success │                              │
+                                  │                              │
+                                  ▼                              │
+                         ┌──────────────────┐                    │
+                         │    HANDSHAKE     │  Version Mismatch  │
+                         │  (Hello/HelloBk) ├───────────────────►┤
+                         └────────┬─────────┘                    │
+                                  │                              │
+                               OK │                              │
+                                  │                              │
+                                  ▼                              │
+                         ┌──────────────────┐                    │
+                         │    CONNECTED     │  CCLOSE (close)    │
+                    ┌───►│  (Authenticated  ├───────────────────►┤
+                    │    │   but inactive)  │                    │
+                    │    └────────┬─────────┘                    │
+                    │             │                              │
+             COUT   │        CINN │                              │
+           (Leave)  │      (Enter)│                              │
+                    │             ▼                              │
+                    │    ┌──────────────────┐                    │
+                    └────┤      ACTIVE      │  CCLOSE (close)    │
+                         │  (Receiving all  ├───────────────────►┘
+                    ┌───►│   input events)  │
+                    │    └────────┬─────────┘
+                    │             │
+                    │             ▼
+                    │    ┌──────────────────┐
+                    └────┤  PROCESS EVENT   │
+                         └──────────────────┘
+                                  
+                                  
+
+```
+
+### State Descriptions
+
+1. **Disconnected**: Initial and final state. No connection to @ref Server.
+2. **Connecting**: @ref TCPSocket connection attempt in progress.
+   - Initiating @ref TCPSocket connection.
+   - On successful TCP connection, moves to the `Handshake` state.
+   - If TCP connection fails (timeout, RST packet), returns to `Disconnected`.
+3. **Handshake**: Protocol version negotiation and authentication.
+   - @ref Server sends @ref kMsgHello with protocol version information.
+   - @ref Client responds with @ref kMsgHelloBack including version and screen name.
+   - @ref Server validates the client's message.
+   - Success transitions to `Connected`, failure sends @ref kMsgEIncompatible error.
+4. **Connected**: Authenticated but not receiving input events.
+   - @ref Client must respond to @ref kMsgCKeepAlive messages from the @ref Server.
+   - Receiving @ref kMsgCEnter message transitions to `Active`.
+5. **Active**: Receiving and processing input events from @ref Server.
+   - Receiving @ref kMsgCLeave message transitions back to `Connected`.
+   - Receiving @ref kMsgCClose message transitions to `Disconnected`.
+
+
+## Message Categories
+
+The protocol organizes messages into logical categories:
+
+| Category | Prefix | Purpose | Examples |
+|----------|---------|----------|-----------|
+| **[Handshake](@ref protocol_handshake)** | None | Connection setup | @ref kMsgHello, @ref kMsgHelloBack |
+| **[Commands](@ref protocol_commands)** | `C` | Screen control | @ref kMsgCEnter, @ref kMsgCLeave, @ref kMsgCKeepAlive |
+| **[Data](@ref protocol_data)** | `D` | Input events | @ref kMsgDKeyDown, @ref kMsgDMouseMove, @ref kMsgCClipboard, @ref kMsgDClipboard |
+| **[Queries](@ref protocol_queries)** | `Q` | Information requests | @ref kMsgQInfo |
+| **[Errors](@ref protocol_errors)** | `E` | Error notifications | @ref kMsgEIncompatible, @ref kMsgEBusy |
+
+## Message Reference Table
+
+This table lists all protocol messages in alphabetical order. For a typical sequence of messages, see the [Typical Control Flow](#typical-control-flow) section.
+
+| Message | Constant | Category | Direction | Purpose | Constraints | Protocol Version |
+|---|---|---|---|---|---|---|
+| [**CALV**](@ref kMsgCKeepAlive) | @ref kMsgCKeepAlive | Command | Both | Keep-alive | [MsgSize](#constraint-protocol-max-message-length), [KeepAlive](#constraint-keep-alive) | 1.3+ |
+| [**CBYE**](@ref kMsgCClose) | @ref kMsgCClose | Command | Server→Client | Close connection | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**CCLP**](@ref kMsgCClipboard) | @ref kMsgCClipboard | Command | Both | Clipboard ownership notification | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**CIAK**](@ref kMsgCInfoAck) | @ref kMsgCInfoAck | Command | Server→Client | Acknowledge info message | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**CINN**](@ref kMsgCEnter) | @ref kMsgCEnter | Command | Server→Client | Enter screen | [MsgSize](#constraint-protocol-max-message-length), [ScreenEntrySync](#constraint-screen-entry-sync) | 1.0+ |
+| [**CNOP**](@ref kMsgCNoop) | @ref kMsgCNoop | Command | Both | No operation | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**COUT**](@ref kMsgCLeave) | @ref kMsgCLeave | Command | Server→Client | Leave screen | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**CROP**](@ref kMsgCResetOptions) | @ref kMsgCResetOptions | Command | Server→Client | Reset options to defaults | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**CSEC**](@ref kMsgCScreenSaver) | @ref kMsgCScreenSaver | Command | Server→Client | Screen saver control | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**DCLP**](@ref kMsgDClipboard) | @ref kMsgDClipboard | Data | Both | Clipboard data | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**DDRG**](@ref kMsgDDragInfo) | @ref kMsgDDragInfo | Data | Server→Client | Drag file info | [MsgSize](#constraint-protocol-max-message-length), [ListSize](#constraint-max-list) | 1.5+ |
+| [**DFTR**](@ref kMsgDFileTransfer) | @ref kMsgDFileTransfer | Data | Both | File transfer data | [MsgSize](#constraint-protocol-max-message-length) | 1.5+ |
+| [**DINF**](@ref kMsgDInfo) | @ref kMsgDInfo | Data | Client→Server | Screen information | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**DKDL**](@ref kMsgDKeyDownLang) | @ref kMsgDKeyDownLang | Data | Server→Client | Key down with language | [MsgSize](#constraint-protocol-max-message-length), [KeyMap](#constraint-keymap) | 1.8+ |
+| [**DKDN**](@ref kMsgDKeyDown) | @ref kMsgDKeyDown | Data | Server→Client | Key down | [MsgSize](#constraint-protocol-max-message-length), [KeyMap](#constraint-keymap) | 1.1+ |
+| [**DKDN**](@ref kMsgDKeyDown1_0) | @ref kMsgDKeyDown1_0 | Data | Server→Client | Key down (legacy) | [MsgSize](#constraint-protocol-max-message-length), [KeyMap](#constraint-keymap) | 1.0 |
+| [**DKRP**](@ref kMsgDKeyRepeat) | @ref kMsgDKeyRepeat | Data | Server→Client | Key repeat | [MsgSize](#constraint-protocol-max-message-length), [KeyMap](#constraint-keymap) | 1.1+ |
+| [**DKRP**](@ref kMsgDKeyRepeat1_0) | @ref kMsgDKeyRepeat1_0 | Data | Server→Client | Key repeat (legacy) | [MsgSize](#constraint-protocol-max-message-length), [KeyMap](#constraint-keymap) | 1.0 |
+| [**DKUP**](@ref kMsgDKeyUp) | @ref kMsgDKeyUp | Data | Server→Client | Key up | [MsgSize](#constraint-protocol-max-message-length), [KeyMap](#constraint-keymap) | 1.1+ |
+| [**DKUP**](@ref kMsgDKeyUp1_0) | @ref kMsgDKeyUp1_0 | Data | Server→Client | Key up (legacy) | [MsgSize](#constraint-protocol-max-message-length), [KeyMap](#constraint-keymap) | 1.0 |
+| [**DMDN**](@ref kMsgDMouseDown) | @ref kMsgDMouseDown | Data | Server→Client | Mouse down | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**DMMV**](@ref kMsgDMouseMove) | @ref kMsgDMouseMove | Data | Server→Client | Mouse move (absolute) | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**DMRM**](@ref kMsgDMouseRelMove) | @ref kMsgDMouseRelMove | Data | Server→Client | Mouse move (relative) | [MsgSize](#constraint-protocol-max-message-length) | 1.2+ |
+| [**DMUP**](@ref kMsgDMouseUp) | @ref kMsgDMouseUp | Data | Server→Client | Mouse up | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**DMWM**](@ref kMsgDMouseWheel) | @ref kMsgDMouseWheel | Data | Server→Client | Mouse wheel | [MsgSize](#constraint-protocol-max-message-length) | 1.3+ |
+| [**DMWM**](@ref kMsgDMouseWheel1_0) | @ref kMsgDMouseWheel1_0 | Data | Server→Client | Mouse wheel (legacy) | [MsgSize](#constraint-protocol-max-message-length) | 1.0-1.2 |
+| [**DSOP**](@ref kMsgDSetOptions) | @ref kMsgDSetOptions | Data | Server→Client | Set options | [MsgSize](#constraint-protocol-max-message-length), [ListSize](#constraint-max-list) | 1.0+ |
+| [**EBAD**](@ref kMsgEBad) | @ref kMsgEBad | Error | Server→Client | Protocol violation | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**EBSY**](@ref kMsgEBusy) | @ref kMsgEBusy | Error | Server→Client | Server busy | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**EICV**](@ref kMsgEIncompatible) | @ref kMsgEIncompatible | Error | Server→Client | Incompatible version | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**EUNK**](@ref kMsgEUnknown) | @ref kMsgEUnknown | Error | Server→Client | Unknown client | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**Hello**](@ref kMsgHello) | @ref kMsgHello | Handshake | Server→Client | Protocol identification | [HelloSize](#constraint-max-hello), [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**HelloArgs**](@ref kMsgHelloArgs) | @ref kMsgHelloArgs | Handshake | Internal | Hello message construction | [HelloSize](#constraint-max-hello), [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**HelloBack**](@ref kMsgHelloBack) | @ref kMsgHelloBack | Handshake | Client→Server | Client identification | [HelloSize](#constraint-max-hello), [MsgSize](#constraint-protocol-max-message-length), [HandshakeTimeout](#constraint-handshake-timeout) | 1.0+ |
+| [**HelloBackArgs**](@ref kMsgHelloBackArgs) | @ref kMsgHelloBackArgs | Handshake | Internal | HelloBack message construction | [HelloSize](#constraint-max-hello), [MsgSize](#constraint-protocol-max-message-length), [HandshakeTimeout](#constraint-handshake-timeout) | 1.0+ |
+| [**LSYN**](@ref kMsgDLanguageSynchronisation) | @ref kMsgDLanguageSynchronisation | Data | Server→Client | Language synchronization | [MsgSize](#constraint-protocol-max-message-length) | 1.8+ |
+| [**QINF**](@ref kMsgQInfo) | @ref kMsgQInfo | Query | Server→Client | Request screen info | [MsgSize](#constraint-protocol-max-message-length) | 1.0+ |
+| [**SECN**](@ref kMsgDSecureInputNotification) | @ref kMsgDSecureInputNotification | Data | Server→Client | Secure input notification | [MsgSize](#constraint-protocol-max-message-length) | 1.7+ |
+
+## Typical Control Flow
+<a id="typical-control-flow"></a>
+
+A typical control flow is as follows:
+1.  **Handshake**: The server and client exchange `Hello` and `HelloBack` messages to agree on a protocol version.
+2.  **Information Exchange**: The server requests client information with `QINF`, and the client responds with `DINF`.
+3.  **Options**: The server sends `DSOP` to configure client options.
+4.  **Keep-Alive**: The server and client periodically exchange `CALV` messages to maintain the connection.
+5.  **Screen Entry**: The server sends `CINN` to grant control to the client.
+6.  **Input Events**: The server sends a stream of input event messages (e.g., `DMMV`, `DMDN`, `DKDN`).
+7.  **Screen Leave**: The server sends `COUT` to revoke control from the client.
+8.  **Connection Close**: The server sends `CCLOSE` to terminate the connection.
+
+## Protocol Constraints
+
+To ensure security, stability, and compatibility, the protocol enforces strict constraints:
+
+<a id="constraint-max-msg"></a>
+
+### Message and Data Size Limits
+
+**Maximum Message Size:**  
+<a id="constraint-protocol-max-message-length"></a>**4,194,304 bytes (4 MB)** — @ref PROTOCOL_MAX_MESSAGE_LENGTH  
+Maximum total size of any single, length-prefixed data packet  
+Defined in Protocol Limits
+
+**Maximum List Size:**  
+<a id="constraint-max-list"></a>**1,048,576 elements** — @ref PROTOCOL_MAX_LIST_LENGTH  
+Maximum number of items in a list/vector within a message  
+Defined in Protocol Limits
+
+**Maximum Hello Size:**  
+<a id="constraint-max-hello"></a>**1,024 bytes** — @ref kMaxHelloLength  
+Maximum size of the initial Connection Handshake message  
+Defined in Protocol Limits
+
+<a id="constraint-tls"></a>
+
+### TLS Handshake and Security (Protocol v1.4+)
+
+When encryption is enabled, the protocol follows this sequence:
+
+1. Standard TCP connection established
+2. TLS handshake performed over TCP socket
+3. Protocol handshake begins only after TLS session is established
+
+- **Implementation Details**:
+    - The client initiates a standard TCP connection, then the (private) SecureSocket::handleTCPConnected method is called, which begins the TLS handshake
+
+- **Certificate Validation**:
+    - Client implementations **must** validate the server's certificate
+    - The reference implementation checks that the public key is RSA or DSA and that the key length is at least 2048 bits
+
+### Key Code and Modifier Mapping
+
+A modifier (modifier mask) represents the state of modifier keys (like Shift, Control, Alt, and Command) on a keyboard. It is a binary code (like 0000 0110) where each bit corresponds to a specific modifier key.
+
+**Key-Up/Key-Down Strategy:**
+- <a id="constraint-keymap"></a>Client must use the @ref KeyButton (physical key) to track pressed keys, as the @ref KeyID (virtual key) can change based on modifier state
+- This strategy is described in the documentation for @ref kMsgDKeyDown
+
+**Modifier Remapping:**
+- The server can command clients to remap modifier keys via the @ref kMsgDSetOptions message
+- The client processes the @ref kMsgDSetOptions message and updates the modifier translation table accordingly
+
+## Timing and Synchronization
+
+<a id="constraint-keep-alive"></a>
+
+### Keep-Alive Mechanism (Protocol v1.3+)
+
+**Server-Side Behavior:**
+- The server sends kMsgCKeepAlive messages every 3.0 seconds (defined by @ref kKeepAliveRate)
+- This timer is implemented in @ref ClientProxy1_3::addHeartbeatTimer in the @ref ClientProxy1_3 class
+
+**Client-Side Behavior:**
+- Upon receiving a kMsgCKeepAlive message, the client must immediately send a kMsgCKeepAlive message back
+- The client maintains a timeout that is reset each time any message is received
+- If no message is received for 9.0 seconds (3 × @ref kKeepAliveRate), client must disconnect
+- This is handled by the  (private) ServerProxy::handleKeepAliveAlarm method
+
+<a id="constraint-screen-entry-sync"></a>
+### Synchronization on Screen Entry
+
+- The @ref kMsgCEnter (Enter Screen) message includes the current modifier state
+- Client must synchronize their local modifier state with this mask
+
+<a id="constraint-handshake-timeout"></a>
+### Handshake Timeout
+
+- Server allows **30 seconds** for handshake completion
+- If client fails to send valid @ref kMsgHelloBack within this time, connection is closed
+- When a new client connects, the server creates a temporary @ref ClientProxyUnknown to handle the version handshake
+- A one-shot timer is started for 30 seconds
+- If the client fails to respond in time, the @ref protocol_errors function is triggered, the connection is logged as unresponsive, and the socket is closed
+
+## Version Compatibility
+
+| Version | Release Date | Project | Features | Compatibility |
+|---------|----------|---------------|----------|---------------|
+| **1.0** | May 2001 | Synergy | Basic keyboard/mouse sharing (@ref kMsgDKeyDown, @ref kMsgDMouseMove) | All versions |
+| **1.1** | Apr 2002 | Synergy | Physical key codes (@ref KeyButton) | 1.1+ |
+| **1.2** | Jan 2006 | Synergy | Relative mouse movement | 1.2+ |
+| **1.3** | May 2006 | Synergy | Keep-alive (@ref kMsgCKeepAlive), horizontal scroll (@ref kMsgDMouseWheel) | 1.3+ |
+| **1.4** | Nov 2012 | Synergy | Encryption support (@ref SecureSocket) | 1.4+ |
+| **1.5** | Sep 2013 | Synergy | File transfer | 1.5+ |
+| **1.6** | Jan 2014 | Synergy | Clipboard streaming | 1.6+ |
+| **1.7** | Nov 2021 | Synergy | Secure input notifications | 1.7+ |
+| **1.8** | Jun 2025 | Synergy | Language synchronization | 1.8+ |
+
+### Version Migration Guide
+
+When implementing a client that supports multiple protocol versions:
+
+1. **Version Negotiation**: During handshake, client should advertise highest supported version
+2. **Feature Detection**: Check server's version in `Hello` message before using version-specific features
+3. **Fallback Mechanism**: Be prepared to operate with only features available in the negotiated version
+4. **Graceful Degradation**: If server supports a lower version than client's minimum, handle `EIncompatible` error gracefully
+
+## Implementation Examples
+
+### Connection Lifecycle
+
+```cpp
+// 1. Connect to server
+std::string server_ip = "192.168.1.100";
+connect(server_ip, 24800);
+
+// 2. Receive Hello from server
+auto hello = receive_message();
+std::string server_version, server_name;
+parse_hello(hello, &server_version, &server_name);
+
+// 3. Send HelloBack to server
+std::string client_version = "1.8";
+std::string client_name = "MyClient";
+send_hello_back(client_version, client_name);
+
+// 4. Enter main message loop
+bool connected = true;
+while (connected) {
+    auto message = receive_message();
+    handle_message(message);
+}
+```
+
+### Message Handling
+
+```cpp
+void handle_message(const Message& msg) {
+    switch (msg.type) {
+        case "CINN": // Enter screen
+            handle_enter(msg.x, msg.y, msg.sequence, msg.modifiers);
+            break;
+        case "DKDN": // Key down
+            handle_key_down(msg.key_id, msg.modifiers, msg.key_button);
+            break;
+        case "DMMV": // Mouse move
+            handle_mouse_move(msg.x, msg.y);
+            break;
+        // ... handle other message types
+    }
+}
+```
+
+### Complete Message Exchange Sequence
+
+Below is a typical message exchange sequence for a client connecting to a server:
+
+
+
+```
+Client                                 Server
+  |                                      |
+  |                                      | Server starts listening on port 24800
+  |                                      |
+  | TCP SYN                              |
+  | ───────────────────────────────────► |
+  |                                      |
+  | ◄─────────────────────────────────── |
+  | TCP SYN+ACK                          |
+  |                                      |
+  | TCP ACK                              |
+  | ───────────────────────────────────► |
+  |                                      | TCP connection established
+  |                                      |
+  | ◄─────────────────────────────────── |
+  | "Deskflow" + version (1.8)           | Hello message
+  |                                      |
+  | "Deskflow" + version + name          |
+  | ───────────────────────────────────► | HelloBack message
+  |                                      |
+  | ◄─────────────────────────────────── |
+  | "QINF"                               | Query screen info
+  |                                      |
+  | "DINF" + screen dimensions           |
+  | ───────────────────────────────────► | Report screen info
+  |                                      |
+  | ◄─────────────────────────────────── |
+  | "DSOP" + options                     | Set options
+  |                                      |
+  | ◄─────────────────────────────────── |
+  | "CALV"                               | Keep-alive
+  |                                      |
+  | "CALV"                               |
+  | ───────────────────────────────────► | Keep-alive response
+  |                                      |
+  | ◄─────────────────────────────────── |
+  | "CINN" + x + y + seq + mask          | Enter screen
+  |                                      |
+  | ◄─────────────────────────────────── |
+  | "DMMV" + x + y                       | Mouse move
+  |                                      |
+  | ◄─────────────────────────────────── |
+  | "DMDN" + button                      | Mouse down
+  |                                      |
+  | ◄─────────────────────────────────── |
+  | "DMUP" + button                      | Mouse up
+  |                                      |
+  | ◄─────────────────────────────────── |
+  | "DKDN" + key + mask + button         | Key down
+  |                                      |
+  | ◄─────────────────────────────────── |
+  | "DKUP" + key + mask + button         | Key up
+  |                                      |
+  | ◄─────────────────────────────────── |
+  | "COUT"                               | Leave screen
+  |                                      |
+  | ◄─────────────────────────────────── |
+  | "CCLOSE"                             | Close connection
+  |                                      |
+  | TCP FIN                              |
+  | ◄─────────────────────────────────── |
+  |                                      |
+  | TCP FIN+ACK                          |
+  | ───────────────────────────────────► |
+  |                                      | Connection closed
+```
+
+**Legend:**
+
+- Hello message: @ref kMsgHello
+- HelloBack message: @ref kMsgHelloBack
+- Query screen info: @ref kMsgQInfo
+- Report screen info: @ref kMsgDInfo
+- Set options: @ref kMsgDSetOptions
+- Keep-alive: @ref kMsgCKeepAlive
+- Enter screen: @ref kMsgCEnter
+- Mouse move: @ref kMsgDMouseMove
+- Mouse down: @ref kMsgDMouseDown
+- Mouse up: @ref kMsgDMouseUp
+- Key down: @ref kMsgDKeyDown
+- Key up: @ref kMsgDKeyUp
+- Leave screen: @ref kMsgCLeave
+- Close connection: @ref kMsgCClose
+
+## Debugging and Troubleshooting
+
+### Common Issues
+
+1. **Version Mismatch**: Check protocol version negotiation
+2. **Message Format**: Validate message structure and parameters
+3. **Byte Order**: Ensure network byte order for multi-byte integers
+4. **Keep-Alive**: Implement proper keep-alive response
+5. **Screen Info**: Send accurate screen dimensions and mouse position
+
+### Debug Tools
+
+- **Wireshark**: Capture and analyze network traffic
+- **Protocol Logs**: Enable verbose logging in Deskflow
+- **Message Validation**: Check message format against specification
+
+## Platform-Specific Implementations
+
+For platform-specific implementation details, refer to:
+- @ref ProtocolTypes.h – Complete protocol specification
+- @ref ProtocolUtil.h – Message formatting utilities
+
+## Implementation Checklist
+
+### Basic Client Implementation
+
+- **Connection Management**
+  - TCP connection to server port 24800
+  - Protocol handshake (Hello/HelloBack)
+  - Version negotiation
+  - Keep-alive handling
+
+- **Message Processing**
+  - Message parsing and validation
+  - Command message handling (Enter/Leave)
+  - Input event processing (keyboard/mouse)
+  - Error handling and recovery
+
+- **Screen Management**
+  - Screen information reporting (DINF)
+  - Resolution change detection
+  - Mouse cursor positioning
+
+- **Input Synthesis**
+  - Keyboard event injection
+  - Mouse event injection
+  - Modifier key synchronization
+
+### Advanced Features
+
+- **Clipboard Synchronization**
+  - Clipboard grab notifications
+  - Data transfer (@ref kMsgDClipboard - text, images, HTML)
+  - Streaming for large data (v1.6+)
+
+- **File Transfer** (v1.5+)
+  - Drag-and-drop initiation
+  - Chunked file transfer
+  - Progress tracking
+
+- **Security Features**
+  - TLS/SSL encryption (v1.4+)
+  - Secure input notifications (v1.7+)
+  - Input validation and limits
+
+## Reference Implementation
+
+The @ref ServerProxy class provides a reference implementation demonstrating:
+
+- Basic protocol handling
+- Message parsing and generation
+- Connection management
+- Input event processing
+
+
+## Contributing
+
+When extending the protocol:
+
+1. **Maintain Compatibility**: New features should be backward compatible
+2. **Update Documentation**: Document new messages and parameters
+3. **Version Increment**: Bump minor version for new features
+4. **Test Thoroughly**: Verify with existing clients and servers
+
+## Support and Resources
+
+
+- @ref ProtocolTypes.h – Complete protocol specification
+- @ref ProtocolUtil.h – Message formatting utilities
+
+---
+
+*This documentation is generated from the source code and is always up-to-date with the latest protocol implementation.*

docs/user/CMakeLists.txt

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-License-Identifier: MIT
+
+set(DOXYGEN_USE_MDFILE_AS_MAINPAGE mainpage.md)
+
+# Files used to make our documents
+# User facing documents will not include doxy comments in source code
+doxygen_add_docs(user-docs ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Generating user documentation" ALL)
+
+# HACK Only these will show in your IDE
+target_sources(user-docs PRIVATE
+  mainpage.md
+  configuration.md
+)
+
+install(
+  DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html"
+  DESTINATION ${CMAKE_INSTALL_DOCDIR}
+)

docs/user/configuration.md

@@ -0,0 +1,817 @@
+# GUI Config
+
+ Deskflow will automatically figure out where to save settings and other files.
+
+
+## Search paths
+
+Deskflow will look for settings in several places depending on your operating system.
+The search order for a setting file depends on your operating system
+
+### Linux
+
+  1. `<XDG_CONFIG_HOME>/Deskflow/Deskflow.conf`
+  2. `~/.config/Deskflow/Deskflow.conf`
+  3. `/etc/Deskflow/Deskflow.conf`
+ 
+A new settings file will be created in the user path if no settings file is found.
+The path of the settings file will be used as the base for all other config files.
+
+### macOS
+ 
+  1. `~/Library/Deskflow/Deskflow.conf`
+  2. `/Library/Deskflow/Deskflow.conf`
+ 
+A new settings file will be created in the user path if no settings file is found.
+The path of the settings file will be used as the base for all other config files.
+
+### Windows
+
+  1. `<install-path>/settings/Deskflow.conf`
+  2. Windows Registry `HKCU\Software\Deskflow\Deskflow`
+
+Windows will save to the install dir if settings are loaded from there. If not, it saves any other config files in: `C:\ProgramData\Deskflow\`
+
+When using settings from the install dir, the service mode will not be available.
+
+## Valid GUI Keys
+
+The GUI config file contains several sections.
+Each section is formatted the same.
+Option-value pairs are only written if the value is not the default value.
+
+```
+[section]
+option=value
+```
+
+### Client
+
+This section contains options used when in client mode. 
+It will begin with `[client]`
+
+| Option            |    Valid Values    | Description |
+|:------------------|:------------------:|:-----------|
+| languageSync      | `true` or `false`  | Sync to server language [default: true] |
+| remoteHost        | `IP` or `hostname` | The remote host(s) to connect to. Use a comma separated list when you want to try several hosts |
+| yScrollScale      | Double 0.1 - 10.0  | Vertical mouse scrolling will be scaled by this amount on the client [default: 1.0] |
+| xScrollScale      | Double 0.1 - 10.0  | Horizontal mouse scrolling will be scaled by this amount on the client [default: 1.0] |
+| invertYScroll     | `true` or `false`  | Invert vertical scroll on this client [default: false] |
+| invertXScroll     | `true` or `false`  | Invert horizontal scroll on this client [default: false] |
+| xdpRestoreToken   | UUID               | Restore token provided by XDG portals |
+
+### Core
+
+This section contains general options it will begin with `[core]`
+
+|Option         | Valid Values|Description|
+|:--------------|:-----------:|:-----------|
+| coreMode      | `0` or `1` or `2` | The mode to start in 0: None, 1: Client, 2: Server [default: 0]|
+| display       |  int              | The XWindow display to use [default: autodetected] |
+| interface     | IP Address        | Preferred IP to use for network communication. By default the server board casts on any available address |
+| lastVersion   | M.m.p.t           | The version last run used for checking for updates |
+| port          | port #            | Port to use when connecting [default: 24800 |
+| preventSleep  | `true` or `false` | Prevent sleep when Deskflow is active [default: false] |
+| processMode   | `1` or `0`        | The mode we use to start the process Service or Desktop |
+| computerName  | string            | Name used to identify the computer [default: machine's hostname] |
+| useHooks      | `true` or `false` | If Windows uses hooks or not [default: true] |
+| language      | 639 language      | The language to display the GUI in [default: en] |
+| wlClipboard   | `true` or `false` | When true the wl-clipboard backend will be enabled [default: false] |
+| enableEnterCommand | `true` or `false` | Should the enter command be triggered when the screen is entered [defaut: false] |
+| enterCommand  | command | A command to run when the screen is entered. |
+| enableExitCommand | `true` or `false` | Should the exit command be triggered when the screen is exited [defaut: false] |
+| exitCommand  | command | A command to run when the screen is exited. |
+
+### Daemon
+
+This section contains options used by the daemon on windows it will begin with `[daemon]`
+
+|Option | Valid Values|Description|
+|:----------|:-----------:|:-----------|
+| command   | Filename          | The filename of the binary the daemon. This binary exists in the same path as the deskflow GUI |
+| elevate   | `true` or `false` | Elevate the daemon app [default: true unless portable mode ] |
+| logFile   | Filepath          | Filepath of the daemon log |
+| logLevel  | valid log Level,  | Log Level  |
+
+### GUI
+
+This section contains options used by the GUI it will begin with `[gui]`
+
+|Option                          | Valid Values      |Description|
+|:-------------------------------|:-----------------:|:-----------|
+| autoHide                       | `true` or `false` | When true the app will hide itself on start up [default: false] |
+| enableUpdateCheck              | `true` or `false` | When true check the update URL to see if a new version was released on start up [default: false] |
+| closeReminder                  | `true` or `false` | Used to track if we have shown the reminder that when you close the app it remain running in the background  [default: true]|
+| closeToTray                    | `true` or `false` | When `true` the gui will run in the systemTray when its closed [default: true] |
+| logExpanded                    | `true` or `false` | Should the log section of the GUI be opened [default: false] |
+| symbolicTrayIcon               | `true` or `false` | When true use the monocolor (symbolic) icon false uses a colorful icon for the tray [default: true] |
+| windowGeometry                 | QRect             | Geometry of the window used to restore the window geometry after exiting the app |
+| showGenericClientFailureDialog | `true` or `false` | When `true` client connection errors will not show popup error messages [default: true] |
+| shownFirstConnectedMessage     | `true` or `false` | When `true` GUI has shown the user the message for connecting the first time [default: false] |
+| shownServerFirstStartMessage   | `true` or `false` | When `true` GUI has shown the user the Deskflow server is now running message [default: false] |
+| shownVerionInTitle             | `true` or `false` | When `true` GUI will include the version in the window title [default: false] |
+| startCoreWithGui               | `true` or `false` | When true the Core will be started with the GUI. It is set to the Core's state on exit. |
+| updateCheckUrl                 | URL               | The URL to use when checking for a new version number, it should return a version [default: https://api.deskflow.org/version]|
+
+### Log
+
+This section contains options used by the application logging it will begin with `[log]`
+
+|Option    |    Valid Values   |Description|
+|:---------|:-----------------:|:-----------|
+| file     | Filepath          | The file to write the log into |
+| level    | Valid log level   | Log level to use |
+| toFile   | `true` or `false` | When true the log will be written to the value of the `file` option |
+| guiDebug | `true` or `false` | When true the log will show the Gui's internal debug messages |
+
+### Security
+
+This section contains options used by the application security it will begin with `[security]`
+
+|Option                 |   Valid Values    |Description|
+|:----------------------|:-----------------:|:-----------|
+| checkPeerFingerprints | `true` or `false` | When true peers will have their fingerprints confirmed by the user and stored [default: true] |
+| certificate           | Filepath          | Path to the certificate to use to encrypt messages.|
+| keySize               | `2048` OR `4096`  | Size of the TLS key to use [default: 2048]| 
+| tlsEnabled            | `true` or `false` | Are we using TLS encryption when communicating [default: true].|
+
+### Server
+
+This section contains options used when in server mode it will begin with `[server]`
+
+|Option              |    Valid Values   |Description|
+|:-------------------|:-----------------:|:-----------|
+| externalConfig     | `true` or `false` | When true use the external config path |
+| externalConfigFile | Filepath          | Path the server config file if it does not exist the GUI will it generated based on the `internalConfig` section.|
+
+### InternalConfig
+
+This section contains options used when in server mode it will begin with `[internalConfig]`
+block of a server config file as seen below. This section is used by the GUI to generate a server configuration
+
+```
+[internalConfig]
+clipboardSharing=true
+clipboardSharingSize=@Variant(\0\0\0\x84\0\0\0\0\0\0<\0)
+defaultLockToScreenState=false
+disableLockToScreen=false
+hasHeartbeat=false
+hasSwitchDelay=false
+hasSwitchDoubleTap=false
+heartbeat=5000
+hotkeys\1\actions\1\activeOnRelease=false
+hotkeys\1\actions\1\hasScreens=true
+hotkeys\1\actions\1\keys\1\key=83
+hotkeys\1\actions\1\keys\size=1
+hotkeys\1\actions\1\lockCursorToScreen=0
+hotkeys\1\actions\1\restartServer=false
+hotkeys\1\actions\1\switchInDirection=0
+hotkeys\1\actions\1\switchScreenName=void
+hotkeys\1\actions\1\type=0
+hotkeys\1\actions\1\typeScreenNames\size=0
+hotkeys\1\actions\size=1
+hotkeys\1\keys\1\key=83
+hotkeys\1\keys\size=1
+hotkeys\size=1
+numColumns=5
+numRows=3
+protocol=1
+relativeMouseMoves=false
+screens\1\name=
+screens\10\aliasArray\size=0
+screens\10\fixArray\1\fix=false
+screens\10\fixArray\2\fix=false
+screens\10\fixArray\3\fix=false
+screens\10\fixArray\4\fix=false
+screens\10\fixArray\size=4
+screens\10\modifierArray\1\modifier=0
+screens\10\modifierArray\2\modifier=1
+screens\10\modifierArray\3\modifier=2
+screens\10\modifierArray\4\modifier=3
+screens\10\modifierArray\5\modifier=4
+screens\10\modifierArray\6\modifier=5
+screens\10\modifierArray\size=6
+screens\10\name=null
+screens\10\switchCornerArray\1\switchCorner=false
+screens\10\switchCornerArray\2\switchCorner=false
+screens\10\switchCornerArray\3\switchCorner=false
+screens\10\switchCornerArray\4\switchCorner=false
+screens\10\switchCornerArray\size=4
+screens\10\switchCornerSize=0
+screens\11\name=
+screens\12\name=
+screens\13\name=
+screens\14\name=
+screens\15\name=
+screens\2\name=
+screens\3\name=
+screens\4\name=
+screens\5\name=
+screens\6\name=
+screens\7\aliasArray\size=0
+screens\7\fixArray\1\fix=false
+screens\7\fixArray\2\fix=false
+screens\7\fixArray\3\fix=false
+screens\7\fixArray\4\fix=false
+screens\7\fixArray\size=4
+screens\7\modifierArray\1\modifier=0
+screens\7\modifierArray\2\modifier=1
+screens\7\modifierArray\3\modifier=2
+screens\7\modifierArray\4\modifier=3
+screens\7\modifierArray\5\modifier=4
+screens\7\modifierArray\6\modifier=5
+screens\7\modifierArray\size=6
+screens\7\name=void
+screens\7\switchCornerArray\1\switchCorner=false
+screens\7\switchCornerArray\2\switchCorner=false
+screens\7\switchCornerArray\3\switchCorner=false
+screens\7\switchCornerArray\4\switchCorner=false
+screens\7\switchCornerArray\size=4
+screens\7\switchCornerSize=0
+screens\8\aliasArray\size=0
+screens\8\fixArray\1\fix=false
+screens\8\fixArray\2\fix=false
+screens\8\fixArray\3\fix=false
+screens\8\fixArray\4\fix=false
+screens\8\fixArray\size=4
+screens\8\modifierArray\1\modifier=0
+screens\8\modifierArray\2\modifier=1
+screens\8\modifierArray\3\modifier=2
+screens\8\modifierArray\4\modifier=3
+screens\8\modifierArray\5\modifier=4
+screens\8\modifierArray\6\modifier=5
+screens\8\modifierArray\size=6
+screens\8\name=chris-Precision-5570
+screens\8\switchCornerArray\1\switchCorner=false
+screens\8\switchCornerArray\2\switchCorner=false
+screens\8\switchCornerArray\3\switchCorner=false
+screens\8\switchCornerArray\4\switchCorner=false
+screens\8\switchCornerArray\size=4
+screens\8\switchCornerSize=0
+screens\9\aliasArray\size=0
+screens\9\fixArray\1\fix=false
+screens\9\fixArray\2\fix=false
+screens\9\fixArray\3\fix=false
+screens\9\fixArray\4\fix=false
+screens\9\fixArray\size=4
+screens\9\modifierArray\1\modifier=0
+screens\9\modifierArray\2\modifier=1
+screens\9\modifierArray\3\modifier=2
+screens\9\modifierArray\4\modifier=3
+screens\9\modifierArray\5\modifier=4
+screens\9\modifierArray\6\modifier=5
+screens\9\modifierArray\size=6
+screens\9\name=abyss.lan
+screens\9\switchCornerArray\1\switchCorner=false
+screens\9\switchCornerArray\2\switchCorner=false
+screens\9\switchCornerArray\3\switchCorner=false
+screens\9\switchCornerArray\4\switchCorner=false
+screens\9\switchCornerArray\size=4
+screens\9\switchCornerSize=0
+screens\size=15
+switchCornerArray\1\switchCorner=false
+switchCornerArray\2\switchCorner=false
+switchCornerArray\3\switchCorner=false
+switchCornerArray\4\switchCorner=false
+switchCornerArray\size=4
+switchCornerSize=0
+switchDelay=250
+switchDoubleTap=250
+win32KeepForeground=false
+```
+
+
+# Server Config
+
+The `deskflow-server` command accepts the `-c` or `--config` option, which takes one argument,
+the path to a server configuration file. When using the GUI the `internalConfig` section of the GUI settings will be exported as the server configuration.
+The configuration file is plain text and case-sensitive. The file is broken into sections, and each section has the form:
+```
+section: ''name''
+	''arg'' = ''value''
+end
+```
+
+Comments are introduced by ''#'' and continue to the end of the line. ''name'' must be one of the following:
+
+* ''screens''
+* ''aliases''
+* ''links''
+* ''options''
+
+The file is parsed top to bottom and names cannot be used before they've been defined in the <code>screens</code> or <code>aliases</code> sections. So the <code>links</code> and <code>aliases</code> must appear after the <code>screens</code> and <code>links</code> cannot refer to aliases unless the <code>aliases</code> appear before the <code>links</code>.
+
+### The screens section
+
+''args'' is a list of computer names, one name per line, each followed by a colon. Names are arbitrary strings but they must be unique. The hostname of each computer is recommended. (This is the computer's network name on win32 and the name reported by the program hostname on Unix and OS X. Note that OS X may append .local to the name you gave your computer; e.g. somehost.local.) There must be a computer name for the server and each client. Each computer can specify a number of options. Options have the form name = value and are listed one per line after the computer name.
+
+```
+section: screens
+	moe:
+	larry:
+		halfDuplexCapsLock = true
+		halfDuplexNumLock = true
+	curly:
+		meta = alt
+end
+```
+
+This declares three computers named ''moe'', ''larry'', and ''curly''. Computer ''larry'' has half-duplex ''Caps Lock'' and ''Num Lock'' keys (see below) and computer ''curly'' converts the ''Meta'' modifier key to the ''Alt'' modifier key.
+
+#### screen options
+
+A computer can have the following options:
+|Option | Valid Values| Description|
+|:----------|:-----------:|:-----------|
+|halfDuplexCapsLock| `true` or `false` | This computer has a ''Caps Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Caps Lock'' acts strangely on all computers then you may need to set this option to true on the server. If it acts strangely on one computer then that computer may need the option set to true.|
+|halfDuplexNumLock | `true` or `false` | This computer has a ''Num Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Num Lock'' acts strangely on all computers then you may need to set this option to true on the server. If it acts strangely on one computer then that computer may need the option set to true.|
+|halfDuplexScrollLock| `true` or `false`| This computer has a ''Scroll Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Scroll Lock'' acts strangely on all computers then you may need to set this option to true on the server. If it acts strangely on one computer then that computer may need the option set to true.|
+|xtestIsXineramaUnaware| `true` or `false`| This option works around a bug in the XTest extension when used in combination with Xinerama. It affects X11 clients only. Not all versions of the XTest extension are aware of the Xinerama extension. As a result, they do not move the mouse correctly when using multiple Xinerama screens. This option is currently ''true'' by default. If you know your XTest extension is Xinerama aware then set this option to ''false''.|
+|preserveFocus| `true` or `false` | When true don't drop focus when switching computers
+|switchCorners| corners |See <a href="#switch-corners">switchCorners</a> below.|
+|switchCornerSize | integer | see switchCornerSize below.|
+|shift | shift ctrl alt meta super none | Map the server's shift modifer to different key on a client computer|
+|ctrl  | shift ctrl alt meta super none | Map the server's ctrl modifer to different key on a client computer|
+|alt | shift ctrl alt meta super none | Map the server's alt modifer to different key on a client computer|
+|meta|  shift ctrl alt meta super none | Map the server's meta modifer to different key on a client computer|
+|super|  shift ctrl alt meta super none | Map the server's super modifer to different key on a client computer|
+
+### aliases section
+
+''args'' is a list of computer names just like in the ''screens'' section except each computer is followed by a list of aliases, one per line, not followed by a colon. An ''alias'' is a computer name and must be unique. When searching for computers each alias is equivalent to the computer name it aliases. So a client can connect using its canonical computer name or any of its aliases.
+
+```
+section: aliases
+	larry:
+		larry.stooges.com
+	curly:
+		shemp
+end
+```
+
+Computer ''larry'' is also known as ''larry.stooges.com'' and can connect as either name. Computer ''curly'' is also known as ''shemp'' (hey, it's just an example).
+
+### links secion
+
+''args'' is a list of computer names just like in the ''screens'' section except each computer is followed by a list of links, one per line. Each link has the form:
+```
+ {left|right|up|down}[<range>] = name[<range>]
+```
+
+A link indicates which computer is adjacent in the given direction.
+
+Each side of a link can specify a range which defines a portion of an edge. A range on the direction is the portion of edge you can leave from while a range on the computer is the portion of edge you'll enter into. Ranges are optional and default to the entire edge. All ranges on a particular direction of a particular computer must not overlap.
+
+A ''range'' is written as <code>(start,end)</code>. Both ''start'' and ''end'' are percentages in the range 0 to 100, inclusive. The start must be less than the end. 0 is the left or top of an edge and 100 is the right or bottom. 
+
+```
+section: links
+	moe:
+		right        = larry
+		up(50,100)   = curly(0,50)
+	larry:
+		left         = moe
+		up(0,50)     = curly(50,100)
+	curly:
+		down(0,50)   = moe
+		down(50,100) = larry(0,50)
+end
+```
+
+This indicates that computer ''larry'' is to the right of computer ''moe'' (so moving the cursor off the right edge of ''moe'' would make it appear at the left edge of ''larry''), the left half of curly is above the right half of ''moe'', ''moe'' is to the left of ''larry'' (edges are not necessarily symmetric so you have to provide both directions), the right half of curly is above the left half of ''larry'', all of ''moe'' is below the left half of ''curly'', and the left half of ''larry'' is below the right half of ''curly''.
+
+Note that links do not have to be symmetrical; for instance, here the edge between ''moe'' and ''curly'' maps to different ranges depending on if you're going up or down. In fact links don't have to be bidirectional. You can configure the right of ''moe'' to go to ''larry'' without a link from the left of ''larry'' to ''moe''. It's possible to configure a computer with no outgoing links; the cursor will get stuck on that computer unless you have a hot key configured to switch off of that computer.
+
+### options section
+
+''args'' is a list of lines of the form <code>name = value</code>. These set the global options.
+
+```
+section: options
+	protocol = barrier
+	heartbeat = 5000
+	switchDelay = 500
+end
+```
+
+#### List of options allowed in options section
+
+| Options | Value Values| Description|
+|:--------|:-----------:|:-----------|
+|protocol | barrier or synergy| The protocol to use when saying hello to clients. Can be set to barrier or synergy. If not set barrier is used as the default |
+|heartbeat| integer (N) | The server will expect each client to send a message no less than every `N` milliseconds. If no message arrives from a client within `3N` seconds the server forces that client to disconnect. If deskflow fails to detect clients disconnecting while the server is sleeping or vice versa, try using this option. |
+|switchCorners | none top-left top-right bottom-left bottom-right left right top bottom all | Deskflow won't switch computers when the mouse reaches the edge of the computer if it's in a listed corner. The size of all corners is given by the `switchCornerSize` option. The first name in the list is one of the above names and defines the initial set of corners. Subsequent names are prefixed with + or - to add the corner to or remove the corner from the set, respectively. For example: `all -left +top-left` starts will all corners, removes the left corners (top and bottom) then adds the top-left back in, resulting in the top-left, bottom-left and bottom-right corners.|
+|switchCornerSize | integer (N) | Sets the size of all corners in pixels. The cursor must be within `N` pixels of the corner to be considered to be in the corner.|
+|switchDelay | integer| Deskflow won't switch computers when the mouse reaches edge of a computer unless it stays on the edge for `N` milliseconds. This helps prevent unintentional switching when working near an edge.|
+|switchDoubleTap| integer(N) | Deskflow won't switch computers when the mouse reaches the edge of a computer unless it's moved away from the edge and then back to the edge within `N` milliseconds. With the option you have to quickly tap the edge twice to switch. This helps prevent unintentional switching when working near the edge.|
+|screenSaverSync| `true` or `false`| ''Note: Removed in v1.14.1'' If set to ''false'' then Deskflow won't synchronize screen savers. Client screen savers will start according to their individual configurations. The server screen saver won't start if there is input, even if that input is directed toward a client computer.|
+|relativeMouseMoves| `true` or `false`| If set to ''true'' then secondary computers move the mouse using relative rather than absolute mouse moves when and only when the cursor is locked to the computer (by ''Scroll Lock'' or a configured hot key). This is intended to make Deskflow work better with certain games. If set to ''false'' or not set then all mouse moves are absolute.|
+|clipboardSharing| `true` or `false`|If set to ''true'' then clipboard sharing will be enabled and the ''clipboardSharingSize'' setting will be used. If set to false, then clipboard sharing will be disabled and the the ''clipboardSharingSize'' setting will be ignored.|
+|clipboardSharingSize| integer (N)| Deskflow will send a maximum of `N` kilobytes of clipboard data to another computer when the mouse transitions to that computer.|
+|win32KeepForeground | `true` or `false`| If set to ''true'' (the default), Deskflow will grab the foreground focus on a Windows server (thereby putting all other windows in the background) upon switching to a client. If set to ''false'', it will leave the currently foreground window in the foreground. Deskflow grabs the focus to avoid issues with other apps interfering with Deskflow's ability to read the hardware inputs. |
+|keystroke(key) | actions | Binds the ''key'' combination key to the given ''actions''. ''key'' is an optional list of modifiers (''shift'', ''control'', ''alt'', ''meta'' or ''super'') optionally followed by a character or a key name, all separated by + (plus signs). You must have either modifiers or a character/key name or both. See below for `valid key names` and `actions`. Keyboard hot keys are handled while the cursor any computer. Separate actions can be assigned to press and release.|
+|mousebutton(button) | actions| Binds the modifier and mouse button combination ''button'' to the given ''actions''. ''button'' is an optional list of modifiers (''shift'', ''control'', ''alt'', ''meta'' or ''super'') followed by a button number. The primary button (the left button for right handed users) is button 1, the middle button is 2, etc. Actions can be found below. Mouse button actions are not handled while the cursor is on the server. You cannot use these to perform an action while on the server. Separate actions can be assigned to press and release.|
+
+
+You can use both the ''switchDelay'' and ''switchDoubleTap'' options at the same time. Deskflow will switch when either requirement is satisfied.
+
+##### Actions
+
+Actions are two lists of individual actions separated by commas. The two lists are separated by a '';'' (semicolon). Either list can be empty and if the second list is empty then the semicolon is optional. The first list lists actions to take when the condition becomes true (e.g. the hot key or mouse button is pressed) and the second lists actions to take when the condition becomes false (e.g. the hot key or button is released). The condition becoming true is called activation and becoming false is called deactivation. Allowed individual actions are:
+
+* `keystroke(key[,computers])`
+
+* `keyDown(key[,computers])`
+
+* `keyUp(key[,computers])`
+
+
+: Synthesizes the modifiers and key given in ''key'' which has the same form as described in the ''keystroke'' option. If given, ''computers'' lists the computer or computers to direct the event to, regardless of the active computer. If not given then the event is directed to the active computer only.
+: ''keyDown'' synthesizes a key press and ''keyUp'' synthesizes a key release. ''keystroke'' synthesizes a key press on activation and a release on deactivation and is equivalent to a ''keyDown'' on activation and ''keyUp'' on deactivation.
+: ''computers'' is either ''*'' (asterisk) to indicate all computers or a '':'' (colon) separated list of computer names. (Note that the computer name must have already been encountered in the configuration file so you'll probably want to put ''actions'' at the bottom of the file.)
+
+* `mousebutton(button)`
+* `mouseDown(button)`
+* `mouseUp(button)`
+: Synthesizes the modifiers and mouse button given in ''button'' which has the same form as described in the ''mousebutton'' option.
+: ''mouseDown'' synthesizes a mouse press and ''mouseUp'' synthesizes a mouse release. ''mousebutton'' synthesizes a mouse press on activation and a release on deactivation and is equivalent to a ''mouseDown'' on activation and ''mouseUp'' on deactivation.
+
+* `lockCursorToScreen(mode)`
+: Locks the cursor to or unlocks the cursor from the active computer. ''mode'' can be ''off'' to unlock the cursor, ''on'' to lock the cursor, or ''toggle'' to toggle the current state. The default is ''toggle''. If the configuration has no ''lockCursorToScreen'' action and ''Scroll Lock'' is not used as a hot key then ''Scroll Lock'' toggles cursor locking.
+
+* `switchToScreen(computerName)`
+: Jump to computer with name or alias ''computerName''.
+
+* `switchInDirection(dir)`
+: Switch to the computer in the direction ''dir'', which may be one of ''left'', ''right'', ''up'' or ''down''.
+
+* `switchToNextScreen()`
+: Cycle to the next computer in the configuration order. If at the last computer, cycles back to the first computer.
+
+##### Keynames
+Valid key names are:
+
+<details><summary>Valid Key Names</summary>
+* AppMail
+* AppMedia
+* AppUser1
+* AppUser2
+* AudioDown
+* AudioMute
+* AudioNext
+* AudioPlay
+* AudioPrev
+* AudioStop
+* AudioUp
+* BackSpace
+* Begin
+* Break
+* Cancel
+* CapsLock
+* Clear
+* Delete
+* Down
+* Eject
+* End
+* Escape
+* Execute
+* F1
+* F2
+* F3
+* F4
+* F5
+* F6
+* F7
+* F8
+* F9
+* F10
+* F11
+* F12
+* F13
+* F14
+* F15
+* F16
+* F17
+* F18
+* F19
+* F20
+* F21
+* F22
+* F23
+* F24
+* F25
+* F26
+* F27
+* F28
+* F29
+* F30
+* F31
+* F32
+* F33
+* F34
+* F35
+* Find
+* Help
+* Home
+* Insert
+* KP_0
+* KP_1
+* KP_2
+* KP_3
+* KP_4
+* KP_5
+* KP_6
+* KP_7
+* KP_8
+* KP_9
+* KP_Add
+* KP_Begin
+* KP_Decimal
+* KP_Delete
+* KP_Divide
+* KP_Down
+* KP_End
+* KP_Enter
+* KP_Equal
+* KP_F1
+* KP_F2
+* KP_F3
+* KP_F4
+* KP_Home
+* KP_Insert
+* KP_Left
+* KP_Multiply
+* KP_PageDown
+* KP_PageUp
+* KP_Right
+* KP_Separator
+* KP_Space
+* KP_Subtract
+* KP_Tab
+* KP_Up
+* Left
+* LeftTab
+* Linefeed
+* Menu
+* NumLock
+* PageDown
+* PageUp
+* Pause
+* Print
+* Redo
+* Return
+* Right
+* ScrollLock
+* Select
+* Sleep
+* Space
+* SysReq
+* Tab
+* Undo
+* Up
+* WWWBack
+* WWWFavorites
+* WWWForward
+* WWWHome
+* WWWRefresh
+* WWWSearch
+* WWWStop
+* Space
+* Exclaim
+* DoubleQuote
+* Number
+* Dollar
+* Percent
+* Ampersand
+* Apostrophe
+* ParenthesisL
+* ParenthesisR
+* Asterisk
+* Plus
+* Comma
+* Minus
+* Period
+* Slash
+* Colon
+* Semicolon
+* Less
+* Equal
+* Greater
+* Question
+* At
+* BracketL
+* Backslash
+* BracketR
+* Circumflex
+* Underscore
+* Grave
+* BraceL
+* Bar
+* BraceR
+* Tilde
+</details>
+
+Additionally, a name of the form `\uXXXX` where ''XXXX'' is a hexadecimal number is interpreted as a unicode character code. Key and modifier names are case-insensitive. Keys that don't exist on the keyboard or in the default keyboard layout will not work.
+
+### Example textual configuration file
+
+This example comes from doc/deskflow-basic.conf
+
+```
+# sample deskflow configuration file
+#
+# comments begin with the # character and continue to the end of
+# line.  comments may appear anywhere the syntax permits.
+# +-------+  +--------+ +---------+
+# |Laptop |  |Desktop1| |iMac     |
+# |       |  |        | |         |
+# +-------+  +--------+ +---------+
+
+section: screens
+	# three hosts named:  Laptop, Desktop1, and iMac
+	# These are the nice names of the hosts to make it easy to write the config file
+	# The aliases section below contain the "actual" names of the hosts (their hostnames)
+	Laptop:
+	Desktop1:
+	iMac:
+end
+
+section: links
+	# iMac is to the right of Desktop1
+	# Laptop is to the left of Desktop1
+	Desktop1:
+	        right(0,100) = iMac # the numbers in parentheses indicate the percentage of the computer's edge to be considered active for switching)
+		left  = Laptop
+		shift = shift (shift, alt, super, meta can be mapped to any of the others)
+	# Desktop1 is to the right of Laptop
+	Laptop:
+		right = Desktop1
+	# Desktop1 is to the left of iMac
+	iMac:
+		left  = Desktop1
+end
+section: aliases
+	# The "real" name of iMac is John-Smiths-iMac-3.local. 
+	# If we wanted we could remove this alias and instead use John-Smiths-iMac-3.local everywhere iMac is above. 
+	# Hopefully it should be easy to see why using an alias is nicer
+	iMac:
+		John-Smiths-iMac-3.local
+end
+```
+
+#### Cursor Wrapping
+
+The text config allows computers to be wrapped around. For example, with two machines (a server and a client), the mouse can go off the right of the server onto the left side of the client, then off the right side of the client back onto the left side of server. This config also uses ''Ctrl''+''Super''+(''left arrow''/''right arrow'') to switch between machines on keypress.
+
+```
+# Physical monitor arrangement, with machine names as used by Deskflow.
+#  +----------+----------+
+#  | syn-serv | syn-cli  |
+#  |          |          |
+#  +----------+----------+ 
+ 
+section: screens
+	syn-serv:
+	syn-cli:
+end
+section: links
+	syn-serv:
+		left = syn-cli     # "wrapping" arrangement
+		right = syn-cli    # "normal" arrangement
+	syn-cli:
+		left = syn-serv    # "normal"
+		right = syn-serv   # "wrapping"
+end
+section: options
+                keystroke(control+super+right) = switchInDirection(right) # Switch computers on keypress 
+<!--		keystroke(control+super+left) = switchInDirection(left) -->
+end
+```
+
+### AltGr key
+
+The following screen config allows the mapping for ''Alt'' to ''AltGr''. Although this may not work, see [https://github.com/deskflow/deskflow-core/issues/4411 bug #4411].
+```
+section: screens
+	client1:
+		altgr = alt          # mapping to fix AltGr key not working on windows clients (e.g. @-Symbol etc.).
+end
+```
+
+See also: the man page for ''deskflow-core''.
+
+### Stacked Example
+
+Stack one computer on top of another's.
+
+```
+#           +-------+
+#           | curly |
+#           |       |
+#           +-------+
+# +-------+ +-------+
+# | moe   | | larry |
+# |       | |       |
+# +-------+ +-------+
+
+section: screens
+	# three hosts named: moe, larry, and curly
+	moe:
+	larry:
+	curly:
+end
+
+section: links
+	# larry is to the right of moe and curly is above moe.
+	moe:
+		right = larry
+		up    = curly
+
+	# moe is to the left of larry and curly is above larry.
+	larry:
+		left  = moe
+		up    = curly
+
+	# larry is below curly.
+	curly:
+		down  = larry
+end
+
+section: aliases
+	# curly is also known as shemp
+	curly:
+		shemp
+end
+```
+
+### Horizontal Example
+
+Align all computers horizontally.
+
+```
+# +-------+ +-------+ +-------+
+# | moe   | | larry | | curly |
+# |       | |       | |       |
+# +-------+ +-------+ +-------+
+
+section: screens
+	# three hosts named: moe, larry, and curly
+	moe:
+	larry:
+	curly:
+end
+
+section: links
+	# curly is to the right of larry and moe is to the left of larry.
+	larry:
+		right = curly
+		left  = moe
+
+	# larry is to the right of moe.
+	moe:
+		right = larry
+
+	# larry is to the left of curly.
+	curly:
+		left  = larry
+end
+
+```
+
+### Span Example
+
+Span one computer across the two other computers.
+
+```
+# +-------+ +-------+
+# | curly | | curly |
+# |       | |       |
+# +-------+ +-------+
+# +-------+ +-------+
+# | moe   | | larry |
+# |       | |       |
+# +-------+ +-------+
+
+section: screens
+	# three hosts named: moe, larry, and curly
+	moe:
+	larry:
+	curly:
+end
+
+section: links
+	# larry is to the right of moe and curly is above moe.
+	moe:
+		right = larry
+		up    = curly
+
+	# moe is to the left of larry and curly is above larry.
+	larry:
+		left  = moe
+		up    = curly
+
+	# larry is below curly.
+	curly:
+		down  = larry
+end
+```

docs/user/mainpage.md

@@ -1,5 +1,3 @@
-![Deskflow](https://github.com/user-attachments/assets/f005b958-24df-4f4a-9bfd-4f834dae59d6)
-
 **Deskflow** is a free and open source keyboard and mouse sharing app.
 Use the keyboard, mouse, or trackpad of one computer to control nearby computers,
 and work seamlessly between them.

sonar-project.properties

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

src/CMakeLists.txt

@@ -1,15 +1,15 @@
-# SPDX-FileCopyrightText: 2024 Deskflow Developers
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2024 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
-include_directories(./lib)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/lib)
+include_directories(./lib "${CMAKE_CURRENT_BINARY_DIR}/lib")
 
 add_subdirectory(lib)
 add_subdirectory(apps)
 
 option(BUILD_TESTS "Build tests" ON)
 if(BUILD_TESTS)
-  add_subdirectory(test)
+  add_subdirectory(unittests)
 endif()
+

src/apps/CMakeLists.txt

@@ -1,20 +1,42 @@
-# SPDX-FileCopyrightText: 2024 Deskflow Developers
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2024 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
-option(BUILD_UNIFIED "Build unified binary" OFF)
-if(BUILD_UNIFIED)
+if(UNIX AND NOT APPLE)
+  find_program(HELP2MAN help2man)
+  if(NOT HELP2MAN)
+    message(STATUS "Man page tool (help2man) not found, man pages will not be generated")
+  endif()
+endif()
+
+function(generate_app_man TARGET NAME)
+  if(HELP2MAN)
+    add_custom_command(
+      TARGET ${target} POST_BUILD
+        COMMAND QT_QPA_PLATFORM=minimal PATH=$<TARGET_FILE_DIR:${target}>:${PATH} ${HELP2MAN}
+          --name ${NAME}
+          --include ${CMAKE_SOURCE_DIR}/src/apps/res/manpage.txt
+          --no-info
+          ${target}
+          -o $<TARGET_FILE_DIR:${target}>/${target}.1
+    )
+    install(
+      FILES $<TARGET_FILE_DIR:${target}>/${target}.1
+      DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
+    )
+  endif()
+endfunction()
+
+set(WIN32_PRE_EXCLUDE_REGEXES
+  "api-ms-win-.*"
+  "ext-ms-.*"
+  "^hvsifiletrust\\.dll$"
+  "^icu.*\\.dll$"
+)
+
+set(WIN32_POST_EXCLUDE_REGEXES ".*system32.*")
+
 add_subdirectory(deskflow-core)
-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-daemon) #Only used on windows
 add_subdirectory(deskflow-gui)
-endif(BUILD_GUI)

src/apps/deskflow-client/CMakeLists.txt

@@ -1,64 +0,0 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
-# SPDX-License-Identifier: MIT
-
-set(target ${CMAKE_PROJECT_NAME}-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

@@ -1,35 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
- * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "arch/Arch.h"
-#include "base/EventQueue.h"
-#include "base/Log.h"
-#include "deskflow/ClientApp.h"
-
-#if SYSAPI_WIN32
-#include "arch/win32/ArchMiscWindows.h"
-#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-client/deskflow-client.exe.manifest

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

src/apps/deskflow-core/CMakeLists.txt

@@ -1,11 +1,17 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
 set(target ${CMAKE_PROJECT_NAME}-core)
 
-add_executable(${target} "${target}.cpp")
+add_executable(${target}
+  "${target}.cpp"
+  CoreArgs.h
+  CoreArgParser.h
+  CoreArgParser.cpp
+)
+
 if(WIN32)
   # Generate rc file
   set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} combined server and client application")
@@ -32,27 +38,27 @@ target_link_libraries(
   app
   ${libs})
 
-if(APPLE)
+install(
+  TARGETS ${target}
+  RUNTIME_DEPENDENCY_SET coreDeps
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+if(BUILD_OSX_BUNDLE)
   set_target_properties(${target} PROPERTIES
     BUILD_WITH_INSTALL_RPATH TRUE
     INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
     RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS
   )
-elseif(UNIX)
-  install(TARGETS ${target} DESTINATION bin)
-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 .
-  )
+  if (APPLE_CODESIGN_DEV)
+    configure_mac_codesign(${target})
+  endif()
+elseif (WIN32)
+  install(RUNTIME_DEPENDENCY_SET coreDeps
+    PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
+    POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  )
+else()
+  generate_app_man(${target} "${CMAKE_PROJECT_DESCRIPTION}")
 endif()

src/apps/deskflow-core/CoreArgParser.cpp

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

src/apps/deskflow-core/CoreArgParser.h

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

src/apps/deskflow-core/CoreArgs.h

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

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

@@ -6,57 +6,93 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
+#include "CoreArgParser.h"
+
 #include "arch/Arch.h"
 #include "base/EventQueue.h"
 #include "base/Log.h"
+#include "common/Constants.h"
+#include "common/ExitCodes.h"
 #include "deskflow/ClientApp.h"
 #include "deskflow/ServerApp.h"
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
 #include "arch/win32/ArchMiscWindows.h"
+#include <QCoreApplication>
 #endif
 
-#include <iostream>
+#include <QFileInfo>
+#include <QSharedMemory>
+#include <QTextStream>
 
-void showHelp()
+void showHelp(const CoreArgParser &parser)
 {
-  std::cout << "Usage: deskflow-core <server | client> [...options]" << std::endl;
-  std::cout << "server - start as a server (deskflow-server)" << std::endl;
-  std::cout << "client - start as a client (deskflow-client)" << std::endl;
-  std::cout << "use deskflow-core <server|client> --help for more information." << std::endl;
-}
-
-bool isServer(int argc, char **argv)
-{
-  return (argc > 1 && argv[1] == std::string("server"));
-}
-
-bool isClient(int argc, char **argv)
-{
-  return (argc > 1 && argv[1] == std::string("client"));
+  QTextStream(stdout) << parser.helpText();
 }
 
 int main(int argc, char **argv)
 {
-#if SYSAPI_WIN32
-  ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
+#if defined(Q_OS_WIN)
+  // HACK to make sure settings gets the correct qApp path
+  QCoreApplication m(argc, argv);
+  m.deleteLater();
+
+  ArchMiscWindows::setInstanceWin32(GetModuleHandle(nullptr));
 #endif
 
   Arch arch;
   arch.init();
 
   Log log;
+
+  QStringList args;
+  for (int i = 0; i < argc; i++)
+    args.append(argv[i]);
+
+  CoreArgParser parser(args);
+
+  // Print any parser errors
+  if (!parser.errorText().isEmpty()) {
+    QTextStream(stdout) << parser.errorText() << "\n";
+  }
+
+  if (parser.help()) {
+    showHelp(parser);
+    return s_exitSuccess;
+  }
+
+  if (parser.version()) {
+    QTextStream(stdout) << parser.versionText();
+    return s_exitSuccess;
+  }
+
+  // Before we check any more args we need to check for a duplicate process.
+  // Create a shared memory segment with a unique key
+  // This is to prevent a new instance from running if one is already running
+  QSharedMemory sharedMemory(kCoreBinName);
+
+  // Attempt to attach first and detach in order to clean up stale shm chunks
+  // This can happen if the previous instance was killed or crashed
+  if (sharedMemory.attach())
+    sharedMemory.detach();
+
+  if (!sharedMemory.create(1) && parser.singleInstanceOnly()) {
+    LOG_WARN("an instance of deskflow core is already running");
+    return s_exitDuplicate;
+  }
+
+  parser.parse();
+
   EventQueue events;
+  const auto processName = QFileInfo(argv[0]).fileName();
 
-  if (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();
+  if (parser.serverMode()) {
+    ServerApp app(&events, processName);
+    return app.run();
+  } else if (parser.clientMode()) {
+    ClientApp app(&events, processName);
+    return app.run();
   }
 
-  return 0;
+  return s_exitSuccess;
 }

src/apps/deskflow-daemon/CMakeLists.txt

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

src/apps/deskflow-daemon/DaemonApp.cpp

@@ -1,21 +1,22 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2026 Deskflow Developers
  * SPDX-FileCopyrightText: (C) 2012 - 2025 Symless Ltd.
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "deskflow/DaemonApp.h"
+#include "DaemonApp.h"
 
+#include "arch/Arch.h"
 #include "base/IEventQueue.h"
 #include "base/Log.h"
 #include "base/LogOutputters.h"
+#include "common/ExitCodes.h"
 #include "common/Settings.h"
-#include "deskflow/App.h"
 #include "deskflow/ipc/DaemonIpcServer.h"
 
-#if SYSAPI_WIN32
-
-#include "arch/win32/ArchMiscWindows.h" // IWYU pragma: keep
+#if defined(Q_OS_WIN)
+#include "arch/win32/ArchDaemonWindows.h"
 #include "deskflow/Screen.h"
 #include "platform/MSWindowsDebugOutputter.h"
 #include "platform/MSWindowsEventQueueBuffer.h"
@@ -26,21 +27,13 @@
 
 #endif
 
-#include <filesystem>
-#include <iostream>
 #include <string>
 
-using namespace std;
 using namespace deskflow::core;
 
-void showHelp(int argc, char **argv) // NOSONAR - CLI args
-{
-  const auto binName = argc > 0 ? std::filesystem::path(argv[0]).filename().string() : kDaemonBinName;
-  std::cout << "Usage: " << binName << " [-f|--foreground] [--install] [--uninstall]" << std::endl;
-}
-
 DaemonApp::DaemonApp(IEventQueue &events) : m_events(events)
 {
+  // do nothing
 }
 
 DaemonApp::~DaemonApp() = default;
@@ -70,7 +63,7 @@ void DaemonApp::applyWatchdogCommand() const
 {
   LOG_DEBUG("applying watchdog command");
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   m_pWatchdog->setProcessConfig(m_command, m_elevate);
 #else
   LOG_ERR("applying watchdog command not implemented on this platform");
@@ -84,7 +77,7 @@ void DaemonApp::clearWatchdogCommand()
   // Clear the setting to prevent it from being next time the daemon starts.
   setCommand("");
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   m_pWatchdog->setProcessConfig("", false);
 #else
   LOG_ERR("clearing watchdog command not implemented on this platform");
@@ -94,52 +87,30 @@ void DaemonApp::clearWatchdogCommand()
 void DaemonApp::clearSettings() const
 {
   LOG_INFO("clearing daemon settings");
-  Settings::setValue(Settings::Daemon::Command, QVariant());
-  Settings::setValue(Settings::Daemon::Elevate, QVariant());
-  Settings::setValue(Settings::Daemon::LogFile, QVariant());
-  Settings::setValue(Settings::Daemon::LogLevel, QVariant());
+  Settings::setValue(Settings::Daemon::Command);
+  Settings::setValue(Settings::Daemon::Elevate);
+  Settings::setValue(Settings::Daemon::LogFile);
+  Settings::setValue(Settings::Daemon::LogLevel);
 }
 
 void DaemonApp::connectIpcServer(const ipc::DaemonIpcServer *ipcServer) const
 {
   // Use direct connection as this object is on it's own thread,
   // and so is on a different event loop to the main Qt loop.
-  QObject::connect(
-      ipcServer, &ipc::DaemonIpcServer::logLevelChanged, this, &DaemonApp::saveLogLevel, //
+  connect(ipcServer, &ipc::DaemonIpcServer::logLevelChanged, this, &DaemonApp::saveLogLevel, Qt::DirectConnection);
+  connect(ipcServer, &ipc::DaemonIpcServer::elevateModeChanged, this, &DaemonApp::setElevate, Qt::DirectConnection);
+  connect(ipcServer, &ipc::DaemonIpcServer::commandChanged, this, &DaemonApp::setCommand, Qt::DirectConnection);
+  connect(
+      ipcServer, &ipc::DaemonIpcServer::startProcessRequested, this, &DaemonApp::applyWatchdogCommand,
       Qt::DirectConnection
   );
-  QObject::connect(
-      ipcServer, &ipc::DaemonIpcServer::elevateModeChanged, this, &DaemonApp::setElevate, //
+  connect(
+      ipcServer, &ipc::DaemonIpcServer::stopProcessRequested, this, &DaemonApp::clearWatchdogCommand,
       Qt::DirectConnection
   );
-  QObject::connect(
-      ipcServer, &ipc::DaemonIpcServer::commandChanged, this, &DaemonApp::setCommand, //
-      Qt::DirectConnection
+  connect(
+      ipcServer, &ipc::DaemonIpcServer::clearSettingsRequested, this, &DaemonApp::clearSettings, Qt::DirectConnection
   );
-  QObject::connect(
-      ipcServer, &ipc::DaemonIpcServer::startProcessRequested, this, &DaemonApp::applyWatchdogCommand, //
-      Qt::DirectConnection
-  );
-  QObject::connect(
-      ipcServer, &ipc::DaemonIpcServer::stopProcessRequested, this, &DaemonApp::clearWatchdogCommand, //
-      Qt::DirectConnection
-  );
-  QObject::connect(
-      ipcServer, &ipc::DaemonIpcServer::clearSettingsRequested, this, &DaemonApp::clearSettings, //
-      Qt::DirectConnection
-  );
-}
-
-void DaemonApp::install() const
-{
-  LOG_NOTE("installing windows daemon");
-  ARCH->installDaemon();
-}
-
-void DaemonApp::uninstall() const
-{
-  LOG_NOTE("uninstalling windows daemon");
-  ARCH->uninstallDaemon();
 }
 
 void DaemonApp::run(QThread &daemonThread)
@@ -150,7 +121,7 @@ void DaemonApp::run(QThread &daemonThread)
   // owned by the daemon app, as they will be created on the daemon thread.
   moveToThread(&daemonThread);
 
-  QObject::connect(&daemonThread, &QThread::started, [this, &daemonThread]() {
+  connect(&daemonThread, &QThread::started, this, [this, &daemonThread]() {
     LOG_DEBUG("daemon thread started");
 
     if (m_foreground) {
@@ -158,14 +129,14 @@ void DaemonApp::run(QThread &daemonThread)
       mainLoop();
     } else {
       LOG_DEBUG("running daemon in background (daemonizing)");
-      ARCH->daemonize(kAppName, [this](int, const char **) { return daemonLoop(); });
+      ARCH->daemonize([this] { return daemonLoop(); });
     }
 
     daemonThread.quit();
     LOG_DEBUG("daemon thread finished");
   });
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   m_pWatchdog = std::make_unique<MSWindowsWatchdog>(m_foreground, *m_pFileLogOutputter);
 
   auto command = Settings::value(Settings::Daemon::Command).toString().toStdString();
@@ -182,27 +153,26 @@ void DaemonApp::run(QThread &daemonThread)
 
 int DaemonApp::daemonLoop()
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   // Runs the daemon through the Windows service controller, which controls the program lifecycle.
-  return ArchMiscWindows::runDaemon([this]() { return mainLoop(); });
-#elif SYSAPI_UNIX
+  return ArchDaemonWindows::runDaemon([this]() { return mainLoop(); });
+#else
   return mainLoop();
 #endif
 }
 
 int DaemonApp::mainLoop()
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   if (m_pWatchdog == nullptr) {
     LOG_ERR("watchdog not initialized");
-    return kExitFailed;
+    return s_exitFailed;
   }
+  ArchDaemonWindows::daemonRunning(true);
 #endif
 
-  DAEMON_RUNNING(true);
-
   try {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
     // Install the platform event queue to handle service stop events.
     // This must be done on the same thread as the event loop, otherwise the service stop
     // request will not add the quit event to the event queue, and the service won't stop.
@@ -215,26 +185,26 @@ int DaemonApp::mainLoop()
     LOG_INFO("daemon is running");
     m_events.loop();
   } catch (std::exception &e) { // NOSONAR - Catching all exceptions
-    LOG((CLOG_CRIT "daemon error: %s", e.what()));
+    LOG_CRIT("daemon error: %s", e.what());
   } catch (...) { // NOSONAR - Catching remaining exceptions
-    LOG((CLOG_CRIT "daemon unknown error"));
+    LOG_CRIT("daemon unknown error");
   }
 
   LOG_INFO("daemon is stopping");
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   try {
     LOG_DEBUG("stopping process watchdog");
     m_pWatchdog->stop();
   } catch (std::exception &e) { // NOSONAR - Catching all exceptions
-    LOG((CLOG_CRIT "daemon stop watchdog error: %s", e.what()));
+    LOG_CRIT("daemon stop watchdog error: %s", e.what());
   } catch (...) { // NOSONAR - Catching remaining exceptions
-    LOG((CLOG_CRIT "daemon stop watchdog unknown error"));
+    LOG_CRIT("daemon stop watchdog unknown error");
   }
+  ArchDaemonWindows::daemonRunning(false);
 #endif
 
-  DAEMON_RUNNING(false);
-  return kExitSuccess;
+  return s_exitSuccess;
 }
 
 QString DaemonApp::logFilename()
@@ -250,7 +220,7 @@ void DaemonApp::setForeground()
 
 void DaemonApp::initLogging()
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   if (!m_foreground) {
     // Only use MS debug outputter when the process is daemonized, since stdout won't be accessible
     // in that case, but is accessible when running in the foreground.
@@ -258,13 +228,13 @@ void DaemonApp::initLogging()
   }
 #endif
 
-  m_pFileLogOutputter = new FileLogOutputter(logFilename().toStdString().c_str()); // NOSONAR - Adopted by `Log`
+  m_pFileLogOutputter = new FileLogOutputter(qPrintable(logFilename())); // NOSONAR - Adopted by `Log`
   CLOG->insert(m_pFileLogOutputter);
 }
 
 void DaemonApp::showConsole()
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   // The daemon bin is compiled using the Win32 subsystem which works best for Windows services,
   // so when running as a foreground process we need to allocate a console (or we won't see output).
   // It is important to do this inside the arg check loop so that we can attach console ahead

src/apps/deskflow-daemon/DaemonApp.h

@@ -6,8 +6,6 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 #include <string>
 
 #include <QObject>
@@ -23,7 +21,7 @@ namespace deskflow::core::ipc {
 class DaemonIpcServer;
 }
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
 class MSWindowsWatchdog;
 #endif
 
@@ -34,22 +32,9 @@ class DaemonApp : public QObject
   Q_OBJECT
 
 public:
-  enum class InitResult
-  {
-    Installed,
-    Uninstalled,
-    StartDaemon,
-    ShowHelp,
-    ArgsError,
-    FatalError,
-  };
-
   explicit DaemonApp(IEventQueue &events);
   ~DaemonApp() override;
 
-  InitResult init(int argc, char **argv);
-  void install() const;
-  void uninstall() const;
   void run(QThread &daemonThread);
   void setForeground();
   void initLogging();
@@ -60,7 +45,6 @@ public:
 private:
   void daemonize();
   void handleError(const char *message);
-  void handleIpcMessage(const Event &e, void *);
   int mainLoop();
   int daemonLoop();
   void saveLogLevel(const QString &logLevel) const;
@@ -72,7 +56,7 @@ private:
 
   static void showConsole();
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   std::unique_ptr<MSWindowsWatchdog> m_pWatchdog;
 #endif
 

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

@@ -5,20 +5,21 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
+#include "DaemonApp.h"
+
 #include "arch/Arch.h"
 #include "base/EventQueue.h"
 #include "base/Log.h"
+#include "common/ExitCodes.h"
 #include "common/Settings.h"
-#include "deskflow/DaemonApp.h"
+#include "common/VersionInfo.h"
 #include "deskflow/ipc/DaemonIpcServer.h"
 
-#if SYSAPI_WIN32
-
+#if defined(Q_OS_WIN)
 #include "arch/win32/ArchMiscWindows.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
-
 #endif
 
 #include <QCommandLineParser>
@@ -31,7 +32,7 @@ void handleError(const char *message = "Unrecognized error.");
 
 int main(int argc, char **argv)
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   ArchMiscWindows::guardRuntimeVersion();
 
   // Save window instance for later use, e.g. `GetModuleFileName` which is used when installing the daemon.
@@ -57,12 +58,6 @@ int main(int argc, char **argv)
   const auto foregroundOption = QCommandLineOption({"f", "foreground"}, "Run in the foreground (show console)");
   parser.addOption(foregroundOption);
 
-  const auto installOption = QCommandLineOption({"i", "install"}, "Install as a Windows service");
-  parser.addOption(installOption);
-
-  const auto uninstallOption = QCommandLineOption({"u", "uninstall"}, "Uninstall the Windows service");
-  parser.addOption(uninstallOption);
-
   parser.process(app);
 
   if (parser.isSet(foregroundOption)) {
@@ -77,34 +72,25 @@ int main(int argc, char **argv)
   // useful for troubleshooting Windows services.
   // It's important to write the version number to the log file so we can be certain the old daemon
   // was uninstalled, since sometimes Windows services can get stuck and fail to be removed.
-  LOG_PRINT("%s v%s", QCoreApplication::applicationName().toStdString().c_str(), kDisplayVersion);
+  LOG_PRINT("%s v%s", qPrintable(QCoreApplication::applicationName()), kDisplayVersion);
 
   // Default log level to system setting (found in Registry).
   auto logLevel = Settings::value(Settings::Daemon::LogLevel).toString().toStdString();
-  if (logLevel != "") {
+  if (!logLevel.empty()) {
     CLOG->setFilter(logLevel.c_str());
     LOG_DEBUG("log level: %s", logLevel.c_str());
   }
 
   try {
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
     // Show warning if not running as admin as daemon will behave differently.
     if (!ArchMiscWindows::isProcessElevated()) {
       LOG_WARN("not running as admin, some features may not work");
     }
 #endif
 
-    if (parser.isSet(installOption)) {
-      daemon.install();
-      return kExitSuccess;
-    } else if (parser.isSet(uninstallOption)) {
-      daemon.uninstall();
-      return kExitSuccess;
-    }
-
-    const auto ipcServer =
-        new ipc::DaemonIpcServer(&app, DaemonApp::logFilename().toStdString().c_str()); // NOSONAR - Qt managed
+    const auto ipcServer = new ipc::DaemonIpcServer(&app, qPrintable(DaemonApp::logFilename())); // NOSONAR - Qt managed
     ipcServer->listen();
     daemon.connectIpcServer(ipcServer);
 
@@ -120,15 +106,14 @@ int main(int argc, char **argv)
 
   } catch (std::exception &e) {
     handleError(e.what());
-    return kExitFailed;
+    return s_exitFailed;
   } catch (...) {
     handleError();
-    return kExitFailed;
+    return s_exitFailed;
   }
 }
 
-#if SYSAPI_WIN32
-
+#if defined(Q_OS_WIN)
 // Win32 subsystem entry point (simply forwards to main).
 // We need this because using regular main under the Win32 subsystem results in empty args.
 int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
@@ -143,7 +128,7 @@ void handleError(const char *message)
   // Always print error to stdout in case run as CLI program.
   LOG_ERR("%s", message);
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   // Show a message box for when run from MSI in Win32 subsystem.
   MessageBoxA(nullptr, message, "Deskflow daemon error", MB_OK | MB_ICONERROR);
 #endif

src/apps/deskflow-gui/CMakeLists.txt

@@ -1,5 +1,5 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-FileCopyrightText: 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 Symless Ltd
 # SPDX-License-Identifier: MIT
 
 if(APPLE)
@@ -15,12 +15,12 @@ if(WIN32)
   set(EXE_ICON "IDI_ICON1 ICON DISCARDABLE \"${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico\" ")
   configure_file(${CMAKE_SOURCE_DIR}/src/apps/res/windows.rc.in deskflow.rc)
   set(platform_extra deskflow.rc)
-elseif(APPLE)
+elseif(BUILD_OSX_BUNDLE)
   #setup our bundle plist file
   set(BUNDLE_EXECUTABLE_NAME "${target}")
   set(BUNDLE_BUNDLE_NAME "${target}")
   set(BUNDLE_DISPLAY_NAME "${target}")
-  set(BUNDLE_GUI_IDENTIFIER "org.deskflow.deskflow")
+  set(BUNDLE_GUI_IDENTIFIER "${CMAKE_PROJECT_REV_FQDN}")
   set(BUNDLE_ICON_FILE ${target}.icns)
   set(BUNDLE_INFO_STRING "${CMAKE_PROJECT_DESCRIPTION}")
   set(BUNDLE_COPYRIGHT "${CMAKE_PROJECT_COPYRIGHT}")
@@ -31,91 +31,14 @@ elseif(APPLE)
     @ONLY
   )
 
-  file(COPY_FILE
-    ${PROJECT_SOURCE_DIR}/LICENSES/LicenseRef-OpenSSL-Exception.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/LICENSE_EXCEPTION
-    ONLY_IF_DIFFERENT
-  )
-
-  set(platform_extra ../res/Deskflow.icns ${CMAKE_SOURCE_DIR}/LICENSE ${CMAKE_CURRENT_BINARY_DIR}/LICENSE_EXCEPTION)
+  set(platform_extra ../res/Deskflow.icns)
   set_source_files_properties(${platform_extra} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 endif()
 
 add_executable(${target} WIN32 MACOSX_BUNDLE
   ${platform_extra}
   ../res/deskflow.qrc
-  Action.cpp
-  Action.h
-  DataDownloader.cpp
-  DataDownloader.h
-  Diagnostic.cpp
-  Diagnostic.h
-  Hotkey.cpp
-  Hotkey.h
-  KeySequence.cpp
-  KeySequence.h
-  main.cpp
-  MainWindow.cpp
-  MainWindow.h
-  MainWindow.ui
-  ScreenSetupModel.cpp
-  ScreenSetupModel.h
-  ServerConfig.cpp
-  ServerConfig.h
-  StyleUtils.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
-  validators/AliasValidator.cpp
-  validators/AliasValidator.h
-  validators/ComputerNameValidator.cpp
-  validators/ComputerNameValidator.h
-  validators/EmptyStringValidator.cpp
-  validators/EmptyStringValidator.h
-  validators/IStringValidator.cpp
-  validators/IStringValidator.h
-  validators/LineEditValidator.cpp
-  validators/LineEditValidator.h
-  validators/ScreenDuplicationsValidator.cpp
-  validators/ScreenDuplicationsValidator.h
-  validators/ScreenNameValidator.cpp
-  validators/ScreenNameValidator.h
-  validators/SpacesValidator.cpp
-  validators/SpacesValidator.h
-  validators/ValidationError.cpp
-  validators/ValidationError.h
-  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
+  deskflow-gui.cpp
 )
 
 target_link_libraries(
@@ -126,33 +49,58 @@ target_link_libraries(
   Qt6::Widgets
   Qt6::Network)
 
-if(WIN32)
-  set_target_properties(${target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
 install(
   TARGETS ${target}
   RUNTIME_DEPENDENCY_SET guiDeps
-    DESTINATION .
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  BUNDLE DESTINATION .
 )
+
+if(WIN32)
+  set_target_properties(${target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
+
   install(RUNTIME_DEPENDENCY_SET guiDeps
-    PRE_EXCLUDE_REGEXES
-      "api-ms-win-.*"
-      "ext-ms-.*"
-      "^hvsifiletrust\\.dll$"
-    POST_EXCLUDE_REGEXES
-      ".*system32.*"
-    RUNTIME DESTINATION .
+    PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
+    POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
 
+  set(QT_DEPENDS_DIR ${CMAKE_BINARY_DIR}/qt-depends)
+
   add_custom_command(
     TARGET ${target} POST_BUILD
-      COMMAND ${DEPLOYQT} --no-compiler-runtime --no-system-d3d-compiler --no-quick-import -network $<TARGET_FILE:${target}>
+    COMMAND ${DEPLOYQT}
+      --no-compiler-runtime
+      --no-system-d3d-compiler
+      --no-opengl-sw
+      --no-quick-import
+      --dir "${QT_DEPENDS_DIR}"
+      --plugindir "${QT_DEPENDS_DIR}/plugins"
+      $<TARGET_FILE:${target}>
+    COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different
+      ${QT_DEPENDS_DIR}
+      $<TARGET_FILE_DIR:${target}>
   )
+
+  install(
+    DIRECTORY ${QT_DEPENDS_DIR}/
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    PATTERN "dx*.dll" EXCLUDE
+    PATTERN "icu*.dll" EXCLUDE
+  )
+
 elseif(APPLE)
+  if (BUILD_OSX_BUNDLE)
     set_target_properties(${target} PROPERTIES
       INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
       MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/deskflow.plist"
     )
-  install(TARGETS ${target} BUNDLE DESTINATION .)
-else()
-  install(TARGETS ${target} DESTINATION bin)
+    if (APPLE_CODESIGN_DEV)
+      configure_mac_codesign(${target})
+    endif()
+  else()
+    set_target_properties(${target} PROPERTIES MACOSX_BUNDLE FALSE)
+  endif()
+else()
+  generate_app_man(${target} "${CMAKE_PROJECT_DESCRIPTION} \\(GUI\\)")
 endif()

src/apps/deskflow-gui/DataDownloader.cpp

@@ -1,46 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2014 - 2016 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "DataDownloader.h"
-
-DataDownloader::DataDownloader(QObject *parent) : QObject(parent), m_pReply(nullptr), m_IsFinished(false)
-{
-  connect(&m_NetworkManager, &QNetworkAccessManager::finished, this, &DataDownloader::complete);
-}
-
-DataDownloader::~DataDownloader()
-{
-}
-
-void DataDownloader::complete(QNetworkReply *reply)
-{
-  m_Data = reply->readAll();
-  reply->deleteLater();
-  m_pReply = nullptr;
-
-  if (!m_Data.isEmpty()) {
-    m_IsFinished = true;
-    Q_EMIT isComplete();
-  }
-}
-
-QByteArray DataDownloader::data() const
-{
-  return m_Data;
-}
-
-void DataDownloader::cancel()
-{
-  if (m_pReply != nullptr) {
-    m_pReply->abort();
-  }
-}
-
-void DataDownloader::download(QUrl url)
-{
-  QNetworkRequest request(url);
-  m_pReply = m_NetworkManager.get(request);
-}

src/apps/deskflow-gui/DataDownloader.h

@@ -1,42 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2014 - 2016 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include <QByteArray>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QObject>
-
-class DataDownloader : public QObject
-{
-  Q_OBJECT
-
-public:
-  explicit DataDownloader(QObject *parent = 0);
-  virtual ~DataDownloader();
-
-  QByteArray data() const;
-  void cancel();
-  void download(QUrl url);
-  bool isFinished() const
-  {
-    return m_IsFinished;
-  }
-
-signals:
-  void isComplete();
-
-private slots:
-  void complete(QNetworkReply *reply);
-
-private:
-  QNetworkAccessManager m_NetworkManager;
-  QByteArray m_Data;
-  QNetworkReply *m_pReply;
-  bool m_IsFinished;
-};

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

@@ -6,26 +6,24 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "Diagnostic.h"
-#include "MainWindow.h"
-#include "StyleUtils.h"
-
 #include "common/Constants.h"
+#include "common/ExitCodes.h"
+#include "common/I18N.h"
+#include "common/PlatformInfo.h"
 #include "common/UrlConstants.h"
-#include "gui/DotEnv.h"
-#include "gui/Logger.h"
+#include "common/VersionInfo.h"
+#include "gui/Diagnostic.h"
+#include "gui/MainWindow.h"
 #include "gui/Messages.h"
+#include "gui/StyleUtils.h"
 
 #include <QApplication>
-#include <QDebug>
-#include <QGuiApplication>
+#include <QCommandLineParser>
 #include <QLocalSocket>
 #include <QMessageBox>
-#include <QObject>
 #include <QSharedMemory>
-#include <QtGlobal>
 
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
 #include <Carbon/Carbon.h>
 #include <cstdlib>
 #endif
@@ -34,25 +32,17 @@
 #include <QLoggingCategory>
 #endif
 
+#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN)
+#include "platform/XDGPortalRegistry.h"
+#endif
+
 using namespace deskflow::gui;
 
-class QThreadImpl : public QThread
-{
-public:
-  static void msleep(unsigned long msecs)
-  {
-    QThread::msleep(msecs);
-  }
-};
-
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
 bool checkMacAssistiveDevices();
 #endif
 
-bool hasArg(const QString &arg, const QStringList &args)
-{
-  return std::ranges::any_of(args, [&arg](const QString &a) { return a == arg; });
-}
+const static auto kHeader = QStringLiteral("%1: %2\n").arg(kAppName, kDisplayVersion);
 
 int main(int argc, char *argv[])
 {
@@ -61,24 +51,53 @@ int main(int argc, char *argv[])
   QLoggingCategory::setFilterRules(QStringLiteral("*.debug=true\nqt.*=false"));
 #endif
 
-#if defined(Q_OS_MAC)
-  /* Workaround for QTBUG-40332 - "High ping when QNetworkAccessManager is
-   * instantiated" */
-  ::setenv("QT_BEARER_POLL_TIMEOUT", "-1", 1);
+#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN)
+  deskflow::platform::setAppId();
 #endif
 
   QCoreApplication::setApplicationName(kAppName);
   QCoreApplication::setOrganizationName(kAppName);
-  QGuiApplication::setDesktopFileName(QStringLiteral("org.deskflow.deskflow"));
-
-  // used as a prefix for settings paths, and must not be a url.
-  QCoreApplication::setOrganizationDomain(kOrgDomain);
+  QCoreApplication::setApplicationVersion(kVersion);
+  QCoreApplication::setOrganizationDomain(kOrgDomain); // used in prefix, can't be a url
+  QGuiApplication::setDesktopFileName(kRevFqdnName);
 
   QApplication app(argc, argv);
 
+  // Ensure the I18N object is made before strings
+  QTextStream(stdout) << "initial language: " << I18N::currentLanguage() << '\n';
+
+  // Add Command Line Options
+  auto helpOption = QCommandLineOption({"h", "help"}, "Display Help on the command line");
+  auto versionOption = QCommandLineOption({"v", "version"}, "Display version information");
+  auto resetOption = QCommandLineOption("reset", "Reset all settings");
+
+  QCommandLineParser parser;
+  parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
+  parser.addOption(helpOption);
+  parser.addOption(versionOption);
+  parser.addOption(resetOption);
+  parser.parse(QCoreApplication::arguments());
+
+  if (!parser.errorText().isEmpty()) {
+    qCritical().noquote() << parser.errorText() << "\nUse --help for more information.";
+    return s_exitArgs;
+  }
+
+  if (parser.isSet(helpOption)) {
+    QTextStream(stdout) << kHeader << QStringLiteral("  %1\n\n").arg(kAppDescription)
+                        << parser.helpText().replace(QApplication::applicationFilePath(), kAppId);
+    return s_exitSuccess;
+  }
+
+  if (parser.isSet(versionOption)) {
+    QTextStream(stdout) << kHeader << kCopyright << Qt::endl;
+    return s_exitSuccess;
+  }
+
+  const auto shmId = QStringLiteral("%1-gui").arg(kAppId);
   // Create a shared memory segment with a unique key
   // This is to prevent a new instance from running if one is already running
-  QSharedMemory sharedMemory("deskflow-gui");
+  QSharedMemory sharedMemory(shmId);
 
   // Attempt to attach first and detach in order to clean up stale shm chunks
   // This can happen if the previous instance was killed or crashed
@@ -89,40 +108,34 @@ int main(int argc, char *argv[])
   if (!sharedMemory.create(1)) {
     // Ping the running instance to have it show itself
     QLocalSocket socket;
-    socket.connectToServer("deskflow-gui", QLocalSocket::ReadOnly);
+    socket.connectToServer(shmId, QLocalSocket::ReadOnly);
     if (!socket.waitForConnected()) {
       // If we can't connect to the other instance tell the user its running.
       // This should never happen but just incase we should show something
-      QMessageBox::information(nullptr, QObject::tr("Deskflow"), QObject::tr("Deskflow is already running"));
+      QMessageBox::information(nullptr, kAppName, QObject::tr("%1 is already running").arg(kAppName));
     }
     socket.disconnectFromServer();
-    return 0;
+    return s_exitDuplicate;
   }
 
-#if !defined(Q_OS_MAC)
-  // causes dark mode to be used on some DE's
-  if (qEnvironmentVariable("XDG_CURRENT_DESKTOP") != QLatin1String("KDE")) {
+  if (!deskflow::platform::isMac() && qEnvironmentVariable("XDG_CURRENT_DESKTOP") != QLatin1String("KDE")) {
     QApplication::setStyle("fusion");
   }
-#endif
 
-  // Sets the fallback icon path
-  setIconFallbackPaths();
+  // Sets the fallback icon path and fallback theme
+  updateIconTheme();
 
   qInstallMessageHandler(deskflow::gui::messages::messageHandler);
-  qInfo("%s v%s", kAppName, qPrintable(kVersion));
+  qInfo("%s v%s", kAppName, kDisplayVersion);
 
-  dotenv();
-  Logger::instance().loadEnvVars();
-
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
 
   if (app.applicationDirPath().startsWith("/Volumes/")) {
     QString msgBody = QStringLiteral(
         "Please drag %1 to the Applications folder, "
         "and open it from there."
     );
-    QMessageBox::information(NULL, kAppName, msgBody.arg(kAppName));
+    QMessageBox::information(nullptr, kAppName, msgBody.arg(kAppName));
     return 1;
   }
 
@@ -132,10 +145,7 @@ int main(int argc, char *argv[])
 #endif
 
   // --no-reset
-  QStringList arguments = QCoreApplication::arguments();
-  const auto noReset = hasArg("--no-reset", arguments);
-  const auto resetEnvVar = QVariant(qEnvironmentVariable("DESKFLOW_RESET_ALL")).toBool();
-  if (resetEnvVar && !noReset) {
+  if (parser.isSet(resetOption)) {
     diagnostic::clearSettings(false);
   }
 
@@ -145,11 +155,9 @@ int main(int argc, char *argv[])
   return QApplication::exec();
 }
 
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
 bool checkMacAssistiveDevices()
 {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 // mavericks
-
   // new in mavericks, applications are trusted individually
   // with use of the accessibility api. this call will show a
   // prompt which can show the security/privacy/accessibility
@@ -162,26 +170,10 @@ bool checkMacAssistiveDevices()
 
   const void *keys[] = {kAXTrustedCheckOptionPrompt};
   const void *trueValue[] = {kCFBooleanTrue};
-  CFDictionaryRef options = CFDictionaryCreate(NULL, keys, trueValue, 1, NULL, NULL);
+  CFDictionaryRef options = CFDictionaryCreate(nullptr, keys, trueValue, 1, nullptr, nullptr);
 
   bool result = AXIsProcessTrustedWithOptions(options);
   CFRelease(options);
   return result;
-
-#else
-
-  // now deprecated in mavericks.
-  bool result = AXAPIEnabled();
-  if (!result) {
-    QString msgBody = QString(
-        "Please enable access to assistive devices "
-        "System Preferences -> Security & Privacy -> "
-        "Privacy -> Accessibility, then re-open %1."
-    );
-    QMessageBox::information(NULL, kAppName, msgBody.arg(kAppName));
-  }
-  return result;
-
-#endif
 }
 #endif

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

@@ -1,95 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2014 - 2016 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "AddClientDialog.h"
-#include "ui_AddClientDialog.h"
-
-#include <QLabel>
-#include <QPushButton>
-
-AddClientDialog::AddClientDialog(const QString &clientName, QWidget *parent)
-    : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
-      ui{std::make_unique<Ui::AddClientDialog>()},
-      m_AddResult(kAddClientIgnore)
-{
-  ui->setupUi(this);
-
-  ui->m_pLabelHead->setText(
-      "A client wants to connect. "
-      "Please choose a location for " +
-      clientName + "."
-  );
-
-  QIcon icon(":res/icons/64x64/video-display.png");
-  QSize IconSize(32, 32);
-
-  m_pButtonLeft = new QPushButton(this);
-  m_pButtonLeft->setIcon(icon);
-  m_pButtonLeft->setIconSize(IconSize);
-  ui->gridLayout->addWidget(m_pButtonLeft, 2, 0, 1, 1, Qt::AlignCenter);
-  connect(m_pButtonLeft, &QPushButton::clicked, this, &AddClientDialog::handleButtonLeft);
-
-  m_pButtonUp = new QPushButton(this);
-  m_pButtonUp->setIcon(icon);
-  m_pButtonUp->setIconSize(IconSize);
-  ui->gridLayout->addWidget(m_pButtonUp, 1, 1, 1, 1, Qt::AlignCenter);
-  connect(m_pButtonUp, &QPushButton::clicked, this, &AddClientDialog::handleButtonUp);
-
-  m_pButtonRight = new QPushButton(this);
-  m_pButtonRight->setIcon(icon);
-  m_pButtonRight->setIconSize(IconSize);
-  ui->gridLayout->addWidget(m_pButtonRight, 2, 2, 1, 1, Qt::AlignCenter);
-  connect(m_pButtonRight, &QPushButton::clicked, this, &AddClientDialog::handleButtonRight);
-
-  m_pButtonDown = new QPushButton(this);
-  m_pButtonDown->setIcon(icon);
-  m_pButtonDown->setIconSize(IconSize);
-  ui->gridLayout->addWidget(m_pButtonDown, 3, 1, 1, 1, Qt::AlignCenter);
-  connect(m_pButtonDown, &QPushButton::clicked, this, &AddClientDialog::handleButtonDown);
-
-  m_pLabelCenter = new QLabel(this);
-  m_pLabelCenter->setPixmap(QPixmap(":res/icons/64x64/video-display.png"));
-  ui->gridLayout->addWidget(m_pLabelCenter, 2, 1, 1, 1, Qt::AlignCenter);
-
-#if defined(Q_OS_MAC)
-  ui->m_pDialogButtonBox->setLayoutDirection(Qt::RightToLeft);
-#endif
-
-  QPushButton *advanced = ui->m_pDialogButtonBox->addButton("Advanced", QDialogButtonBox::HelpRole);
-  connect(advanced, &QPushButton::clicked, this, &AddClientDialog::handleButtonAdvanced);
-}
-
-AddClientDialog::~AddClientDialog() = default;
-
-void AddClientDialog::handleButtonLeft()
-{
-  m_AddResult = kAddClientLeft;
-  close();
-}
-
-void AddClientDialog::handleButtonUp()
-{
-  m_AddResult = kAddClientUp;
-  close();
-}
-
-void AddClientDialog::handleButtonRight()
-{
-  m_AddResult = kAddClientRight;
-  close();
-}
-
-void AddClientDialog::handleButtonDown()
-{
-  m_AddResult = kAddClientDown;
-  close();
-}
-
-void AddClientDialog::handleButtonAdvanced()
-{
-  m_AddResult = kAddClientOther;
-  close();
-}

src/apps/deskflow-gui/dialogs/AddClientDialog.h

@@ -1,55 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2014 - 2016 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include <QDialog>
-
-class QPushButton;
-class QLabel;
-
-namespace Ui {
-class AddClientDialog;
-}
-
-enum
-{
-  kAddClientRight,
-  kAddClientLeft,
-  kAddClientUp,
-  kAddClientDown,
-  kAddClientOther,
-  kAddClientIgnore
-};
-
-class AddClientDialog : public QDialog
-{
-  Q_OBJECT
-public:
-  AddClientDialog(const QString &clientName, QWidget *parent = 0);
-  ~AddClientDialog() override;
-
-  int addResult()
-  {
-    return m_AddResult;
-  }
-
-private slots:
-  void handleButtonLeft();
-  void handleButtonUp();
-  void handleButtonRight();
-  void handleButtonDown();
-  void handleButtonAdvanced();
-
-private:
-  std::unique_ptr<Ui::AddClientDialog> ui;
-  QPushButton *m_pButtonLeft;
-  QPushButton *m_pButtonUp;
-  QPushButton *m_pButtonRight;
-  QPushButton *m_pButtonDown;
-  QLabel *m_pLabelCenter;
-  int m_AddResult;
-};

src/apps/deskflow-gui/dialogs/AddClientDialog.ui

@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AddClientDialog</class>
- <widget class="QDialog" name="AddClientDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>350</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <widget class="QWidget" name="gridLayoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>381</width>
-     <height>301</height>
-    </rect>
-   </property>
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="1">
-     <widget class="QLabel" name="m_pLabelHead">
-      <property name="text">
-       <string>TextLabel</string>
-      </property>
-      <property name="wordWrap">
-       <bool>true</bool>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="2">
-     <spacer name="horizontalSpacer_2">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>40</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item row="0" column="0">
-     <spacer name="horizontalSpacer">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>40</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QWidget" name="horizontalLayoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>320</y>
-     <width>381</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <layout class="QHBoxLayout" name="horizontalLayout">
-    <item>
-     <widget class="QCheckBox" name="m_pCheckBoxIgnoreClient">
-      <property name="text">
-       <string>Ignore auto connect clients</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QDialogButtonBox" name="m_pDialogButtonBox">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="standardButtons">
-       <set>QDialogButtonBox::Ignore</set>
-      </property>
-      <property name="centerButtons">
-       <bool>false</bool>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>m_pDialogButtonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>AddClientDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_pDialogButtonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>AddClientDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

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

@@ -1,78 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "FingerprintDialog.h"
-
-#include "widgets/FingerprintPreview.h"
-
-#include <QFont>
-#include <QLabel>
-#include <QPushButton>
-#include <QVBoxLayout>
-
-FingerprintDialog::FingerprintDialog(
-    QWidget *parent, const QList<deskflow::FingerprintData> &fingerprints, FingerprintDialogMode mode
-)
-    : QDialog(parent),
-      m_lblHeader{new QLabel(this)},
-      m_lblFooter{new QLabel(this)},
-      m_fingerprintPreview{new FingerprintPreview(this, fingerprints)},
-      m_buttonBox{new QDialogButtonBox(this)}
-{
-  setWindowIcon(QIcon::fromTheme("fingerprint"));
-  setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-
-  m_lblHeader->setWordWrap(true);
-  m_lblFooter->setWordWrap(true);
-  m_lblFooter->setAlignment(Qt::AlignHCenter);
-
-  auto layout = new QVBoxLayout();
-  layout->addWidget(m_lblHeader);
-  layout->addSpacerItem(new QSpacerItem(0, 10, QSizePolicy::Fixed, QSizePolicy::Fixed));
-  layout->addWidget(m_fingerprintPreview, 0, Qt::AlignTop | Qt::AlignHCenter);
-  layout->addWidget(m_lblFooter);
-  layout->addWidget(m_buttonBox);
-  setLayout(layout);
-
-  if (mode == Local) {
-    setWindowTitle(tr("Local Fingerprints"));
-    m_lblHeader->setText(tr("Local computer's fingerprints"));
-    m_lblFooter->setVisible(false);
-    m_buttonBox->setStandardButtons(QDialogButtonBox::Ok);
-    connect(m_buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked, this, &QDialog::accept);
-  } else {
-    setWindowTitle(tr("Security Question"));
-    auto body =
-        tr("Compare the fingerprints in this dialog to those on the %1.\n"
-           "Only connect if they match!");
-
-    if (mode == FingerprintDialogMode::Server) {
-      m_lblHeader->setText(tr("A new client is connecting.\n%1").arg(body.arg(tr("client"))));
-      m_lblFooter->setText(tr("\nDo you want connect to and trust the client?\n"));
-    } else {
-      m_lblHeader->setText(tr("You are connecting to a new server.\n%1").arg(body.arg(tr("server"))));
-      m_lblFooter->setText(tr("\nDo you want connect to the server?\n"));
-    }
-
-    m_buttonBox->setStandardButtons(QDialogButtonBox::Help | QDialogButtonBox::Yes | QDialogButtonBox::No);
-
-    // Use help to request a dialog with the host prints
-    // Help is used because its always to the furthest from the other buttons.
-    m_buttonBox->button(QDialogButtonBox::Help)->setText(tr("View local fingerprints"));
-    m_buttonBox->button(QDialogButtonBox::Help)->setIcon(QIcon::fromTheme("fingerprint"));
-    m_buttonBox->button(QDialogButtonBox::Help)->setToolTip(tr("Show the local machines fingerprints"));
-    connect(
-        m_buttonBox->button(QDialogButtonBox::Help), &QPushButton::clicked, this,
-        &FingerprintDialog::requestLocalPrintsDialog
-    );
-
-    m_buttonBox->button(QDialogButtonBox::No)->setFocus();
-    connect(m_buttonBox->button(QDialogButtonBox::No), &QPushButton::clicked, this, &QDialog::reject);
-    connect(m_buttonBox->button(QDialogButtonBox::Yes), &QPushButton::clicked, this, &QDialog::accept);
-  }
-  adjustSize();
-  setFixedSize(size());
-}

src/apps/deskflow-gui/dialogs/FingerprintDialog.h

@@ -1,43 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include "net/FingerprintData.h"
-
-#include <QDialog>
-#include <QDialogButtonBox>
-
-enum FingerprintDialogMode
-{
-  Local,
-  Client,
-  Server
-};
-
-class QLabel;
-class FingerprintPreview;
-
-class FingerprintDialog : public QDialog
-{
-  Q_OBJECT
-
-public:
-  explicit FingerprintDialog(
-      QWidget *parent = nullptr, const QList<deskflow::FingerprintData> &fingerprints = {},
-      FingerprintDialogMode mode = FingerprintDialogMode::Local
-  );
-  ~FingerprintDialog() = default;
-
-signals:
-  void requestLocalPrintsDialog();
-
-private:
-  QLabel *m_lblHeader = nullptr;
-  QLabel *m_lblFooter = nullptr;
-  FingerprintPreview *m_fingerprintPreview = nullptr;
-  QDialogButtonBox *m_buttonBox = nullptr;
-};

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

@@ -1,143 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2012 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2008 Volker Lanz <vl@fidra.de>
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "ScreenSettingsDialog.h"
-#include "ui_ScreenSettingsDialog.h"
-
-#include "gui/Styles.h"
-#include "gui/config/Screen.h"
-#include "validators/AliasValidator.h"
-#include "validators/ScreenNameValidator.h"
-#include "validators/ValidationError.h"
-
-#include <QMessageBox>
-
-using namespace deskflow::gui;
-using enum ScreenConfig::Modifier;
-using enum ScreenConfig::SwitchCorner;
-using enum ScreenConfig::Fix;
-
-ScreenSettingsDialog::~ScreenSettingsDialog() = default;
-
-ScreenSettingsDialog::ScreenSettingsDialog(QWidget *parent, Screen *pScreen, const ScreenList *pScreens)
-    : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
-      ui_{std::make_unique<Ui::ScreenSettingsDialog>()},
-      m_pScreen(pScreen)
-{
-
-  ui_->setupUi(this);
-
-  ui_->m_pLabelAliasError->setStyleSheet(kStyleErrorActiveLabel);
-  ui_->m_pLabelNameError->setStyleSheet(kStyleErrorActiveLabel);
-
-  ui_->m_pLineEditName->setText(m_pScreen->name());
-  ui_->m_pLineEditName->setValidator(new validators::ScreenNameValidator(
-      ui_->m_pLineEditName, new validators::ValidationError(this, ui_->m_pLabelNameError), pScreens
-  ));
-  ui_->m_pLineEditName->selectAll();
-
-  ui_->m_pLineEditAlias->setValidator(new validators::AliasValidator(
-      ui_->m_pLineEditAlias, new validators::ValidationError(this, ui_->m_pLabelAliasError)
-  ));
-
-  for (int i = 0; i < m_pScreen->aliases().count(); i++)
-    new QListWidgetItem(m_pScreen->aliases()[i], ui_->m_pListAliases);
-
-  ui_->m_pComboBoxShift->setCurrentIndex(m_pScreen->modifier(static_cast<int>(Shift)));
-  ui_->m_pComboBoxCtrl->setCurrentIndex(m_pScreen->modifier(static_cast<int>(Ctrl)));
-  ui_->m_pComboBoxAlt->setCurrentIndex(m_pScreen->modifier(static_cast<int>(Alt)));
-  ui_->m_pComboBoxMeta->setCurrentIndex(m_pScreen->modifier(static_cast<int>(Meta)));
-  ui_->m_pComboBoxSuper->setCurrentIndex(m_pScreen->modifier(static_cast<int>(Super)));
-
-  ui_->m_pCheckBoxCornerTopLeft->setChecked(m_pScreen->switchCorner(static_cast<int>(TopLeft)));
-  ui_->m_pCheckBoxCornerTopRight->setChecked(m_pScreen->switchCorner(static_cast<int>(TopRight)));
-  ui_->m_pCheckBoxCornerBottomLeft->setChecked(m_pScreen->switchCorner(static_cast<int>(BottomLeft)));
-  ui_->m_pCheckBoxCornerBottomRight->setChecked(m_pScreen->switchCorner(static_cast<int>(BottomRight)));
-  ui_->m_pSpinBoxSwitchCornerSize->setValue(m_pScreen->switchCornerSize());
-
-  ui_->m_pCheckBoxCapsLock->setChecked(m_pScreen->fix(CapsLock));
-  ui_->m_pCheckBoxNumLock->setChecked(m_pScreen->fix(NumLock));
-  ui_->m_pCheckBoxScrollLock->setChecked(m_pScreen->fix(ScrollLock));
-  ui_->m_pCheckBoxXTest->setChecked(m_pScreen->fix(XTest));
-}
-
-void ScreenSettingsDialog::accept()
-{
-  if (ui_->m_pLineEditName->text().isEmpty()) {
-    QMessageBox::warning(
-        this, tr("Screen name is empty"),
-        tr("The screen name cannot be empty. "
-           "Please either fill in a name or cancel the dialog.")
-    );
-    return;
-  } else if (!ui_->m_pLabelNameError->text().isEmpty()) {
-    return;
-  }
-
-  m_pScreen->init();
-
-  m_pScreen->setName(ui_->m_pLineEditName->text());
-
-  for (int i = 0; i < ui_->m_pListAliases->count(); i++) {
-    QString alias(ui_->m_pListAliases->item(i)->text());
-    if (alias == ui_->m_pLineEditName->text()) {
-      QMessageBox::warning(
-          this, tr("Screen name matches alias"),
-          tr("The screen name cannot be the same as an alias. "
-             "Please either remove the alias or change the screen name.")
-      );
-      return;
-    }
-    m_pScreen->addAlias(alias);
-  }
-
-  m_pScreen->setModifier(static_cast<int>(Shift), ui_->m_pComboBoxShift->currentIndex());
-  m_pScreen->setModifier(static_cast<int>(Ctrl), ui_->m_pComboBoxCtrl->currentIndex());
-  m_pScreen->setModifier(static_cast<int>(Alt), ui_->m_pComboBoxAlt->currentIndex());
-  m_pScreen->setModifier(static_cast<int>(Meta), ui_->m_pComboBoxMeta->currentIndex());
-  m_pScreen->setModifier(static_cast<int>(Super), ui_->m_pComboBoxSuper->currentIndex());
-
-  m_pScreen->setSwitchCorner(static_cast<int>(TopLeft), ui_->m_pCheckBoxCornerTopLeft->isChecked());
-  m_pScreen->setSwitchCorner(static_cast<int>(TopRight), ui_->m_pCheckBoxCornerTopRight->isChecked());
-  m_pScreen->setSwitchCorner(static_cast<int>(BottomLeft), ui_->m_pCheckBoxCornerBottomLeft->isChecked());
-  m_pScreen->setSwitchCorner(static_cast<int>(BottomRight), ui_->m_pCheckBoxCornerBottomRight->isChecked());
-  m_pScreen->setSwitchCornerSize(ui_->m_pSpinBoxSwitchCornerSize->value());
-
-  m_pScreen->setFix(static_cast<int>(CapsLock), ui_->m_pCheckBoxCapsLock->isChecked());
-  m_pScreen->setFix(static_cast<int>(NumLock), ui_->m_pCheckBoxNumLock->isChecked());
-  m_pScreen->setFix(static_cast<int>(ScrollLock), ui_->m_pCheckBoxScrollLock->isChecked());
-  m_pScreen->setFix(static_cast<int>(XTest), ui_->m_pCheckBoxXTest->isChecked());
-
-  QDialog::accept();
-}
-
-void ScreenSettingsDialog::on_m_pButtonAddAlias_clicked()
-{
-  if (!ui_->m_pLineEditAlias->text().isEmpty() &&
-      ui_->m_pListAliases->findItems(ui_->m_pLineEditAlias->text(), Qt::MatchFixedString).isEmpty()) {
-    new QListWidgetItem(ui_->m_pLineEditAlias->text(), ui_->m_pListAliases);
-    ui_->m_pLineEditAlias->clear();
-  }
-}
-
-void ScreenSettingsDialog::on_m_pLineEditAlias_textChanged(const QString &text)
-{
-  ui_->m_pButtonAddAlias->setEnabled(!text.isEmpty() && ui_->m_pLabelAliasError->text().isEmpty());
-}
-
-void ScreenSettingsDialog::on_m_pButtonRemoveAlias_clicked()
-{
-  QList<QListWidgetItem *> items = ui_->m_pListAliases->selectedItems();
-
-  for (int i = 0; i < items.count(); i++)
-    delete items[i];
-}
-
-void ScreenSettingsDialog::on_m_pListAliases_itemSelectionChanged()
-{
-  ui_->m_pButtonRemoveAlias->setEnabled(!ui_->m_pListAliases->selectedItems().isEmpty());
-}

src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.ui

@@ -1,975 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ScreenSettingsDialog</class>
- <widget class="QDialog" name="ScreenSettingsDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>440</width>
-    <height>739</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-    <horstretch>0</horstretch>
-    <verstretch>1</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>400</width>
-    <height>620</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Computer settings</string>
-  </property>
-  <layout class="QVBoxLayout">
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <property name="leftMargin">
-    <number>11</number>
-   </property>
-   <property name="topMargin">
-    <number>12</number>
-   </property>
-   <property name="rightMargin">
-    <number>11</number>
-   </property>
-   <property name="bottomMargin">
-    <number>15</number>
-   </property>
-   <item>
-    <widget class="QFrame" name="groupBox">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_4">
-      <property name="topMargin">
-       <number>15</number>
-      </property>
-      <property name="bottomMargin">
-       <number>15</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_7">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Computer &amp;name</string>
-        </property>
-        <property name="buddy">
-         <cstring>m_pLineEditName</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="m_pLineEditName">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="maxLength">
-         <number>255</number>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLabel" name="m_pLabelNameError">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>m_pLabelNameError</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>3</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QLabel" name="m_pLlabelModifierKeys">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Modifier keys</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QFrame" name="m_pGroupModifiers">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <property name="topMargin">
-       <number>10</number>
-      </property>
-      <property name="bottomMargin">
-       <number>10</number>
-      </property>
-      <property name="verticalSpacing">
-       <number>8</number>
-      </property>
-      <item row="0" column="4">
-       <widget class="QLabel" name="label_5">
-        <property name="maximumSize">
-         <size>
-          <width>40</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>M&amp;eta</string>
-        </property>
-        <property name="buddy">
-         <cstring>m_pComboBoxMeta</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="m_pComboBoxShift">
-        <item>
-         <property name="text">
-          <string>Shift</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Ctrl</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Alt</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Meta</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Super</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>None</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="m_pComboBoxCtrl">
-        <property name="currentIndex">
-         <number>1</number>
-        </property>
-        <item>
-         <property name="text">
-          <string>Shift</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Ctrl</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Alt</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Meta</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Super</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>None</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Al&amp;t</string>
-        </property>
-        <property name="buddy">
-         <cstring>m_pComboBoxAlt</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>30</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>&amp;Ctrl</string>
-        </property>
-        <property name="buddy">
-         <cstring>m_pComboBoxCtrl</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="maximumSize">
-         <size>
-          <width>40</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>&amp;Shift</string>
-        </property>
-        <property name="buddy">
-         <cstring>m_pComboBoxShift</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QComboBox" name="m_pComboBoxAlt">
-        <property name="currentIndex">
-         <number>2</number>
-        </property>
-        <item>
-         <property name="text">
-          <string>Shift</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Ctrl</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Alt</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Meta</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Super</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>None</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="0" column="5">
-       <widget class="QComboBox" name="m_pComboBoxMeta">
-        <property name="currentIndex">
-         <number>3</number>
-        </property>
-        <item>
-         <property name="text">
-          <string>Shift</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Ctrl</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Alt</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Meta</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Super</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>None</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="1" column="4">
-       <widget class="QLabel" name="label_6">
-        <property name="text">
-         <string>S&amp;uper</string>
-        </property>
-        <property name="buddy">
-         <cstring>m_pComboBoxSuper</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="5">
-       <widget class="QComboBox" name="m_pComboBoxSuper">
-        <property name="currentIndex">
-         <number>4</number>
-        </property>
-        <item>
-         <property name="text">
-          <string>Shift</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Ctrl</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Alt</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Meta</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Super</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>None</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer_4">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>3</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QLabel" name="m_pLabelDeadCorners">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Dead corners defaults</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QFrame" name="m_pGroupSwitchCorners">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0" columnstretch="0,0,0,0">
-      <property name="sizeConstraint">
-       <enum>QLayout::SetDefaultConstraint</enum>
-      </property>
-      <property name="topMargin">
-       <number>15</number>
-      </property>
-      <property name="bottomMargin">
-       <number>15</number>
-      </property>
-      <property name="spacing">
-       <number>10</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="m_pCheckBoxCornerTopLeft">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Top-left</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QCheckBox" name="m_pCheckBoxCornerBottomRight">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Bottom-right</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QCheckBox" name="m_pCheckBoxCornerTopRight">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Top-right</string>
-        </property>
-        <property name="autoRepeatInterval">
-         <number>100</number>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLabel" name="label">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Corner si&amp;ze</string>
-        </property>
-        <property name="buddy">
-         <cstring>m_pSpinBoxSwitchCornerSize</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="m_pCheckBoxCornerBottomLeft">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Bottom-left</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3">
-       <widget class="QSpinBox" name="m_pSpinBoxSwitchCornerSize">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>70</width>
-          <height>0</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer_6">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>3</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QLabel" name="m_LabelFixes">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Fixes</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QFrame" name="m_pGroupFixes">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <property name="topMargin">
-       <number>15</number>
-      </property>
-      <property name="bottomMargin">
-       <number>15</number>
-      </property>
-      <property name="verticalSpacing">
-       <number>16</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="m_pCheckBoxCapsLock">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>CAPS LOCK key</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="m_pCheckBoxNumLock">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>NUM LOCK key</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QCheckBox" name="m_pCheckBoxScrollLock">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>SCROLL LOCK key</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QCheckBox" name="m_pCheckBoxXTest">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>XTest for Xinerama</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer_8">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>3</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QLabel" name="m_pLabelAliases">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Aliases</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QFrame" name="m_pGroupAliases">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="sizeConstraint">
-       <enum>QLayout::SetDefaultConstraint</enum>
-      </property>
-      <item>
-       <layout class="QGridLayout" name="gridLayout_5">
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="verticalSpacing">
-         <number>6</number>
-        </property>
-        <item row="2" column="0">
-         <spacer name="horizontalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="2" column="1">
-         <widget class="QPushButton" name="m_pButtonAddAlias">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="text">
-           <string>&amp;Add</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0" colspan="2">
-         <widget class="QLineEdit" name="m_pLineEditAlias">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>168</width>
-            <height>20</height>
-           </size>
-          </property>
-          <property name="maxLength">
-           <number>255</number>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0" colspan="2">
-         <widget class="QLabel" name="m_pLabelAliasError">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16777215</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>m_pLabelNameError</string>
-          </property>
-          <property name="wordWrap">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0" colspan="2">
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QGridLayout" name="gridLayout_7">
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="verticalSpacing">
-         <number>6</number>
-        </property>
-        <item row="0" column="0" colspan="2">
-         <widget class="QListWidget" name="m_pListAliases">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16777215</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="selectionMode">
-           <enum>QAbstractItemView::ExtendedSelection</enum>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QPushButton" name="m_pButtonRemoveAlias">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="text">
-           <string>&amp;Remove</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="2" column="1">
-         <spacer name="verticalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer_9">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>10</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="m_pButtonBox">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>m_pButtonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>ScreenSettingsDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>222</x>
-     <y>502</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_pButtonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>ScreenSettingsDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>290</x>
-     <y>508</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

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

@@ -1,294 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
- * SPDX-FileCopyrightText: (C) 2012 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2008 Volker Lanz <vl@fidra.de>
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "SettingsDialog.h"
-#include "ui_SettingsDialog.h"
-
-#include "common/Settings.h"
-#include "gui/Messages.h"
-#include "gui/core/CoreProcess.h"
-#include "gui/tls/TlsCertificate.h"
-#include "gui/tls/TlsUtility.h"
-
-#include <QDir>
-#include <QFileDialog>
-#include <QMessageBox>
-
-using namespace deskflow::gui;
-
-SettingsDialog::SettingsDialog(QWidget *parent, const IServerConfig &serverConfig, const CoreProcess &coreProcess)
-    : QDialog(parent),
-      ui{std::make_unique<Ui::SettingsDialog>()},
-      m_serverConfig(serverConfig),
-      m_coreProcess(coreProcess),
-      m_tlsUtility(this)
-{
-
-  ui->setupUi(this);
-
-  ui->comboTlsKeyLength->setItemIcon(0, QIcon::fromTheme(QIcon::ThemeIcon::SecurityLow));
-  ui->comboTlsKeyLength->setItemIcon(1, QIcon::fromTheme(QStringLiteral("security-medium")));
-  ui->comboTlsKeyLength->setItemIcon(2, QIcon::fromTheme(QIcon::ThemeIcon::SecurityHigh));
-  ui->lblTlsCertInfo->setFixedSize(28, 28);
-
-  ui->rbIconMono->setIcon(QIcon::fromTheme(QStringLiteral("deskflow-symbolic")));
-  ui->rbIconColorful->setIcon(QIcon::fromTheme(QStringLiteral("deskflow")));
-
-  // force the first tab, since qt creator sets the active tab as the last one
-  // the developer was looking at, and it's easy to accidentally save that.
-  ui->tabWidget->setCurrentIndex(0);
-
-  loadFromConfig();
-  updateControls();
-
-  adjustSize();
-  QApplication::processEvents();
-  setFixedHeight(height());
-  setWindowFlags((windowFlags() | Qt::CustomizeWindowHint) & ~Qt::WindowMinMaxButtonsHint);
-
-  initConnections();
-}
-
-void SettingsDialog::initConnections()
-{
-  connect(this, &SettingsDialog::shown, this, &SettingsDialog::showReadOnlyMessage, Qt::QueuedConnection);
-  connect(Settings::instance(), &Settings::writableChanged, this, &SettingsDialog::showReadOnlyMessage);
-
-  connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &SettingsDialog::accept);
-  connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-
-  connect(ui->groupSecurity, &QGroupBox::toggled, this, &SettingsDialog::updateTlsControlsEnabled);
-  connect(ui->cbServiceEnabled, &QCheckBox::toggled, this, &SettingsDialog::updateControls);
-  connect(ui->btnTlsRegenCert, &QPushButton::clicked, this, &SettingsDialog::regenCertificates);
-  connect(ui->comboTlsKeyLength, &QComboBox::currentIndexChanged, this, &SettingsDialog::updateRequestedKeySize);
-  connect(ui->btnTlsCertPath, &QPushButton::clicked, this, &SettingsDialog::browseCertificatePath);
-  connect(ui->btnBrowseLog, &QPushButton::clicked, this, &SettingsDialog::browseLogPath);
-  connect(ui->cbLogToFile, &QCheckBox::toggled, this, &SettingsDialog::setLogToFile);
-}
-
-void SettingsDialog::regenCertificates()
-{
-  if (m_tlsUtility.generateCertificate()) {
-    QMessageBox::information(this, tr("TLS Certificate Regenerated"), tr("TLS certificate regenerated successfully."));
-    const auto certificate = Settings::value(Settings::Security::Certificate).toString();
-    updateKeyLengthOnFile(certificate);
-  }
-}
-
-void SettingsDialog::browseCertificatePath()
-{
-  QString fileName = QFileDialog::getSaveFileName(
-      this, tr("Select a TLS certificate to use..."), ui->lineTlsCertPath->text(), "Cert (*.pem)", nullptr,
-      QFileDialog::DontConfirmOverwrite
-  );
-
-  if (!fileName.isEmpty()) {
-    ui->lineTlsCertPath->setText(fileName);
-
-    if (QFile(fileName).exists()) {
-      updateKeyLengthOnFile(fileName);
-    } else {
-      qDebug("no tls certificate file at: %s", qUtf8Printable(fileName));
-    }
-  }
-}
-
-void SettingsDialog::browseLogPath()
-{
-  QString fileName =
-      QFileDialog::getSaveFileName(this, tr("Save log file to..."), ui->lineLogFilename->text(), "Logs (*.log *.txt)");
-
-  if (!fileName.isEmpty()) {
-    ui->lineLogFilename->setText(fileName);
-  }
-}
-
-void SettingsDialog::setLogToFile(bool logToFile)
-{
-  ui->widgetLogFilename->setEnabled(logToFile);
-}
-
-void SettingsDialog::showEvent(QShowEvent *event)
-{
-  QDialog::showEvent(event);
-  Q_EMIT shown();
-}
-
-void SettingsDialog::showReadOnlyMessage()
-{
-  if (Settings::isWritable())
-    return;
-  messages::showReadOnlySettings(this, Settings::settingsFile());
-}
-
-void SettingsDialog::accept()
-{
-  Settings::setValue(Settings::Core::Port, ui->sbPort->value());
-  Settings::setValue(Settings::Core::Interface, ui->lineInterface->text());
-  Settings::setValue(Settings::Log::Level, ui->comboLogLevel->currentIndex());
-  Settings::setValue(Settings::Log::ToFile, ui->cbLogToFile->isChecked());
-  Settings::setValue(Settings::Log::File, ui->lineLogFilename->text());
-  Settings::setValue(Settings::Core::ElevateMode, ui->comboElevate->currentIndex());
-  Settings::setValue(Settings::Gui::Autohide, ui->cbAutoHide->isChecked());
-  Settings::setValue(Settings::Gui::AutoUpdateCheck, ui->cbAutoUpdate->isChecked());
-  Settings::setValue(Settings::Core::PreventSleep, ui->cbPreventSleep->isChecked());
-  Settings::setValue(Settings::Security::Certificate, ui->lineTlsCertPath->text());
-  Settings::setValue(Settings::Security::KeySize, ui->comboTlsKeyLength->currentText().toInt());
-  Settings::setValue(Settings::Security::TlsEnabled, ui->groupSecurity->isChecked());
-  Settings::setValue(Settings::Client::LanguageSync, ui->cbLanguageSync->isChecked());
-  Settings::setValue(Settings::Client::InvertScrollDirection, ui->cbScrollDirection->isChecked());
-  Settings::setValue(Settings::Gui::CloseToTray, ui->cbCloseToTray->isChecked());
-  Settings::setValue(Settings::Gui::SymbolicTrayIcon, ui->rbIconMono->isChecked());
-  Settings::setValue(Settings::Security::CheckPeers, ui->cbRequireClientCert->isChecked());
-
-  Settings::ProcessMode mode;
-  if (ui->cbServiceEnabled->isChecked())
-    mode = Settings::ProcessMode::Service;
-  else
-    mode = Settings::ProcessMode::Desktop;
-  Settings::setValue(Settings::Core::ProcessMode, mode);
-
-  QDialog::accept();
-}
-
-void SettingsDialog::loadFromConfig()
-{
-  ui->sbPort->setValue(Settings::value(Settings::Core::Port).toInt());
-  ui->lineInterface->setText(Settings::value(Settings::Core::Interface).toString());
-  ui->comboLogLevel->setCurrentIndex(Settings::value(Settings::Log::Level).toInt());
-  ui->cbLogToFile->setChecked(Settings::value(Settings::Log::ToFile).toBool());
-  ui->lineLogFilename->setText(Settings::value(Settings::Log::File).toString());
-  ui->cbAutoHide->setChecked(Settings::value(Settings::Gui::Autohide).toBool());
-  ui->cbPreventSleep->setChecked(Settings::value(Settings::Core::PreventSleep).toBool());
-  ui->cbLanguageSync->setChecked(Settings::value(Settings::Client::LanguageSync).toBool());
-  ui->cbScrollDirection->setChecked(Settings::value(Settings::Client::InvertScrollDirection).toBool());
-  ui->cbCloseToTray->setChecked(Settings::value(Settings::Gui::CloseToTray).toBool());
-  ui->comboElevate->setCurrentIndex(Settings::value(Settings::Core::ElevateMode).toInt());
-  ui->cbAutoUpdate->setChecked(Settings::value(Settings::Gui::Autohide).toBool());
-
-  const auto processMode = Settings::value(Settings::Core::ProcessMode).value<Settings::ProcessMode>();
-  ui->cbServiceEnabled->setChecked(processMode == Settings::ProcessMode::Service);
-
-  if (Settings::value(Settings::Gui::SymbolicTrayIcon).toBool())
-    ui->rbIconMono->setChecked(true);
-  else
-    ui->rbIconColorful->setChecked(true);
-
-  qDebug() << "load from config done";
-  updateTlsControls();
-}
-
-void SettingsDialog::updateTlsControls()
-{
-  const auto certificate = Settings::value(Settings::Security::Certificate).toString();
-  if (QFile(certificate).exists()) {
-    updateKeyLengthOnFile(certificate);
-  }
-
-  ui->comboTlsKeyLength->setCurrentText(Settings::value(Settings::Security::KeySize).toString());
-
-  const auto tlsEnabled = Settings::value(Settings::Security::TlsEnabled).toBool();
-  const auto writable = Settings::isWritable();
-  const auto enabled = writable && tlsEnabled;
-
-  ui->lineTlsCertPath->setText(certificate);
-  ui->cbRequireClientCert->setChecked(Settings::value(Settings::Security::CheckPeers).toBool());
-  ui->groupSecurity->setChecked(tlsEnabled);
-
-  ui->groupSecurity->setEnabled(writable);
-  ui->comboTlsKeyLength->setEnabled(enabled);
-  ui->widgetTlsCert->setEnabled(enabled);
-  ui->lblTlsKeyLength->setEnabled(enabled);
-  ui->btnTlsRegenCert->setEnabled(enabled);
-  ui->cbRequireClientCert->setEnabled(enabled);
-}
-
-void SettingsDialog::updateTlsControlsEnabled()
-{
-  const auto writable = Settings::isWritable();
-  const auto clientMode =
-      Settings::value(Settings::Core::CoreMode).value<Settings::CoreMode>() == Settings::CoreMode::Client;
-  const auto tlsChecked = ui->groupSecurity->isChecked();
-
-  auto enabled = writable && tlsChecked && !clientMode;
-  ui->lblTlsKeyLength->setEnabled(enabled);
-  ui->comboTlsKeyLength->setEnabled(enabled);
-  ui->lblTlsCert->setEnabled(enabled);
-  ui->widgetTlsCert->setEnabled(enabled);
-  ui->btnTlsRegenCert->setEnabled(enabled);
-  ui->cbRequireClientCert->setEnabled(enabled);
-}
-
-bool SettingsDialog::isClientMode() const
-{
-  return m_coreProcess.mode() == Settings::CoreMode::Client;
-}
-
-void SettingsDialog::updateKeyLengthOnFile(const QString &path)
-{
-  TlsCertificate ssl;
-  if (!QFile(path).exists()) {
-    qFatal("tls certificate file not found: %s", qUtf8Printable(path));
-  }
-
-  auto length = ssl.getCertKeyLength(path);
-  QPixmap labelIcon = QPixmap(QIcon::fromTheme(QIcon::ThemeIcon::SecurityLow).pixmap(24, 24));
-  if (length == 2048)
-    labelIcon = QPixmap(QIcon::fromTheme(QStringLiteral("security-medium")).pixmap(24, 24));
-  if (length == 4096)
-    labelIcon = QPixmap(QIcon::fromTheme(QIcon::ThemeIcon::SecurityHigh).pixmap(24, 24));
-
-  ui->lblTlsCertInfo->setPixmap(labelIcon);
-  ui->lblTlsCertInfo->setToolTip(QStringLiteral("Key length: %1 bits").arg(QString::number(length)));
-}
-
-void SettingsDialog::updateControls()
-{
-
-#if defined(Q_OS_WIN)
-  const auto serviceAvailable = true;
-#else
-  // service not supported on unix yet, so always disable.
-  const auto serviceAvailable = false;
-  ui->groupService->setTitle("Service (Windows only)");
-#endif
-
-  const bool writable = Settings::isWritable();
-  const bool serviceChecked = ui->cbServiceEnabled->isChecked();
-  const bool logToFile = ui->cbLogToFile->isChecked();
-
-  ui->sbPort->setEnabled(writable);
-  ui->lineInterface->setEnabled(writable);
-  ui->comboLogLevel->setEnabled(writable);
-  ui->cbLogToFile->setEnabled(writable);
-  ui->cbAutoHide->setEnabled(writable);
-  ui->cbAutoUpdate->setEnabled(writable);
-  ui->cbPreventSleep->setEnabled(writable);
-  ui->lineTlsCertPath->setEnabled(writable);
-  ui->comboTlsKeyLength->setEnabled(writable);
-  ui->cbCloseToTray->setEnabled(writable);
-
-  ui->cbServiceEnabled->setEnabled(writable && serviceAvailable);
-  ui->widgetElevate->setEnabled(writable && serviceChecked && serviceAvailable);
-
-  ui->cbLanguageSync->setEnabled(writable && isClientMode());
-  ui->cbScrollDirection->setEnabled(writable && isClientMode());
-
-  ui->widgetLogFilename->setEnabled(writable && logToFile);
-
-  updateTlsControls();
-}
-
-void SettingsDialog::updateRequestedKeySize()
-{
-  if (ui->comboTlsKeyLength->currentText() == Settings::value(Settings::Security::KeySize).toString())
-    return;
-  Settings::setValue(Settings::Security::KeySize, ui->comboTlsKeyLength->currentText());
-}
-
-SettingsDialog::~SettingsDialog() = default;

src/apps/deskflow-gui/dialogs/SettingsDialog.ui

@@ -1,693 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SettingsDialog</class>
- <widget class="QDialog" name="SettingsDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>550</width>
-    <height>612</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Preferences</string>
-  </property>
-  <property name="modal">
-   <bool>true</bool>
-  </property>
-  <layout class="QVBoxLayout" name="_13">
-   <property name="spacing">
-    <number>20</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <widget class="QWidget" name="tabRegular">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <attribute name="title">
-       <string>&amp;Regular</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="_8">
-       <property name="spacing">
-        <number>15</number>
-       </property>
-       <item>
-        <widget class="QGroupBox" name="groupBasics">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Basics</string>
-         </property>
-         <layout class="QVBoxLayout" name="_10">
-          <item>
-           <widget class="QCheckBox" name="cbPreventSleep">
-            <property name="text">
-             <string>Prevent this computer from going to sleep</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="cbLanguageSync">
-            <property name="text">
-             <string>Use server's keyboard language on this computer (client mode)</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="cbScrollDirection">
-            <property name="text">
-             <string>Invert scroll direction on this computer (client mode)</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupApp">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>App</string>
-         </property>
-         <layout class="QVBoxLayout" name="_9">
-          <item>
-           <widget class="QCheckBox" name="cbAutoUpdate">
-            <property name="text">
-             <string>Check for updates on startup </string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="cbCloseToTray">
-            <property name="text">
-             <string>Leave app running in notification area when the window is closed</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="cbAutoHide">
-            <property name="text">
-             <string>Hide the window when the app starts</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_8">
-            <item>
-             <widget class="QLabel" name="lblTrayIconStyle">
-              <property name="text">
-               <string>Tray icon style</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="rbIconColorful">
-              <property name="text">
-               <string>Colorful</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="rbIconMono">
-              <property name="text">
-               <string>Monocolor</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupSecurity">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Enable TLS Encryption</string>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-         <layout class="QVBoxLayout" name="_11">
-          <item>
-           <widget class="QWidget" name="widgetTlsCert" native="true">
-            <layout class="QHBoxLayout" name="_12">
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item>
-              <widget class="QLabel" name="lblTlsCertInfo">
-               <property name="text">
-                <string notr="true"/>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="lblTlsCert">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>Certificate</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLineEdit" name="lineTlsCertPath">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QPushButton" name="btnTlsCertPath">
-               <property name="cursor">
-                <cursorShape>PointingHandCursor</cursorShape>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset theme="QIcon::ThemeIcon::DocumentOpen"/>
-               </property>
-               <property name="flat">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_5">
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="lblTlsKeyLength">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string>Key length</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QComboBox" name="comboTlsKeyLength">
-              <item>
-               <property name="text">
-                <string>1024</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>2048</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>4096</string>
-               </property>
-              </item>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_2">
-              <property name="orientation">
-               <enum>Qt::Orientation::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item>
-             <widget class="QPushButton" name="btnTlsRegenCert">
-              <property name="text">
-               <string>Regenerate certificate</string>
-              </property>
-              <property name="icon">
-               <iconset theme="QIcon::ThemeIcon::ViewRefresh"/>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="cbRequireClientCert">
-            <property name="text">
-             <string>Require client certificates</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabAdvanced">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <attribute name="title">
-       <string>&amp;Advanced</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="_2">
-       <property name="spacing">
-        <number>15</number>
-       </property>
-       <item>
-        <widget class="QGroupBox" name="groupNetworking">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Networking</string>
-         </property>
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-           <widget class="QLabel" name="lblPort">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Port</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QSpinBox" name="sbPort">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="maximum">
-             <number>65535</number>
-            </property>
-            <property name="value">
-             <number>24800</number>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="lblNetworkIp">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Network IP</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLineEdit" name="lineInterface">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupLogs">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Logs</string>
-         </property>
-         <layout class="QGridLayout" name="_3">
-          <property name="topMargin">
-           <number>15</number>
-          </property>
-          <property name="bottomMargin">
-           <number>15</number>
-          </property>
-          <property name="verticalSpacing">
-           <number>7</number>
-          </property>
-          <item row="0" column="1">
-           <spacer name="horizontalSpacer_5">
-            <property name="orientation">
-             <enum>Qt::Orientation::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="cbLogToFile">
-            <property name="text">
-             <string>Log to file</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="3">
-           <widget class="QComboBox" name="comboLogLevel">
-            <item>
-             <property name="text">
-              <string>Info</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Debug</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Debug1</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Debug2</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="0" column="2">
-           <widget class="QLabel" name="lblLogLevel">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Level</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0" colspan="4">
-           <widget class="QWidget" name="widgetLogFilename" native="true">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <layout class="QHBoxLayout" name="_4">
-             <property name="spacing">
-              <number>3</number>
-             </property>
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item>
-              <widget class="QLabel" name="labelLogPath">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>Log path</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_7">
-               <property name="orientation">
-                <enum>Qt::Orientation::Horizontal</enum>
-               </property>
-               <property name="sizeType">
-                <enum>QSizePolicy::Policy::Minimum</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-             <item>
-              <widget class="QLineEdit" name="lineLogFilename">
-               <property name="enabled">
-                <bool>true</bool>
-               </property>
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QPushButton" name="btnBrowseLog">
-               <property name="enabled">
-                <bool>true</bool>
-               </property>
-               <property name="cursor">
-                <cursorShape>PointingHandCursor</cursorShape>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset theme="QIcon::ThemeIcon::DocumentOpen"/>
-               </property>
-               <property name="flat">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupService">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Service</string>
-         </property>
-         <layout class="QGridLayout" name="_6">
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="cbServiceEnabled">
-            <property name="toolTip">
-             <string>Whether to launch the server or client process through the Windows background
-                service or direct from the GUI.</string>
-            </property>
-            <property name="whatsThis">
-             <string>
-              &lt;p&gt;The background service is only available on Windows.&lt;/p&gt;
-              &lt;p&gt;The Windows background service is used to:&lt;/p&gt;
-              &lt;ul&gt;
-              &lt;li&gt;Start the server or client automatically when the computer starts.&lt;/li&gt;
-              &lt;li&gt;Run the server or client in an elevated mode (e.g. on login screen, UAC dialogs, etc).&lt;/li&gt;
-              &lt;/ul&gt;
-              </string>
-            </property>
-            <property name="text">
-             <string>Use background service (daemon)</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QWidget" name="widgetElevate" native="true">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <layout class="QHBoxLayout" name="_7">
-             <item>
-              <widget class="QLabel" name="lblElevate">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>Launch with elevated privileges</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="comboElevate">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="toolTip">
-                <string>Specify when the Windows background service should run the server or client
-                  process at an elevated privilege level.</string>
-               </property>
-               <property name="whatsThis">
-                <string>
-                &lt;p&gt;You may want to alter whether or not the privilege level of the server or client 
-                  process is automatically changed depending on your use case. In some cases it can help
-                  to diagnose or solve some problems related to elevated processes in Windows.&lt;/p&gt;
-                &lt;ul&gt;
-                  &lt;li&gt;Automatic: Elevate when the window session changes to secure mode&lt;/li&gt;
-                  &lt;li&gt;Always elevate: Always run in elevated mode (could be unsafe)&lt;/li&gt;
-                  &lt;li&gt;Never elevate: Turn off compatibility with login screen and UAC&lt;/li&gt;
-                &lt;/ul&gt;
-                </string>
-               </property>
-               <property name="currentIndex">
-                <number>0</number>
-               </property>
-               <item>
-                <property name="text">
-                 <string>Automatic (as needed)</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>Always elevate</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>Never elevate</string>
-                </property>
-               </item>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Orientation::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Save</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>tabWidget</tabstop>
-  <tabstop>cbPreventSleep</tabstop>
-  <tabstop>cbLanguageSync</tabstop>
-  <tabstop>cbScrollDirection</tabstop>
-  <tabstop>cbAutoUpdate</tabstop>
-  <tabstop>cbCloseToTray</tabstop>
-  <tabstop>cbAutoHide</tabstop>
-  <tabstop>rbIconColorful</tabstop>
-  <tabstop>rbIconMono</tabstop>
-  <tabstop>groupSecurity</tabstop>
-  <tabstop>lineTlsCertPath</tabstop>
-  <tabstop>btnTlsCertPath</tabstop>
-  <tabstop>comboTlsKeyLength</tabstop>
-  <tabstop>btnTlsRegenCert</tabstop>
-  <tabstop>cbRequireClientCert</tabstop>
-  <tabstop>sbPort</tabstop>
-  <tabstop>lineInterface</tabstop>
-  <tabstop>cbLogToFile</tabstop>
-  <tabstop>comboLogLevel</tabstop>
-  <tabstop>lineLogFilename</tabstop>
-  <tabstop>btnBrowseLog</tabstop>
-  <tabstop>cbServiceEnabled</tabstop>
-  <tabstop>comboElevate</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>

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

@@ -1,57 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2021 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "LineEditValidator.h"
-
-#include "gui/Styles.h"
-
-#include <QValidator>
-
-using namespace deskflow::gui;
-
-namespace validators {
-
-LineEditValidator::LineEditValidator(QLineEdit *lineEdit, ValidationError *error)
-    : m_pError(error),
-      m_pLineEdit(lineEdit)
-{
-
-  if (!m_pLineEdit) {
-    qFatal("validator line edit not set");
-  }
-}
-
-void LineEditValidator::addValidator(std::unique_ptr<IStringValidator> validator)
-{
-  m_Validators.push_back(std::move(validator));
-}
-
-QValidator::State LineEditValidator::validate(QString &input, int &pos) const
-{
-  assert(m_pLineEdit);
-
-  QString errorMessage;
-  for (const auto &validator : m_Validators) {
-    if (!validator->validate(input)) {
-      errorMessage = validator->getMessage();
-      break;
-    }
-  }
-
-  if (errorMessage.isEmpty()) {
-    m_pLineEdit->setStyleSheet("");
-  } else {
-    m_pLineEdit->setStyleSheet(kStyleLineEditErrorBorder);
-  }
-
-  if (m_pError) {
-    m_pError->setMessage(errorMessage);
-  }
-
-  return errorMessage.isEmpty() ? Acceptable : Intermediate;
-}
-
-} // namespace validators

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

@@ -1,50 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2024 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "ValidationError.h"
-
-#include "gui/Styles.h"
-
-using namespace deskflow::gui;
-
-namespace validators {
-
-void clear(QLabel *label)
-{
-  if (label) {
-    label->setStyleSheet(kStyleErrorInactiveLabel);
-    label->setText("");
-  }
-}
-
-ValidationError::ValidationError(QObject *parent, QLabel *label) : QObject(parent), m_pLabel(label)
-{
-
-  if (m_pLabel) {
-    clear(m_pLabel);
-  }
-}
-
-const QString &ValidationError::message() const
-{
-  return m_message;
-}
-
-void ValidationError::setMessage(const QString &message)
-{
-  m_message = message;
-
-  if (m_pLabel) {
-    if (message.isEmpty()) {
-      clear(m_pLabel);
-    } else {
-      m_pLabel->setStyleSheet(kStyleErrorActiveLabel);
-      m_pLabel->setText(message);
-    }
-  }
-}
-
-} // namespace validators

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

@@ -1,101 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "FingerprintPreview.h"
-
-#include <QFont>
-#include <QHBoxLayout>
-#include <QLabel>
-
-#include <net/SecureUtils.h>
-
-FingerprintPreview::FingerprintPreview(QWidget *parent, const QList<deskflow::FingerprintData> &fingerprints)
-    : QFrame(parent)
-{
-  setFrameShape(QFrame::StyledPanel);
-  setFrameStyle(QFrame::Sunken);
-  setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-
-  QString sha1String;
-  QString sha256String;
-  QString sha256Art;
-
-  for (const auto &fingerprint : fingerprints) {
-    if (fingerprint.algorithm == "sha1") {
-      sha1String = QString::fromStdString(deskflow::formatSSLFingerprint(fingerprint.data));
-    }
-
-    if (fingerprint.algorithm == "sha256") {
-      sha256String = QString::fromStdString(deskflow::formatSSLFingerprintColumns(fingerprint.data));
-      sha256Art = QString::fromStdString(deskflow::generateFingerprintArt(fingerprint.data));
-    }
-  }
-
-  auto labelSha1 = new QLabel(QStringLiteral("SHA1:"), this);
-  labelSha1->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-
-  auto lblSha1 = new QLabel(sha1String, this);
-  lblSha1->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-  lblSha1->setTextInteractionFlags(Qt::TextSelectableByMouse);
-
-  auto sha1Layout = new QHBoxLayout();
-  sha1Layout->addWidget(labelSha1);
-  sha1Layout->addWidget(lblSha1);
-
-  auto frameSha1 = new QFrame(this);
-  frameSha1->setFrameShape(QFrame::StyledPanel);
-  frameSha1->setFrameStyle(QFrame::Sunken);
-  frameSha1->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-  frameSha1->setLayout(sha1Layout);
-
-  auto labelSha256 = new QLabel(QStringLiteral("SHA256:"), this);
-  labelSha256->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-
-  auto lblSha256String = new QLabel(sha256String, this);
-  lblSha256String->setAlignment(Qt::AlignTop | Qt::AlignHCenter);
-  lblSha256String->setTextInteractionFlags(Qt::TextSelectableByMouse);
-
-  auto lblSha256Art = new QLabel(sha256Art, this);
-  lblSha256Art->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
-  lblSha256Art->setTextInteractionFlags(Qt::TextSelectableByMouse);
-
-  QFont f = font();
-  f.setFamilies({"Hack", "Liberation Mono", "Monospace", "Andale Mono"});
-  f.setStyleHint(QFont::Monospace);
-  lblSha256Art->setFont(f);
-
-  auto innersha256Layout = new QHBoxLayout();
-  innersha256Layout->setContentsMargins(0, 0, 0, 0);
-  innersha256Layout->addWidget(lblSha256String);
-  innersha256Layout->addWidget(lblSha256Art);
-
-  auto sha256Layout = new QVBoxLayout();
-  sha256Layout->addWidget(labelSha256);
-  sha256Layout->addLayout(innersha256Layout);
-
-  auto frameSha256 = new QFrame(this);
-  frameSha256->setFrameShape(QFrame::StyledPanel);
-  frameSha256->setFrameStyle(QFrame::Sunken);
-  frameSha256->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-  frameSha256->setLayout(sha256Layout);
-
-  auto layout = new QVBoxLayout();
-  layout->addWidget(frameSha1);
-  layout->addWidget(frameSha256);
-
-  setLayout(layout);
-
-  if (sha1String.isEmpty()) {
-    frameSha1->setVisible(false);
-  }
-
-  if (sha256String.isEmpty()) {
-    frameSha256->setVisible(false);
-  }
-
-  adjustSize();
-  setFixedSize(size());
-}

src/apps/deskflow-gui/widgets/FingerprintPreview.h

@@ -1,18 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include <QFrame>
-#include <net/FingerprintData.h>
-
-class FingerprintPreview : public QFrame
-{
-  Q_OBJECT
-public:
-  explicit FingerprintPreview(QWidget *parent, const QList<deskflow::FingerprintData> &fingerprints = {});
-  ~FingerprintPreview() = default;
-};

src/apps/deskflow-server/CMakeLists.txt

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

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

@@ -1,59 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
- * SPDX-FileCopyrightText: (C) 2012-2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "arch/Arch.h"
-#include "base/EventQueue.h"
-#include "base/Log.h"
-#include "deskflow/ServerApp.h"
-
-#if SYSAPI_WIN32
-#include "arch/win32/ArchMiscWindows.h"
-#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;
-
-  // HACK: the `--active-desktop` arg actually belongs in the `deskflow-core` binary,
-  // but we are placing it here in the server binary temporarily until we are ready to
-  // ship the `deskflow-core` binary. we are deliberately not integrating `--active-desktop`
-  // into the existing `ServerApp` arg parsing code as that would be a waste of time.
-#if SYSAPI_WIN32
-  for (int i = 1; i < argc; ++i) {
-    std::string arg(argv[i]);
-    // This is called by the daemon (running in session 0) when it needs to know the name of the
-    // interactive desktop.
-    // It is necessary to run a utility process because the daemon runs in session 0, which does not
-    // have access to the active desktop, and so cannot query it's name.
-    if (arg == "--active-desktop") {
-      const auto name = ArchMiscWindows::getActiveDesktopName();
-      if (name.empty()) {
-        LOG((CLOG_CRIT "failed to get active desktop name"));
-        return kExitFailed;
-      }
-
-      LOG((CLOG_PRINT "%s", name.c_str()));
-      return kExitSuccess;
-    }
-  }
-#endif
-
-  ServerApp app(&events);
-  return app.run(argc, argv);
-}

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

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

src/apps/res/deskflow.plist.in

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

src/apps/res/deskflow.qrc

@@ -5,34 +5,58 @@
         <file>icons/deskflow-dark/actions/16/document-edit.svg</file>
         <file>icons/deskflow-dark/actions/16/document-open.svg</file>
         <file>icons/deskflow-dark/actions/16/document-save-as.svg</file>
+        <file>icons/deskflow-dark/actions/16/go-down.svg</file>
+        <file>icons/deskflow-dark/actions/16/go-up.svg</file>
         <file>icons/deskflow-dark/actions/16/help-about.svg</file>
+        <file>icons/deskflow-dark/actions/16/network-connect.svg</file>
+        <file>icons/deskflow-dark/actions/16/network-disconnect.svg</file>
         <file>icons/deskflow-dark/actions/16/process-stop.svg</file>
         <file>icons/deskflow-dark/actions/16/system-run.svg</file>
+        <file>icons/deskflow-dark/actions/16/system-search.svg</file>
         <file>icons/deskflow-dark/actions/16/tools-report-bug.svg</file>
+        <file>icons/deskflow-dark/actions/16/view-close.svg</file>
         <file>icons/deskflow-dark/actions/16/view-refresh.svg</file>
+        <file>icons/deskflow-dark/actions/16/window-minimize-pip.svg</file>
+        <file>icons/deskflow-dark/actions/16/window-restore-pip.svg</file>
         <file>icons/deskflow-dark/actions/22/configure.svg</file>
         <file>icons/deskflow-dark/actions/22/edit-copy.svg</file>
         <file>icons/deskflow-dark/actions/22/document-edit.svg</file>
         <file>icons/deskflow-dark/actions/22/document-open.svg</file>
         <file>icons/deskflow-dark/actions/22/document-save-as.svg</file>
         <file>icons/deskflow-dark/actions/22/fingerprint.svg</file>
+        <file>icons/deskflow-dark/actions/22/go-down.svg</file>
+        <file>icons/deskflow-dark/actions/22/go-up.svg</file>
         <file>icons/deskflow-dark/actions/22/help-about.svg</file>
+        <file>icons/deskflow-dark/actions/22/network-connect.svg</file>
+        <file>icons/deskflow-dark/actions/22/network-disconnect.svg</file>
         <file>icons/deskflow-dark/actions/22/process-stop.svg</file>
         <file>icons/deskflow-dark/actions/22/system-run.svg</file>
+        <file>icons/deskflow-dark/actions/22/system-search.svg</file>
         <file>icons/deskflow-dark/actions/22/tools-report-bug.svg</file>
+        <file>icons/deskflow-dark/actions/22/view-close.svg</file>
         <file>icons/deskflow-dark/actions/22/view-refresh.svg</file>
+        <file>icons/deskflow-dark/actions/22/window-minimize-pip.svg</file>
+        <file>icons/deskflow-dark/actions/22/window-restore-pip.svg</file>
         <file>icons/deskflow-dark/actions/24/configure.svg</file>
         <file>icons/deskflow-dark/actions/24/edit-copy.svg</file>
         <file>icons/deskflow-dark/actions/24/document-edit.svg</file>
         <file>icons/deskflow-dark/actions/24/document-open.svg</file>
         <file>icons/deskflow-dark/actions/24/document-save-as.svg</file>
+        <file>icons/deskflow-dark/actions/24/go-down.svg</file>
+        <file>icons/deskflow-dark/actions/24/go-up.svg</file>
         <file>icons/deskflow-dark/actions/24/edit-clear-all.svg</file>
         <file>icons/deskflow-dark/actions/24/fingerprint.svg</file>
         <file>icons/deskflow-dark/actions/24/help-about.svg</file>
+        <file>icons/deskflow-dark/actions/24/network-connect.svg</file>
+        <file>icons/deskflow-dark/actions/24/network-disconnect.svg</file>
         <file>icons/deskflow-dark/actions/24/process-stop.svg</file>
         <file>icons/deskflow-dark/actions/24/system-run.svg</file>
+        <file>icons/deskflow-dark/actions/24/system-search.svg</file>
         <file>icons/deskflow-dark/actions/24/tools-report-bug.svg</file>
+        <file>icons/deskflow-dark/actions/24/view-close.svg</file>
         <file>icons/deskflow-dark/actions/24/view-refresh.svg</file>
+        <file>icons/deskflow-dark/actions/24/window-minimize-pip.svg</file>
+        <file>icons/deskflow-dark/actions/24/window-restore-pip.svg</file>
         <file>icons/deskflow-dark/actions/32/configure.svg</file>
         <file>icons/deskflow-dark/actions/32/application-exit.svg</file>
         <file>icons/deskflow-dark/actions/32/dialog-cancel.svg</file>
@@ -40,10 +64,13 @@
         <file>icons/deskflow-dark/actions/32/dialog-ok-apply.svg</file>
         <file>icons/deskflow-dark/actions/32/document-open.svg</file>
         <file>icons/deskflow-dark/actions/32/document-save-as.svg</file>
+        <file>icons/deskflow-dark/actions/32/go-down.svg</file>
+        <file>icons/deskflow-dark/actions/32/go-up.svg</file>
         <file>icons/deskflow-dark/actions/32/help-about.svg</file>
         <file>icons/deskflow-dark/actions/32/view-refresh.svg</file>
-        <file>icons/deskflow-dark/apps/64/deskflow.svg</file>
-        <file>icons/deskflow-dark/apps/64/deskflow-symbolic.svg</file>
+        <file>icons/deskflow-dark/actions/32/system-search.svg</file>
+        <file>icons/deskflow-dark/apps/64/org.deskflow.deskflow.svg</file>
+        <file>icons/deskflow-dark/apps/64/org.deskflow.deskflow-symbolic.svg</file>
         <file>icons/deskflow-dark/devices/64/video-display.svg</file>
         <file>icons/deskflow-dark/places/64/user-trash.svg</file>
         <file>icons/deskflow-dark/status/32/software-updates-release.svg</file>
@@ -62,11 +89,19 @@
         <file>icons/deskflow-light/actions/16/document-edit.svg</file>
         <file>icons/deskflow-light/actions/16/document-open.svg</file>
         <file>icons/deskflow-light/actions/16/document-save-as.svg</file>
+        <file>icons/deskflow-light/actions/16/go-down.svg</file>
+        <file>icons/deskflow-light/actions/16/go-up.svg</file>
         <file>icons/deskflow-light/actions/16/help-about.svg</file>
+        <file>icons/deskflow-light/actions/16/network-connect.svg</file>
+        <file>icons/deskflow-light/actions/16/network-disconnect.svg</file>
         <file>icons/deskflow-light/actions/16/process-stop.svg</file>
         <file>icons/deskflow-light/actions/16/system-run.svg</file>
+        <file>icons/deskflow-light/actions/16/system-search.svg</file>
         <file>icons/deskflow-light/actions/16/tools-report-bug.svg</file>
+        <file>icons/deskflow-light/actions/16/view-close.svg</file>
         <file>icons/deskflow-light/actions/16/view-refresh.svg</file>
+        <file>icons/deskflow-light/actions/16/window-minimize-pip.svg</file>
+        <file>icons/deskflow-light/actions/16/window-restore-pip.svg</file>
         <file>icons/deskflow-light/actions/22/configure.svg</file>
         <file>icons/deskflow-light/actions/22/edit-clear-all.svg</file>
         <file>icons/deskflow-light/actions/22/edit-copy.svg</file>
@@ -74,11 +109,19 @@
         <file>icons/deskflow-light/actions/22/document-open.svg</file>
         <file>icons/deskflow-light/actions/22/document-save-as.svg</file>
         <file>icons/deskflow-light/actions/22/fingerprint.svg</file>
+        <file>icons/deskflow-light/actions/22/go-down.svg</file>
+        <file>icons/deskflow-light/actions/22/go-up.svg</file>
+        <file>icons/deskflow-light/actions/22/network-connect.svg</file>
+        <file>icons/deskflow-light/actions/22/network-disconnect.svg</file>
         <file>icons/deskflow-light/actions/22/help-about.svg</file>
         <file>icons/deskflow-light/actions/22/process-stop.svg</file>
         <file>icons/deskflow-light/actions/22/system-run.svg</file>
+        <file>icons/deskflow-light/actions/22/system-search.svg</file>
         <file>icons/deskflow-light/actions/22/tools-report-bug.svg</file>
+        <file>icons/deskflow-light/actions/22/view-close.svg</file>
         <file>icons/deskflow-light/actions/22/view-refresh.svg</file>
+        <file>icons/deskflow-light/actions/22/window-minimize-pip.svg</file>
+        <file>icons/deskflow-light/actions/22/window-restore-pip.svg</file>
         <file>icons/deskflow-light/actions/24/configure.svg</file>
         <file>icons/deskflow-light/actions/24/edit-clear-all.svg</file>
         <file>icons/deskflow-light/actions/24/edit-copy.svg</file>
@@ -86,11 +129,19 @@
         <file>icons/deskflow-light/actions/24/document-edit.svg</file>
         <file>icons/deskflow-light/actions/24/document-open.svg</file>
         <file>icons/deskflow-light/actions/24/document-save-as.svg</file>
+        <file>icons/deskflow-light/actions/24/go-down.svg</file>
+        <file>icons/deskflow-light/actions/24/go-up.svg</file>
         <file>icons/deskflow-light/actions/24/help-about.svg</file>
+        <file>icons/deskflow-light/actions/24/network-connect.svg</file>
+        <file>icons/deskflow-light/actions/24/network-disconnect.svg</file>
         <file>icons/deskflow-light/actions/24/process-stop.svg</file>
         <file>icons/deskflow-light/actions/24/system-run.svg</file>
+        <file>icons/deskflow-light/actions/24/system-search.svg</file>
         <file>icons/deskflow-light/actions/24/tools-report-bug.svg</file>
+        <file>icons/deskflow-light/actions/24/view-close.svg</file>
         <file>icons/deskflow-light/actions/24/view-refresh.svg</file>
+        <file>icons/deskflow-light/actions/24/window-minimize-pip.svg</file>
+        <file>icons/deskflow-light/actions/24/window-restore-pip.svg</file>
         <file>icons/deskflow-light/actions/32/configure.svg</file>
         <file>icons/deskflow-light/actions/32/application-exit.svg</file>
         <file>icons/deskflow-light/actions/32/dialog-cancel.svg</file>
@@ -98,10 +149,13 @@
         <file>icons/deskflow-light/actions/32/dialog-ok-apply.svg</file>
         <file>icons/deskflow-light/actions/32/document-open.svg</file>
         <file>icons/deskflow-light/actions/32/document-save-as.svg</file>
+        <file>icons/deskflow-light/actions/32/go-down.svg</file>
+        <file>icons/deskflow-light/actions/32/go-up.svg</file>
         <file>icons/deskflow-light/actions/32/help-about.svg</file>
         <file>icons/deskflow-light/actions/32/view-refresh.svg</file>
-        <file>icons/deskflow-light/apps/64/deskflow.svg</file>
-        <file>icons/deskflow-light/apps/64/deskflow-symbolic.svg</file>
+        <file>icons/deskflow-light/actions/32/system-search.svg</file>
+        <file>icons/deskflow-light/apps/64/org.deskflow.deskflow.svg</file>
+        <file>icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg</file>
         <file>icons/deskflow-light/devices/64/video-display.svg</file>
         <file>icons/deskflow-light/status/32/software-updates-release.svg</file>
         <file>icons/deskflow-light/status/64/dialog-error.svg</file>