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,33 +1,37 @@
 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
+  - type: checkboxes
-    id: project
+    id: sanity-checks
     attributes:
-      label: Project
+      label: Sanity checks
-      description: Are you using Deskflow or a fork/derivative?
+      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
+        - label: I have done the sanity checks, and my issue persists
-        -
+        - label: These sanity checks are not relevant to the bug
-        - Deskflow
-        - Barrier
-        - Input Leap
-        - Synergy
-      default: 0
     validations:
       required: true
-
+      
-  - type: input
+  - type: textarea
     id: version
     attributes:
-      label: Deskflow version number
+      label: Deskflow version info
-      description: You can find the Deskflow version number on the about screen.
+      description: You can find the Deskflow version number on the About screen.
-      placeholder: 1.2.3.4
+      placeholder: |
+        Deskflow: 1.2.3.4 (deadc0de)
+        Qt: 3.2.1
+        System: Hannah Montana Linux (Workstation Edition)
+        Session: Unity (Compiz)
     validations:
       required: true
 
@@ -51,7 +55,7 @@ body:
     id: os
     attributes:
       label: Operating systems (OS)
-      description: Which operating systems (OS) are you using?
+      description: Operating systems (OS) in use for all servers and clients
       options:
         - label: Windows
         - label: macOS
@@ -62,69 +66,28 @@ 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 the OS of the server/host/primary and the OS of the client/guest/secondary.
+        Let us know what OS your server and client are running, including all OS versions.
-        This will help us understand how you're using Deskflow.
+        If you're using Linux, please provide the name of the distribution.
       placeholder: |
         - Windows 11 server, macOS 15 client
         - Each computer has a single monitor
         - Windows is on the left, macOS is on the right
-
+    validations:
+      required: true
+      
   - type: textarea
     id: repro-steps
     attributes:
       label: What steps will reproduce the problem?
       description: |
-        Please list the steps to reproduce the issue.
+        Please list the _numbered steps_ to reproduce the issue.
         If you're not sure, please provide as much detail as possible.
-        This will help us understand the problem.
       placeholder: |
         1. Start Deskflow
         2. Click 'Configure Server'

.github/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,13 +1,8 @@
-![Deskflow](https://github.com/user-attachments/assets/f005b958-24df-4f4a-9bfd-4f834dae59d6)
+<picture>
-
+  <source media="(prefers-color-scheme: dark)" srcset="https://github.com/deskflow/deskflow-artwork/blob/main/logo/deskflow-logo-dark-200px.png?raw=true">
-> [!NOTE]
+  <source media="(prefers-color-scheme: light)" srcset="https://github.com/deskflow/deskflow-artwork/blob/main/logo/deskflow-logo-light-200px.png?raw=true">
-> **Deskflow** is the official upstream project for [Synergy](https://symless.com/synergy).
+  <img alt="Deskflow" src="https://github.com/user-attachments/assets/f005b958-24df-4f4a-9bfd-4f834dae59d6">
-> Purchasing a Synergy license is one way to support Deskflow’s growth and sustainability.
+</picture>
->
-> The Deskflow project was established to cultivate community-driven development where everyone can collaborate.
-> Synergy sponsors the Deskflow project by contributing code and providing financial support.
->
-> More info: [Relationship with Synergy](https://github.com/deskflow/deskflow/wiki/Relationship-with-Synergy)
 
 **Deskflow** is a free and open source keyboard and mouse sharing app.
 Use the keyboard, mouse, or trackpad of one computer to control nearby computers,
@@ -15,16 +10,35 @@ 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/)
 [![GitHub License](https://img.shields.io/github/license/deskflow/deskflow?logo=github)](LICENSE)
+[![REUSE status](https://api.reuse.software/badge/github.com/deskflow/deskflow)](https://api.reuse.software/info/github.com/deskflow/deskflow)
 
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=deskflow_deskflow&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=deskflow_deskflow)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=deskflow_deskflow&metric=coverage)](https://sonarcloud.io/summary/new_code?id=deskflow_deskflow)
@@ -35,27 +49,15 @@ To use Deskflow you can use one of our [packages](https://github.com/deskflow/de
 [![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
+## Contribute
 
-- Motivated by the community interests (not business-driven)
+[![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)
-- 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
 
-## Ways to get involved
+There are many ways to contribute to the Deskflow project.
 
-> [!TIP]
+We're a friendly, active, and welcoming community focused on building a great app.
-> 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
 
-## Build Quick Start
+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)
 
@@ -63,12 +65,12 @@ For instructions on building Deskflow, use the wiki page: [Building](https://git
 
 We support all major operating systems, including Windows, macOS, Linux, and Unix-like BSD-derived.
 
-Windows 10 or higher is required.
+Windows 10 v1809 or higher is required.
 
-macOS 12 or higher is required.
+macOS 13 or higher is required to use our CI builds for Apple Silicon machines. macOS 12 or higher is required for Intel macs or local builds.
 
-All Linux distributions are supported, primarily focusing on: 
+Linux requires libei 1.3+ and libportal 0.8+ for the server/client. Additionally, Qt 6.7+ is required for the GUI.
-Debian, Ubuntu, Linux Mint, Fedora, RHEL, AlmaLinux, Rocky Linux, Arch Linux, openSUSE, Gentoo.
+Linux users with systems not meeting these requirements should use flatpak in place of a native package.
 
 We officially support FreeBSD, and would also like to support: OpenBSD, NetBSD, DragonFly, Solaris.
 
@@ -79,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.
@@ -93,50 +93,44 @@ 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`
 
-
+## Similar Projects
-
-## Collaborative 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) -
+- [**Synergy**](https://symless.com/synergy) -
-  Deskflow/Synergy-derivative with the goal of continuing what Barrier started, after Barrier
+  Downstream commercial fork. Synergy sponsors Deskflow with financial support and contributes code ([learn more](https://github.com/deskflow/deskflow/wiki/Relationship-with-Synergy)).
-  became a dead fork.
+- [**Input Leap**](https://github.com/input-leap/input-leap) -
-* [**Synergy**](https://github.com/deskflow/deskflow/wiki/Relationship-with-Synergy) -
+  Inactive Deskflow/Synergy-derivative with the goal continuing Barrier development (now a dead fork).
-  Downstream commercial fork and Deskflow sponsor, geared toward adapting to customer
-  needs, offering business and enterprise licensing.
 
 ## 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).
+- Deskflow will _just work_ with Input Leap and Barrier (server or client).
-- Connecting a Deskflow client to a Synergy server will also *just work*.
+- Connecting a Deskflow client to a Synergy 1 server will also _just work_.
-- To connect a Synergy client, you need to select the Synergy protocol in the Deskflow server settings.
+- To connect a Synergy 1 client, you need to select the Synergy protocol in the Deskflow server settings.
+
+_Note:_ Only Synergy 1 is compatible with Deskflow (Synergy 3 is not yet compatible).
 
 ### Is Deskflow compatible with Lan Mouse?
 
@@ -145,25 +139,27 @@ We would love to see compatibility with Lan Mouse. This may be quite an effort a
 ### If I want to solve issues in Deskflow do I need to contribute to a fork?
 
 We welcome PRs (pull requests) from the community. If you'd like to make a change, please feel
-free to [start a discussion](https://github.com/deskflow/deskflow/discussions) or 
+free to [start a discussion](https://github.com/deskflow/deskflow/discussions) or
 [open a PR](https://github.com/deskflow/deskflow/wiki/Contributing).
 
 ### Is clipboard sharing supported?
 
-Absolutely. The clipboard-sharing feature is a cornerstone feature of the product and we are 
+Absolutely. The clipboard-sharing feature is a cornerstone feature of the product and we are
 committed to maintaining and improving that feature.
 
 ### Is Wayland for Linux supported?
 
-Yes! Wayland (the Linux display server protocol aimed to become the successor of the X Window 
+Yes! Wayland (the Linux display server protocol aimed to become the successor of the X Window
 System) is an important platform for us.
-The [`libei`](https://gitlab.freedesktop.org/libinput/libei) and 
+The [`libei`](https://gitlab.freedesktop.org/libinput/libei) and
-[`libportal`](https://github.com/flatpak/libportal) libraries enable 
+[`libportal`](https://github.com/flatpak/libportal) libraries enable
 Wayland support for Deskflow. We would like to give special thanks to Peter Hutterer,
 who is the author of `libei`, a major contributor to `libportal`, and the author of the Wayland
 implementation in Deskflow. Others such as Olivier Fourdan and Povilas Kanapickas helped with the
 Wayland implementation.
 
+Some features _may_ be unavailable or broken on Wayland. Please see the [known Wayland issues](https://github.com/deskflow/deskflow/discussions/7499).
+
 ### Where did it all start?
 
 Deskflow was first created as Synergy in 2001 by Chris Schoeneman.
@@ -174,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">
@@ -185,4 +184,4 @@ Deskflow is made by possible by these contributors.
 
 ## License
 
-This project is licensed under [GPL-2.0](LICENSE) with an [OpenSSL exception](LICENSE_EXCEPTION).
+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

@@ -9,8 +9,12 @@ inputs:
     description: "Used only on linux distro type: debian, fedora, suse, arch"
     required: false
 
-  mac-qt-version:
+  qt-version:
-    description: "The verison of Qt to install on mac os"
+    description: "The version of Qt to install (Windows & macOS)"
+    required: false
+
+  vcpkg-triplet:
+    description: "vcpkg triplet to use (Windows)"
     required: false
 
 outputs:
@@ -23,41 +27,33 @@ runs:
 
   steps:
     - name: Install Depends
+      if: ${{ runner.os != 'Windows' }}
       run: |
-          if [ "$RUNNER_OS" == "Windows" ]; then
+          if [ "$RUNNER_OS" == "macOS" ]; then
-            echo "Window not supported yet"
+            brew install googletest openssl doxygen --quiet
-          elif [ "$RUNNER_OS" == "macOS" ]; then
-            brew install cmake googletest ninja openssl --quiet
           elif [ "$RUNNER_OS" == "Linux" ]; then
             if [ ${{inputs.like}} == "debian" ]; then
               apt update -qqq > /dev/null
               apt install -qqq cmake build-essential ninja-build \
                 xorg-dev libx11-dev libxtst-dev libssl-dev \
-                libglib2.0-dev libgdk-pixbuf-2.0-dev libnotify-dev \
+                libglib2.0-dev libxkbfile-dev qt6-base-dev qt6-tools-dev \
-                libxkbfile-dev qt6-base-dev qt6-tools-dev \
+                libgtk-3-dev libgtest-dev libgmock-dev \
-                libgtk-3-dev libgtest-dev libgmock-dev libpugixml-dev \
+                libei-dev libportal-dev help2man doxygen -y >/dev/null
-                libei-dev libportal-dev libtomlplusplus-dev libcli11-dev -y >/dev/null
             elif [ ${{inputs.like}} == "fedora" ]; then
-              dnf install -y cmake make ninja-build gcc-c++ \
+              dnf install -y cmake make ninja-build gcc-c++ rpm-build openssl-devel \
-                rpm-build openssl-devel glib2-devel \
+                glib2-devel libXtst-devel libxkbfile-devel qt6-qtbase-devel qt6-qttools-devel \
-                gdk-pixbuf2-devel libXtst-devel libnotify-devel \
+                gtk3-devel gtest-devel gmock-devel libei-devel libportal-devel help2man doxygen
-                libxkbfile-devel qt6-qtbase-devel qt6-qttools-devel \
-                gtk3-devel gtest-devel gmock-devel pugixml-devel \
-                libei-devel libportal-devel tomlplusplus-devel \
-                cli11-devel
             elif [ ${{inputs.like}} == "suse" ]; then
               zypper refresh
               zypper install -y --force-resolution \
                 cmake make ninja gcc-c++ rpm-build libopenssl-devel \
-                glib2-devel gdk-pixbuf-devel libXtst-devel libnotify-devel \
+                glib2-devel libXtst-devel libxkbfile-devel qt6-base-devel qt6-tools-devel \
-                libxkbfile-devel qt6-base-devel qt6-tools-devel gtk3-devel \
+                qt6-linguist-devel gtk3-devel doxygen \
-                googletest-devel googlemock-devel pugixml-devel libei-devel \
+                googletest-devel googlemock-devel libei-devel libportal-devel help2man
-                libportal-devel tomlplusplus-devel cli11-devel
             elif [ ${{ inputs.like }} == "arch" ]; then
               pacman -Syu --noconfirm base-devel cmake ninja \
-                gcc openssl glib2 gdk-pixbuf2 libxtst libnotify \
+                gcc openssl glib2 libxtst libxkbfile gtest libei libportal \
-                libxkbfile gtest pugixml libei libportal \
+                qt6-base qt6-tools qt6-svg qt6-translations qt6-declarative gtk3 help2man doxygen graphviz rsync
-                qt6-base qt6-tools gtk3 tomlplusplus cli11
             else
               echo "Unknown like"
             fi
@@ -67,30 +63,41 @@ runs:
       shell: bash
 
     - name: Install Qt
-      if: ${{runner.os == 'macOS' }}
+      if: ${{runner.os != 'Linux' }}
       uses: jurplel/install-qt-action@v4
+      env:
+        AQT_CONFIG: ${{ github.workspace }}/.github/actions/install-dependencies/aqt.ini
       with:
-        dir: "/Users/runner"
+        version: ${{inputs.qt-version}}
-        version: ${{inputs.mac-qt-version}}
         cache: true
-        cache-key-prefix: ${{matrix.target.os}}-${{env.qt-version}}
+        cache-key-prefix: ${{matrix.target.os}}-${{inputs.qt-version}}
-
-    # Install Ninja with an action instead of using Chocolatey, as it's more
-    # reliable and faster. The Ninja install action is pretty good as it
-    # 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:
-        manifest-dir: ${{ github.workspace }}
+        pkgs: gtest openssl
-        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' }}
@@ -100,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,11 +1,11 @@
-name: "Lint Check"
+name: "Lint Clang"
-description: "Checks for lint errors and posts a helpful comment"
+description: "Checks for Clang lint errors and posts a helpful comment"
 
 runs:
   using: "composite"
   steps:
     - name: Install Dependencies
-      run: pipx install --global clang_format
+      run: pipx install --global clang-format==20.1.0
       shell: bash
 
     - name: Run format command
@@ -48,8 +48,10 @@ runs:
       run: |
         code_block="\`\`\`"
 
-        summary=$(cat<<EOF
+        clang_version=$(clang-format --version | sed -n 's/^.*version //p')
-        ❌ \`clang-format\`: It looks like your changes don't match our code style.
+
+        summary=$(cat <<EOF
+        ❌ \`clang-format\` \`v${clang_version}\`: It looks like your changes don't match our code style.
 
         🛠️ Please either run \`clang-format -i\` on the file or apply this patch with \`git apply\`:
 
@@ -57,12 +59,21 @@ runs:
         $code_block diff
         ${{ steps.changes.outputs.diff }}
         $code_block
+
+        Hint: Install the right version of \`clang-format\`, e.g.: \`pipx install --global clang-format==${clang_version}\`
         EOF
         )
         echo "$summary" >> $GITHUB_STEP_SUMMARY
 
-        file="ci_summary.md"
+        pr_comment=$(cat <<EOF
-        echo "❌🛠️ \`clang-format\`: Lint errors, fix available." >> $file
+        ### 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
+    - name: Unit Tests
-      id: unittests
+      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
+    - name: Legacy Tests
-      id: integtests
+      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 }}"
+        unit_tests_outcome="${{ steps.unit-tests.outcome }}"
-        integtests_outcome="${{ steps.integtests.outcome }}"
+        legacy_tests_outcome="${{ steps.legacy-tests.outcome }}"
-        unittests=$( [ "$unittests_outcome" = "success" ] && echo $pass || echo $fail )
+        unit_tests=$( [ "$unit_tests_outcome" = "success" ] && echo $pass || echo $fail )
-        integtests=$( [ "$integtests_outcome" = "success" ] && echo $pass || echo $fail )
+        legacy_tests=$( [ "$legacy_tests_outcome" = "success" ] && echo $pass || echo $fail )
-        echo "unittests=$unittests" >> $GITHUB_OUTPUT
+        echo "unit-tests=$unit_tests" >> $GITHUB_OUTPUT
-        echo "integtests=$integtests" >> $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.unit-tests }} "
-        row+="| ${{ steps.results.outputs.integtests }} |"
+        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
+        | OS | Unit tests | Legacy tests |
-        | Job name | Unit tests | Integration 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}')
+        echo "$table" > $GITHUB_STEP_SUMMARY
-        file="ci-summary.md"
 
+        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
+# This is best run as a standalone workflow, not as part of another workflow like CI
-# and by pull requests (we only run this on open PRs as it's very slow). We also use the
+# because of how GitHub understands the code scanning workflows in it's UI.
-# `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.
 on:
   workflow_dispatch:
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
+    paths:
-    paths-ignore:
+      - '.github/workflows/codeql-analysis.yml'
-      - '**/*.md'
+      - 'cmake/Libraries.cmake'
-      - '.github/ISSUE_TEMPLATE/**'
+      - 'CMakeLists.txt'
-      - '.editorconfig'
+      - 'src/**'
-      - '.env-example'
+      - '!src/res/**'
-      - '.gitignore'
+      - '!src/unittests/**'
-      - '.gitattributes'
-      - 'cspell.json'
   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:
+  codeql:
-    if: ${{ !github.event.pull_request.draft }}
-
-    name: Analyze
     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.0.0
+        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
+concurrency:
-      - reopened
+  group: ${{ github.workflow }}-${{ github.ref }}
-      - synchronize
+  cancel-in-progress: true
-      - ready_for_review
-    paths-ignore:
-      - '**/*.md'
-      - '.github/ISSUE_TEMPLATE/**'
-      - '.editorconfig'
-      - '.env-example'
-      - '.gitignore'
-      - '.gitattributes'
-      - 'cspell.json'
 
 env:
   GIT_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
   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,41 +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
 
-  lint-check:
+  lint-reuse:
     runs-on: ubuntu-latest
     timeout-minutes: 5
 
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: REUSE Compliance Check
+        uses: fsfe/reuse-action@v5
+
+  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:
+  analyze-valgrind:
-    needs: lint-check
+    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 }}
@@ -120,53 +95,135 @@ jobs:
         target:
           - name: "windows-2022-x64"
             runs-on: "windows-2022"
-            timeout: 120 #Windows can take while if it has to build vcpkg cache
+            timeout: 30
             config-args: "-G Ninja"
+            vcpkg-triplet: x64-windows-release
+            arch: "amd64"
+            qt-version: 6.10.2
 
-          - name: "macos-14-arm64"
+          - name: "windows-2022-arm64"
-            runs-on: "macos-14"
+            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
+            qt-version: 6.10.2
-            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"arm64\""
+            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"
+          - name: "macos-x64"
-            runs-on: macos-13
+            runs-on: macos-15-intel
             timeout: 20
-            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"x86_64\""
+            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: "fedora-41-x86_64"
+          - name: "debian-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: debian:stable-slim
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "debian-testing-x86_64"
             runs-on: ubuntu-latest
-            container: fedora:41
+            container: debian:testing-slim
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "debian-testing-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: debian:testing-slim
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "fedora-42-x86_64"
+            runs-on: ubuntu-latest
+            container: fedora:42
             like: "fedora"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "fedora-40-x86_84"
+          - name: "fedora-42-arm64"
-            runs-on: ubuntu-latest
+            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"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "archlinux-x86_84"
+          - name: "opensuse-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: opensuse/tumbleweed:latest
+            like: "suse"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "archlinux-x86_64"
             runs-on: ubuntu-latest
             container: archlinux:latest
             like: "arch"
             timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DEV_DOCS=ON"
+
+          - name: "ubuntu-25.10-x86_64"
+            runs-on: ubuntu-latest
+            container: ubuntu:25.10
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "ubuntu-25.10-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: ubuntu:25.10
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "ubuntu-26.04-x86_64"
+            runs-on: ubuntu-latest
+            container: ubuntu:26.04
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "ubuntu-26.04-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: ubuntu:26.04
+            like: "debian"
+            timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
     steps:
@@ -174,40 +231,48 @@ jobs:
       - name: Install Git on Container
         if: ${{ matrix.target.container }}
         shell: bash
-        run : |
+        run: |
-           if [ "${{matrix.target.like}}" == "debian" ]; then
+          if [ "${{matrix.target.like}}" == "debian" ]; then
-             apt update -qqq > /dev/null && apt install -qqq git devscripts > /dev/null
+            apt update -qqq > /dev/null && apt install -qqq git devscripts > /dev/null
-           elif [ "${{matrix.target.like}}" == "fedora" ]; then
+          elif [ "${{matrix.target.like}}" == "fedora" ]; then
-             dnf install -y git
+            dnf install -y git
-           elif [ "${{matrix.target.like}}" == "suse" ]; then
+          elif [ "${{matrix.target.like}}" == "suse" ]; then
-             zypper refresh
+            zypper refresh
-             zypper install -y --force-resolution git
+            zypper install -y --force-resolution git
-           elif [ "${{matrix.target.like}}" == "arch" ]; then
+          elif [ "${{matrix.target.like}}" == "arch" ]; then
-             pacman -Syu --noconfirm git
+            pacman -Syu --noconfirm git
-           else
+          else
-             echo "Unknown: ${{matrix.target.like}}"
+            echo "Unknown: ${{matrix.target.like}}"
-           fi
+          fi
       # Fancy checkout gets all the tags
       # it also makes sure we can use git --describe correctly
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1.0.0
+        uses: sithlord48/fancy-checkout@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:
-          mac-qt-version: 6.7.2
+          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}}"
 
@@ -215,7 +280,21 @@ jobs:
         shell: bash
         run: |
           if [[ "${{matrix.target.like}}" != "arch" ]]; then
-            cmake --build build --config Release -j8 --target package
+            if [ "$RUNNER_OS" != "macOS" ]; then
+              cmake --build build --config Release -j8 --target package
+            else
+              cmake --build build --config Release -j8
+              for i in $(seq 1 5); do
+                cmake --build build --config Release -j8 --target package 2>&1
+                if [ $? -eq 0 ]; then
+                  echo "Package successful"
+                  break
+                else
+                  echo "Package attempt $i failed"
+                  sleep 1
+                fi
+              done
+            fi
           else
             cmake --build build --config Release -j8
             useradd -m build
@@ -228,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:
@@ -242,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
@@ -258,49 +357,68 @@ jobs:
       # Fancy checkout gets all the tags
       # it also makes sure we can use git --describe correctly
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1.0.0
+        uses: sithlord48/fancy-checkout@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/unittests || true
-            ./build/bin/integtests || true
   flatpak:
-    needs: lint-check
+    needs: lint-clang
-    runs-on: ubuntu-latest
+    name: flatpak-${{matrix.flatpak.arch}}
+    runs-on: ${{matrix.flatpak.runs-on}}
+    timeout-minutes: 60
     container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-6.7
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.10
       options: --privileged
+    strategy:
+      fail-fast: false
+      matrix:
+        flatpak:
+          - runs-on: ubuntu-latest
+            arch: x86_64
+          - runs-on: ubuntu-24.04-arm
+            arch: aarch64
     steps:
       - name: Check out repository
-        uses: sithlord48/fancy-checkout@v1.0.0
+        uses: sithlord48/fancy-checkout@v2
 
       - run: git config --global protocol.file.allow always
 
       - name: Get version
         uses: ./.github/actions/get-version
 
-      - uses: flatpak/flatpak-github-actions/flatpak-builder@master
+      - name: Lint appsteam
-        name: "Build"
+        run: flatpak-builder-lint appstream deploy/linux/org.deskflow.deskflow.metainfo.xml
+
+      - name: Lint manifest
+        run: flatpak-builder-lint manifest deploy/linux/flatpak/org.deskflow.deskflow.yml
+
+      - name: Build
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
-          bundle: deskflow-${{env.DESKFLOW_PACKAGE_VERSION}}-linux-x86_64.flatpak
+          bundle: deskflow-${{env.DESKFLOW_PACKAGE_VERSION}}-linux-${{matrix.flatpak.arch}}.flatpak
           manifest-path: deploy/linux/flatpak/org.deskflow.deskflow.yml
-          cache-key: flatpak-builder-${{ github.sha }}
+          cache-key: flatpak-builder-${{matrix.flatpak.arch}}-2.0
+          arch: ${{matrix.flatpak.arch}}
           upload-artifact: false
 
+      - name: Validate build
+        run: flatpak-builder-lint --exceptions --user-exceptions deploy/linux/flatpak/ci-build-lint-exceptions.json repo repo
+
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: package-${{ env.PACKAGE_PREFIX }}-flatpak-x86_64
+          name: package-${{ env.PACKAGE_PREFIX }}-flatpak-${{matrix.flatpak.arch}}
           path: ${{github.workspace}}/deskflow[-_]*.flatpak
 
   release:
@@ -310,7 +428,7 @@ jobs:
 
     steps:
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1.0.0
+        uses: sithlord48/fancy-checkout@v2
 
       - name: Get version
         uses: ./.github/actions/get-version
@@ -334,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
@@ -348,20 +466,13 @@ jobs:
           files: |
             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.0.0
 
-      - name: Get version
+      - name: Update Homebrewtap
-        uses: ./.github/actions/get-version
+        shell: bash
-
+        run: |
-      - name: Submit
+          curl -L -X POST \
-        uses: ./.github/actions/winget-publish
+          -H "Accept: application/vnd.github+json" \
-        with:
+          -H "Authorization: Bearer ${{ secrets.DF_TAP_TOKEN }}" \
-          release-version: ${{env.DESKFLOW_PACKAGE_VERSION}}
+          -H "X-GitHub-Api-Version: 2022-11-28" \
-          token: ${{ secrets.WINGET_DEPLOY_TOKEN }}
+          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:
+  pull_request:
-    secrets:
+    paths:
-      SONAR_TOKEN:
+      - '.github/workflows/sonarcloud-analysis.yml'
-        required: true
+      - '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
+      CPU_CORE_COUNT: 4
-      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 }}
 
     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.0.0
+        uses: sithlord48/fancy-checkout@v2
 
       - name: Install project dependencies
         uses: ./.github/actions/install-dependencies
         with:
           like: "debian"
 
-      - name: Install sonar-scanner and build-wrapper
+      - name: Install Build Wrapper
-        uses: sonarsource/sonarcloud-github-c-cpp@v3
+        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
+        run: |
-
+          tests=(`cmake --build build  --target help | grep -o "^coverage-[^:]*"`)
-      - name: Integration tests coverage
+          for i in "${tests[@]}"; do
-        env:
+            cmake --build build --target "$i"
-          QT_QPA_PLATFORM: offscreen
+          done
-        run: cmake --build build --target coverage-integtests
 
       - name: Get coverage report paths
         id: coverage-paths
         run: |
-          unittests=$(find build -name coverage-unittests.xml)
+          paths=$(ls -w 0 -m build/coverage-*.xml | sed 's/ //g')
-          integtests=$(find build -name coverage-integtests.xml)
-          paths="${unittests}${integtests:+,$integtests}"
           if [ -z "$paths" ]; then
             echo "Error: No coverage files found"
             exit 1
           fi
           echo "csv=$paths" >> $GITHUB_OUTPUT
 
-      - name: Run SonarScanner
+      - name: SonarQube Scan
-        run: |
+        uses: SonarSource/sonarqube-scan-action@v6
-          export PATH=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux-x64/bin:$PATH
+        with:
-          sonar-scanner \
+          args: >
-            -Dsonar.coverageReportPaths=${{ steps.coverage-paths.outputs.csv }} \
+            -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.0.0
+        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
+          executable: ./build/bin/legacytests
-
-      - name: Valgrind integration tests
-        id: integtests
-        uses: ./.github/actions/run-valgrind
-        with:
-          executable: ./build/bin/integtests
 
       - 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 }}
+          ${{ steps.legacytests.outputs.summary }}
-          $backticks
-
-          ### Integration tests
-          $backticks
-          ${{ steps.integtests.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,24 +1,8 @@
-# Deskflow -- mouse and keyboard sharing utility
+# SPDX-FileCopyrightText: (C) 2024 - 2026 Deskflow Developers
-# Copyright (C) 2024 Symless Ltd.
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
-# Copyright (C) 2009 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
-#
+# SPDX-License-Identifier: MIT
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Why CMake 3.8?
-# This allows package maintainers to create reproducible builds:
-# > New in version 3.8: If the SOURCE_DATE_EPOCH environment variable is set,
-# > its value will be used instead of the current time.
-# > See https://reproducible-builds.org/specs/source-date-epoch/ for details.
 cmake_minimum_required(VERSION 3.24)
 
 # Link items by fill path
@@ -27,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)
@@ -34,12 +23,11 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Fallback for when git can not be found
 set(DESKFLOW_VERSION_MAJOR 1)
-set(DESKFLOW_VERSION_MINOR 18)
+set(DESKFLOW_VERSION_MINOR 26)
 set(DESKFLOW_VERSION_PATCH 0)
 set(DESKFLOW_VERSION_TWEAK 0)
 
 # Get the version from git if it's a git repository
-# cmake-format: off
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
   find_package(Git)
   if(GIT_FOUND)
@@ -53,9 +41,10 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
       COMMAND ${GIT_EXECUTABLE} describe --long --match v* --always
       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
       OUTPUT_VARIABLE GITREV
-      ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+      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}")
@@ -67,35 +56,84 @@ 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 "")
+    else()
-      set(DESKFLOW_VERSION_TWEAK ${GITREV})
+      set(DESKFLOW_VERSION_TWEAK "9999")
     endif()
+    unset(GITREV)
   endif()
 endif()
-# cmake-format: on
 
-set(DESKFLOW_VERSION
+#generate vcpkg file if needed
-    "${DESKFLOW_VERSION_MAJOR}.${DESKFLOW_VERSION_MINOR}.${DESKFLOW_VERSION_PATCH}.${DESKFLOW_VERSION_TWEAK}"
+if(WIN32)
-)
+    option (VCPKG_QT "Use Qt from VCPKG" OFF)
-set(DESKFLOW_VERSION_MS_CSV
+    if(VCPKG_QT)
-    "${DESKFLOW_VERSION_MAJOR},${DESKFLOW_VERSION_MINOR},${DESKFLOW_VERSION_PATCH},${DESKFLOW_VERSION_TWEAK}"
+        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}
+  VERSION "${DESKFLOW_VERSION_MAJOR}.${DESKFLOW_VERSION_MINOR}.${DESKFLOW_VERSION_PATCH}.${DESKFLOW_VERSION_TWEAK}"
-  DESCRIPTION "Mouse and keyboard sharing utility"
+  DESCRIPTION "Keyboard and mouse sharing utility"
-  LANGUAGES C CXX)
+  HOMEPAGE_URL "https://deskflow.org"
+  LANGUAGES C CXX
+)
+
+# Define Additional "PROJECT" vars for packaging and metadata
+set(CMAKE_PROJECT_PROPER_NAME "Deskflow")
+set(CMAKE_PROJECT_VENDOR "${CMAKE_PROJECT_PROPER_NAME} Devs")
+set(CMAKE_PROJECT_COPYRIGHT "(C) 2024-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)
+unset(DESKFLOW_VERSION_MINOR)
+unset(DESKFLOW_VERSION_PATCH)
+unset(DESKFLOW_VERSION_TWEAK)
 
 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.
+  set(REQUIRED_MSVC_RUNTIME_MAJOR 14)
+  cmake_host_system_information(
+    RESULT REQUIRED_MSVC_RUNTIME_MINOR
+    QUERY WINDOWS_REGISTRY
+    "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}")
+  else()
+    message(FATAL_ERROR "MSVC runtime registry entry not found")
+  endif()
+endif()
+
 # Control debug item visibility
 # When not set logging is forced to DEBUG and show code locations
 # Also exposes a test menu
@@ -104,41 +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)
+# disables the use of signals,slots and emit
-include(GNUInstallDirs)
+# 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)
+if(BUILD_OSX_BUNDLE AND APPLE_CODESIGN_DEV)
-add_subdirectory(src)
+  include(cmake/MacCodesign.cmake)
-
-# Install License, License is in the App Bundle on mac os (src/gui)
-if(WIN32)
-  install(
-    FILES
-      ${PROJECT_SOURCE_DIR}/LICENSE
-      ${PROJECT_SOURCE_DIR}/LICENSE_EXCEPTION
-    DESTINATION .
-  )
-elseif(UNIX AND NOT APPLE)
-  install(
-    FILES
-      ${PROJECT_SOURCE_DIR}/LICENSE
-      ${PROJECT_SOURCE_DIR}/LICENSE_EXCEPTION
-    DESTINATION share/licenses/deskflow
-  )
 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
+)

LICENSES/GPL-2.0-only.txt

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

LICENSES/LGPL-2.1-only.txt

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

LICENSES/MIT.txt

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

REUSE.toml

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

cmake/Libraries.cmake

@@ -1,17 +1,6 @@
-# Deskflow -- mouse and keyboard sharing utility
+# SPDX-FileCopyrightText: (C) 2024 - 2025 Deskflow Developers
-# Copyright (C) 2024 Symless Ltd.
+# SPDX-FileCopyrightText: (C) 2024 Symless Ltd
-#
+# SPDX-License-Identifier: MIT
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 macro(configure_libs)
 
@@ -19,10 +8,9 @@ macro(configure_libs)
   if(UNIX)
     configure_unix_libs()
   elseif(WIN32)
-    find_package(Python REQUIRED QUIET)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /D _BIND_TO_CURRENT_VCLIBS_VERSION=1")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD /O2 /Ob2")
-    list(APPEND libs Wtsapi32 Userenv Wininet comsuppw Shlwapi)
+    list(APPEND libs Wtsapi32 Userenv Wininet comsuppw Shlwapi version)
     add_definitions(
       /DWIN32
       /D_WINDOWS
@@ -32,40 +20,55 @@ macro(configure_libs)
   endif()
 
   find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Widgets Network)
+  if(UNIX AND NOT APPLE)
+      find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS DBus Xml)
+  endif()
+
+  # Define the location of Qt deployment tool
+  if(WIN32)
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND VCPKG_QT)
+      set(DEPLOY_TOOL windeployqt.debug.bat)
+    else()
+      set(DEPLOY_TOOL windeployqt)
+    endif()
+  elseif(APPLE)
+      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)
+  set(CMAKE_AUTOUIC ON)
+  set(CMAKE_AUTORCC ON)
 
   message(STATUS "Qt version: ${Qt6_VERSION}")
 
-  # TODO SSL check can happen in lib/net when don't have to deploy it any longer on windows
+  # 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)
 
-  # Apple has to use static libraries because "Use of the Apple-provided OpenSSL
+  if(HAVE_FORMAT)
-  # libraries by apps is strongly discouraged."
+    add_definitions(-DHAVE_FORMAT)
-  # https://developer.apple.com/library/archive/documentation/Security/Conceptual/cryptoservices/SecureNetworkCommunicationAPIs/SecureNetworkCommunicationAPIs.html
-  if(APPLE)
-    set(OPENSSL_USE_STATIC_LIBS TRUE)
   endif()
 
-  find_package(OpenSSL ${REQUIRED_OPENSSL_VERSION} REQUIRED COMPONENTS SSL Crypto)
-  if(WIN32) #Used for dev in TLS and WIX
-    cmake_path(SET OPENSSL_ROOT_DIR NORMALIZE "${OPENSSL_INCLUDE_DIR}/..")
-    message(VERBOSE "Set OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
-    set(OPENSSL_EXE_DIR "${OPENSSL_ROOT_DIR}/tools/openssl")
-    add_definitions(-DOPENSSL_EXE_DIR="${OPENSSL_EXE_DIR}")
-    # HACK Install a copy of openssl on windows
-    install(
-        FILES
-          ${OPENSSL_EXE_DIR}/openssl.exe
-          ${OPENSSL_EXE_DIR}/openssl.cnf
-        DESTINATION .
-    )
-  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.
@@ -74,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
+      NAME coverage-legacytests
-      EXECUTABLE integtests
+      EXECUTABLE legacytests
-      BASE_DIRECTORY ${test_src}
-      EXCLUDE ${test_exclude}
-    )
-
-    setup_target_for_coverage_gcovr_xml(
-      NAME coverage-unittests
-      EXECUTABLE unittests
       BASE_DIRECTORY ${test_src}
       EXCLUDE ${test_exclude}
     )
@@ -107,61 +103,23 @@ macro(configure_unix_libs)
   include(CheckIncludeFileCXX)
   include(CheckSymbolExists)
   include(CheckCSourceCompiles)
+  include(CheckCXXSourceCompiles)
 
-  check_include_file_cxx(istream HAVE_ISTREAM)
-  check_include_file_cxx(ostream HAVE_OSTREAM)
-  check_include_file_cxx(sstream HAVE_SSTREAM)
-
-  check_include_files(inttypes.h HAVE_INTTYPES_H)
-  check_include_files(locale.h HAVE_LOCALE_H)
-  check_include_files(memory.h HAVE_MEMORY_H)
-  check_include_files(stdlib.h HAVE_STDLIB_H)
-  check_include_files(strings.h HAVE_STRINGS_H)
-  check_include_files(string.h HAVE_STRING_H)
-  check_include_files(sys/select.h HAVE_SYS_SELECT_H)
   check_include_files(sys/socket.h HAVE_SYS_SOCKET_H)
-  check_include_files(sys/stat.h HAVE_SYS_STAT_H)
+  if (NOT HAVE_SYS_SOCKET_H)
-  check_include_files(sys/time.h HAVE_SYS_TIME_H)
+    message(FATAL_ERROR "Missing header: sys/socket.h")
-  check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H)
-  check_include_files(unistd.h HAVE_UNISTD_H)
-  check_include_files(wchar.h HAVE_WCHAR_H)
-
-  check_function_exists(getpwuid_r HAVE_GETPWUID_R)
-  check_function_exists(gmtime_r HAVE_GMTIME_R)
-  check_function_exists(nanosleep HAVE_NANOSLEEP)
-  check_function_exists(sigwait HAVE_POSIX_SIGWAIT)
-  check_function_exists(strftime HAVE_STRFTIME)
-  check_function_exists(vsnprintf HAVE_VSNPRINTF)
-  check_function_exists(inet_aton HAVE_INET_ATON)
-
-  # For some reason, the check_function_exists macro doesn't detect the
-  # inet_aton on some pure Unix platforms (e.g. sunos5). So we need to do a more
-  # detailed check and also include some extra libs.
-  if(NOT HAVE_INET_ATON)
-    set(CMAKE_REQUIRED_LIBRARIES nsl)
-
-    check_c_source_compiles(
-      "#include <arpa/inet.h>\n int main() { inet_aton (0, 0); }"
-      HAVE_INET_ATON_ADV)
-
-    set(CMAKE_REQUIRED_LIBRARIES)
-
-    if(HAVE_INET_ATON_ADV)
-      # Override the previous fail.
-      set(HAVE_INET_ATON 1)
-
-      # Assume that both nsl and socket will be needed, it seems safe to add
-      # socket on the back of nsl, since socket only ever needed when nsl is
-      # needed.
-      list(APPEND libs nsl socket)
-    endif()
-
   endif()
 
-  check_type_size(char SIZEOF_CHAR)
+
-  check_type_size(int SIZEOF_INT)
+  check_include_files(unistd.h HAVE_UNISTD_H)
-  check_type_size(long SIZEOF_LONG)
+  if (NOT HAVE_UNISTD_H)
-  check_type_size(short SIZEOF_SHORT)
+    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
   check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
@@ -183,67 +141,26 @@ 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()
 
-    configure_xorg_libs()
+    if (BUILD_X11_SUPPORT)
+      configure_xorg_libs()
+    endif()
 
     include(FindPkgConfig)
-
+    find_package(PkgConfig)
     if(PKG_CONFIG_FOUND)
       pkg_check_modules(LIBXKBCOMMON REQUIRED xkbcommon)
-      pkg_check_modules(GLIB2 REQUIRED glib-2.0 gio-2.0)
+      pkg_check_modules(GLIB2 REQUIRED glib-2.0)
       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()
-
-
-    find_package(pugixml REQUIRED)
-
-    find_package(PkgConfig)
-    if(PKG_CONFIG_FOUND)
-      pkg_check_modules(lib_glib REQUIRED IMPORTED_TARGET glib-2.0)
-      pkg_search_module(PC_GDKPIXBUF gdk-pixbuf-2.0)
-
-      include_directories(${PC_GDKPIXBUF_INCLUDE_DIRS})
-
-      pkg_check_modules(lib_gdkpixbuf REQUIRED IMPORTED_TARGET gdk-pixbuf-2.0)
-      pkg_check_modules(lib_notify REQUIRED IMPORTED_TARGET libnotify)
-
-      add_definitions(-DHAVE_GDK_PIXBUF=1 -DHAVE_LIBNOTIFY=1)
-    else()
-      message(WARNING "pkg-config not found, skipping libnotify and gdk-pixbuf")
-    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(ACCEPT_TYPE_ARG3 socklen_t)
-  set(HAVE_CXX_BOOL 1)
-  set(HAVE_CXX_CASTS 1)
-  set(HAVE_CXX_EXCEPTIONS 1)
-  set(HAVE_CXX_MUTABLE 1)
-  set(HAVE_CXX_STDLIB 1)
-  set(HAVE_PTHREAD_SIGNAL 1)
-  set(SELECT_TYPE_ARG1 int)
-  set(SELECT_TYPE_ARG234 " (fd_set *)")
-  set(SELECT_TYPE_ARG5 " (struct timeval *)")
-  set(STDC_HEADERS 1)
-  set(TIME_WITH_SYS_TIME 1)
-  set(HAVE_SOCKLEN_T 1)
-
-  # 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()
 
 #
@@ -264,18 +181,11 @@ macro(configure_xorg_libs)
                       HAVE_X11_EXTENSIONS_DPMS_H)
   check_include_files("X11/extensions/Xinerama.h"
                       HAVE_X11_EXTENSIONS_XINERAMA_H)
-  check_include_files("${XKBlib};X11/extensions/XKBstr.h"
-                      HAVE_X11_EXTENSIONS_XKBSTR_H)
   check_include_files("X11/extensions/XKB.h" HAVE_XKB_EXTENSION)
   check_include_files("X11/extensions/XTest.h" HAVE_X11_EXTENSIONS_XTEST_H)
   check_include_files("${XKBlib}" HAVE_X11_XKBLIB_H)
   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

@@ -11,19 +11,23 @@
     "codesigning",
     "Compat",
     "contribs",
+    "daemonized",
     "Daun",
-    "Devs",
     "Deskflow",
+    "Devs",
     "distro",
     "distros",
     "dmgbuild",
     "dotenv",
     "Evenson",
     "Feder",
+    "Flatpaks",
     "Fourdan",
     "gdrive",
     "Hadzhylov",
     "Hetu",
+    "HINSTANCE",
+    "HKLM",
     "hotspots",
     "Hutterer",
     "ifdef",
@@ -35,12 +39,15 @@
     "Kitware",
     "Kutytska",
     "Lanz",
+    "legacytests",
     "libei",
     "Libera",
     "libportal",
     "LLDB",
+    "logonui",
     "Lysytsia",
     "macdeployqt",
+    "mojibake",
     "msvc",
     "noquote",
     "NOSONAR",
@@ -48,6 +55,8 @@
     "Oleksandr",
     "Olena",
     "outputdir",
+    "outputter",
+    "outputters",
     "pacman",
     "Petroules",
     "Pixmap",
@@ -57,8 +66,10 @@
     "Priddy",
     "psutil",
     "pyproject",
+    "qobject",
     "qputenv",
     "readf",
+    "Redist",
     "Regen",
     "Repology",
     "Rizzitello",
@@ -67,9 +78,13 @@
     "Schoeneman",
     "Serhii",
     "shemp",
+    "SNAPPROCESS",
+    "sonarcloud",
+    "sonarqube",
     "Sorin",
     "subproject",
     "subprojects",
+    "Toolhelp",
     "trackpad",
     "Trixie",
     "unittests",
@@ -81,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,13 +8,12 @@ file(COPY_FILE
   ONLY_IF_DIFFERENT
 )
 
-
 # Generic Package Items
 set(CPACK_STRIP_FILES TRUE)
 set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
-set(CPACK_PACKAGE_CONTACT "Deskflow <maintainers@deskflow.org>")
+set(CPACK_PACKAGE_CONTACT ${CMAKE_PROJECT_CONTACT})
 set(CPACK_PACKAGE_DESCRIPTION ${CMAKE_PROJECT_DESCRIPTION})
-set(CPACK_PACKAGE_VENDOR "Deskflow")
+set(CPACK_PACKAGE_VENDOR ${CMAKE_PROJECT_VENDOR})
 set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt)
 
 set(CPACK_PACKAGE_VERSION ${CMAKE_PROJECT_VERSION})

deploy/linux/arch/PKGBUILD.in

@@ -1,34 +1,42 @@
+# SPDX-FileCopyrightText: (C) 2024 Deskflow Developers
+# SPDX-License-Identifier: MIT
 # Maintainer: Deskflow Developers
 
-pkgname=deskflow
+_basename=@CMAKE_PROJECT_NAME@
-pkgver=@DESKFLOW_VERSION@
+pkgname=${_basename}-git
+pkgver=@CMAKE_PROJECT_VERSION@
 pkgrel=1
-pkgdesc="Mouse and keyboard sharing utility"
+pkgdesc="@CMAKE_PROJECT_DESCRIPTION@"
-url='https://deskflow.org'
+url="@CMAKE_PROJECT_HOMEPAGE_URL@"
-arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
+arch=('i686' 'x86_64' 'armv7h' 'aarch64')
-license=('GPL-2.0-only')
+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=("$_basename")
 depends=(
-  'gcc-libs'
+  gcc-libs
-  'glibc'
+  glib2
-  'openssl'
+  glibc
-  'libx11'
+  hicolor-icon-theme
-  'libxi'
+  libei
-  'libxkbfile'
+  libglvnd
-  'libxext'
+  libice
-  'libxtst'
+  libportal
-  'libxinerama'
+  libsm
-  'libxkbcommon-x11'
+  libx11
-  'libnotify'
+  libxext
-  'hicolor-icon-theme'
+  libxi
-  'pugixml'
+  libxinerama
-  'qt6-base'
+  libxkbcommon
-  'qt6-tools'
+  libxkbcommon-x11
-  'libei'
+  libxkbfile
-  'libportal'
+  libxrandr
-  'tomlplusplus'
+  libxtst
-  'cli11'
+  openssl
+  qt6-base
+  qt6-svg
+  qt6-translations
 )
-conflicts=('synergy-git' 'synergy1-bin' 'synergy2-bin' 'synergy3-bin')
+
 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
+  FILES ${MY_DIR}/${CMAKE_PROJECT_REV_FQDN}.desktop
-  DESTINATION share/applications
+  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
+  FILES ${CMAKE_SOURCE_DIR}/src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg
-  DESTINATION share/icons/hicolor/512x512/apps/
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/symbolic/apps/
-  RENAME org.deskflow.deskflow.png
 )
 
 # Install our metainfo
 install(
-  FILES ${MY_DIR}/org.deskflow.deskflow.metainfo.xml
+  FILES ${MY_DIR}/${CMAKE_PROJECT_REV_FQDN}.metainfo.xml
-  DESTINATION share/metainfo/
+  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")
 
@@ -67,7 +69,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
   # Check if Debian-link
   string(REGEX MATCH debian|buntu DEBTYPE "${DISTRO_LIKE}")
-  if((NOT ("${DEBTYPE}" STREQUAL "")) OR ("${DISTRO_NAME}" STREQUAL "debian"))
+  string(REGEX MATCH debian|deepin|uos DEBNAME "${DISTRO_NAME}")
+  if((NOT ("${DEBTYPE}" STREQUAL "")) OR (NOT ("${DEBNAME}" STREQUAL "")))
     set(CPACK_GENERATOR "DEB")
   endif()
 
@@ -99,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/ci-build-lint-exceptions.json

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

deploy/linux/flatpak/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,23 +17,11 @@ cleanup:
   - /lib/cmake
   - /lib/pkgconfig
   - /share/pkgconfig
-  - /share/tomlplusplus
   - /share/cmake
   - /share/doc
   - /share/gir-1.0
   - /lib/girepository-1.0
 modules:
-  - name: python3-attrs
-    buildsystem: simple
-    build-commands:
-      - pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
-          --prefix=${FLATPAK_DEST} --no-build-isolation attrs
-    sources:
-      - type: file
-        url: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl
-        sha256: 99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1
-    cleanup:
-      - '*'
   - name: python3-Jinja2
     buildsystem: simple
     build-commands:
@@ -41,8 +29,12 @@ modules:
         --prefix=${FLATPAK_DEST} --no-build-isolation Jinja2
     sources:
       - type: file
-        url: https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl
+        url: https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl
-        sha256: 7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa
+        sha256: 85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67
+        x-checker-data:
+          type: pypi
+          name: Jinja2
+          packagetype: bdist_wheel
       - type: file
         url: https://files.pythonhosted.org/packages/87/5b/aae44c6655f3801e81aa3eef09dbbf012431987ba564d7231722f68df02d/MarkupSafe-2.1.5.tar.gz
         sha256: d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b
@@ -57,8 +49,11 @@ modules:
     sources:
         - type: git
           url: https://gitlab.freedesktop.org/libinput/libei
-          tag: 1.3.0
+          tag: 1.5.0
-          commit: 997b7c0f37faea4f8bae59613c8f27370925d5b0
+          commit: 19b64535408aa47abbc8151bc2c925afd6583851
+          x-checker-data:
+            type: git
+            tag-pattern: ^([\\d.]+)$
   - name: libportal
     buildsystem: meson
     config-opts:
@@ -70,38 +65,20 @@ modules:
     sources:
       - type: git
         url: https://github.com/flatpak/libportal.git
-        tag: 0.8.1
+        tag: 0.9.1
-        commit: 26c15008cbe579f57f89468384f8efc033f25f6f
+        commit: 8f5dc8d192f6e31dafe69e35219e3b707bde71ce
-  - name: puixml
+      - type: patch
-    buildsystem: cmake-ninja
+        path: libportal-qt69.patch
-    sources:
-      - type: git
-        url: https://github.com/zeux/pugixml
-        tag: v1.14
-        commit: db78afc2b7d8f043b4bc6b185635d949ea2ed2a8
-  - 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
   - name: gtest
     buildsystem: cmake-ninja
     sources:
       - type: git
         url: https://github.com/google/googletest.git
-        tag: v1.15.2
+        tag: v1.17.0
-        commit: b514bdc898e2951020cbdca1304b75f5950d1f59
+        commit: 52eb8108c5bdec04579160ae17225d66034bd723
+        x-checker-data:
+          type: git
+          tag-pattern: ^([\\d.]+)$
     cleanup:
       - '*'
   - name: deskflow

deploy/linux/org.deskflow.deskflow.desktop

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2024 Deskflow Developers
+# SPDX-License-Identifier: MIT
+
 [Desktop Entry]
 Type=Application
 Version=1.0
@@ -8,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,21 +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_name>Deskflow Developers</developer_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://github.com/user-attachments/assets/883660dc-f3f5-4b69-8821-a079a58d3882</image>
+			<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-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>
@@ -24,8 +59,12 @@
 		<category>Utility</category>
 	</categories>
 	<keywords>
-		<keyword translate="no">Input</keyword>
+		<keyword>Input</keyword>
-		<keyword translate="no">Sharing</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>
@@ -35,9 +74,228 @@
 	</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>
+				<ul>
+					<li>Cleanup unused classes</li>
+					<li>New Settings class</li>
+					<li>Remove need for pugixml</li>
+					<li>Remove need for libNotify</li>
+					<li>Remove need for gio</li>
+					<li>Remove need for gitkpixbuf</li>
+					<li>Fix issues with windows installer when msvc is missing</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.21.0</url>
+		</release>
+		<release version="1.20.1" date="2025-03-07" urgency="low">
+			<description>
+				<p>This stable release introduces a Windows dependency requirement and fixes a macOS bug.</p>
+				<ul>
+					<li>Fix: macOS menu bar icon invisible when menu bar is light</li>
+					<li>Feature: Add Windows installer check for Visual C++ Redistributable</li>
+					<li>Feature: Prevent Windows binaries running if MSVC runtime too old</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.20.1</url>
+		</release>
+		<release version="1.20.0" date="2025-03-03" urgency="high">
+			<description>
+				<p>This stable release fixes a few security issues, additionally fixes several bugs and adds a few new features. For the full changelog see the release page.</p>
+				<ul>
+					<li>Feature: Peer Id Checking - Fixes CVE-2021-42072 and CVE-2021-42073</li>
+					<li>Feature: Use Sha256 fingerprints</li>
+					<li>Feature: Gui cleanup and improvements</li>
+					<li>Remove: Inverse connection option</li>
+					<li>Fix: Screen Corner option</li>
+					<li>Fix: Show new client dialog</li>
+					<li>Win32: Daemon Improvements</li>
+					<li>Win32: Fix clear settings</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.20.0</url>
+		</release>
+		<release version="1.19.0" date="2025-01-31" urgency="high">
+			<description>
+				<p>This stable release fixes several bugs and adds a few new features. For the full changelog see the release page.</p>
+				<ul>
+					<li>Feature: New Fallback icon theme</li>
+					<li>Feature: Allow only one gui instance</li>
+					<li>Fix: Modifier remapping on macOS</li>
+					<li>Fix: Show Screen icons again in the server settings</li>
+					<li>Fix: Show the TLS Label</li>
+					<li>Fix: Mainwindow restore </li>
+					<li>Fix: Hotkey with more then one action now work again</li>
+					<li>Better Detection of evdev on BSD</li>
+					<li>Better language detection on X11</li>
+					<li>Better deal with screen changes on wayland</li>
+					<li>Remove Legacy tray icons</li>
+					<li>Lots of Internal Cleanup</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.19.0</url>
+		</release>
 		<release version="1.18.0" date="2024-12-26" urgency="high">
 			<description>
-				<p>This stable Release Fixes a few security issues, additionally fixes several bugs and adds a few new features. For the full changelog see the relase page.</p>
+				<p>This stable release fixes a few security issues, additionally fixes several bugs and adds a few new features. For the full changelog see the release page.</p>
 				<ul>
 					<li>Fix CVE-2021-42075: Close connection on app-level handshake failure</li>
 					<li>Fix CVE-2021-42074: Handle SSL race conditions and segmentation fault</li>
@@ -52,7 +310,7 @@
 					<li>Update the windows clipboard format listener to monitor the clipboard</li>
 				</ul>
 			</description>
-		<url>https://github.com/deskflow/deskflow/releases/tag/v1.18.0</url>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.18.0</url>
 		</release>
 		<release version="1.17.2" date="2024-11-20" urgency="medium">
 			<description>
@@ -106,11 +364,11 @@
 					<li>ci: build flatpaks</li>
 				</ul>
 			</description>
-		<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.2</url>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.2</url>
 		</release>
-		<release version="1.17.1" date="2024-11-7" urgency="high">
+		<release version="1.17.1" date="2024-11-07" urgency="high">
 			<description>
-				<p>This stable Release Has a very long chagelog some notable ones are.</p>
+				<p>This stable release has a very long changelog some notable ones are.</p>
 				<ul>
 					<li>Remove word 'beta' from Wayland message</li>
 					<li>docs: Update `README.md` with Matrix link</li>
@@ -223,11 +481,11 @@
 					<li>ci: adjust pacakge script to use the names we would like when in cpack</li>
 				</ul>
 			</description>
-		<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.1</url>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.1</url>
 		</release>
 		<release version="1.17.0" date="2024-10-02" urgency="low">
 			<description>
-				<p>This is the first Deskflow Release.</p>
+				<p>This is the first Deskflow release.</p>
 				<ul>
 					<li>Use Deskflow Name</li>
 					<li>fix: windows build typos</li>
@@ -273,7 +531,7 @@
 					<li>Use sonarsource/sonarcloud-github-c-cpp</li>
 				</ul>
 			</description>
-		<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.0</url>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.0</url>
 		</release>
 	</releases>
 </component>

deploy/mac/deploy.cmake

@@ -1,15 +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-${CMAKE_SYSTEM_PROCESSOR}")
+set(OS_STRING "macos-${BUILD_ARCHITECTURE}")
-set(CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks")
+
-set(CPACK_PACKAGE_ICON "${MY_DIR}/dmg-volume.icns")
+if (OSX_BUNDLE)
-set(CPACK_DMG_BACKGROUND_IMAGE "${MY_DIR}/dmg-background.tiff")
+  install(CODE "execute_process(COMMAND
-set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${MY_DIR}/generate_ds_store.applescript")
+    ${DEPLOYQT}
-set(CPACK_DMG_VOLUME_NAME "Deskflow")
+    \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_PROJECT_PROPER_NAME}.app\"
-set(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE ON)
+    -timestamp -codesign=-
-set(CPACK_GENERATOR "DragNDrop")
+  )")
+  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/mac/generate_ds_store.applescript

@@ -1,3 +1,6 @@
+-- SPDX-FileCopyrightText: 2020 Chris Rizzitello <sithlord48@gmail.com>
+-- SPDX-License-Identifier: MIT
+
 on run argv
   set image_name to item 1 of argv
 

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,41 +1,40 @@
-# 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(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
+set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${CMAKE_INSTALL_LIBDIR})
+include(InstallRequiredSystemLibraries)
 
-# Configure the windows version rc file
+configure_file(${MY_DIR}/pre-cpack.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pre-cpack.cmake @ONLY)
-configure_file(
+set(CPACK_PRE_BUILD_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/pre-cpack.cmake)
-  ${MY_DIR}/version.rc.in
-  ${PROJECT_BINARY_DIR}/src/version.rc @ONLY
-)
 
-# Setup OS_STRING
+configure_file(${MY_DIR}/cpack-options.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cpack-options.cmake @ONLY)
-if(CMAKE_SYSTEM_PROCESSOR MATCHES AMD64)
+set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/cpack-options.cmake)
-  set(OS_STRING "win-x64")
+
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ARM64)
+set(OS_STRING "win-${BUILD_ARCHITECTURE}")
-  set(OS_STRING "win-arm64")
+
-else()
+list(APPEND CPACK_GENERATOR "7Z")
-  set(OS_STRING "win-${CMAKE_SYSTEM_PROCESSOR}")
-endif()
 
 # If Wix4+ is installed make a package
 find_program(WIX_APP wix)
 if (NOT "${WIX_APP}" STREQUAL "")
   set(CPACK_WIX_VERSION 4)
+  set(CPACK_WIX_ARCHITECTURE ${BUILD_ARCHITECTURE})
   list(APPEND CPACK_GENERATOR "WIX")
 endif()
 
-set(CPACK_PACKAGE_NAME "Deskflow")
+set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_PROPER_NAME}")
 
 # Menu Entry
-set(CPACK_WIX_PROGRAM_MENU_FOLDER "Deskflow")
+set(CPACK_WIX_PROGRAM_MENU_FOLDER "${CMAKE_PROJECT_PROPER_NAME}")
-set(CPACK_PACKAGE_EXECUTABLES "deskflow" "Deskflow")
+set(CPACK_PACKAGE_EXECUTABLES "deskflow" "${CMAKE_PROJECT_PROPER_NAME}")
 
 # Default Install Path
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "Deskflow")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_PROPER_NAME}")
 
 # Wix Specific Values
 set(CPACK_WIX_UPGRADE_GUID "027D1C8A-E7A5-4754-BB93-B2D45BFDBDC8")
@@ -49,7 +48,6 @@ list(APPEND CPACK_WIX_EXTENSIONS "WixToolset.Util.wixext" "WixToolset.Firewall.w
 list(APPEND CPACK_WIX_CUSTOM_XMLNS "util=http://wixtoolset.org/schemas/v4/wxs/util" "firewall=http://wixtoolset.org/schemas/v4/wxs/firewall")
 
 # The patch has to know the full path of our msm file
-set(CPACK_WIX_MSM_FILE "${MY_DIR}/Microsoft_VC142_CRT_x64.msm")
 configure_file(
   ${MY_DIR}/wix-patch.xml.in
   ${CMAKE_CURRENT_BINARY_DIR}/wix-patch.xml @ONLY
@@ -57,3 +55,18 @@ configure_file(
 
 # This patch set ups filewall rules, the service and msm module
 set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/wix-patch.xml")
+
+# Creates a DLL that can be used by our MSI for custom actions.
+configure_file(
+  ${MY_DIR}/wix-custom.h.in
+  ${CMAKE_CURRENT_BINARY_DIR}/wix-custom.h @ONLY
+)
+add_library(
+  wix-custom SHARED
+  ${MY_DIR}/wix-custom.cpp
+)
+target_include_directories(wix-custom PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+set_target_properties(wix-custom PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+)
+target_link_libraries(wix-custom PRIVATE Msi)

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/version.rc.in

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

deploy/windows/wix-custom.cpp

@@ -0,0 +1,72 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Symless Ltd.
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#include "wix-custom.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+// Include after Windows.h
+#include <MsiQuery.h>
+
+#include <stdio.h>
+#include <string>
+
+namespace {
+// Warning: DLL will crash with error code 1603 if we exceed this.
+const auto kLogLineMax = 1024;
+
+// Prefixes log messages with the app name so they're easier to find/filter.
+const std::string kLogPrefix = std::string(kAppId) + " installer: ";
+
+// Note: Resized to log line max when used.
+static std::string s_logMessageBuffer; // NOSONAR - Must be mutable.
+} // namespace
+
+// This log output can be viewed by using the DebugView program.
+#define MS_LOG_DEBUG(message, ...)                                                                                     \
+  s_logMessageBuffer.resize(kLogLineMax);                                                                              \
+  sprintf(s_logMessageBuffer.data(), message, __VA_ARGS__);                                                            \
+  OutputDebugStringA((kLogPrefix + s_logMessageBuffer + "\n").c_str())
+
+extern "C" __declspec(dllexport) UINT __stdcall CheckVCRedist(MSIHANDLE hInstall)
+{
+  const auto kKeyName = TEXT(kRegKey);
+  const auto kValueName = TEXT("Minor");
+  const auto kProperty = "VC_REDIST_VERSION_OK";
+
+  MS_LOG_DEBUG("checking for msvc redist v%d.%d", kWindowsRuntimeMajor, kWindowsRuntimeMinor);
+
+  HKEY hKey;
+  if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, kKeyName, 0, KEY_READ, &hKey) != ERROR_SUCCESS) {
+    MS_LOG_DEBUG("msvc redist registry key not found");
+    return ERROR_FUNCTION_FAILED;
+  }
+
+  MS_LOG_DEBUG("msvc redist registry key found, querying minor version");
+
+  DWORD minorVersion = 0;
+  DWORD size = sizeof(DWORD);
+  RegQueryValueEx(hKey, kValueName, nullptr, nullptr, (LPBYTE)&minorVersion, &size);
+  RegCloseKey(hKey);
+
+  MS_LOG_DEBUG("msvc redist minor version: %lu", minorVersion);
+
+  if (minorVersion < kWindowsRuntimeMinor) {
+    MS_LOG_DEBUG("msvc redist minor version %lu too low, expected >= %d", minorVersion, kWindowsRuntimeMinor);
+    // Returning success allows the installer will show a friendly error message.
+    return ERROR_SUCCESS;
+  }
+
+  MS_LOG_DEBUG("msvc redist version ok, setting: %s", kProperty);
+  if (MsiSetProperty(hInstall, kProperty, "ok") != ERROR_SUCCESS) {
+    MS_LOG_DEBUG("failed to set property: %s", kProperty);
+    return ERROR_FUNCTION_FAILED;
+  }
+
+  MS_LOG_DEBUG("msvc redist version check successful");
+  return ERROR_SUCCESS;
+}

deploy/windows/wix-custom.h.in

@@ -0,0 +1,15 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Symless Ltd.
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#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@;
+const auto kWindowsRuntimeMinor = @REQUIRED_MSVC_RUNTIME_MINOR@;
+// clang-format on

deploy/windows/wix-patch.xml.in

@@ -1,26 +1,78 @@
 <CPackWiXPatch>
   <CPackWiXFragment Id="CM_CP_deskflow_daemon.exe">
-    <ServiceInstall Description="Controls the Deskflow foreground processes." DisplayName="Deskflow" ErrorControl="normal" Id="ServiceInstall" Name="Deskflow" Start="auto" Type="ownProcess">
+    <ServiceInstall
-      <util:ServiceConfig FirstFailureActionType="restart" ResetPeriodInDays="1" RestartServiceDelayInSeconds="1" SecondFailureActionType="restart" ThirdFailureActionType="restart"/>
+      Id="ServiceInstall"
+      Name="Deskflow"
+      DisplayName="Deskflow"
+      Description="Runs the Core process on secure desktops (UAC prompts, login screen, etc)."
+      ErrorControl="normal"
+      Start="auto"
+      Type="ownProcess">
+      <util:ServiceConfig
+        ResetPeriodInDays="1"
+        RestartServiceDelayInSeconds="1"
+        FirstFailureActionType="restart"
+        SecondFailureActionType="restart"
+        ThirdFailureActionType="none"
+      />
     </ServiceInstall>
     <ServiceControl Id="ServiceControl" Name="Deskflow" Remove="uninstall" Start="install" Stop="both"/>
+    <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 Id="CM_CP_deskflow_core.exe">
-  </CPackWiXFragment>
+    <firewall:FirewallException Id="ServerFirewallException" Name="Deskflow Server" Program="[INSTALL_ROOT]deskflow-core.exe" Scope="any"/>
-  <CPackWiXFragment Id="CM_CP_deskflow_client.exe">
+    <firewall:FirewallException Id="ClientFirewallException" Name="Deskflow Client" Program="[INSTALL_ROOT]deskflow-core.exe" Scope="any"/>
-    <firewall:FirewallException Id="ClientFirewallException" Name="Deskflow Client" Program="[INSTALL_ROOT]deskflow-client.exe" Scope="any"/>
   </CPackWiXFragment>
+
   <CPackWiXFragment Id="#PRODUCT">
-    <StandardDirectory  Id="TARGETDIR">
+    <Property Id="VC_REDIST_INSTALLED">
-      <Merge Id="VCRedist" SourceFile="@CPACK_WIX_MSM_FILE@" DiskId="1" Language="0"/>
+      <RegistrySearch
-    </StandardDirectory >
+        Id="FindVCRedist"
-    <Feature Id="VCRedist" Title="Visual C++ Runtime" AllowAbsent="no" AllowAdvertise="yes" Display="hidden" InstallDefault="local" TypicalDefault="install">
+        Root="HKLM"
-      <MergeRef Id="VCRedist" Primary="yes"/>
+        Key="SOFTWARE\Microsoft\VisualStudio\@REQUIRED_MSVC_RUNTIME_MAJOR@.0\VC\Runtimes\@BUILD_ARCHITECTURE@"
-    </Feature>
+        Name="Installed"
-    <CustomAction Id="Run_Deskflow" ExeCommand="Deskflow" FileRef="CM_FP_deskflow.exe" Return="asyncNoWait"/>
+        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"
+      DllEntry="CheckVCRedist"
+      Execute="immediate" />
+
+    <CustomAction
+      Id="ShowVCRedistError"
+      Error="Microsoft Visual C++ Redistributable v@REQUIRED_MSVC_RUNTIME_MAJOR@.@REQUIRED_MSVC_RUNTIME_MINOR@ or later is required. Please download and install the latest version and then restart the installation. See our documentation for instructions." />
+
+    <CustomAction
+      Id="RunDeskflow"
+      ExeCommand="[INSTALL_ROOT]deskflow.exe"
+      Directory="INSTALL_ROOT"
+      Execute="immediate"
+      Impersonate="yes"
+      Return="asyncNoWait" />
+
     <InstallExecuteSequence>
-      <Custom Action="Run_Deskflow" OnExit="success" Condition="NOT Installed"/>
+      <Custom
+        Action="CheckVCRedist"
+        Before="InstallInitialize"
+        Condition="NOT Installed AND VC_REDIST_INSTALLED" />
+      <Custom
+        Action="ShowVCRedistError"
+        Before="InstallInitialize"
+        Condition="NOT Installed AND (NOT VC_REDIST_INSTALLED OR NOT VC_REDIST_VERSION_OK)" />
     </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/Security.md

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

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,12 +1,15 @@
 sonar.organization=deskflow
 sonar.projectKey=deskflow_deskflow
 sonar.sources=src/apps,src/lib
-sonar.tests=src/test
+sonar.tests=src/unittests
-sonar.exclusions=subprojects/**,build/**
+sonar.exclusions=subprojects/**,build/**,translations/**
-sonar.coverage.exclusions=subprojects/**,src/test/**,src/apps/deskflow-gui/**,src/apps/res/**
+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.coverageReportPaths=${{ steps.coverage-paths.outputs.csv }}
 sonar.cfamily.compile-commands=build/compile_commands.json
-sonar.cfamily.threads=${{ env.CPU_CORE_COUNT }}
 sonar.python.version=3.10
+
+# Allow use of `new` which is idiomatic for Qt code.
+sonar.issue.ignore.multicriteria=e1
+sonar.issue.ignore.multicriteria.e1.ruleKey=cpp:S5025
+sonar.issue.ignore.multicriteria.e1.resourceKey=**

src/CMakeLists.txt

@@ -1,26 +1,15 @@
-# Deskflow -- mouse and keyboard sharing utility
+# SPDX-FileCopyrightText: (C) 2024 Deskflow Developers
-# Copyright (C) 2012-2024 Symless Ltd.
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
-# Copyright (C) 2009-2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
-#
+# SPDX-License-Identifier: MIT
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-include_directories(./lib)
+include_directories(./lib "${CMAKE_CURRENT_BINARY_DIR}/lib")
-include_directories(${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,31 +1,42 @@
-# Deskflow -- mouse and keyboard sharing utility
+# SPDX-FileCopyrightText: (C) 2024 Deskflow Developers
-# Copyright (C) 2012-2024 Symless Ltd.
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
-# Copyright (C) 2009-2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
-#
+# SPDX-License-Identifier: MIT
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-option(BUILD_UNIFIED "Build unified binary" OFF)
+if(UNIX AND NOT APPLE)
-if(BUILD_UNIFIED)
+  find_program(HELP2MAN help2man)
-  add_subdirectory(deskflow-core)
+  if(NOT HELP2MAN)
-else()
+    message(STATUS "Man page tool (help2man) not found, man pages will not be generated")
-  add_subdirectory(deskflow-client)
+  endif()
-  add_subdirectory(deskflow-server)
+endif()
-endif(BUILD_UNIFIED)
 
-## Only used on windows
+function(generate_app_man TARGET NAME)
-add_subdirectory(deskflow-daemon)
+  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()
 
-option(BUILD_GUI "Build GUI" ON)
+set(WIN32_PRE_EXCLUDE_REGEXES
-if(BUILD_GUI)
+  "api-ms-win-.*"
-  add_subdirectory(deskflow-gui)
+  "ext-ms-.*"
-endif(BUILD_GUI)
+  "^hvsifiletrust\\.dll$"
+  "^icu.*\\.dll$"
+)
+
+set(WIN32_POST_EXCLUDE_REGEXES ".*system32.*")
+
+add_subdirectory(deskflow-core)
+add_subdirectory(deskflow-daemon) #Only used on windows
+add_subdirectory(deskflow-gui)

src/apps/deskflow-client/.gitignore

@@ -1 +0,0 @@
-/*.aps

src/apps/deskflow-client/CMakeLists.txt

@@ -1,81 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
-# Copyright (C) 2012-2024 Symless Ltd.
-# Copyright (C) 2009-2012 Nick Bolton
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-set(target deskflow-client)
-
-if(WIN32)
-  set(PLATFORM_SOURCES
-    deskflow-client.exe.manifest
-    deskflow-client.rc
-    MSWindowsClientTaskBarReceiver.cpp
-    MSWindowsClientTaskBarReceiver.h
-    resource.h
-    ${PROJECT_SOURCE_DIR}/src/apps/res/deskflow.ico
-    ${PROJECT_SOURCE_DIR}/src/apps/res/tb_error.ico
-    ${PROJECT_SOURCE_DIR}/src/apps/res/tb_idle.ico
-    ${PROJECT_SOURCE_DIR}/src/apps/res/tb_run.ico
-    ${PROJECT_BINARY_DIR}/src/version.rc
-  )
-elseif(APPLE)
-  set(PLATFORM_SOURCES
-    OSXClientTaskBarReceiver.cpp
-    OSXClientTaskBarReceiver.h
-  )
-elseif(UNIX)
-  set(PLATFORM_SOURCES
-    XWindowsClientTaskBarReceiver.cpp
-    XWindowsClientTaskBarReceiver.h
-  )
-endif()
-
-add_executable(${target} ${PLATFORM_SOURCES} deskflow-client.cpp)
-
-target_link_libraries(
-  ${target}
-  arch
-  base
-  client
-  io
-  mt
-  net
-  ipc
-  platform
-  server
-  app
-  ${libs})
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:Deskflow>/MacOS)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  install(TARGETS ${target} DESTINATION bin)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-  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/MSWindowsClientTaskBarReceiver.cpp

@@ -1,333 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2003 Chris Schoeneman
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "MSWindowsClientTaskBarReceiver.h"
-
-#include "arch/Arch.h"
-#include "arch/win32/ArchMiscWindows.h"
-#include "arch/win32/ArchTaskBarWindows.h"
-#include "base/EventQueue.h"
-#include "base/EventTypes.h"
-#include "base/log_outputters.h"
-#include "client/Client.h"
-#include "platform/MSWindowsClipboard.h"
-#include "platform/MSWindowsScreen.h"
-#include "resource.h"
-
-//
-// MSWindowsClientTaskBarReceiver
-//
-
-const UINT MSWindowsClientTaskBarReceiver::s_stateToIconID[kMaxState] = {
-    IDI_TASKBAR_NOT_RUNNING, IDI_TASKBAR_NOT_WORKING, IDI_TASKBAR_NOT_CONNECTED, IDI_TASKBAR_CONNECTED
-};
-
-MSWindowsClientTaskBarReceiver::MSWindowsClientTaskBarReceiver(
-    HINSTANCE appInstance, const BufferedLogOutputter *logBuffer, IEventQueue *events
-)
-    : ClientTaskBarReceiver(events),
-      m_appInstance(appInstance),
-      m_window(NULL),
-      m_logBuffer(logBuffer)
-{
-  for (UInt32 i = 0; i < kMaxState; ++i) {
-    m_icon[i] = loadIcon(s_stateToIconID[i]);
-  }
-  m_menu = LoadMenu(m_appInstance, MAKEINTRESOURCE(IDR_TASKBAR));
-
-  // don't create the window yet.  we'll create it on demand.  this
-  // has the side benefit of being created in the thread used for
-  // the task bar.  that's good because it means the existence of
-  // the window won't prevent changing the main thread's desktop.
-
-  // add ourself to the task bar
-  ARCH->addReceiver(this);
-}
-
-MSWindowsClientTaskBarReceiver::~MSWindowsClientTaskBarReceiver()
-{
-  cleanup();
-}
-
-void MSWindowsClientTaskBarReceiver::cleanup()
-{
-  ARCH->removeReceiver(this);
-  for (UInt32 i = 0; i < kMaxState; ++i) {
-    deleteIcon(m_icon[i]);
-  }
-  DestroyMenu(m_menu);
-  destroyWindow();
-}
-
-void MSWindowsClientTaskBarReceiver::showStatus()
-{
-  // create the window
-  createWindow();
-
-  // lock self while getting status
-  lock();
-
-  // get the current status
-  std::string status = getToolTip();
-
-  // done getting status
-  unlock();
-
-  // update dialog
-  HWND child = GetDlgItem(m_window, IDC_TASKBAR_STATUS_STATUS);
-  SendMessage(child, WM_SETTEXT, 0, (LPARAM)status.c_str());
-
-  if (!IsWindowVisible(m_window)) {
-    // position it by the mouse
-    POINT cursorPos;
-    GetCursorPos(&cursorPos);
-    RECT windowRect;
-    GetWindowRect(m_window, &windowRect);
-    int x = cursorPos.x;
-    int y = cursorPos.y;
-    int fw = GetSystemMetrics(SM_CXDLGFRAME);
-    int fh = GetSystemMetrics(SM_CYDLGFRAME);
-    int ww = windowRect.right - windowRect.left;
-    int wh = windowRect.bottom - windowRect.top;
-    int sw = GetSystemMetrics(SM_CXFULLSCREEN);
-    int sh = GetSystemMetrics(SM_CYFULLSCREEN);
-    if (fw < 1) {
-      fw = 1;
-    }
-    if (fh < 1) {
-      fh = 1;
-    }
-    if (x + ww - fw > sw) {
-      x -= ww - fw;
-    } else {
-      x -= fw;
-    }
-    if (x < 0) {
-      x = 0;
-    }
-    if (y + wh - fh > sh) {
-      y -= wh - fh;
-    } else {
-      y -= fh;
-    }
-    if (y < 0) {
-      y = 0;
-    }
-    SetWindowPos(m_window, HWND_TOPMOST, x, y, ww, wh, SWP_SHOWWINDOW);
-  }
-}
-
-void MSWindowsClientTaskBarReceiver::runMenu(int x, int y)
-{
-  // do popup menu.  we need a window to pass to TrackPopupMenu().
-  // the SetForegroundWindow() and SendMessage() calls around
-  // TrackPopupMenu() are to get the menu to be dismissed when
-  // another window gets activated and are just one of those
-  // win32 weirdnesses.
-  createWindow();
-  SetForegroundWindow(m_window);
-  HMENU menu = GetSubMenu(m_menu, 0);
-  SetMenuDefaultItem(menu, IDC_TASKBAR_STATUS, FALSE);
-  HMENU logLevelMenu = GetSubMenu(menu, 3);
-  CheckMenuRadioItem(logLevelMenu, 0, 6, CLOG->getFilter() - kERROR, MF_BYPOSITION);
-  int n =
-      TrackPopupMenu(menu, TPM_NONOTIFY | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, x, y, 0, m_window, NULL);
-  SendMessage(m_window, WM_NULL, 0, 0);
-
-  // perform the requested operation
-  switch (n) {
-  case IDC_TASKBAR_STATUS:
-    showStatus();
-    break;
-
-  case IDC_TASKBAR_LOG:
-    copyLog();
-    break;
-
-  case IDC_TASKBAR_SHOW_LOG:
-    ARCH->showConsole(true);
-    break;
-
-  case IDC_TASKBAR_LOG_LEVEL_ERROR:
-    CLOG->setFilter(kERROR);
-    break;
-
-  case IDC_TASKBAR_LOG_LEVEL_WARNING:
-    CLOG->setFilter(kWARNING);
-    break;
-
-  case IDC_TASKBAR_LOG_LEVEL_NOTE:
-    CLOG->setFilter(kNOTE);
-    break;
-
-  case IDC_TASKBAR_LOG_LEVEL_INFO:
-    CLOG->setFilter(kINFO);
-    break;
-
-  case IDC_TASKBAR_LOG_LEVEL_DEBUG:
-    CLOG->setFilter(kDEBUG);
-    break;
-
-  case IDC_TASKBAR_LOG_LEVEL_DEBUG1:
-    CLOG->setFilter(kDEBUG1);
-    break;
-
-  case IDC_TASKBAR_LOG_LEVEL_DEBUG2:
-    CLOG->setFilter(kDEBUG2);
-    break;
-
-  case IDC_TASKBAR_QUIT:
-    quit();
-    break;
-  }
-}
-
-void MSWindowsClientTaskBarReceiver::primaryAction()
-{
-  showStatus();
-}
-
-IArchTaskBarReceiver::Icon MSWindowsClientTaskBarReceiver::getIcon() const
-{
-  return static_cast<Icon>(m_icon[getStatus()]);
-}
-
-void MSWindowsClientTaskBarReceiver::copyLog() const
-{
-  if (m_logBuffer != NULL) {
-    // collect log buffer
-    String data;
-    for (BufferedLogOutputter::const_iterator index = m_logBuffer->begin(); index != m_logBuffer->end(); ++index) {
-      data += *index;
-      data += "\n";
-    }
-
-    // copy log to clipboard
-    if (!data.empty()) {
-      MSWindowsClipboard clipboard(m_window);
-      clipboard.open(0);
-      clipboard.emptyUnowned();
-      clipboard.add(IClipboard::kText, data);
-      clipboard.close();
-    }
-  }
-}
-
-void MSWindowsClientTaskBarReceiver::onStatusChanged()
-{
-  if (IsWindowVisible(m_window)) {
-    showStatus();
-  }
-}
-
-HICON
-MSWindowsClientTaskBarReceiver::loadIcon(UINT id)
-{
-  HANDLE icon = LoadImage(m_appInstance, MAKEINTRESOURCE(id), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
-  return static_cast<HICON>(icon);
-}
-
-void MSWindowsClientTaskBarReceiver::deleteIcon(HICON icon)
-{
-  if (icon != NULL) {
-    DestroyIcon(icon);
-  }
-}
-
-void MSWindowsClientTaskBarReceiver::createWindow()
-{
-  // ignore if already created
-  if (m_window != NULL) {
-    return;
-  }
-
-  // get the status dialog
-  m_window = CreateDialogParam(
-      m_appInstance, MAKEINTRESOURCE(IDD_TASKBAR_STATUS), NULL, (DLGPROC)&MSWindowsClientTaskBarReceiver::staticDlgProc,
-      reinterpret_cast<LPARAM>(static_cast<void *>(this))
-  );
-
-  // window should appear on top of everything, including (especially)
-  // the task bar.
-  LONG_PTR style = GetWindowLongPtr(m_window, GWL_EXSTYLE);
-  style |= WS_EX_TOOLWINDOW | WS_EX_TOPMOST;
-  SetWindowLongPtr(m_window, GWL_EXSTYLE, style);
-
-  // tell the task bar about this dialog
-  ArchTaskBarWindows::addDialog(m_window);
-}
-
-void MSWindowsClientTaskBarReceiver::destroyWindow()
-{
-  if (m_window != NULL) {
-    ArchTaskBarWindows::removeDialog(m_window);
-    DestroyWindow(m_window);
-    m_window = NULL;
-  }
-}
-
-BOOL MSWindowsClientTaskBarReceiver::dlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM)
-{
-  switch (msg) {
-  case WM_INITDIALOG:
-    // use default focus
-    return TRUE;
-
-  case WM_ACTIVATE:
-    // hide when another window is activated
-    if (LOWORD(wParam) == WA_INACTIVE) {
-      ShowWindow(hwnd, SW_HIDE);
-    }
-    break;
-  }
-  return FALSE;
-}
-
-BOOL CALLBACK MSWindowsClientTaskBarReceiver::staticDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-  // if msg is WM_INITDIALOG, extract the MSWindowsClientTaskBarReceiver*
-  // and put it in the extra window data then forward the call.
-  MSWindowsClientTaskBarReceiver *self = NULL;
-  if (msg == WM_INITDIALOG) {
-    self = static_cast<MSWindowsClientTaskBarReceiver *>(reinterpret_cast<void *>(lParam));
-    SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)lParam);
-  } else {
-    // get the extra window data and forward the call
-    LONG_PTR data = GetWindowLongPtr(hwnd, GWLP_USERDATA);
-    if (data != 0) {
-      self = (MSWindowsClientTaskBarReceiver *)data;
-    }
-  }
-
-  // forward the message
-  if (self != NULL) {
-    return self->dlgProc(hwnd, msg, wParam, lParam);
-  } else {
-    return (msg == WM_INITDIALOG) ? TRUE : FALSE;
-  }
-}
-
-IArchTaskBarReceiver *createTaskBarReceiver(const BufferedLogOutputter *logBuffer, IEventQueue *events)
-{
-  ArchMiscWindows::setIcons(
-      (HICON)LoadImage(ArchMiscWindows::instanceWin32(), MAKEINTRESOURCE(IDI_DESKFLOW), IMAGE_ICON, 32, 32, LR_SHARED),
-      (HICON)LoadImage(ArchMiscWindows::instanceWin32(), MAKEINTRESOURCE(IDI_DESKFLOW), IMAGE_ICON, 16, 16, LR_SHARED)
-  );
-
-  return new MSWindowsClientTaskBarReceiver(MSWindowsScreen::getWindowInstance(), logBuffer, events);
-}

src/apps/deskflow-client/MSWindowsClientTaskBarReceiver.h

@@ -1,66 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2003 Chris Schoeneman
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "deskflow/ClientTaskBarReceiver.h"
-
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-
-class BufferedLogOutputter;
-class IEventQueue;
-
-//! Implementation of ClientTaskBarReceiver for Microsoft Windows
-class MSWindowsClientTaskBarReceiver : public ClientTaskBarReceiver
-{
-public:
-  MSWindowsClientTaskBarReceiver(HINSTANCE, const BufferedLogOutputter *, IEventQueue *events);
-  virtual ~MSWindowsClientTaskBarReceiver();
-
-  // IArchTaskBarReceiver overrides
-  void showStatus() override;
-  void runMenu(int x, int y) override;
-  void primaryAction() override;
-  Icon getIcon() const override;
-  void cleanup();
-
-protected:
-  void copyLog() const;
-
-  // ClientTaskBarReceiver overrides
-  virtual void onStatusChanged();
-
-private:
-  HICON loadIcon(UINT);
-  void deleteIcon(HICON);
-  void createWindow();
-  void destroyWindow();
-
-  BOOL dlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
-  static BOOL CALLBACK staticDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
-
-private:
-  HINSTANCE m_appInstance;
-  HWND m_window;
-  HMENU m_menu;
-  HICON m_icon[kMaxState];
-  const BufferedLogOutputter *m_logBuffer;
-
-  static const UINT s_stateToIconID[];
-};

src/apps/deskflow-client/OSXClientTaskBarReceiver.cpp

@@ -1,61 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2004 Chris Schoeneman
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "OSXClientTaskBarReceiver.h"
-#include "arch/Arch.h"
-
-//
-// OSXClientTaskBarReceiver
-//
-
-OSXClientTaskBarReceiver::OSXClientTaskBarReceiver(const BufferedLogOutputter *, IEventQueue *events)
-    : ClientTaskBarReceiver(events)
-{
-  // add ourself to the task bar
-  ARCH->addReceiver(this);
-}
-
-OSXClientTaskBarReceiver::~OSXClientTaskBarReceiver()
-{
-  ARCH->removeReceiver(this);
-}
-
-void OSXClientTaskBarReceiver::showStatus()
-{
-  // do nothing
-}
-
-void OSXClientTaskBarReceiver::runMenu(int, int)
-{
-  // do nothing
-}
-
-void OSXClientTaskBarReceiver::primaryAction()
-{
-  // do nothing
-}
-
-IArchTaskBarReceiver::Icon OSXClientTaskBarReceiver::getIcon() const
-{
-  return nullptr;
-}
-
-IArchTaskBarReceiver *createTaskBarReceiver(const BufferedLogOutputter *logBuffer, IEventQueue *events)
-{
-  return new OSXClientTaskBarReceiver(logBuffer, events);
-}

src/apps/deskflow-client/OSXClientTaskBarReceiver.h

@@ -1,38 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2004 Chris Schoeneman
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "deskflow/ClientTaskBarReceiver.h"
-
-class BufferedLogOutputter;
-class IEventQueue;
-
-//! Implementation of ClientTaskBarReceiver for OS X
-class OSXClientTaskBarReceiver : public ClientTaskBarReceiver
-{
-public:
-  OSXClientTaskBarReceiver(const BufferedLogOutputter *, IEventQueue *events);
-  virtual ~OSXClientTaskBarReceiver();
-
-  // IArchTaskBarReceiver overrides
-  void showStatus() override;
-  void runMenu(int x, int y) override;
-  void primaryAction() override;
-  Icon getIcon() const override;
-};

src/apps/deskflow-client/XWindowsClientTaskBarReceiver.cpp

@@ -1,61 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2003 Chris Schoeneman
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "XWindowsClientTaskBarReceiver.h"
-#include "arch/Arch.h"
-
-//
-// CXWindowsClientTaskBarReceiver
-//
-
-CXWindowsClientTaskBarReceiver::CXWindowsClientTaskBarReceiver(const BufferedLogOutputter *, IEventQueue *events)
-    : ClientTaskBarReceiver(events)
-{
-  // add ourself to the task bar
-  ARCH->addReceiver(this);
-}
-
-CXWindowsClientTaskBarReceiver::~CXWindowsClientTaskBarReceiver()
-{
-  ARCH->removeReceiver(this);
-}
-
-void CXWindowsClientTaskBarReceiver::showStatus()
-{
-  // do nothing
-}
-
-void CXWindowsClientTaskBarReceiver::runMenu(int, int)
-{
-  // do nothing
-}
-
-void CXWindowsClientTaskBarReceiver::primaryAction()
-{
-  // do nothing
-}
-
-IArchTaskBarReceiver::Icon CXWindowsClientTaskBarReceiver::getIcon() const
-{
-  return nullptr;
-}
-
-IArchTaskBarReceiver *createTaskBarReceiver(const BufferedLogOutputter *logBuffer, IEventQueue *events)
-{
-  return new CXWindowsClientTaskBarReceiver(logBuffer, events);
-}

src/apps/deskflow-client/XWindowsClientTaskBarReceiver.h

@@ -1,43 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2003 Chris Schoeneman
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "deskflow/ClientTaskBarReceiver.h"
-
-class BufferedLogOutputter;
-class IEventQueue;
-
-//! Implementation of ClientTaskBarReceiver for X Windows
-class CXWindowsClientTaskBarReceiver : public ClientTaskBarReceiver
-{
-public:
-  CXWindowsClientTaskBarReceiver(const BufferedLogOutputter *, IEventQueue *events);
-  CXWindowsClientTaskBarReceiver(const CXWindowsClientTaskBarReceiver &) = delete;
-  CXWindowsClientTaskBarReceiver(CXWindowsClientTaskBarReceiver &&) = delete;
-  virtual ~CXWindowsClientTaskBarReceiver();
-
-  CXWindowsClientTaskBarReceiver &operator=(const CXWindowsClientTaskBarReceiver &) = delete;
-  CXWindowsClientTaskBarReceiver &operator=(CXWindowsClientTaskBarReceiver &&) = delete;
-
-  // IArchTaskBarReceiver overrides
-  void showStatus() override;
-  void runMenu(int x, int y) override;
-  void primaryAction() override;
-  Icon getIcon() const override;
-};

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

@@ -1,53 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2002 Chris Schoeneman
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#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
-
-#if WINAPI_MSWINDOWS
-#include "MSWindowsClientTaskBarReceiver.h"
-#elif WINAPI_XWINDOWS
-#include "XWindowsClientTaskBarReceiver.h"
-#elif WINAPI_CARBON
-#include "OSXClientTaskBarReceiver.h"
-#else
-#error Platform not supported.
-#endif
-
-int main(int argc, char **argv)
-{
-#if SYSAPI_WIN32
-  // record window instance for tray icon, etc
-  ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
-#endif
-
-  Arch arch;
-  arch.init();
-
-  Log log;
-  EventQueue events;
-
-  ClientApp app(&events, createTaskBarReceiver);
-  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-client/deskflow-client.rc

@@ -1,141 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include <winresrc.h>
-#if !defined(IDC_STATIC)
-#define IDC_STATIC (-1)
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include <winresrc.h>\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_DESKFLOW             ICON    DISCARDABLE     "../res/deskflow.ico"
-IDI_TASKBAR_NOT_RUNNING ICON    DISCARDABLE     "../res/tb_idle.ico"
-IDI_TASKBAR_NOT_WORKING ICON    DISCARDABLE     "../res/tb_error.ico"
-IDI_TASKBAR_NOT_CONNECTED ICON    DISCARDABLE     "../res/deskflow.ico"
-IDI_TASKBAR_CONNECTED   ICON    DISCARDABLE     "../res/tb_run.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_TASKBAR_STATUS DIALOG DISCARDABLE  0, 0, 145, 18
-STYLE DS_MODALFRAME | WS_POPUP
-FONT 8, "MS Sans Serif"
-BEGIN
-    EDITTEXT        IDC_TASKBAR_STATUS_STATUS,3,3,139,12,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_TASKBAR MENU DISCARDABLE 
-BEGIN
-    POPUP "Deskflow"
-    BEGIN
-        MENUITEM "Show Status",                 IDC_TASKBAR_STATUS
-        MENUITEM "Show Log",                    IDC_TASKBAR_SHOW_LOG
-        MENUITEM "Copy Log To Clipboard",       IDC_TASKBAR_LOG
-        POPUP "Set Log Level"
-        BEGIN
-            MENUITEM "Error",                       IDC_TASKBAR_LOG_LEVEL_ERROR
-
-            MENUITEM "Warning",                     IDC_TASKBAR_LOG_LEVEL_WARNING
-
-            MENUITEM "Note",                        IDC_TASKBAR_LOG_LEVEL_NOTE
-
-            MENUITEM "Info",                        IDC_TASKBAR_LOG_LEVEL_INFO
-
-            MENUITEM "Debug",                       IDC_TASKBAR_LOG_LEVEL_DEBUG
-
-            MENUITEM "Debug1",                      IDC_TASKBAR_LOG_LEVEL_DEBUG1
-
-            MENUITEM "Debug2",                      IDC_TASKBAR_LOG_LEVEL_DEBUG2
-
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Quit",                        IDC_TASKBAR_QUIT
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_FAILED              "Deskflow is about to quit with errors or warnings.  Please check the log then click OK."
-    IDS_INIT_FAILED         "Deskflow failed to initialize: %{1}"
-    IDS_UNCAUGHT_EXCEPTION  "Uncaught exception: %{1}"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

src/apps/deskflow-client/resource.h

@@ -1,37 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by deskflowc.rc
-//
-#define IDS_FAILED 1
-#define IDS_INIT_FAILED 2
-#define IDS_UNCAUGHT_EXCEPTION 3
-#define IDI_DESKFLOW 101
-#define IDI_TASKBAR_NOT_RUNNING 102
-#define IDI_TASKBAR_NOT_WORKING 103
-#define IDI_TASKBAR_NOT_CONNECTED 104
-#define IDI_TASKBAR_CONNECTED 105
-#define IDR_TASKBAR 107
-#define IDD_TASKBAR_STATUS 108
-#define IDC_TASKBAR_STATUS_STATUS 1000
-#define IDC_TASKBAR_QUIT 40001
-#define IDC_TASKBAR_STATUS 40002
-#define IDC_TASKBAR_LOG 40003
-#define IDC_TASKBAR_SHOW_LOG 40004
-#define IDC_TASKBAR_LOG_LEVEL_ERROR 40009
-#define IDC_TASKBAR_LOG_LEVEL_WARNING 40010
-#define IDC_TASKBAR_LOG_LEVEL_NOTE 40011
-#define IDC_TASKBAR_LOG_LEVEL_INFO 40012
-#define IDC_TASKBAR_LOG_LEVEL_DEBUG 40013
-#define IDC_TASKBAR_LOG_LEVEL_DEBUG1 40014
-#define IDC_TASKBAR_LOG_LEVEL_DEBUG2 40015
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 109
-#define _APS_NEXT_COMMAND_VALUE 40016
-#define _APS_NEXT_CONTROL_VALUE 1001
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif

src/apps/deskflow-core/CMakeLists.txt

@@ -1,27 +1,27 @@
-# Deskflow -- mouse and keyboard sharing utility
+# SPDX-FileCopyrightText: (C) 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
-# Copyright (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
-# Copyright (C) 2012-2024 Symless Ltd.
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
-# Copyright (C) 2009-2012 Nick Bolton
+# SPDX-License-Identifier: MIT
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set(target deskflow-core)
+set(target ${CMAKE_PROJECT_NAME}-core)
+
+add_executable(${target}
+  "${target}.cpp"
+  CoreArgs.h
+  CoreArgParser.h
+  CoreArgParser.cpp
+)
 
-add_executable(${target} "${target}.cpp")
 if(WIN32)
+  # Generate rc file
+  set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} combined server and client application")
+  set(EXE_ICON "IDI_DESKFLOW ICON DISCARDABLE \"${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico\"")
+  configure_file(${CMAKE_SOURCE_DIR}/src/apps/res/windows.rc.in ${target}.rc)
+
   target_sources(${target} PRIVATE
-    "${target}.exe.manifest"
+    ${target}.exe.manifest
-    "${PROJECT_BINARY_DIR}/src/version.rc"
+    ${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico
+    ${CMAKE_CURRENT_BINARY_DIR}/${target}.rc
   )
 endif()
 
@@ -33,29 +33,32 @@ target_link_libraries(
   io
   mt
   net
-  ipc
   platform
   server
   app
   ${libs})
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+install(
-  set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:Deskflow>/MacOS)
+  TARGETS ${target}
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  RUNTIME_DEPENDENCY_SET coreDeps
-  install(TARGETS ${target} DESTINATION bin)
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+)
-  install(
+
-    TARGETS ${target}
+if(BUILD_OSX_BUNDLE)
-    RUNTIME_DEPENDENCY_SET coreDeps
+  set_target_properties(${target} PROPERTIES
-    DESTINATION .
+    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
   )
+  if (APPLE_CODESIGN_DEV)
+    configure_mac_codesign(${target})
+  endif()
+elseif (WIN32)
   install(RUNTIME_DEPENDENCY_SET coreDeps
-    PRE_EXCLUDE_REGEXES
+    PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
-      "api-ms-win-.*"
+    POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
-      "ext-ms-.*"
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
-      "^hvsifiletrust\\.dll$"
-    POST_EXCLUDE_REGEXES
-      ".*system32.*"
-    RUNTIME DESTINATION .
   )
+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

@@ -1,70 +1,98 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2022 Symless Ltd.
+ * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
- * Copyright (C) 2002 Chris Schoeneman
+ * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
- *
+ * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
- * This package is free software; you can redistribute it and/or
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+#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"
-#include <iostream>
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
 #include "arch/win32/ArchMiscWindows.h"
+#include <QCoreApplication>
 #endif
 
-void showHelp()
+#include <QFileInfo>
-{
+#include <QSharedMemory>
-  std::cout << "Usage: " CORE_BINARY_NAME " <server | client> [...options]" << std::endl;
+#include <QTextStream>
-  std::cout << "server - start as a server ( deskflow-server)" << std::endl;
-  std::cout << "client - start as a client ( deslflow-client)" << std::endl;
-  std::cout << "use deskflow-core <server|client> --help for more information." << std::endl;
-}
 
-bool isServer(int argc, char **argv)
+void showHelp(const CoreArgParser &parser)
 {
-  return (argc > 1 && argv[1] == std::string("server"));
+  QTextStream(stdout) << parser.helpText();
-}
-
-bool isClient(int argc, char **argv)
-{
-  return (argc > 1 && argv[1] == std::string("client"));
 }
 
 int main(int argc, char **argv)
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
-  ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
+  // 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;
-  EventQueue events;
 
-  if (isServer(argc, argv)) {
+  QStringList args;
-    ServerApp app(&events, nullptr);
+  for (int i = 0; i < argc; i++)
-    return app.run(argc, argv);
+    args.append(argv[i]);
-  } else if (isClient(argc, argv)) {
+
-    ClientApp app(&events, nullptr);
+  CoreArgParser parser(args);
-    return app.run(argc, argv);
+
-  } else {
+  // Print any parser errors
-    showHelp();
+  if (!parser.errorText().isEmpty()) {
+    QTextStream(stdout) << parser.errorText() << "\n";
   }
 
-  return 0;
+  if (parser.help()) {
+    showHelp(parser);
+    return s_exitSuccess;
+  }
+
+  if (parser.version()) {
+    QTextStream(stdout) << parser.versionText();
+    return s_exitSuccess;
+  }
+
+  // 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 (parser.serverMode()) {
+    ServerApp app(&events, processName);
+    return app.run();
+  } else if (parser.clientMode()) {
+    ClientApp app(&events, processName);
+    return app.run();
+  }
+
+  return s_exitSuccess;
 }

src/apps/deskflow-daemon/CMakeLists.txt

@@ -1,52 +1,45 @@
-# Deskflow -- mouse and keyboard sharing utility
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
-# Copyright (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
-# Copyright (C) 2012-2024 Symless Ltd.
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
-# Copyright (C) 2009-2012 Nick Bolton
+# SPDX-License-Identifier: MIT
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Daemon is only needed on Windows for elevating processes to deal with UAC.
 if(WIN32)
-  set(target deskflow-daemon)
+  set(target ${CMAKE_PROJECT_NAME}-daemon)
-  add_executable(${target} WIN32
+
-    deskflow-daemon.cpp
+  # Generate rc file
-    "${PROJECT_BINARY_DIR}/src/version.rc"
+  set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} Daemon for handling secure desktops (UAC prompts, login screen, etc)")
-  )
+  set(EXE_ICON "IDI_DESKFLOW ICON DISCARDABLE \"${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico\"")
+  configure_file(${CMAKE_SOURCE_DIR}/src/apps/res/windows.rc.in ${target}.rc)
+
+  add_executable(
+    ${target} WIN32
+    ${target}.cpp
+    DaemonApp.cpp
+    DaemonApp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/${target}.rc)
 
   target_link_libraries(
     ${target}
     arch
     base
     io
-    ipc
     mt
     net
     platform
     app
-    ${libs})
+    common
+    ${libs}
+    Qt6::Core)
 
   install(
     TARGETS ${target}
-    RUNTIME_DEPENDENCY_SET deamonDeps
+    RUNTIME_DEPENDENCY_SET daemonDeps
-    DESTINATION .
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   )
   install(RUNTIME_DEPENDENCY_SET daemonDeps
-    PRE_EXCLUDE_REGEXES
+    PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
-      "api-ms-win-.*"
+    POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
-      "ext-ms-.*"
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
-      "^hvsifiletrust\\.dll$"
-    POST_EXCLUDE_REGEXES
-      ".*system32.*"
-    RUNTIME DESTINATION .
   )
 endif()

src/apps/deskflow-daemon/DaemonApp.cpp

@@ -0,0 +1,246 @@
+/*
+ * 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 "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/ipc/DaemonIpcServer.h"
+
+#if defined(Q_OS_WIN)
+#include "arch/win32/ArchDaemonWindows.h"
+#include "deskflow/Screen.h"
+#include "platform/MSWindowsDebugOutputter.h"
+#include "platform/MSWindowsEventQueueBuffer.h"
+#include "platform/MSWindowsWatchdog.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+#endif
+
+#include <string>
+
+using namespace deskflow::core;
+
+DaemonApp::DaemonApp(IEventQueue &events) : m_events(events)
+{
+  // do nothing
+}
+
+DaemonApp::~DaemonApp() = default;
+
+void DaemonApp::saveLogLevel(const QString &logLevel) const
+{
+  LOG_DEBUG("log level changed: %s", logLevel.toUtf8().constData());
+  CLOG->setFilter(logLevel.toUtf8().constData());
+  Settings::setValue(Settings::Daemon::LogLevel, logLevel);
+}
+
+void DaemonApp::setElevate(bool elevate)
+{
+  LOG_DEBUG("elevate value changed: %s", elevate ? "yes" : "no");
+  m_elevate = elevate;
+  Settings::setValue(Settings::Daemon::Elevate, m_elevate);
+}
+
+void DaemonApp::setCommand(const QString &command)
+{
+  LOG_DEBUG("service command updated");
+  Settings::setValue(Settings::Daemon::Command, command);
+  m_command = command.toStdString();
+}
+
+void DaemonApp::applyWatchdogCommand() const
+{
+  LOG_DEBUG("applying watchdog command");
+
+#if defined(Q_OS_WIN)
+  m_pWatchdog->setProcessConfig(m_command, m_elevate);
+#else
+  LOG_ERR("applying watchdog command not implemented on this platform");
+#endif
+}
+
+void DaemonApp::clearWatchdogCommand()
+{
+  LOG_DEBUG("clearing watchdog command");
+
+  // Clear the setting to prevent it from being next time the daemon starts.
+  setCommand("");
+
+#if defined(Q_OS_WIN)
+  m_pWatchdog->setProcessConfig("", false);
+#else
+  LOG_ERR("clearing watchdog command not implemented on this platform");
+#endif
+}
+
+void DaemonApp::clearSettings() const
+{
+  LOG_INFO("clearing daemon settings");
+  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.
+  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
+  );
+  connect(
+      ipcServer, &ipc::DaemonIpcServer::stopProcessRequested, this, &DaemonApp::clearWatchdogCommand,
+      Qt::DirectConnection
+  );
+  connect(
+      ipcServer, &ipc::DaemonIpcServer::clearSettingsRequested, this, &DaemonApp::clearSettings, Qt::DirectConnection
+  );
+}
+
+void DaemonApp::run(QThread &daemonThread)
+{
+  LOG_NOTE("starting daemon");
+
+  // Important: Move the daemon app to the daemon thread before creating any more Qt objects
+  // owned by the daemon app, as they will be created on the daemon thread.
+  moveToThread(&daemonThread);
+
+  connect(&daemonThread, &QThread::started, this, [this, &daemonThread]() {
+    LOG_DEBUG("daemon thread started");
+
+    if (m_foreground) {
+      LOG_DEBUG("running daemon in foreground");
+      mainLoop();
+    } else {
+      LOG_DEBUG("running daemon in background (daemonizing)");
+      ARCH->daemonize([this] { return daemonLoop(); });
+    }
+
+    daemonThread.quit();
+    LOG_DEBUG("daemon thread finished");
+  });
+
+#if defined(Q_OS_WIN)
+  m_pWatchdog = std::make_unique<MSWindowsWatchdog>(m_foreground, *m_pFileLogOutputter);
+
+  auto command = Settings::value(Settings::Daemon::Command).toString().toStdString();
+  bool elevate = Settings::value(Settings::Daemon::Elevate).toBool();
+  if (!command.empty()) {
+    LOG_DEBUG("using last known command: %s", command.c_str());
+    m_pWatchdog->setProcessConfig(command, elevate);
+  }
+#endif
+
+  LOG_DEBUG("starting daemon thread");
+  daemonThread.start();
+}
+
+int DaemonApp::daemonLoop()
+{
+#if defined(Q_OS_WIN)
+  // Runs the daemon through the Windows service controller, which controls the program lifecycle.
+  return ArchDaemonWindows::runDaemon([this]() { return mainLoop(); });
+#else
+  return mainLoop();
+#endif
+}
+
+int DaemonApp::mainLoop()
+{
+#if defined(Q_OS_WIN)
+  if (m_pWatchdog == nullptr) {
+    LOG_ERR("watchdog not initialized");
+    return s_exitFailed;
+  }
+  ArchDaemonWindows::daemonRunning(true);
+#endif
+
+  try {
+#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.
+    m_events.adoptBuffer(new MSWindowsEventQueueBuffer(&m_events));
+
+    LOG_DEBUG("starting watchdog threads");
+    m_pWatchdog->startAsync();
+#endif
+
+    LOG_INFO("daemon is running");
+    m_events.loop();
+  } catch (std::exception &e) { // NOSONAR - Catching all exceptions
+    LOG_CRIT("daemon error: %s", e.what());
+  } catch (...) { // NOSONAR - Catching remaining exceptions
+    LOG_CRIT("daemon unknown error");
+  }
+
+  LOG_INFO("daemon is stopping");
+
+#if defined(Q_OS_WIN)
+  try {
+    LOG_DEBUG("stopping process watchdog");
+    m_pWatchdog->stop();
+  } catch (std::exception &e) { // NOSONAR - Catching all exceptions
+    LOG_CRIT("daemon stop watchdog error: %s", e.what());
+  } catch (...) { // NOSONAR - Catching remaining exceptions
+    LOG_CRIT("daemon stop watchdog unknown error");
+  }
+  ArchDaemonWindows::daemonRunning(false);
+#endif
+
+  return s_exitSuccess;
+}
+
+QString DaemonApp::logFilename()
+{
+  return Settings::value(Settings::Daemon::LogFile).toString();
+}
+
+void DaemonApp::setForeground()
+{
+  m_foreground = true;
+  showConsole();
+}
+
+void DaemonApp::initLogging()
+{
+#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.
+    CLOG->insert(new MSWindowsDebugOutputter()); // NOSONAR - Adopted by `Log`
+  }
+#endif
+
+  m_pFileLogOutputter = new FileLogOutputter(qPrintable(logFilename())); // NOSONAR - Adopted by `Log`
+  CLOG->insert(m_pFileLogOutputter);
+}
+
+void DaemonApp::showConsole()
+{
+#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
+  // of log output generated by handling other args.
+  AllocConsole();
+  freopen("CONOUT$", "w", stdout);
+  freopen("CONOUT$", "w", stderr);
+#endif
+}

src/apps/deskflow-daemon/DaemonApp.h

@@ -0,0 +1,69 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2012 - 2025 Symless Ltd.
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#pragma once
+
+#include <string>
+
+#include <QObject>
+#include <QThread>
+
+class Event;
+class IEventQueue;
+class FileLogOutputter;
+class QLocalServer;
+class QCoreApplication;
+
+namespace deskflow::core::ipc {
+class DaemonIpcServer;
+}
+
+#if defined(Q_OS_WIN)
+class MSWindowsWatchdog;
+#endif
+
+extern const char *const kLogFilename;
+
+class DaemonApp : public QObject
+{
+  Q_OBJECT
+
+public:
+  explicit DaemonApp(IEventQueue &events);
+  ~DaemonApp() override;
+
+  void run(QThread &daemonThread);
+  void setForeground();
+  void initLogging();
+  void connectIpcServer(const deskflow::core::ipc::DaemonIpcServer *ipcServer) const;
+
+  static QString logFilename();
+
+private:
+  void daemonize();
+  void handleError(const char *message);
+  int mainLoop();
+  int daemonLoop();
+  void saveLogLevel(const QString &logLevel) const;
+  void setElevate(bool elevate);
+  void setCommand(const QString &command);
+  void applyWatchdogCommand() const;
+  void clearWatchdogCommand();
+  void clearSettings() const;
+
+  static void showConsole();
+
+#if defined(Q_OS_WIN)
+  std::unique_ptr<MSWindowsWatchdog> m_pWatchdog;
+#endif
+
+  IEventQueue &m_events;
+  FileLogOutputter *m_pFileLogOutputter = nullptr;
+  deskflow::core::ipc::DaemonIpcServer *m_ipcServer = nullptr;
+  std::string m_command = "";
+  bool m_elevate = false;
+  bool m_foreground = false;
+};

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

@@ -1,42 +1,135 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
+ * SPDX-FileCopyrightText: (C) 2012 - 2016, 2025 Symless Ltd.
- * Copyright (C) 2012 Nick Bolton
+ * SPDX-FileCopyrightText: (C) 2012 Nick Bolton
- *
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "deskflow/DaemonApp.h"
+#include "DaemonApp.h"
 
-#include <iostream>
+#include "arch/Arch.h"
+#include "base/EventQueue.h"
+#include "base/Log.h"
+#include "common/ExitCodes.h"
+#include "common/Settings.h"
+#include "common/VersionInfo.h"
+#include "deskflow/ipc/DaemonIpcServer.h"
 
-#ifdef SYSAPI_UNIX
+#if defined(Q_OS_WIN)
-
+#include "arch/win32/ArchMiscWindows.h"
-int main(int argc, char **argv)
-{
-  DaemonApp app;
-  return app.run(argc, argv);
-}
-
-#elif SYSAPI_WIN32
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
+#endif
 
+#include <QCommandLineParser>
+#include <QCoreApplication>
+#include <QThread>
+
+using namespace deskflow::core;
+
+void handleError(const char *message = "Unrecognized error.");
+
+int main(int argc, char **argv)
+{
+#if defined(Q_OS_WIN)
+  ArchMiscWindows::guardRuntimeVersion();
+
+  // Save window instance for later use, e.g. `GetModuleFileName` which is used when installing the daemon.
+  ArchMiscWindows::setInstanceWin32(GetModuleHandle(nullptr));
+#endif
+
+  Arch arch;
+  arch.init();
+
+  Log log;
+  EventQueue events;
+
+  // Daemon deliberately does not have a parent, as it will be moved to a new thread.
+  DaemonApp daemon(events);
+
+  QCoreApplication app(argc, argv);
+  QCoreApplication::setApplicationName(QStringLiteral("%1 Daemon").arg(kAppName));
+
+  QCommandLineParser parser;
+  parser.addHelpOption();
+  parser.addVersionOption();
+
+  const auto foregroundOption = QCommandLineOption({"f", "foreground"}, "Run in the foreground (show console)");
+  parser.addOption(foregroundOption);
+
+  parser.process(app);
+
+  if (parser.isSet(foregroundOption)) {
+    daemon.setForeground();
+  }
+
+  // Depends on whether foreground option was set.
+  daemon.initLogging();
+
+  // Important: Log the app name and version number to the log file daemon app has initialized
+  // logging as it creates the file logger. Logging before would only log to stdout which is not
+  // useful for troubleshooting Windows services.
+  // It's important to write the version number to the log file so we can be certain the old daemon
+  // was uninstalled, since sometimes Windows services can get stuck and fail to be removed.
+  LOG_PRINT("%s 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.empty()) {
+    CLOG->setFilter(logLevel.c_str());
+    LOG_DEBUG("log level: %s", logLevel.c_str());
+  }
+
+  try {
+
+#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
+
+    const auto ipcServer = new ipc::DaemonIpcServer(&app, qPrintable(DaemonApp::logFilename())); // NOSONAR - Qt managed
+    ipcServer->listen();
+    daemon.connectIpcServer(ipcServer);
+
+    QThread daemonThread;
+    QObject::connect(&daemonThread, &QThread::finished, &app, &QCoreApplication::quit);
+    daemon.run(daemonThread);
+
+    const auto exitCode = QCoreApplication::exec();
+    daemonThread.wait();
+
+    LOG_DEBUG("daemon exited, code: %d", exitCode);
+    return exitCode;
+
+  } catch (std::exception &e) {
+    handleError(e.what());
+    return s_exitFailed;
+  } catch (...) {
+    handleError();
+    return s_exitFailed;
+  }
+}
+
+#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)
 {
-  DaemonApp app;
+  return main(__argc, __argv);
-  return app.run(__argc, __argv);
 }
 
 #endif
+
+void handleError(const char *message)
+{
+  // Always print error to stdout in case run as CLI program.
+  LOG_ERR("%s", message);
+
+#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/Action.cpp

@@ -1,139 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "Action.h"
-
-#include <QSettings>
-#include <QTextStream>
-
-const char *Action::m_ActionTypeNames[] = {
-    "keyDown",       "keyUp",     "keystroke", "switchToScreen", "switchInDirection", "lockCursorToScreen",
-    "restartServer", "mouseDown", "mouseUp",   "mousebutton"
-};
-
-const char *Action::m_SwitchDirectionNames[] = {"left", "right", "up", "down"};
-const char *Action::m_LockCursorModeNames[] = {"toggle", "on", "off"};
-
-QString Action::text() const
-{
-  QString text = QString(m_ActionTypeNames[keySequence().isMouseButton() ? type() + 6 : type()]) + "(";
-
-  switch (type()) {
-  case keyDown:
-  case keyUp:
-  case keystroke: {
-    text += keySequence().toString();
-
-    if (!keySequence().isMouseButton()) {
-      const QStringList &screens = typeScreenNames();
-      if (haveScreens() && !screens.isEmpty()) {
-        text += ",";
-
-        for (int i = 0; i < screens.size(); i++) {
-          text += screens[i];
-          if (i != screens.size() - 1)
-            text += ":";
-        }
-      } else
-        text += ",*";
-    }
-  } break;
-
-  case switchToScreen:
-    text += switchScreenName();
-    break;
-
-  case switchInDirection:
-    text += m_SwitchDirectionNames[m_SwitchDirection];
-    break;
-
-  case lockCursorToScreen:
-    text += m_LockCursorModeNames[m_LockCursorMode];
-    break;
-
-  case restartAllConnections:
-    text += "restart";
-    break;
-  default:
-    Q_ASSERT(0);
-    break;
-  }
-
-  text += ")";
-
-  return text;
-}
-
-void Action::loadSettings(QSettings &settings)
-{
-  keySequence().loadSettings(settings);
-  setType(settings.value("type", keyDown).toInt());
-
-  typeScreenNames().clear();
-  int numTypeScreens = settings.beginReadArray("typeScreenNames");
-  for (int i = 0; i < numTypeScreens; i++) {
-    settings.setArrayIndex(i);
-    typeScreenNames().append(settings.value("typeScreenName").toString());
-  }
-  settings.endArray();
-
-  setSwitchScreenName(settings.value("switchScreenName").toString());
-  setSwitchDirection(settings.value("switchInDirection", switchLeft).toInt());
-  setLockCursorMode(settings.value("lockCursorToScreen", lockCursorToggle).toInt());
-  setActiveOnRelease(settings.value("activeOnRelease", false).toBool());
-  setHaveScreens(settings.value("hasScreens", false).toBool());
-  setRestartServer(settings.value("restartServer", false).toBool());
-}
-
-void Action::saveSettings(QSettings &settings) const
-{
-  keySequence().saveSettings(settings);
-  settings.setValue("type", type());
-
-  settings.beginWriteArray("typeScreenNames");
-  for (int i = 0; i < typeScreenNames().size(); i++) {
-    settings.setArrayIndex(i);
-    settings.setValue("typeScreenName", typeScreenNames()[i]);
-  }
-  settings.endArray();
-
-  settings.setValue("switchScreenName", switchScreenName());
-  settings.setValue("switchInDirection", switchDirection());
-  settings.setValue("lockCursorToScreen", lockCursorMode());
-  settings.setValue("activeOnRelease", activeOnRelease());
-  settings.setValue("hasScreens", haveScreens());
-  settings.setValue("restartServer", restartServer());
-}
-
-bool Action::operator==(const Action &a) const
-{
-  return m_KeySequence == a.m_KeySequence && m_Type == a.m_Type && m_TypeScreenNames == a.m_TypeScreenNames &&
-         m_SwitchScreenName == a.m_SwitchScreenName && m_SwitchDirection == a.m_SwitchDirection &&
-         m_LockCursorMode == a.m_LockCursorMode && m_ActiveOnRelease == a.m_ActiveOnRelease &&
-         m_HasScreens == a.m_HasScreens && m_restartServer == a.m_restartServer;
-}
-
-QTextStream &operator<<(QTextStream &outStream, const Action &action)
-{
-  if (action.activeOnRelease())
-    outStream << ";";
-
-  outStream << action.text();
-
-  return outStream;
-}

src/apps/deskflow-gui/Action.h

@@ -1,170 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "KeySequence.h"
-
-#include <QList>
-#include <QString>
-#include <QStringList>
-
-class ActionDialog;
-class QSettings;
-class QTextStream;
-
-class Action
-{
-  friend class ActionDialog;
-  friend QTextStream &operator<<(QTextStream &outStream, const Action &action);
-
-public:
-  enum ActionType
-  {
-    keyDown,
-    keyUp,
-    keystroke,
-    switchToScreen,
-    switchInDirection,
-    lockCursorToScreen,
-    restartAllConnections,
-    mouseDown,
-    mouseUp,
-    mousebutton,
-  };
-  enum SwitchDirection
-  {
-    switchLeft,
-    switchRight,
-    switchUp,
-    switchDown
-  };
-  enum LockCursorMode
-  {
-    lockCursorToggle,
-    lockCursonOn,
-    lockCursorOff
-  };
-
-public:
-  Action() = default;
-
-public:
-  QString text() const;
-  const KeySequence &keySequence() const
-  {
-    return m_KeySequence;
-  }
-  void loadSettings(QSettings &settings);
-  void saveSettings(QSettings &settings) const;
-  int type() const
-  {
-    return m_Type;
-  }
-  const QStringList &typeScreenNames() const
-  {
-    return m_TypeScreenNames;
-  }
-  const QString &switchScreenName() const
-  {
-    return m_SwitchScreenName;
-  }
-  int switchDirection() const
-  {
-    return m_SwitchDirection;
-  }
-  int lockCursorMode() const
-  {
-    return m_LockCursorMode;
-  }
-  bool activeOnRelease() const
-  {
-    return m_ActiveOnRelease;
-  }
-  bool haveScreens() const
-  {
-    return m_HasScreens;
-  }
-  bool restartServer() const
-  {
-    return m_restartServer;
-  }
-
-  bool operator==(const Action &a) const;
-
-protected:
-  KeySequence &keySequence()
-  {
-    return m_KeySequence;
-  }
-  void setKeySequence(const KeySequence &seq)
-  {
-    m_KeySequence = seq;
-  }
-  void setType(int t)
-  {
-    m_Type = t;
-  }
-  QStringList &typeScreenNames()
-  {
-    return m_TypeScreenNames;
-  }
-  void setSwitchScreenName(const QString &n)
-  {
-    m_SwitchScreenName = n;
-  }
-  void setSwitchDirection(int d)
-  {
-    m_SwitchDirection = d;
-  }
-  void setLockCursorMode(int m)
-  {
-    m_LockCursorMode = m;
-  }
-  void setActiveOnRelease(bool b)
-  {
-    m_ActiveOnRelease = b;
-  }
-  void setHaveScreens(bool b)
-  {
-    m_HasScreens = b;
-  }
-  void setRestartServer(bool b)
-  {
-    m_restartServer = b;
-  }
-
-private:
-  KeySequence m_KeySequence;
-  int m_Type = keystroke;
-  QStringList m_TypeScreenNames = QStringList();
-  QString m_SwitchScreenName = QString();
-  int m_SwitchDirection = switchLeft;
-  int m_LockCursorMode = lockCursorToggle;
-  bool m_ActiveOnRelease = false;
-  bool m_HasScreens = false;
-  bool m_restartServer;
-
-  static const char *m_ActionTypeNames[];
-  static const char *m_SwitchDirectionNames[];
-  static const char *m_LockCursorModeNames[];
-};
-
-using ActionList = QList<Action>;
-
-QTextStream &operator<<(QTextStream &outStream, const Action &action);

src/apps/deskflow-gui/AppDelegate.h

@@ -1,20 +0,0 @@
-#pragma once
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#import <Cocoa/Cocoa.h>
-#if OSX_DEPLOYMENT_TARGET >= 1014
-#import <UserNotifications/UNUserNotificationCenter.h>
-  @interface AppDelegate
-      : NSObject <NSApplicationDelegate, NSUserNotificationCenterDelegate, UNUserNotificationCenterDelegate>
-#else
-@interface AppDelegate : NSObject <NSApplicationDelegate, NSUserNotificationCenterDelegate>
-#endif
-
-  @end
-
-#ifdef __cplusplus
-}
-#endif

src/apps/deskflow-gui/AppDelegate.mm

@@ -1,38 +0,0 @@
-#import "AppDelegate.h"
-
-@interface AppDelegate ()
-
-@property(strong) IBOutlet NSWindow *window;
-@end
-
-@implementation AppDelegate {
-}
-
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
-{
-  [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:self];
-#if OSX_DEPLOYMENT_TARGET >= 1014
-  [[UNUserNotificationCenter currentNotificationCenter] setDelegate:self];
-#endif
-}
-
-- (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center
-     shouldPresentNotification:(NSUserNotification *)notification
-{
-  return YES;
-}
-
-#if OSX_DEPLOYMENT_TARGET >= 1014
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center
-       willPresentNotification:(UNNotification *)notification
-         withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler
-{
-  UNNotificationPresentationOptions presentationOptions = UNNotificationPresentationOptionSound |
-                                                          UNNotificationPresentationOptionAlert |
-                                                          UNNotificationPresentationOptionBadge;
-
-  completionHandler(presentationOptions);
-}
-#endif
-
-@end

src/apps/deskflow-gui/CMakeLists.txt

@@ -1,17 +1,6 @@
-# Deskflow -- mouse and keyboard sharing utility
+# SPDX-FileCopyrightText: (C) 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
-# Copyright (C) 2024 Symless Ltd.
+# SPDX-FileCopyrightText: (C) 2024 Symless Ltd
-#
+# SPDX-License-Identifier: MIT
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 if(APPLE)
   set(target Deskflow)
@@ -19,92 +8,99 @@ else()
   set(target deskflow)
 endif()
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-file(
-  GLOB
-  sources
-  ../res/deskflow.qrc
-  *.cpp
-  *.h
-  dialogs/*.h
-  dialogs/*.cpp
-  validators/*
-  widgets/*)
-file(GLOB ui_files *.ui dialogs/*.ui)
-
 if(WIN32)
-  set(platform_extra deskflow.rc ${PROJECT_BINARY_DIR}/src/version.rc)
+  set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} GUI configuration tool")
-elseif(APPLE)
+  set(EXE_ICON "IDI_ICON1 ICON DISCARDABLE \"${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico\" ")
-  set(platform_extra Deskflow.icns ${PROJECT_SOURCE_DIR}/LICENSE ${PROJECT_SOURCE_DIR}/LICENSE_EXCEPTION)
+  configure_file(${CMAKE_SOURCE_DIR}/src/apps/res/windows.rc.in deskflow.rc)
+  set(platform_extra deskflow.rc)
+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 "${CMAKE_PROJECT_REV_FQDN}")
+  set(BUNDLE_ICON_FILE ${target}.icns)
+  set(BUNDLE_INFO_STRING "${CMAKE_PROJECT_DESCRIPTION}")
+  set(BUNDLE_COPYRIGHT "${CMAKE_PROJECT_COPYRIGHT}")
+
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/../res/deskflow.plist.in
+    ${CMAKE_CURRENT_BINARY_DIR}/deskflow.plist
+    @ONLY
+  )
+
+  set(platform_extra ../res/Deskflow.icns)
   set_source_files_properties(${platform_extra} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 endif()
 
-# gui library autogen headers:
+add_executable(${target} WIN32 MACOSX_BUNDLE
-# qt doesn't seem to auto include the autogen headers for libraries.
+  ${platform_extra}
-include_directories(${PROJECT_BINARY_DIR}/src/lib/gui/gui_autogen/include)
+  ../res/deskflow.qrc
-
+  deskflow-gui.cpp
-# generated includes
+)
-include_directories(${PROJECT_BINARY_DIR}/config)
-
-add_executable(${target} WIN32 MACOSX_BUNDLE ${sources} ${ui_files} ${platform_extra})
 
 target_link_libraries(
   ${target}
-  ${DESKFLOW_GUI_HOOK_LIB}
   gui
+  common
   Qt6::Core
   Qt6::Widgets
   Qt6::Network)
 
+install(
+  TARGETS ${target}
+  RUNTIME_DEPENDENCY_SET guiDeps
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  BUNDLE DESTINATION .
+)
+
 if(WIN32)
   set_target_properties(${target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
-  install(
+
-    TARGETS ${target}
-    RUNTIME_DEPENDENCY_SET guiDeps
-    DESTINATION .
-  )
   install(RUNTIME_DEPENDENCY_SET guiDeps
-    PRE_EXCLUDE_REGEXES
+    PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
-      "api-ms-win-.*"
+    POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
-      "ext-ms-.*"
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
-      "^hvsifiletrust\\.dll$"
-    POST_EXCLUDE_REGEXES
-      ".*system32.*"
-    RUNTIME DESTINATION .
   )
-  find_program(DEPLOYQT windeployqt6)
+
+  set(QT_DEPENDS_DIR ${CMAKE_BINARY_DIR}/qt-depends)
+
   add_custom_command(
     TARGET ${target} POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/qtDeploy
+    COMMAND ${DEPLOYQT}
-      COMMAND ${DEPLOYQT} --no-compiler-runtime --no-system-d3d-compiler --no-quick-import -network --dir ${CMAKE_BINARY_DIR}/qtDeploy $<TARGET_FILE:${target}>
+      --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 ${CMAKE_BINARY_DIR}/qtDeploy/
+    DIRECTORY ${QT_DEPENDS_DIR}/
-    DESTINATION .
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    FILES_MATCHING PATTERN "*.*"
+    PATTERN "dx*.dll" EXCLUDE
+    PATTERN "icu*.dll" EXCLUDE
   )
+
 elseif(APPLE)
-  set_target_properties(${target} PROPERTIES
+  if (BUILD_OSX_BUNDLE)
-    MACOSX_BUNDLE_BUNDLE_NAME "Deskflow"
+    set_target_properties(${target} PROPERTIES
-    MACOSX_BUNDLE_DISPLAY_NAME "Deskflow"
+      INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
-    MACOSX_BUNDLE_GUI_IDENTIFIER "org.deskflow.deskflow"
+      MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/deskflow.plist"
-    MACOSX_BUNDLE_ICON_FILE Deskflow.icns
+    )
-    MACOSX_BUNDLE_INFO_STRING "${CMAKE_PROJECT_DESCRIPTION}"
+    if (APPLE_CODESIGN_DEV)
-    MACOSX_BUNDLE_COPYRIGHT "© 2024 Deskflow Developers"
+      configure_mac_codesign(${target})
-    MACOSX_BUNDLE_BUNDLE_VERSION ${CMAKE_PROJECT_VERSION}
+    endif()
-    MACOSX_BUNDLE_LONG_VERSION_STRING ${CMAKE_PROJECT_VERSION}
+  else()
-    MACOSX_BUNDLE_SHORT_VERSION_STRING ${CMAKE_PROJECT_VERSION}
+    set_target_properties(${target} PROPERTIES MACOSX_BUNDLE FALSE)
-  )
+  endif()
-  find_program(MACDEPLOYQT_BIN macdeployqt6)
-  add_custom_command(
-    TARGET ${target} POST_BUILD
-    COMMAND ${MACDEPLOYQT_BIN} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target}.app"
-  )
-  install(TARGETS ${target} BUNDLE DESTINATION .)
 else()
-  install(TARGETS ${target} DESTINATION bin)
+  generate_app_man(${target} "${CMAKE_PROJECT_DESCRIPTION} \\(GUI\\)")
 endif()

src/apps/deskflow-gui/DataDownloader.cpp

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