mirror of
https://github.com/feschber/lan-mouse.git
synced 2026-03-26 22:50:56 +03:00
Compare commits
2 Commits
config-wat
...
b391efa631
| Author | SHA1 | Date | |
|---|---|---|---|
|
b391efa631 | ||
|
|
c2b68376d3 |
@@ -1,24 +0,0 @@
|
||||
root = true
|
||||
|
||||
[*]
|
||||
end_of_line = lf
|
||||
insert_final_newline = true
|
||||
trim_trailing_whitespace = true
|
||||
charset = utf-8
|
||||
|
||||
[*.rs]
|
||||
indent_style = space
|
||||
indent_size = 4
|
||||
max_line_length = 100
|
||||
|
||||
[*.{yml,yaml}]
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
|
||||
[*.toml]
|
||||
indent_style = space
|
||||
indent_size = 4
|
||||
|
||||
[*.nix]
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
@@ -1,34 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
# Ensure we're at the repo root
|
||||
cd "$(git rev-parse --show-toplevel)" || exit 1
|
||||
|
||||
echo "Running cargo fmt (auto-format)..."
|
||||
# Run formatter to apply fixes but do not stage them. If formatting changed,
|
||||
# fail the commit so the user can review and stage the changes manually.
|
||||
cargo fmt --all
|
||||
if ! git diff --quiet --exit-code; then
|
||||
echo "" >&2
|
||||
echo "ERROR: cargo fmt modified files. Review changes, stage them, and commit again." >&2
|
||||
git --no-pager diff --name-only
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Running cargo clippy..."
|
||||
# Matches CI: deny warnings to keep code health strict
|
||||
if ! cargo clippy --workspace --all-targets --all-features -- -D warnings; then
|
||||
echo "" >&2
|
||||
echo "ERROR: clippy found warnings/errors. Fix them before committing." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Running cargo test..."
|
||||
if ! cargo test --workspace --all-features; then
|
||||
echo "" >&2
|
||||
echo "ERROR: Some tests failed. Fix tests before committing." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "All pre-commit checks passed."
|
||||
exit 0
|
||||
68
.github/workflows/cachix.yml
vendored
68
.github/workflows/cachix.yml
vendored
@@ -1,50 +1,40 @@
|
||||
name: Nix Binary Cache
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: ["main"]
|
||||
pull_request:
|
||||
branches: ["main"]
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
cancel-in-progress: true
|
||||
name: Binary Cache
|
||||
|
||||
on: [push, pull_request, workflow_dispatch]
|
||||
jobs:
|
||||
nix:
|
||||
strategy:
|
||||
matrix:
|
||||
os:
|
||||
- ubuntu-latest
|
||||
- macos-15-intel
|
||||
- macos-latest
|
||||
os:
|
||||
- ubuntu-latest
|
||||
- macos-15-intel
|
||||
- macos-14
|
||||
name: "Build"
|
||||
runs-on: ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
submodules: recursive
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
# - uses: DeterminateSystems/nix-installer-action@main
|
||||
# with:
|
||||
# logger: pretty
|
||||
# - uses: DeterminateSystems/magic-nix-cache-action@main
|
||||
- uses: cachix/install-nix-action@v31
|
||||
- uses: cachix/cachix-action@v16
|
||||
with:
|
||||
name: lan-mouse
|
||||
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
|
||||
- uses: DeterminateSystems/nix-installer-action@main
|
||||
with:
|
||||
logger: pretty
|
||||
- uses: DeterminateSystems/magic-nix-cache-action@main
|
||||
- uses: cachix/cachix-action@v14
|
||||
with:
|
||||
name: lan-mouse
|
||||
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
||||
|
||||
- name: Build lan-mouse (x86_64-linux)
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
run: nix build --print-build-logs --show-trace .#packages.x86_64-linux.lan-mouse
|
||||
- name: Build lan-mouse (x86_64-linux)
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
run: nix build --print-build-logs --show-trace .#packages.x86_64-linux.lan-mouse
|
||||
|
||||
- name: Build lan-mouse (x86_64-darwin)
|
||||
if: matrix.os == 'macos-15-intel'
|
||||
run: nix build --print-build-logs --show-trace .#packages.x86_64-darwin.lan-mouse
|
||||
- name: Build lan-mouse (x86_64-darwin)
|
||||
if: matrix.os == 'macos-15-intel'
|
||||
run: nix build --print-build-logs --show-trace .#packages.x86_64-darwin.lan-mouse
|
||||
|
||||
- name: Build lan-mouse (aarch64-darwin)
|
||||
if: matrix.os == 'macos-14'
|
||||
run: nix build --print-build-logs --show-trace .#packages.aarch64-darwin.lan-mouse
|
||||
|
||||
- name: Build lan-mouse (aarch64-darwin)
|
||||
if: matrix.os == 'macos-latest'
|
||||
run: nix build --print-build-logs --show-trace .#packages.aarch64-darwin.lan-mouse
|
||||
|
||||
@@ -1,17 +1,10 @@
|
||||
name: "Release"
|
||||
run-name: "Release - ${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || github.event.inputs.name || github.ref_name }}"
|
||||
name: "pre-release"
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ "main" ]
|
||||
tags:
|
||||
- v**
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
name:
|
||||
description: 'Development release name'
|
||||
required: false
|
||||
default: ''
|
||||
|
||||
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
@@ -20,40 +13,19 @@ jobs:
|
||||
linux-release-build:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions/checkout@v4
|
||||
- name: install dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install libx11-dev libxtst-dev
|
||||
sudo apt-get install libadwaita-1-dev libgtk-4-dev
|
||||
- name: Release Build
|
||||
run: |
|
||||
cargo build --release
|
||||
cp target/release/lan-mouse lan-mouse-linux-x86_64
|
||||
run: cargo build --release
|
||||
- name: Upload build artifact
|
||||
uses: actions/upload-artifact@v6
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: lan-mouse-linux-x86_64
|
||||
path: lan-mouse-linux-x86_64
|
||||
|
||||
linux-arm64-release-build:
|
||||
runs-on: ubuntu-22.04-arm
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- name: install dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install libx11-dev libxtst-dev
|
||||
sudo apt-get install libadwaita-1-dev libgtk-4-dev
|
||||
- name: Release Build
|
||||
run: |
|
||||
cargo build --release
|
||||
cp target/release/lan-mouse lan-mouse-linux-arm64
|
||||
- name: Upload build artifact
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: lan-mouse-linux-arm64
|
||||
path: lan-mouse-linux-arm64
|
||||
name: lan-mouse-linux
|
||||
path: target/release/lan-mouse
|
||||
|
||||
windows-release-build:
|
||||
runs-on: windows-latest
|
||||
@@ -92,7 +64,7 @@ jobs:
|
||||
gvsbuild build --msys-dir=C:\msys64 gtk4 libadwaita librsvg
|
||||
Move-Item "C:\Program Files\Git\usr\notbin" "C:\Program Files\Git\usr\bin"
|
||||
Move-Item "C:\Program Files\Git\notbin" "C:\Program Files\Git\bin"
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions/checkout@v4
|
||||
- name: Release Build
|
||||
run: cargo build --release
|
||||
- name: Create Archive
|
||||
@@ -100,21 +72,19 @@ jobs:
|
||||
mkdir "lan-mouse-windows"
|
||||
Get-Childitem -Path "C:\\gtk-build\\gtk\\x64\\release\\bin\\*.dll" -File -Recurse | Copy-Item -Destination "lan-mouse-windows"
|
||||
Copy-Item -Path "target\release\lan-mouse.exe" -Destination "lan-mouse-windows"
|
||||
Compress-Archive -Path "lan-mouse-windows\*" -DestinationPath lan-mouse-windows-x86_64.zip
|
||||
Compress-Archive -Path "lan-mouse-windows\*" -DestinationPath lan-mouse-windows.zip
|
||||
- name: Upload build artifact
|
||||
uses: actions/upload-artifact@v6
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: lan-mouse-windows-x86_64
|
||||
path: lan-mouse-windows-x86_64.zip
|
||||
name: lan-mouse-windows
|
||||
path: lan-mouse-windows.zip
|
||||
|
||||
macos-release-build:
|
||||
runs-on: macos-15-intel
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions/checkout@v4
|
||||
- name: install dependencies
|
||||
run: |
|
||||
brew install --cask inkscape
|
||||
brew install gtk4 libadwaita imagemagick librsvg
|
||||
run: brew install gtk4 libadwaita imagemagick
|
||||
- name: Release Build
|
||||
run: |
|
||||
cargo build --release
|
||||
@@ -132,23 +102,21 @@ jobs:
|
||||
cd target/release/bundle/osx
|
||||
zip -r "lan-mouse-macos-intel.zip" "Lan Mouse.app"
|
||||
- name: Upload build artifact
|
||||
uses: actions/upload-artifact@v6
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: lan-mouse-macos-intel
|
||||
path: target/release/bundle/osx/lan-mouse-macos-intel.zip
|
||||
|
||||
macos-arm64-release-build:
|
||||
runs-on: macos-15
|
||||
macos-aarch64-release-build:
|
||||
runs-on: macos-14
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions/checkout@v4
|
||||
- name: install dependencies
|
||||
run: |
|
||||
brew install --cask inkscape
|
||||
brew install gtk4 libadwaita imagemagick librsvg
|
||||
run: brew install gtk4 libadwaita imagemagick
|
||||
- name: Release Build
|
||||
run: |
|
||||
cargo build --release
|
||||
cp target/release/lan-mouse lan-mouse-macos-arm64
|
||||
cp target/release/lan-mouse lan-mouse-macos-aarch64
|
||||
- name: Make icns
|
||||
run: scripts/makeicns.sh
|
||||
- name: Install cargo bundle
|
||||
@@ -160,45 +128,29 @@ jobs:
|
||||
- name: Zip bundle
|
||||
run: |
|
||||
cd target/release/bundle/osx
|
||||
zip -r "lan-mouse-macos-arm64.zip" "Lan Mouse.app"
|
||||
zip -r "lan-mouse-macos-aarch64.zip" "Lan Mouse.app"
|
||||
- name: Upload build artifact
|
||||
uses: actions/upload-artifact@v6
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: lan-mouse-macos-arm64
|
||||
path: target/release/bundle/osx/lan-mouse-macos-arm64.zip
|
||||
name: lan-mouse-macos-aarch64
|
||||
path: target/release/bundle/osx/lan-mouse-macos-aarch64.zip
|
||||
|
||||
release:
|
||||
name: "Release"
|
||||
needs: [windows-release-build, linux-release-build, linux-arm64-release-build, macos-release-build, macos-arm64-release-build]
|
||||
pre-release:
|
||||
name: "Pre Release"
|
||||
needs: [windows-release-build, linux-release-build, macos-release-build, macos-aarch64-release-build]
|
||||
runs-on: "ubuntu-latest"
|
||||
steps:
|
||||
- name: Download build artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
- name: Create Pre-Release
|
||||
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
|
||||
uses: softprops/action-gh-release@v2
|
||||
- name: Create Release
|
||||
uses: "marvinpinto/action-automatic-releases@latest"
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
tag_name: ${{ github.event.inputs.name || github.ref_name }}
|
||||
name: ${{ github.event.inputs.name || github.ref_name }}
|
||||
repo_token: "${{ secrets.GITHUB_TOKEN }}"
|
||||
automatic_release_tag: "latest"
|
||||
prerelease: true
|
||||
generate_release_notes: true
|
||||
title: "Development Build"
|
||||
files: |
|
||||
lan-mouse-linux-x86_64/lan-mouse-linux-x86_64
|
||||
lan-mouse-linux-arm64/lan-mouse-linux-arm64
|
||||
lan-mouse-linux/lan-mouse
|
||||
lan-mouse-macos-intel/lan-mouse-macos-intel.zip
|
||||
lan-mouse-macos-arm64/lan-mouse-macos-arm64.zip
|
||||
lan-mouse-windows-x86_64/lan-mouse-windows-x86_64.zip
|
||||
- name: Create Tagged Release
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
name: ${{ github.ref_name }}
|
||||
generate_release_notes: true
|
||||
files: |
|
||||
lan-mouse-linux-x86_64/lan-mouse-linux-x86_64
|
||||
lan-mouse-linux-arm64/lan-mouse-linux-arm64
|
||||
lan-mouse-macos-intel/lan-mouse-macos-intel.zip
|
||||
lan-mouse-macos-arm64/lan-mouse-macos-arm64.zip
|
||||
lan-mouse-windows-x86_64/lan-mouse-windows-x86_64.zip
|
||||
lan-mouse-macos-aarch64/lan-mouse-macos-aarch64.zip
|
||||
lan-mouse-windows/lan-mouse-windows.zip
|
||||
10
.github/workflows/rust.yml
vendored
10
.github/workflows/rust.yml
vendored
@@ -9,16 +9,12 @@ on:
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
fmt:
|
||||
name: Formatting
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions/checkout@v4
|
||||
- name: cargo fmt
|
||||
run: cargo fmt --check
|
||||
|
||||
@@ -39,7 +35,7 @@ jobs:
|
||||
- clippy
|
||||
- test
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions/checkout@v4
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
- name: Install Linux deps
|
||||
if: runner.os == 'Linux'
|
||||
@@ -80,7 +76,7 @@ jobs:
|
||||
gvsbuild build --msys-dir=C:\msys64 gtk4 libadwaita librsvg
|
||||
- name: cargo build
|
||||
if: matrix.job == 'build'
|
||||
run: cargo build
|
||||
run: cargo check --workspace --all-targets --all-features
|
||||
|
||||
- name: cargo check
|
||||
if: matrix.job == 'check'
|
||||
|
||||
150
.github/workflows/tagged-release.yml
vendored
Normal file
150
.github/workflows/tagged-release.yml
vendored
Normal file
@@ -0,0 +1,150 @@
|
||||
name: "Tagged Release"
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- v**
|
||||
|
||||
jobs:
|
||||
linux-release-build:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: install dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install libx11-dev libxtst-dev
|
||||
sudo apt-get install libadwaita-1-dev libgtk-4-dev
|
||||
- name: Release Build
|
||||
run: cargo build --release
|
||||
- name: Upload build artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: lan-mouse-linux
|
||||
path: target/release/lan-mouse
|
||||
|
||||
windows-release-build:
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: '3.11'
|
||||
# needed for cache restore
|
||||
- name: create gtk dir
|
||||
run: mkdir C:\gtk-build\gtk\x64\release
|
||||
- uses: actions/cache@v3
|
||||
id: cache
|
||||
with:
|
||||
path: c:/gtk-build/gtk/x64/release/**
|
||||
key: gtk-windows-build
|
||||
restore-keys: gtk-windows-build
|
||||
- name: Update path
|
||||
run: |
|
||||
echo "PKG_CONFIG=C:\gtk-build\gtk\x64\release\bin\pkgconf.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
|
||||
echo "C:\pkg-config-lite-0.28-1\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
|
||||
echo "C:\gtk-build\gtk\x64\release\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
|
||||
echo $env:GITHUB_PATH
|
||||
echo $env:PATH
|
||||
- name: Install dependencies
|
||||
if: steps.cache.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
# choco install msys2
|
||||
# choco install visualstudio2022-workload-vctools
|
||||
# choco install pkgconfiglite
|
||||
py -m venv .venv
|
||||
.venv\Scripts\activate.ps1
|
||||
py -m pip install gvsbuild
|
||||
# see https://github.com/wingtk/gvsbuild/pull/1004
|
||||
Move-Item "C:\Program Files\Git\usr\bin" "C:\Program Files\Git\usr\notbin"
|
||||
Move-Item "C:\Program Files\Git\bin" "C:\Program Files\Git\notbin"
|
||||
gvsbuild build --msys-dir=C:\msys64 gtk4 libadwaita librsvg
|
||||
Move-Item "C:\Program Files\Git\usr\notbin" "C:\Program Files\Git\usr\bin"
|
||||
Move-Item "C:\Program Files\Git\notbin" "C:\Program Files\Git\bin"
|
||||
- uses: actions/checkout@v4
|
||||
- name: Release Build
|
||||
run: cargo build --release
|
||||
- name: Create Archive
|
||||
run: |
|
||||
mkdir "lan-mouse-windows"
|
||||
Get-Childitem -Path "C:\\gtk-build\\gtk\\x64\\release\\bin\\*.dll" -File -Recurse | Copy-Item -Destination "lan-mouse-windows"
|
||||
Copy-Item -Path "target\release\lan-mouse.exe" -Destination "lan-mouse-windows"
|
||||
Compress-Archive -Path "lan-mouse-windows\*" -DestinationPath lan-mouse-windows.zip
|
||||
- name: Upload build artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: lan-mouse-windows
|
||||
path: lan-mouse-windows.zip
|
||||
|
||||
macos-release-build:
|
||||
runs-on: macos-15-intel
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: install dependencies
|
||||
run: brew install gtk4 libadwaita imagemagick
|
||||
- name: Release Build
|
||||
run: |
|
||||
cargo build --release
|
||||
cp target/release/lan-mouse lan-mouse-macos-intel
|
||||
- name: Make icns
|
||||
run: scripts/makeicns.sh
|
||||
- name: Install cargo bundle
|
||||
run: cargo install cargo-bundle
|
||||
- name: Bundle
|
||||
run: |
|
||||
cargo bundle --release
|
||||
scripts/copy-macos-dylib.sh "target/release/bundle/osx/Lan Mouse.app/Contents/MacOS/lan-mouse"
|
||||
- name: Zip bundle
|
||||
run: |
|
||||
cd target/release/bundle/osx
|
||||
zip -r "lan-mouse-macos-intel.zip" "Lan Mouse.app"
|
||||
- name: Upload build artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: lan-mouse-macos-intel.zip
|
||||
path: target/release/bundle/osx/lan-mouse-macos-intel.zip
|
||||
|
||||
macos-aarch64-release-build:
|
||||
runs-on: macos-14
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: install dependencies
|
||||
run: brew install gtk4 libadwaita imagemagick
|
||||
- name: Release Build
|
||||
run: |
|
||||
cargo build --release
|
||||
cp target/release/lan-mouse lan-mouse-macos-aarch64
|
||||
- name: Make icns
|
||||
run: scripts/makeicns.sh
|
||||
- name: Install cargo bundle
|
||||
run: cargo install cargo-bundle
|
||||
- name: Bundle
|
||||
run: |
|
||||
cargo bundle --release
|
||||
scripts/copy-macos-dylib.sh "target/release/bundle/osx/Lan Mouse.app/Contents/MacOS/lan-mouse"
|
||||
- name: Zip bundle
|
||||
run: |
|
||||
cd target/release/bundle/osx
|
||||
zip -r "lan-mouse-macos-aarch64.zip" "Lan Mouse.app"
|
||||
- name: Upload build artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: lan-mouse-macos-aarch64.zip
|
||||
path: target/release/bundle/osx/lan-mouse-macos-aarch64.zip
|
||||
|
||||
tagged-release:
|
||||
name: "Tagged Release"
|
||||
needs: [windows-release-build, linux-release-build, macos-release-build, macos-aarch64-release-build]
|
||||
runs-on: "ubuntu-latest"
|
||||
steps:
|
||||
- name: Download build artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
- name: Create Release
|
||||
uses: "marvinpinto/action-automatic-releases@latest"
|
||||
with:
|
||||
repo_token: "${{ secrets.GITHUB_TOKEN }}"
|
||||
prerelease: false
|
||||
files: |
|
||||
lan-mouse-linux/lan-mouse
|
||||
lan-mouse-macos-intel/lan-mouse-macos-intel.zip
|
||||
lan-mouse-macos-aarch64/lan-mouse-macos-aarch64.zip
|
||||
lan-mouse-windows/lan-mouse-windows.zip
|
||||
65
AGENTS.md
65
AGENTS.md
@@ -1,65 +0,0 @@
|
||||
# Lan Mouse Agent Instructions
|
||||
|
||||
## Overview
|
||||
|
||||
Lan Mouse is an open-source Software KVM sharing mouse/keyboard input across local networks. The Rust workspace combines a GTK frontend, CLI/daemon mode, and multi-OS capture/emulation backends for Linux, Windows, and macOS.
|
||||
|
||||
## Core principles
|
||||
|
||||
- **Scope discipline.** Only implement what was requested; describe follow-up work instead of absorbing it.
|
||||
- **Clarify OS behavior.** Ask when requirements touch OS-specific capture/emulation (they differ significantly).
|
||||
- **Docs stay current.** Update [README.md](README.md) or [DOC.md](DOC.md) when touching public APIs or platform support.
|
||||
- **Rust idioms.** Use `Result`/`Option`, `thiserror` for errors, descriptive logs, and concise comments for non-obvious invariants.
|
||||
|
||||
## Terminology
|
||||
|
||||
- **Client:** A remote machine that can receive or send input events. Each client is either _active_ (receiving events) or _inactive_ (can send events back). This mutual exclusion prevents feedback loops.
|
||||
- **Backend:** OS-specific implementation for capture or emulation (e.g., libei, layer-shell, wlroots, X11, Windows, macOS).
|
||||
- **Handle:** A per-client identifier used to route events and track state (pressed keys, position).
|
||||
|
||||
## Architecture
|
||||
|
||||
**Pipeline:** `input-capture` → `lan-mouse-ipc` → `input-emulation`
|
||||
|
||||
- **input-capture:** Reads OS events into a `Stream<CaptureEvent>`. Backends tried in priority order (libei → layer-shell → X11 → fallback). Tracks `pressed_keys` to avoid stuck modifiers. `position_map` queues events when multiple clients share a screen edge.
|
||||
- **input-emulation:** Replays events via the `Emulation` trait (`consume`, `create`, `destroy`, `terminate`). Maintains `pressed_keys` and releases them on disconnect.
|
||||
- **lan-mouse-ipc / lan-mouse-proto:** Protocol glue and serialization. Events are UDP; connection requests are TCP on the same port. Version bumps required when serialization changes.
|
||||
- **input-event:** Shared scancode enums and abstract event types—extend here, don't duplicate translations.
|
||||
|
||||
## Feature & cfg discipline
|
||||
|
||||
- Feature flags live in root `Cargo.toml`. Gate OS-specific modules with tight cfgs (e.g., `cfg(all(unix, feature = "layer_shell", not(target_os = "macos")))`).
|
||||
- Prefer module-level gating over per-function cfgs to avoid empty stubs.
|
||||
- New backends: add feature in `Cargo.toml`, create gated module, log backend selection.
|
||||
|
||||
## Async patterns
|
||||
|
||||
- Tokio runtime with `futures` streams and `async_trait`. Model new flows as streams or async methods.
|
||||
- Avoid blocking; use `spawn_blocking` if needed. Prefer existing single-threaded stream handling.
|
||||
- `InputCapture` implements `Stream` and manually pumps backends—don't short-circuit this logic.
|
||||
|
||||
## Commands
|
||||
|
||||
```sh
|
||||
cargo build --workspace # full build
|
||||
cargo build -p <crate> # single crate
|
||||
cargo test --workspace # all tests
|
||||
cargo fmt && cargo clippy --workspace --all-targets --all-features # lint
|
||||
RUST_LOG=lan_mouse=debug cargo run # debug logging
|
||||
```
|
||||
|
||||
Run from repo root—no `cd` in scripts.
|
||||
|
||||
## Testing
|
||||
|
||||
- Unit tests for utilities; integration tests for protocol behavior.
|
||||
- OS-specific backends: test via GTK/CLI on target OS or document manual verification.
|
||||
- Dummy backend exercises pipeline without real dependencies.
|
||||
- Verify `terminate()` releases keys on unexpected disconnect.
|
||||
|
||||
## Workflow
|
||||
|
||||
1. Clarify ambiguous requirements, especially OS-specific behavior.
|
||||
2. Implement minimal change; flag follow-up work.
|
||||
3. Add proportional tests; run `cargo test` on affected crates.
|
||||
4. Run `cargo fmt` and `cargo clippy --workspace --all-targets --all-features`.
|
||||
172
Cargo.lock
generated
172
Cargo.lock
generated
@@ -155,6 +155,22 @@ dependencies = [
|
||||
"zbus",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ashpd"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/feschber/ashpd#f5f407e1834501579c49e7104bcaf26d5e0e52e6"
|
||||
dependencies = [
|
||||
"enumflags2",
|
||||
"fastrand",
|
||||
"futures-channel",
|
||||
"futures-util",
|
||||
"serde",
|
||||
"serde_repr",
|
||||
"tokio",
|
||||
"url",
|
||||
"zbus",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "asn1-rs"
|
||||
version = "0.6.2"
|
||||
@@ -971,15 +987,6 @@ dependencies = [
|
||||
"percent-encoding",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fsevent-sys"
|
||||
version = "4.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "futures"
|
||||
version = "0.3.31"
|
||||
@@ -1139,6 +1146,30 @@ dependencies = [
|
||||
"system-deps",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gdk4-wayland"
|
||||
version = "0.9.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bd34518488cd624a85e75e82540bc24c72cfeb0aea6bad7faed683ca3977dba0"
|
||||
dependencies = [
|
||||
"gdk4",
|
||||
"gdk4-wayland-sys",
|
||||
"gio",
|
||||
"glib",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gdk4-wayland-sys"
|
||||
version = "0.9.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7c7a0f2332c531d62ee3f14f5e839ac1abac59e9b052adf1495124c00d89a34b"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"libc",
|
||||
"system-deps",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "generator"
|
||||
version = "0.8.5"
|
||||
@@ -1661,26 +1692,6 @@ dependencies = [
|
||||
"hashbrown",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "inotify"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bd5b3eaf1a28b758ac0faa5a4254e8ab2705605496f1b1f3fbbc3988ad73d199"
|
||||
dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
"inotify-sys",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "inotify-sys"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "inout"
|
||||
version = "0.1.4"
|
||||
@@ -1695,7 +1706,7 @@ dependencies = [
|
||||
name = "input-capture"
|
||||
version = "0.3.0"
|
||||
dependencies = [
|
||||
"ashpd",
|
||||
"ashpd 0.13.0",
|
||||
"async-trait",
|
||||
"bitflags 2.9.1",
|
||||
"core-foundation",
|
||||
@@ -1725,7 +1736,7 @@ dependencies = [
|
||||
name = "input-emulation"
|
||||
version = "0.3.0"
|
||||
dependencies = [
|
||||
"ashpd",
|
||||
"ashpd 0.11.0",
|
||||
"async-trait",
|
||||
"bitflags 2.9.1",
|
||||
"core-graphics",
|
||||
@@ -1872,26 +1883,6 @@ dependencies = [
|
||||
"quote",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "kqueue"
|
||||
version = "1.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
|
||||
dependencies = [
|
||||
"kqueue-sys",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "kqueue-sys"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lan-mouse"
|
||||
version = "0.10.0"
|
||||
@@ -1910,7 +1901,6 @@ dependencies = [
|
||||
"libc",
|
||||
"local-channel",
|
||||
"log",
|
||||
"notify",
|
||||
"rcgen",
|
||||
"rustls",
|
||||
"serde",
|
||||
@@ -1943,6 +1933,7 @@ name = "lan-mouse-gtk"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"async-channel",
|
||||
"gdk4-wayland",
|
||||
"glib-build-tools",
|
||||
"gtk4",
|
||||
"hostname",
|
||||
@@ -1950,6 +1941,7 @@ dependencies = [
|
||||
"libadwaita",
|
||||
"log",
|
||||
"thiserror 2.0.12",
|
||||
"wayland-client",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2171,7 +2163,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"log",
|
||||
"wasi 0.11.1+wasi-snapshot-preview1",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
@@ -2231,33 +2222,6 @@ dependencies = [
|
||||
"minimal-lexical",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "notify"
|
||||
version = "8.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
|
||||
dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
"fsevent-sys",
|
||||
"inotify",
|
||||
"kqueue",
|
||||
"libc",
|
||||
"log",
|
||||
"mio",
|
||||
"notify-types",
|
||||
"walkdir",
|
||||
"windows-sys 0.60.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "notify-types"
|
||||
version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
|
||||
dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nu-ansi-term"
|
||||
version = "0.46.0"
|
||||
@@ -2614,9 +2578,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "quick-xml"
|
||||
version = "0.37.5"
|
||||
version = "0.38.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
|
||||
checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
@@ -2898,15 +2862,6 @@ version = "1.0.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
|
||||
|
||||
[[package]]
|
||||
name = "same-file"
|
||||
version = "1.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
|
||||
dependencies = [
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "scoped-tls"
|
||||
version = "1.0.1"
|
||||
@@ -3613,16 +3568,6 @@ version = "0.9.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
|
||||
|
||||
[[package]]
|
||||
name = "walkdir"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
|
||||
dependencies = [
|
||||
"same-file",
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.11.1+wasi-snapshot-preview1"
|
||||
@@ -3698,9 +3643,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wayland-backend"
|
||||
version = "0.3.11"
|
||||
version = "0.3.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35"
|
||||
checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"downcast-rs",
|
||||
@@ -3711,9 +3656,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wayland-client"
|
||||
version = "0.31.11"
|
||||
version = "0.31.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
|
||||
checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec"
|
||||
dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
"rustix 1.0.8",
|
||||
@@ -3761,9 +3706,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wayland-scanner"
|
||||
version = "0.31.7"
|
||||
version = "0.31.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3"
|
||||
checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quick-xml",
|
||||
@@ -3772,9 +3717,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wayland-sys"
|
||||
version = "0.31.7"
|
||||
version = "0.31.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142"
|
||||
checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd"
|
||||
dependencies = [
|
||||
"pkg-config",
|
||||
]
|
||||
@@ -3860,15 +3805,6 @@ version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-util"
|
||||
version = "0.1.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
|
||||
dependencies = [
|
||||
"windows-sys 0.60.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
|
||||
@@ -67,7 +67,6 @@ rustls = { version = "0.23.12", default-features = false, features = [
|
||||
] }
|
||||
rcgen = "0.13.1"
|
||||
sha2 = "0.10.8"
|
||||
notify = "8.2.0"
|
||||
|
||||
[target.'cfg(unix)'.dependencies]
|
||||
libc = "0.2.148"
|
||||
|
||||
28
README.md
28
README.md
@@ -1,9 +1,4 @@
|
||||
# Lan Mouse
|
||||
|
||||
[](https://github.com/feschber/lan-mouse/actions/workflows/rust.yml) [](https://github.com/feschber/lan-mouse/actions/workflows/cachix.yml) [](https://github.com/feschber/lan-mouse/actions/workflows/release.yml)
|
||||
|
||||
[](https://crates.io/crates/lan-mouse) [](https://github.com/feschber/lan-mouse/blob/main/Cargo.toml)
|
||||
|
||||
Lan Mouse is a *cross-platform* mouse and keyboard sharing software similar to universal-control on Apple devices.
|
||||
It allows for using multiple PCs via a single set of mouse and keyboard.
|
||||
This is also known as a Software KVM switch.
|
||||
@@ -182,27 +177,8 @@ For a detailed list of available features, checkout the [Cargo.toml](./Cargo.tom
|
||||
|
||||
|
||||
|
||||
## Development
|
||||
|
||||
### Git pre-commit hook
|
||||
|
||||
This repository includes a local git hooks directory `.githooks/` with a `pre-commit` script that enforces formatting, lints, and tests before allowing a commit. It is optional to enable it, but it will prevent you from committing code with failing unit tests or that needs clippy/fmt fixes. To enable the hook locally:
|
||||
|
||||
1. Make the hook executable:
|
||||
|
||||
```sh
|
||||
chmod +x .githooks/pre-commit
|
||||
```
|
||||
|
||||
2. Point git to the hooks directory (one-time per clone):
|
||||
|
||||
```sh
|
||||
git config core.hooksPath .githooks
|
||||
```
|
||||
|
||||
The `pre-commit` script runs `cargo fmt --all` (and fails if files were modified), `cargo clippy --workspace --all-targets --all-features -- -D warnings`, and `cargo test --workspace --all-features`.
|
||||
|
||||
### Dependencies & Compiling from Source
|
||||
## Installing Dependencies for Development / Compiling from Source
|
||||
<details>
|
||||
<summary>MacOS</summary>
|
||||
|
||||
@@ -475,4 +451,4 @@ The following sections detail the emulation and capture backends provided by lan
|
||||
- `libei`: This backend uses [libei](https://gitlab.freedesktop.org/libinput/libei) and is supported by GNOME >= 45 or KDE Plasma >= 6.1.
|
||||
- `windows`: Backend for input capture on Windows.
|
||||
- `macos`: Backend for input capture on MacOS.
|
||||
- `x11`: TODO (not yet supported)
|
||||
- `x11`: TODO (not yet supported)
|
||||
|
||||
12
flake.lock
generated
12
flake.lock
generated
@@ -2,11 +2,11 @@
|
||||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1772963539,
|
||||
"narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
|
||||
"lastModified": 1752687322,
|
||||
"narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
|
||||
"rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -29,11 +29,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773025773,
|
||||
"narHash": "sha256-Wik8+xApNfldpUFjPmJkPdg0RrvUPSWGIZis+A/0N1w=",
|
||||
"lastModified": 1752806774,
|
||||
"narHash": "sha256-4cHeoR2roN7d/3J6gT+l6o7J2hTrBIUiCwVdDNMeXzE=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "3c06fdbbd36ff60386a1e590ee0cd52dcd1892bf",
|
||||
"rev": "3c90219b3ba1c9790c45a078eae121de48a39c55",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
139
flake.nix
139
flake.nix
@@ -7,87 +7,60 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
outputs =
|
||||
{
|
||||
nixpkgs,
|
||||
rust-overlay,
|
||||
self,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (nixpkgs) lib;
|
||||
forEachPkgs =
|
||||
f:
|
||||
lib.genAttrs
|
||||
[
|
||||
"aarch64-darwin"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"x86_64-linux"
|
||||
]
|
||||
(
|
||||
system:
|
||||
let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [ rust-overlay.overlays.default ];
|
||||
};
|
||||
# Default toolchain for devshell
|
||||
rustToolchain = pkgs.rust-bin.stable.latest.default.override {
|
||||
extensions = [
|
||||
# includes already:
|
||||
# rustc
|
||||
# cargo
|
||||
# rust-std
|
||||
# rust-docs
|
||||
# rustfmt-preview
|
||||
# clippy-preview
|
||||
"rust-analyzer"
|
||||
"rust-src"
|
||||
];
|
||||
};
|
||||
# Minimal toolchain for builds (rustc + cargo + rust-std only)
|
||||
rustToolchainForBuild = pkgs.rust-bin.stable.latest.minimal;
|
||||
in
|
||||
f { inherit pkgs rustToolchain rustToolchainForBuild; }
|
||||
);
|
||||
in
|
||||
{
|
||||
packages = forEachPkgs (
|
||||
{ pkgs, rustToolchainForBuild, ... }:
|
||||
let
|
||||
customRustPlatform = pkgs.makeRustPlatform {
|
||||
cargo = rustToolchainForBuild;
|
||||
rustc = rustToolchainForBuild;
|
||||
};
|
||||
lan-mouse = pkgs.callPackage ./nix { rustPlatform = customRustPlatform; };
|
||||
in
|
||||
{
|
||||
default = lan-mouse;
|
||||
inherit lan-mouse;
|
||||
}
|
||||
);
|
||||
devShells = forEachPkgs (
|
||||
{ pkgs, rustToolchain, ... }:
|
||||
{
|
||||
default = pkgs.mkShell {
|
||||
packages =
|
||||
with pkgs;
|
||||
[
|
||||
rustToolchain
|
||||
pkg-config
|
||||
gtk4
|
||||
libadwaita
|
||||
librsvg
|
||||
]
|
||||
++ lib.optionals pkgs.stdenv.isLinux [
|
||||
libX11
|
||||
libXtst
|
||||
];
|
||||
env.RUST_SRC_PATH = "${rustToolchain}/lib/rustlib/src/rust/library";
|
||||
};
|
||||
}
|
||||
);
|
||||
homeManagerModules.default = import ./nix/hm-module.nix self;
|
||||
};
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
rust-overlay,
|
||||
...
|
||||
}: let
|
||||
inherit (nixpkgs) lib;
|
||||
genSystems = lib.genAttrs [
|
||||
"aarch64-darwin"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"x86_64-linux"
|
||||
];
|
||||
pkgsFor = system:
|
||||
import nixpkgs {
|
||||
inherit system;
|
||||
|
||||
overlays = [
|
||||
rust-overlay.overlays.default
|
||||
];
|
||||
};
|
||||
mkRustToolchain = pkgs:
|
||||
pkgs.rust-bin.stable.latest.default.override {
|
||||
extensions = ["rust-src"];
|
||||
};
|
||||
pkgs = genSystems (system: import nixpkgs {inherit system;});
|
||||
in {
|
||||
packages = genSystems (system: rec {
|
||||
default = pkgs.${system}.callPackage ./nix {};
|
||||
lan-mouse = default;
|
||||
});
|
||||
homeManagerModules.default = import ./nix/hm-module.nix self;
|
||||
devShells = genSystems (system: let
|
||||
pkgs = pkgsFor system;
|
||||
rust = mkRustToolchain pkgs;
|
||||
in {
|
||||
default = pkgs.mkShell {
|
||||
packages = with pkgs; [
|
||||
rust
|
||||
rust-analyzer-unwrapped
|
||||
pkg-config
|
||||
xorg.libX11
|
||||
gtk4
|
||||
libadwaita
|
||||
librsvg
|
||||
xorg.libXtst
|
||||
] ++ lib.optionals stdenv.isDarwin
|
||||
(with darwin.apple_sdk_11_0.frameworks; [
|
||||
CoreGraphics
|
||||
ApplicationServices
|
||||
]);
|
||||
|
||||
RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
|
||||
};
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ wayland-protocols-wlr = { version = "0.3.1", features = [
|
||||
"client",
|
||||
], optional = true }
|
||||
x11 = { version = "2.21.0", features = ["xlib", "xtest"], optional = true }
|
||||
ashpd = { version = "0.11.0", default-features = false, features = [
|
||||
ashpd = { git = "https://github.com/feschber/ashpd", default-features = false, features = [
|
||||
"tokio",
|
||||
], optional = true }
|
||||
reis = { version = "0.5.0", features = ["tokio"], optional = true }
|
||||
|
||||
@@ -2,6 +2,7 @@ use std::{
|
||||
collections::{HashMap, HashSet, VecDeque},
|
||||
fmt::Display,
|
||||
mem::swap,
|
||||
sync::{Arc, Mutex},
|
||||
task::{Poll, ready},
|
||||
};
|
||||
|
||||
@@ -129,6 +130,23 @@ pub struct InputCapture {
|
||||
pending: VecDeque<(CaptureHandle, CaptureEvent)>,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub enum WindowIdentifier {
|
||||
Wayland(String),
|
||||
X11(u32),
|
||||
}
|
||||
|
||||
impl Into<ashpd::WindowIdentifier> for WindowIdentifier {
|
||||
fn into(self) -> ashpd::WindowIdentifier {
|
||||
match self {
|
||||
WindowIdentifier::Wayland(handle) => {
|
||||
ashpd::WindowIdentifier::from_xdg_foreign_exported_v2(handle)
|
||||
}
|
||||
WindowIdentifier::X11(_) => todo!(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl InputCapture {
|
||||
/// create a new client with the given id
|
||||
pub async fn create(&mut self, id: CaptureHandle, pos: Position) -> Result<(), CaptureError> {
|
||||
@@ -177,8 +195,11 @@ impl InputCapture {
|
||||
}
|
||||
|
||||
/// creates a new [`InputCapture`]
|
||||
pub async fn new(backend: Option<Backend>) -> Result<Self, CaptureCreationError> {
|
||||
let capture = create(backend).await?;
|
||||
pub async fn new(
|
||||
backend: Option<Backend>,
|
||||
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||
) -> Result<Self, CaptureCreationError> {
|
||||
let capture = create(backend, window_identifier).await?;
|
||||
Ok(Self {
|
||||
capture,
|
||||
id_map: Default::default(),
|
||||
@@ -280,13 +301,16 @@ trait Capture: Stream<Item = Result<(Position, CaptureEvent), CaptureError>> + U
|
||||
|
||||
async fn create_backend(
|
||||
backend: Backend,
|
||||
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||
) -> Result<
|
||||
Box<dyn Capture<Item = Result<(Position, CaptureEvent), CaptureError>>>,
|
||||
CaptureCreationError,
|
||||
> {
|
||||
match backend {
|
||||
#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
|
||||
Backend::InputCapturePortal => Ok(Box::new(libei::LibeiInputCapture::new().await?)),
|
||||
Backend::InputCapturePortal => Ok(Box::new(
|
||||
libei::LibeiInputCapture::new(window_identifier).await?,
|
||||
)),
|
||||
#[cfg(all(unix, feature = "layer_shell", not(target_os = "macos")))]
|
||||
Backend::LayerShell => Ok(Box::new(layer_shell::LayerShellInputCapture::new()?)),
|
||||
#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
|
||||
@@ -301,12 +325,13 @@ async fn create_backend(
|
||||
|
||||
async fn create(
|
||||
backend: Option<Backend>,
|
||||
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||
) -> Result<
|
||||
Box<dyn Capture<Item = Result<(Position, CaptureEvent), CaptureError>>>,
|
||||
CaptureCreationError,
|
||||
> {
|
||||
if let Some(backend) = backend {
|
||||
let b = create_backend(backend).await;
|
||||
let b = create_backend(backend, window_identifier).await;
|
||||
if b.is_ok() {
|
||||
log::info!("using capture backend: {backend}");
|
||||
}
|
||||
@@ -325,7 +350,7 @@ async fn create(
|
||||
#[cfg(target_os = "macos")]
|
||||
Backend::MacOs,
|
||||
] {
|
||||
match create_backend(backend).await {
|
||||
match create_backend(backend, window_identifier.clone()).await {
|
||||
Ok(b) => {
|
||||
log::info!("using capture backend: {backend}");
|
||||
return Ok(b);
|
||||
|
||||
@@ -23,7 +23,7 @@ use std::{
|
||||
os::unix::net::UnixStream,
|
||||
pin::Pin,
|
||||
rc::Rc,
|
||||
sync::Arc,
|
||||
sync::{Arc, Mutex},
|
||||
task::{Context, Poll},
|
||||
};
|
||||
use tokio::{
|
||||
@@ -39,7 +39,7 @@ use futures_core::Stream;
|
||||
|
||||
use input_event::Event;
|
||||
|
||||
use crate::CaptureEvent;
|
||||
use crate::{CaptureEvent, WindowIdentifier};
|
||||
|
||||
use super::{
|
||||
Capture as LanMouseInputCapture, Position,
|
||||
@@ -58,8 +58,8 @@ enum LibeiNotifyEvent {
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub struct LibeiInputCapture<'a> {
|
||||
input_capture: Pin<Box<InputCapture<'a>>>,
|
||||
pub struct LibeiInputCapture {
|
||||
input_capture: Pin<Box<InputCapture>>,
|
||||
capture_task: JoinHandle<Result<(), CaptureError>>,
|
||||
event_rx: Receiver<(Position, CaptureEvent)>,
|
||||
notify_capture: Sender<LibeiNotifyEvent>,
|
||||
@@ -130,8 +130,8 @@ fn select_barriers(
|
||||
}
|
||||
|
||||
async fn update_barriers(
|
||||
input_capture: &InputCapture<'_>,
|
||||
session: &Session<'_, InputCapture<'_>>,
|
||||
input_capture: &InputCapture,
|
||||
session: &Session<InputCapture>,
|
||||
active_clients: &[Position],
|
||||
next_barrier_id: &mut NonZeroU32,
|
||||
) -> Result<(Vec<ICBarrier>, HashMap<BarrierID, Position>), ashpd::Error> {
|
||||
@@ -151,21 +151,25 @@ async fn update_barriers(
|
||||
Ok((barriers, id_map))
|
||||
}
|
||||
|
||||
async fn create_session<'a>(
|
||||
input_capture: &'a InputCapture<'a>,
|
||||
) -> std::result::Result<(Session<'a, InputCapture<'a>>, BitFlags<Capabilities>), ashpd::Error> {
|
||||
log::debug!("creating input capture session");
|
||||
async fn create_session(
|
||||
input_capture: &InputCapture,
|
||||
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||
) -> std::result::Result<(Session<InputCapture>, BitFlags<Capabilities>), ashpd::Error> {
|
||||
let window_identifier = window_identifier.lock().unwrap().clone();
|
||||
log::debug!("creating input capture session: {window_identifier:?}");
|
||||
let ashpd_window_identifier: Option<ashpd::WindowIdentifier> =
|
||||
window_identifier.map(|i| i.into());
|
||||
input_capture
|
||||
.create_session(
|
||||
None,
|
||||
ashpd_window_identifier.as_ref(),
|
||||
Capabilities::Keyboard | Capabilities::Pointer | Capabilities::Touchscreen,
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
async fn connect_to_eis(
|
||||
input_capture: &InputCapture<'_>,
|
||||
session: &Session<'_, InputCapture<'_>>,
|
||||
input_capture: &InputCapture,
|
||||
session: &Session<InputCapture>,
|
||||
) -> Result<(ei::Context, Connection, EiConvertEventStream), CaptureError> {
|
||||
log::debug!("connect_to_eis");
|
||||
let fd = input_capture.connect_to_eis(session).await?;
|
||||
@@ -201,11 +205,16 @@ async fn libei_event_handler(
|
||||
}
|
||||
}
|
||||
|
||||
impl LibeiInputCapture<'_> {
|
||||
pub async fn new() -> std::result::Result<Self, LibeiCaptureCreationError> {
|
||||
impl LibeiInputCapture {
|
||||
/// creates a new libei input capture
|
||||
/// `window_id` is a window identifier for user prompts
|
||||
pub async fn new(
|
||||
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||
) -> std::result::Result<Self, LibeiCaptureCreationError> {
|
||||
let input_capture = Box::pin(InputCapture::new().await?);
|
||||
let input_capture_ptr = input_capture.as_ref().get_ref() as *const InputCapture<'static>;
|
||||
let first_session = Some(create_session(unsafe { &*input_capture_ptr }).await?);
|
||||
let input_capture_ptr = input_capture.as_ref().get_ref() as *const InputCapture;
|
||||
let first_session =
|
||||
Some(create_session(unsafe { &*input_capture_ptr }, window_identifier.clone()).await?);
|
||||
|
||||
let (event_tx, event_rx) = mpsc::channel(1);
|
||||
let (notify_capture, notify_rx) = mpsc::channel(1);
|
||||
@@ -220,6 +229,7 @@ impl LibeiInputCapture<'_> {
|
||||
first_session,
|
||||
event_tx,
|
||||
cancellation_token.clone(),
|
||||
window_identifier,
|
||||
);
|
||||
let capture_task = tokio::task::spawn_local(capture);
|
||||
|
||||
@@ -238,12 +248,13 @@ impl LibeiInputCapture<'_> {
|
||||
}
|
||||
|
||||
async fn do_capture(
|
||||
input_capture: *const InputCapture<'static>,
|
||||
input_capture: *const InputCapture,
|
||||
mut capture_event: Receiver<LibeiNotifyEvent>,
|
||||
notify_release: Arc<Notify>,
|
||||
session: Option<(Session<'_, InputCapture<'_>>, BitFlags<Capabilities>)>,
|
||||
session: Option<(Session<InputCapture>, BitFlags<Capabilities>)>,
|
||||
event_tx: Sender<(Position, CaptureEvent)>,
|
||||
cancellation_token: CancellationToken,
|
||||
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||
) -> Result<(), CaptureError> {
|
||||
let mut session = session.map(|s| s.0);
|
||||
|
||||
@@ -289,7 +300,11 @@ async fn do_capture(
|
||||
// create session
|
||||
let mut session = match session.take() {
|
||||
Some(s) => s,
|
||||
None => create_session(input_capture).await?.0,
|
||||
None => {
|
||||
create_session(input_capture, window_identifier.clone())
|
||||
.await?
|
||||
.0
|
||||
}
|
||||
};
|
||||
|
||||
let capture_session = do_capture_session(
|
||||
@@ -336,8 +351,8 @@ async fn do_capture(
|
||||
}
|
||||
|
||||
async fn do_capture_session(
|
||||
input_capture: &InputCapture<'_>,
|
||||
session: &mut Session<'_, InputCapture<'_>>,
|
||||
input_capture: &InputCapture,
|
||||
session: &mut Session<InputCapture>,
|
||||
event_tx: &Sender<(Position, CaptureEvent)>,
|
||||
active_clients: &[Position],
|
||||
next_barrier_id: &mut NonZeroU32,
|
||||
@@ -462,9 +477,9 @@ async fn do_capture_session(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn release_capture<'a>(
|
||||
input_capture: &InputCapture<'a>,
|
||||
session: &Session<'a, InputCapture<'a>>,
|
||||
async fn release_capture(
|
||||
input_capture: &InputCapture,
|
||||
session: &Session<InputCapture>,
|
||||
activated: Activated,
|
||||
current_pos: Position,
|
||||
) -> Result<(), CaptureError> {
|
||||
@@ -561,7 +576,7 @@ async fn handle_ei_event(
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl LanMouseInputCapture for LibeiInputCapture<'_> {
|
||||
impl LanMouseInputCapture for LibeiInputCapture {
|
||||
async fn create(&mut self, pos: Position) -> Result<(), CaptureError> {
|
||||
let _ = self
|
||||
.notify_capture
|
||||
@@ -598,7 +613,7 @@ impl LanMouseInputCapture for LibeiInputCapture<'_> {
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for LibeiInputCapture<'_> {
|
||||
impl Drop for LibeiInputCapture {
|
||||
fn drop(&mut self) {
|
||||
if !self.terminated {
|
||||
/* this workaround is needed until async drop is stabilized */
|
||||
@@ -607,10 +622,10 @@ impl Drop for LibeiInputCapture<'_> {
|
||||
}
|
||||
}
|
||||
|
||||
impl Stream for LibeiInputCapture<'_> {
|
||||
impl Stream for LibeiInputCapture {
|
||||
type Item = Result<(Position, CaptureEvent), CaptureError>;
|
||||
|
||||
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
|
||||
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
|
||||
match self.capture_task.poll_unpin(cx) {
|
||||
Poll::Ready(r) => match r.expect("failed to join") {
|
||||
Ok(()) => Poll::Ready(None),
|
||||
|
||||
@@ -18,9 +18,7 @@ use core_graphics::{
|
||||
event_source::{CGEventSource, CGEventSourceStateID},
|
||||
};
|
||||
use futures_core::Stream;
|
||||
use input_event::{
|
||||
BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent,
|
||||
};
|
||||
use input_event::{BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent};
|
||||
use keycode::{KeyMap, KeyMapping};
|
||||
use libc::c_void;
|
||||
use once_cell::unsync::Lazy;
|
||||
@@ -306,28 +304,16 @@ fn get_events(
|
||||
})))
|
||||
}
|
||||
CGEventType::OtherMouseDown => {
|
||||
let btn_num = ev.get_integer_value_field(EventField::MOUSE_EVENT_BUTTON_NUMBER);
|
||||
let button = match btn_num {
|
||||
3 => BTN_BACK,
|
||||
4 => BTN_FORWARD,
|
||||
_ => BTN_MIDDLE,
|
||||
};
|
||||
result.push(CaptureEvent::Input(Event::Pointer(PointerEvent::Button {
|
||||
time: 0,
|
||||
button,
|
||||
button: BTN_MIDDLE,
|
||||
state: 1,
|
||||
})))
|
||||
}
|
||||
CGEventType::OtherMouseUp => {
|
||||
let btn_num = ev.get_integer_value_field(EventField::MOUSE_EVENT_BUTTON_NUMBER);
|
||||
let button = match btn_num {
|
||||
3 => BTN_BACK,
|
||||
4 => BTN_FORWARD,
|
||||
_ => BTN_MIDDLE,
|
||||
};
|
||||
result.push(CaptureEvent::Input(Event::Pointer(PointerEvent::Button {
|
||||
time: 0,
|
||||
button,
|
||||
button: BTN_MIDDLE,
|
||||
state: 0,
|
||||
})))
|
||||
}
|
||||
|
||||
@@ -10,13 +10,10 @@ use core_graphics::event::{
|
||||
ScrollEventUnit,
|
||||
};
|
||||
use core_graphics::event_source::{CGEventSource, CGEventSourceStateID};
|
||||
use input_event::{
|
||||
BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent,
|
||||
scancode,
|
||||
};
|
||||
use input_event::{BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent, scancode};
|
||||
use keycode::{KeyMap, KeyMapping};
|
||||
use std::cell::Cell;
|
||||
use std::collections::HashSet;
|
||||
use std::ops::{Index, IndexMut};
|
||||
use std::rc::Rc;
|
||||
use std::sync::Arc;
|
||||
use std::time::{Duration, Instant};
|
||||
@@ -33,10 +30,10 @@ pub(crate) struct MacOSEmulation {
|
||||
event_source: CGEventSource,
|
||||
/// task handle for key repeats
|
||||
repeat_task: Option<JoinHandle<()>>,
|
||||
/// current state of the mouse buttons (tracked by evdev button code)
|
||||
pressed_buttons: HashSet<u32>,
|
||||
/// button previously pressed (evdev button code)
|
||||
previous_button: Option<u32>,
|
||||
/// current state of the mouse buttons
|
||||
button_state: ButtonState,
|
||||
/// button previously pressed
|
||||
previous_button: Option<CGMouseButton>,
|
||||
/// timestamp of previous click (button down)
|
||||
previous_button_click: Option<Instant>,
|
||||
/// click state, i.e. number of clicks in quick succession
|
||||
@@ -47,13 +44,31 @@ pub(crate) struct MacOSEmulation {
|
||||
notify_repeat_task: Arc<Notify>,
|
||||
}
|
||||
|
||||
/// Maps an evdev button code to the CGEventType used for drag events.
|
||||
fn drag_event_type(button: u32) -> CGEventType {
|
||||
match button {
|
||||
BTN_LEFT => CGEventType::LeftMouseDragged,
|
||||
BTN_RIGHT => CGEventType::RightMouseDragged,
|
||||
// middle, back, forward, and any other button all use OtherMouseDragged
|
||||
_ => CGEventType::OtherMouseDragged,
|
||||
struct ButtonState {
|
||||
left: bool,
|
||||
right: bool,
|
||||
center: bool,
|
||||
}
|
||||
|
||||
impl Index<CGMouseButton> for ButtonState {
|
||||
type Output = bool;
|
||||
|
||||
fn index(&self, index: CGMouseButton) -> &Self::Output {
|
||||
match index {
|
||||
CGMouseButton::Left => &self.left,
|
||||
CGMouseButton::Right => &self.right,
|
||||
CGMouseButton::Center => &self.center,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl IndexMut<CGMouseButton> for ButtonState {
|
||||
fn index_mut(&mut self, index: CGMouseButton) -> &mut Self::Output {
|
||||
match index {
|
||||
CGMouseButton::Left => &mut self.left,
|
||||
CGMouseButton::Right => &mut self.right,
|
||||
CGMouseButton::Center => &mut self.center,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,9 +78,14 @@ impl MacOSEmulation {
|
||||
pub(crate) fn new() -> Result<Self, MacOSEmulationCreationError> {
|
||||
let event_source = CGEventSource::new(CGEventSourceStateID::CombinedSessionState)
|
||||
.map_err(|_| MacOSEmulationCreationError::EventSourceCreation)?;
|
||||
let button_state = ButtonState {
|
||||
left: false,
|
||||
right: false,
|
||||
center: false,
|
||||
};
|
||||
Ok(Self {
|
||||
event_source,
|
||||
pressed_buttons: HashSet::new(),
|
||||
button_state,
|
||||
previous_button: None,
|
||||
previous_button_click: None,
|
||||
button_click_state: 0,
|
||||
@@ -241,14 +261,14 @@ impl Emulation for MacOSEmulation {
|
||||
mouse_location.x = new_mouse_x;
|
||||
mouse_location.y = new_mouse_y;
|
||||
|
||||
// If any button is held, emit a drag event for it;
|
||||
// otherwise emit a normal mouse-moved event.
|
||||
let event_type = self
|
||||
.pressed_buttons
|
||||
.iter()
|
||||
.next()
|
||||
.map(|&btn| drag_event_type(btn))
|
||||
.unwrap_or(CGEventType::MouseMoved);
|
||||
let mut event_type = CGEventType::MouseMoved;
|
||||
if self.button_state.left {
|
||||
event_type = CGEventType::LeftMouseDragged
|
||||
} else if self.button_state.right {
|
||||
event_type = CGEventType::RightMouseDragged
|
||||
} else if self.button_state.center {
|
||||
event_type = CGEventType::OtherMouseDragged
|
||||
};
|
||||
let event = match CGEvent::new_mouse_event(
|
||||
self.event_source.clone(),
|
||||
event_type,
|
||||
@@ -270,12 +290,6 @@ impl Emulation for MacOSEmulation {
|
||||
button,
|
||||
state,
|
||||
} => {
|
||||
// button number for OtherMouse events (3 = back, 4 = forward, etc.)
|
||||
let cg_button_number: Option<i64> = match button {
|
||||
BTN_BACK => Some(3),
|
||||
BTN_FORWARD => Some(4),
|
||||
_ => None,
|
||||
};
|
||||
let (event_type, mouse_button) = match (button, state) {
|
||||
(BTN_LEFT, 1) => (CGEventType::LeftMouseDown, CGMouseButton::Left),
|
||||
(BTN_LEFT, 0) => (CGEventType::LeftMouseUp, CGMouseButton::Left),
|
||||
@@ -283,29 +297,17 @@ impl Emulation for MacOSEmulation {
|
||||
(BTN_RIGHT, 0) => (CGEventType::RightMouseUp, CGMouseButton::Right),
|
||||
(BTN_MIDDLE, 1) => (CGEventType::OtherMouseDown, CGMouseButton::Center),
|
||||
(BTN_MIDDLE, 0) => (CGEventType::OtherMouseUp, CGMouseButton::Center),
|
||||
(BTN_BACK, 1) | (BTN_FORWARD, 1) => {
|
||||
(CGEventType::OtherMouseDown, CGMouseButton::Center)
|
||||
}
|
||||
(BTN_BACK, 0) | (BTN_FORWARD, 0) => {
|
||||
(CGEventType::OtherMouseUp, CGMouseButton::Center)
|
||||
}
|
||||
_ => {
|
||||
log::warn!("invalid button event: {button},{state}");
|
||||
return Ok(());
|
||||
}
|
||||
};
|
||||
// store button state using the evdev button code so
|
||||
// back, forward, and middle are tracked independently
|
||||
if state == 1 {
|
||||
self.pressed_buttons.insert(button);
|
||||
} else {
|
||||
self.pressed_buttons.remove(&button);
|
||||
}
|
||||
// store button state
|
||||
self.button_state[mouse_button] = state == 1;
|
||||
|
||||
// update double-click tracking using the evdev button
|
||||
// code so that back/forward don't alias with middle
|
||||
// update previous button state
|
||||
if state == 1 {
|
||||
if self.previous_button == Some(button)
|
||||
if self.previous_button.is_some_and(|b| b.eq(&mouse_button))
|
||||
&& self
|
||||
.previous_button_click
|
||||
.is_some_and(|i| i.elapsed() < DOUBLE_CLICK_INTERVAL)
|
||||
@@ -314,7 +316,7 @@ impl Emulation for MacOSEmulation {
|
||||
} else {
|
||||
self.button_click_state = 1;
|
||||
}
|
||||
self.previous_button = Some(button);
|
||||
self.previous_button = Some(mouse_button);
|
||||
self.previous_button_click = Some(Instant::now());
|
||||
}
|
||||
|
||||
@@ -336,13 +338,6 @@ impl Emulation for MacOSEmulation {
|
||||
EventField::MOUSE_EVENT_CLICK_STATE,
|
||||
self.button_click_state,
|
||||
);
|
||||
// Set the button number for extra buttons (back=3, forward=4)
|
||||
if let Some(btn_num) = cg_button_number {
|
||||
event.set_integer_value_field(
|
||||
EventField::MOUSE_EVENT_BUTTON_NUMBER,
|
||||
btn_num,
|
||||
);
|
||||
}
|
||||
event.post(CGEventTapLocation::HID);
|
||||
}
|
||||
PointerEvent::Axis {
|
||||
@@ -421,10 +416,7 @@ impl Emulation for MacOSEmulation {
|
||||
return Ok(());
|
||||
}
|
||||
};
|
||||
let is_modifier = update_modifiers(&self.modifier_state, key, state);
|
||||
if is_modifier {
|
||||
modifier_event(self.event_source.clone(), self.modifier_state.get());
|
||||
}
|
||||
update_modifiers(&self.modifier_state, key, state);
|
||||
match state {
|
||||
// pressed
|
||||
1 => self.spawn_repeat_task(code).await,
|
||||
@@ -453,6 +445,21 @@ impl Emulation for MacOSEmulation {
|
||||
async fn terminate(&mut self) {}
|
||||
}
|
||||
|
||||
trait ButtonEq {
|
||||
fn eq(&self, other: &Self) -> bool;
|
||||
}
|
||||
|
||||
impl ButtonEq for CGMouseButton {
|
||||
fn eq(&self, other: &Self) -> bool {
|
||||
matches!(
|
||||
(self, other),
|
||||
(CGMouseButton::Left, CGMouseButton::Left)
|
||||
| (CGMouseButton::Right, CGMouseButton::Right)
|
||||
| (CGMouseButton::Center, CGMouseButton::Center)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fn update_modifiers(modifiers: &Cell<XMods>, key: u32, state: u8) -> bool {
|
||||
if let Ok(key) = scancode::Linux::try_from(key) {
|
||||
let mask = match key {
|
||||
|
||||
@@ -8,12 +8,14 @@ repository = "https://github.com/feschber/lan-mouse"
|
||||
|
||||
[dependencies]
|
||||
gtk = { package = "gtk4", version = "0.9.0", features = ["v4_2"] }
|
||||
gdk4_wayland = { package = "gdk4-wayland", version="0.9.6" }
|
||||
adw = { package = "libadwaita", version = "0.7.0", features = ["v1_1"] }
|
||||
async-channel = { version = "2.1.1" }
|
||||
hostname = "0.4.0"
|
||||
log = "0.4.20"
|
||||
lan-mouse-ipc = { path = "../lan-mouse-ipc", version = "0.2.0" }
|
||||
thiserror = "2.0.0"
|
||||
wayland-client = "0.31.12"
|
||||
|
||||
[build-dependencies]
|
||||
glib-build-tools = { version = "0.20.0" }
|
||||
|
||||
@@ -10,7 +10,7 @@ use std::{env, process, str};
|
||||
|
||||
use window::Window;
|
||||
|
||||
use lan_mouse_ipc::FrontendEvent;
|
||||
use lan_mouse_ipc::{FrontendEvent, FrontendRequest, WindowIdentifier};
|
||||
|
||||
use adw::Application;
|
||||
use gtk::{IconTheme, gdk::Display, glib::clone, prelude::*};
|
||||
@@ -19,6 +19,8 @@ use gtk::{gio, glib, prelude::ApplicationExt};
|
||||
use self::client_object::ClientObject;
|
||||
use self::key_object::KeyObject;
|
||||
|
||||
use gdk4_wayland::WaylandToplevel;
|
||||
|
||||
use thiserror::Error;
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
@@ -124,6 +126,27 @@ fn build_ui(app: &Application) {
|
||||
|
||||
let window = Window::new(app, frontend_tx);
|
||||
|
||||
// export TopLevel handle and send it to the service so that it can put the InpuCapture / RemoteDesktop
|
||||
// windows on top of it using xdg-foreign.
|
||||
window.connect_show(|window| {
|
||||
// needs the surface so we have to present first!
|
||||
if let Some(surface) = window.surface() {
|
||||
if surface.display().backend().is_wayland() {
|
||||
// let surface = surface.downcast::<WaylandSurface>();
|
||||
let toplevel = surface.downcast::<WaylandToplevel>().expect("xdg-toplevel");
|
||||
let window = window.clone();
|
||||
toplevel.export_handle(move |_toplevel, handle| {
|
||||
if let Ok(handle) = handle {
|
||||
let handle = handle.to_string();
|
||||
window.request(FrontendRequest::WindowIdentifier(
|
||||
WindowIdentifier::Wayland(handle),
|
||||
));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
glib::spawn_future_local(clone!(
|
||||
#[weak]
|
||||
window,
|
||||
|
||||
@@ -422,7 +422,7 @@ impl Window {
|
||||
self.request(FrontendRequest::RemoveAuthorizedKey(fp));
|
||||
}
|
||||
|
||||
fn request(&self, request: FrontendRequest) {
|
||||
pub(crate) fn request(&self, request: FrontendRequest) {
|
||||
let mut requester = self.imp().frontend_request_writer.borrow_mut();
|
||||
let requester = requester.as_mut().unwrap();
|
||||
if let Err(e) = requester.request(request) {
|
||||
|
||||
@@ -255,6 +255,14 @@ pub enum FrontendRequest {
|
||||
UpdateEnterHook(u64, Option<String>),
|
||||
/// save config file
|
||||
SaveConfiguration,
|
||||
/// window identifier used to present input-capture / remote-desktop prompts
|
||||
WindowIdentifier(WindowIdentifier),
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
|
||||
pub enum WindowIdentifier {
|
||||
Wayland(String),
|
||||
X11(u32),
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, PartialEq, Eq, Debug, Default, Serialize, Deserialize)]
|
||||
|
||||
@@ -1,40 +1,34 @@
|
||||
{
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
lib,
|
||||
pkg-config,
|
||||
libX11,
|
||||
gtk4,
|
||||
libadwaita,
|
||||
libXtst,
|
||||
wrapGAppsHook4,
|
||||
librsvg,
|
||||
git,
|
||||
}:
|
||||
let
|
||||
cargoToml = fromTOML (builtins.readFile ../Cargo.toml);
|
||||
pkgs,
|
||||
}: let
|
||||
cargoToml = builtins.fromTOML (builtins.readFile ../Cargo.toml);
|
||||
pname = cargoToml.package.name;
|
||||
version = cargoToml.package.version;
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname;
|
||||
inherit version;
|
||||
pname = pname;
|
||||
version = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
nativeBuildInputs = with pkgs; [
|
||||
git
|
||||
pkg-config
|
||||
cmake
|
||||
makeWrapper
|
||||
buildPackages.gtk4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = with pkgs; [
|
||||
xorg.libX11
|
||||
gtk4
|
||||
libadwaita
|
||||
librsvg
|
||||
]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
libX11
|
||||
libXtst
|
||||
];
|
||||
xorg.libXtst
|
||||
] ++ lib.optionals stdenv.isDarwin
|
||||
(with darwin.apple_sdk_11_0.frameworks; [
|
||||
CoreGraphics
|
||||
ApplicationServices
|
||||
]);
|
||||
|
||||
src = builtins.path {
|
||||
name = pname;
|
||||
@@ -46,7 +40,11 @@ rustPlatform.buildRustPackage {
|
||||
# Set Environment Variables
|
||||
RUST_BACKTRACE = "full";
|
||||
|
||||
# Needed to enable support for SVG icons in GTK
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/lan-mouse" \
|
||||
--set GDK_PIXBUF_MODULE_FILE ${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
|
||||
|
||||
install -Dm444 *.desktop -t $out/share/applications
|
||||
install -Dm444 lan-mouse-gtk/resources/*.svg -t $out/share/icons/hicolor/scalable/apps
|
||||
'';
|
||||
|
||||
@@ -29,13 +29,13 @@ iconset="${3:-./target/icon.iconset}"
|
||||
set -u
|
||||
|
||||
mkdir -p "$iconset"
|
||||
magick "$svg" -background none -resize 1024x1024 "$iconset"/icon_512x512@2x.png
|
||||
magick "$svg" -background none -resize 512x512 "$iconset"/icon_512x512.png
|
||||
magick "$svg" -background none -resize 256x256 "$iconset"/icon_256x256.png
|
||||
magick "$svg" -background none -resize 128x128 "$iconset"/icon_128x128.png
|
||||
magick "$svg" -background none -resize 64x64 "$iconset"/icon_32x32@2x.png
|
||||
magick "$svg" -background none -resize 32x32 "$iconset"/icon_32x32.png
|
||||
magick "$svg" -background none -resize 16x16 "$iconset"/icon_16x16.png
|
||||
magick convert -background none -resize 1024x1024 "$svg" "$iconset"/icon_512x512@2x.png
|
||||
magick convert -background none -resize 512x512 "$svg" "$iconset"/icon_512x512.png
|
||||
magick convert -background none -resize 256x256 "$svg" "$iconset"/icon_256x256.png
|
||||
magick convert -background none -resize 128x128 "$svg" "$iconset"/icon_128x128.png
|
||||
magick convert -background none -resize 64x64 "$svg" "$iconset"/icon_32x32@2x.png
|
||||
magick convert -background none -resize 32x32 "$svg" "$iconset"/icon_32x32.png
|
||||
magick convert -background none -resize 16x16 "$svg" "$iconset"/icon_16x16.png
|
||||
cp "$iconset"/icon_512x512.png "$iconset"/icon_256x256@2x.png
|
||||
cp "$iconset"/icon_256x256.png "$iconset"/icon_128x128@2x.png
|
||||
cp "$iconset"/icon_32x32.png "$iconset"/icon_16x16@2x.png
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
use std::{
|
||||
cell::{Cell, RefCell},
|
||||
rc::Rc,
|
||||
sync::{Arc, Mutex},
|
||||
time::{Duration, Instant},
|
||||
};
|
||||
|
||||
use futures::StreamExt;
|
||||
use input_capture::{
|
||||
CaptureError, CaptureEvent, CaptureHandle, InputCapture, InputCaptureError, Position,
|
||||
WindowIdentifier,
|
||||
};
|
||||
use input_event::scancode;
|
||||
use lan_mouse_proto::ProtoEvent;
|
||||
@@ -59,8 +61,6 @@ enum CaptureRequest {
|
||||
Destroy(CaptureHandle),
|
||||
/// reenable input capture
|
||||
Reenable,
|
||||
/// set release bind
|
||||
SetReleaseBind(Vec<scancode::Linux>),
|
||||
}
|
||||
|
||||
impl Capture {
|
||||
@@ -68,6 +68,7 @@ impl Capture {
|
||||
backend: Option<input_capture::Backend>,
|
||||
conn: LanMouseConnection,
|
||||
release_bind: Vec<scancode::Linux>,
|
||||
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||
) -> Self {
|
||||
let (request_tx, request_rx) = channel();
|
||||
let (event_tx, event_rx) = channel();
|
||||
@@ -82,6 +83,7 @@ impl Capture {
|
||||
request_rx,
|
||||
release_bind: Rc::new(RefCell::new(release_bind)),
|
||||
state: Default::default(),
|
||||
window_identifier,
|
||||
};
|
||||
let task = spawn_local(capture_task.run());
|
||||
Self {
|
||||
@@ -133,10 +135,6 @@ impl Capture {
|
||||
pub(crate) async fn event(&mut self) -> ICaptureEvent {
|
||||
self.event_rx.recv().await.expect("channel closed")
|
||||
}
|
||||
|
||||
pub(crate) fn set_release_bind(&mut self, bind: Vec<scancode::Linux>) {
|
||||
let _ = self.request_tx.send(CaptureRequest::SetReleaseBind(bind));
|
||||
}
|
||||
}
|
||||
|
||||
/// debounce a statement `$st`, i.e. the statement is executed only if the
|
||||
@@ -166,6 +164,7 @@ struct CaptureTask {
|
||||
release_bind: Rc<RefCell<Vec<scancode::Linux>>>,
|
||||
request_rx: Receiver<CaptureRequest>,
|
||||
state: State,
|
||||
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||
}
|
||||
|
||||
impl CaptureTask {
|
||||
@@ -200,6 +199,7 @@ impl CaptureTask {
|
||||
}
|
||||
|
||||
async fn run(mut self) {
|
||||
tokio::time::sleep(Duration::from_secs(1)).await;
|
||||
loop {
|
||||
if let Err(e) = self.do_capture().await {
|
||||
log::warn!("input capture exited: {e}");
|
||||
@@ -207,13 +207,10 @@ impl CaptureTask {
|
||||
loop {
|
||||
tokio::select! {
|
||||
r = self.request_rx.recv() => match r.expect("channel closed") {
|
||||
CaptureRequest::Reenable => break,
|
||||
CaptureRequest::Create(h, p, t) => self.add_capture(h, p, t),
|
||||
CaptureRequest::Destroy(h) => self.remove_capture(h),
|
||||
CaptureRequest::Release => { /* nothing to do */ }
|
||||
CaptureRequest::SetReleaseBind(bind) => {
|
||||
self.release_bind.borrow_mut().clone_from(&bind);
|
||||
}
|
||||
CaptureRequest::Reenable=>break,
|
||||
CaptureRequest::Create(h,p,t)=>self.add_capture(h,p,t),
|
||||
CaptureRequest::Destroy(h)=>self.remove_capture(h),
|
||||
CaptureRequest::Release=>{}
|
||||
},
|
||||
_ = self.cancellation_token.cancelled() => return,
|
||||
}
|
||||
@@ -224,7 +221,7 @@ impl CaptureTask {
|
||||
async fn do_capture(&mut self) -> Result<(), InputCaptureError> {
|
||||
/* allow cancelling capture request */
|
||||
let mut capture = tokio::select! {
|
||||
r = InputCapture::new(self.backend) => r?,
|
||||
r = InputCapture::new(self.backend, self.window_identifier.clone()) => r?,
|
||||
_ = self.cancellation_token.cancelled() => return Ok(()),
|
||||
};
|
||||
|
||||
@@ -294,19 +291,10 @@ impl CaptureTask {
|
||||
}
|
||||
},
|
||||
e = self.request_rx.recv() => match e.expect("channel closed") {
|
||||
CaptureRequest::Reenable => { /* already active */ },
|
||||
CaptureRequest::Release => self.release_capture(capture).await?,
|
||||
CaptureRequest::Create(h, p, t) => {
|
||||
self.add_capture(h, p, t);
|
||||
capture.create(h, p).await?;
|
||||
}
|
||||
CaptureRequest::Destroy(h) => {
|
||||
self.remove_capture(h);
|
||||
capture.destroy(h).await?;
|
||||
}
|
||||
CaptureRequest::SetReleaseBind(bind) => {
|
||||
self.release_bind.borrow_mut().clone_from(&bind);
|
||||
}
|
||||
CaptureRequest::Reenable=>{},
|
||||
CaptureRequest::Release=>self.release_capture(capture).await?,
|
||||
CaptureRequest::Create(h,p,t)=>{self.add_capture(h,p,t);capture.create(h,p).await?;}
|
||||
CaptureRequest::Destroy(h)=>{self.remove_capture(h);capture.destroy(h).await?;}
|
||||
},
|
||||
_ = self.cancellation_token.cancelled() => break,
|
||||
}
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
use crate::config::Config;
|
||||
use clap::Args;
|
||||
use futures::StreamExt;
|
||||
@@ -12,7 +14,7 @@ pub async fn run(config: Config, _args: TestCaptureArgs) -> Result<(), InputCapt
|
||||
log::info!("creating input capture");
|
||||
let backend = config.capture_backend().map(|b| b.into());
|
||||
loop {
|
||||
let mut input_capture = InputCapture::new(backend).await?;
|
||||
let mut input_capture = InputCapture::new(backend, Arc::new(Mutex::new(None))).await?;
|
||||
log::info!("creating clients");
|
||||
input_capture.create(0, Position::Left).await?;
|
||||
input_capture.create(4, Position::Left).await?;
|
||||
|
||||
@@ -9,8 +9,6 @@ use slab::Slab;
|
||||
|
||||
use lan_mouse_ipc::{ClientConfig, ClientHandle, ClientState, Position};
|
||||
|
||||
use crate::config::ConfigClient;
|
||||
|
||||
#[derive(Clone, Default)]
|
||||
pub struct ClientManager {
|
||||
clients: Rc<RefCell<Slab<(ClientConfig, ClientState)>>>,
|
||||
@@ -26,25 +24,6 @@ impl ClientManager {
|
||||
.collect::<Vec<_>>()
|
||||
}
|
||||
|
||||
pub fn add_with_config(&self, config_client: ConfigClient) -> ClientHandle {
|
||||
let config = ClientConfig {
|
||||
hostname: config_client.hostname,
|
||||
fix_ips: config_client.ips.into_iter().collect(),
|
||||
port: config_client.port,
|
||||
pos: config_client.pos,
|
||||
cmd: config_client.enter_hook,
|
||||
};
|
||||
let state = ClientState {
|
||||
active: config_client.active,
|
||||
ips: HashSet::from_iter(config.fix_ips.iter().cloned()),
|
||||
..Default::default()
|
||||
};
|
||||
let handle = self.add_client();
|
||||
self.set_config(handle, config);
|
||||
self.set_state(handle, state);
|
||||
handle
|
||||
}
|
||||
|
||||
/// add a new client to this manager
|
||||
pub fn add_client(&self) -> ClientHandle {
|
||||
self.clients.borrow_mut().insert(Default::default()) as ClientHandle
|
||||
@@ -251,15 +230,6 @@ impl ClientManager {
|
||||
.and_then(|(c, _)| c.cmd.clone())
|
||||
}
|
||||
|
||||
/// returns all clients that are currently registered
|
||||
pub(crate) fn registered_clients(&self) -> Vec<ClientHandle> {
|
||||
self.clients
|
||||
.borrow()
|
||||
.iter()
|
||||
.map(|(h, _)| h as ClientHandle)
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// returns all clients that are currently active
|
||||
pub(crate) fn active_clients(&self) -> Vec<ClientHandle> {
|
||||
self.clients
|
||||
|
||||
113
src/config.rs
113
src/config.rs
@@ -1,7 +1,6 @@
|
||||
use crate::capture_test::TestCaptureArgs;
|
||||
use crate::emulation_test::TestEmulationArgs;
|
||||
use clap::{Parser, Subcommand, ValueEnum};
|
||||
use notify::{EventKind, RecommendedWatcher, Watcher};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::HashMap;
|
||||
use std::env::{self, VarError};
|
||||
@@ -47,7 +46,7 @@ fn default_path() -> Result<PathBuf, VarError> {
|
||||
Ok(PathBuf::from(default_path))
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, Default, PartialEq)]
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, Default)]
|
||||
struct ConfigToml {
|
||||
capture_backend: Option<CaptureBackend>,
|
||||
emulation_backend: Option<EmulationBackend>,
|
||||
@@ -245,14 +244,8 @@ pub struct Config {
|
||||
cert_path: PathBuf,
|
||||
/// path to the config file used
|
||||
config_path: PathBuf,
|
||||
/// path to config directory (parent of above)
|
||||
config_dir: PathBuf,
|
||||
/// the (optional) toml config and it's path
|
||||
config_toml: Option<ConfigToml>,
|
||||
// filesystem watcher
|
||||
watcher: notify::RecommendedWatcher,
|
||||
// channel for filesystem events
|
||||
watch_rx: tokio::sync::mpsc::Receiver<Result<notify::Event, notify::Error>>,
|
||||
}
|
||||
|
||||
pub struct ConfigClient {
|
||||
@@ -318,8 +311,6 @@ pub enum ConfigError {
|
||||
Io(#[from] io::Error),
|
||||
#[error(transparent)]
|
||||
Var(#[from] VarError),
|
||||
#[error(transparent)]
|
||||
Watcher(#[from] notify::Error),
|
||||
}
|
||||
|
||||
const DEFAULT_RELEASE_KEYS: [scancode::Linux; 4] =
|
||||
@@ -351,55 +342,12 @@ impl Config {
|
||||
.or(config_toml.as_ref().and_then(|c| c.cert_path.clone()))
|
||||
.unwrap_or(default_path()?.join(CERT_FILE_NAME));
|
||||
|
||||
let (tx, watch_rx) = tokio::sync::mpsc::channel(16);
|
||||
let watcher = RecommendedWatcher::new(
|
||||
move |res| {
|
||||
let _ = tx.blocking_send(res);
|
||||
},
|
||||
notify::Config::default(),
|
||||
)?;
|
||||
let config_dir = config_path
|
||||
.parent()
|
||||
.expect("config directory")
|
||||
.to_path_buf();
|
||||
let mut config = Config {
|
||||
Ok(Config {
|
||||
args,
|
||||
cert_path,
|
||||
config_path,
|
||||
config_dir,
|
||||
config_toml,
|
||||
watcher,
|
||||
watch_rx,
|
||||
};
|
||||
config.watch()?;
|
||||
Ok(config)
|
||||
}
|
||||
|
||||
fn watch(&mut self) -> Result<(), notify::Error> {
|
||||
self.watcher
|
||||
.watch(&self.config_dir, notify::RecursiveMode::NonRecursive)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn unwatch(&mut self) -> Result<(), notify::Error> {
|
||||
self.watcher.unwatch(&self.config_dir)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn changed(&mut self) -> Result<(), notify::Error> {
|
||||
loop {
|
||||
let event = self.watch_rx.recv().await.expect("channel closed");
|
||||
let event = event.expect("filesystem event");
|
||||
if event.paths.contains(&self.config_path)
|
||||
&& matches!(
|
||||
event.kind,
|
||||
EventKind::Create(_) | EventKind::Modify(_) | EventKind::Remove(_)
|
||||
)
|
||||
&& self.read_from_disk()?
|
||||
{
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/// the command to run
|
||||
@@ -480,6 +428,9 @@ impl Config {
|
||||
|
||||
/// set authorized keys
|
||||
pub fn set_authorized_keys(&mut self, fingerprints: HashMap<String, String>) {
|
||||
if fingerprints.is_empty() {
|
||||
return;
|
||||
}
|
||||
if self.config_toml.is_none() {
|
||||
self.config_toml = Default::default();
|
||||
}
|
||||
@@ -489,58 +440,38 @@ impl Config {
|
||||
.authorized_fingerprints = Some(fingerprints);
|
||||
}
|
||||
|
||||
pub fn read_from_disk(&mut self) -> Result<bool, io::Error> {
|
||||
log::info!("reading config from {:?}", &self.config_path);
|
||||
|
||||
let current_config = fs::read_to_string(&self.config_path)?;
|
||||
let current_config = match current_config.parse::<DocumentMut>() {
|
||||
Ok(c) => c,
|
||||
Err(e) => {
|
||||
log::warn!("{:?} {e}", self.config_path());
|
||||
return Ok(false);
|
||||
}
|
||||
};
|
||||
let mut changed = false;
|
||||
match toml_edit::de::from_document::<ConfigToml>(current_config) {
|
||||
Ok(current_config) => {
|
||||
changed = self
|
||||
.config_toml
|
||||
.as_ref()
|
||||
.is_none_or(|c| c != ¤t_config);
|
||||
self.config_toml.replace(current_config);
|
||||
}
|
||||
Err(e) => log::warn!("{:?} {e}", self.config_path()),
|
||||
};
|
||||
Ok(changed)
|
||||
}
|
||||
|
||||
pub fn write_back(&mut self) -> Result<(), io::Error> {
|
||||
pub fn write_back(&self) -> Result<(), io::Error> {
|
||||
log::info!("writing config to {:?}", &self.config_path);
|
||||
/* load the current configuration file */
|
||||
let current_config = match fs::read_to_string(&self.config_path) {
|
||||
Ok(c) => c.parse::<DocumentMut>().unwrap_or_default(),
|
||||
Err(e) => {
|
||||
log::info!("{:?} {e} => creating new config", self.config_path());
|
||||
Default::default()
|
||||
}
|
||||
};
|
||||
let _current_config =
|
||||
toml_edit::de::from_document::<ConfigToml>(current_config).unwrap_or_default();
|
||||
|
||||
/* the new config */
|
||||
let new_config = self.config_toml.clone().unwrap_or_default();
|
||||
// let new_config = toml_edit::ser::to_document::<ConfigToml>(&new_config).expect("fixme");
|
||||
let new_config = toml_edit::ser::to_string_pretty(&new_config).expect("config");
|
||||
|
||||
/*
|
||||
* TODO merge with current config file to preserve comments
|
||||
* => eventually we might want to split this up into clients configured
|
||||
* TODO merge documents => eventually we might want to split this up into clients configured
|
||||
* via the config file and clients managed through the GUI / frontend.
|
||||
* The latter should be saved to $XDG_DATA_HOME instead of $XDG_CONFIG_HOME,
|
||||
* and clients configured through .config could be made permanent.
|
||||
* For now we just override the config file.
|
||||
*/
|
||||
|
||||
let _ = self.unwatch();
|
||||
/* write new config to file */
|
||||
if let Some(p) = self.config_path().parent() {
|
||||
fs::create_dir_all(p)?;
|
||||
}
|
||||
{
|
||||
let mut f = File::create(self.config_path())?;
|
||||
f.write_all(new_config.as_bytes())?;
|
||||
f.sync_all()?;
|
||||
}
|
||||
|
||||
let _ = self.watch();
|
||||
let mut f = File::create(self.config_path())?;
|
||||
f.write_all(new_config.as_bytes())?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -11,15 +11,15 @@ use crate::{
|
||||
use futures::StreamExt;
|
||||
use hickory_resolver::ResolveError;
|
||||
use lan_mouse_ipc::{
|
||||
AsyncFrontendListener, ClientHandle, FrontendEvent, FrontendRequest, IpcError,
|
||||
IpcListenerCreationError, Position, Status,
|
||||
AsyncFrontendListener, ClientConfig, ClientHandle, ClientState, FrontendEvent, FrontendRequest,
|
||||
IpcError, IpcListenerCreationError, Position, Status,
|
||||
};
|
||||
use log;
|
||||
use std::{
|
||||
collections::{HashMap, HashSet, VecDeque},
|
||||
io,
|
||||
net::{IpAddr, SocketAddr},
|
||||
sync::{Arc, RwLock},
|
||||
sync::{Arc, Mutex, RwLock},
|
||||
};
|
||||
use thiserror::Error;
|
||||
use tokio::{process::Command, signal, sync::Notify};
|
||||
@@ -70,6 +70,7 @@ pub struct Service {
|
||||
/// map from capture handle to connection info
|
||||
incoming_conn_info: HashMap<ClientHandle, Incoming>,
|
||||
next_trigger_handle: u64,
|
||||
window_identifier: Arc<Mutex<Option<input_capture::WindowIdentifier>>>,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
@@ -83,7 +84,21 @@ impl Service {
|
||||
pub async fn new(config: Config) -> Result<Self, ServiceError> {
|
||||
let client_manager = ClientManager::default();
|
||||
for client in config.clients() {
|
||||
client_manager.add_with_config(client);
|
||||
let config = ClientConfig {
|
||||
hostname: client.hostname,
|
||||
fix_ips: client.ips.into_iter().collect(),
|
||||
port: client.port,
|
||||
pos: client.pos,
|
||||
cmd: client.enter_hook,
|
||||
};
|
||||
let state = ClientState {
|
||||
active: client.active,
|
||||
ips: HashSet::from_iter(config.fix_ips.iter().cloned()),
|
||||
..Default::default()
|
||||
};
|
||||
let handle = client_manager.add_client();
|
||||
client_manager.set_config(handle, config);
|
||||
client_manager.set_state(handle, state);
|
||||
}
|
||||
|
||||
// load certificate
|
||||
@@ -101,7 +116,13 @@ impl Service {
|
||||
|
||||
// input capture + emulation
|
||||
let capture_backend = config.capture_backend().map(|b| b.into());
|
||||
let capture = Capture::new(capture_backend, conn, config.release_bind());
|
||||
let window_identifier = Arc::new(Mutex::new(None));
|
||||
let capture = Capture::new(
|
||||
capture_backend,
|
||||
conn,
|
||||
config.release_bind(),
|
||||
window_identifier.clone(),
|
||||
);
|
||||
let emulation_backend = config.emulation_backend().map(|b| b.into());
|
||||
let emulation = Emulation::new(emulation_backend, listener);
|
||||
|
||||
@@ -126,6 +147,7 @@ impl Service {
|
||||
incoming_conn_info: Default::default(),
|
||||
incoming_conns: Default::default(),
|
||||
next_trigger_handle: 0,
|
||||
window_identifier,
|
||||
};
|
||||
Ok(service)
|
||||
}
|
||||
@@ -150,7 +172,6 @@ impl Service {
|
||||
event = self.emulation.event() => self.handle_emulation_event(event),
|
||||
event = self.capture.event() => self.handle_capture_event(event),
|
||||
event = self.resolver.event() => self.handle_resolver_event(event),
|
||||
_ = self.config.changed() => self.handle_config_change(),
|
||||
r = signal::ctrl_c() => break r.expect("failed to wait for CTRL+C"),
|
||||
}
|
||||
}
|
||||
@@ -218,6 +239,20 @@ impl Service {
|
||||
self.update_enter_hook(handle, enter_hook)
|
||||
}
|
||||
FrontendRequest::SaveConfiguration => self.save_config(),
|
||||
FrontendRequest::WindowIdentifier(handle) => {
|
||||
log::info!("xdg-foreign handle: {handle:?}");
|
||||
self.window_identifier
|
||||
.lock()
|
||||
.unwrap()
|
||||
.replace(match handle {
|
||||
lan_mouse_ipc::WindowIdentifier::Wayland(handle) => {
|
||||
input_capture::WindowIdentifier::Wayland(handle)
|
||||
}
|
||||
lan_mouse_ipc::WindowIdentifier::X11(xid) => {
|
||||
input_capture::WindowIdentifier::X11(xid)
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -242,30 +277,6 @@ impl Service {
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_config_change(&mut self) {
|
||||
for h in self.client_manager.registered_clients() {
|
||||
self.remove_client(h);
|
||||
}
|
||||
for c in self.config.clients() {
|
||||
let handle = self.client_manager.add_with_config(c);
|
||||
log::info!("added client {handle}");
|
||||
let (c, s) = self.client_manager.get_state(handle).unwrap();
|
||||
if s.active {
|
||||
self.client_manager.deactivate_client(handle);
|
||||
self.activate_client(handle);
|
||||
}
|
||||
self.notify_frontend(FrontendEvent::Created(handle, c, s));
|
||||
}
|
||||
let release_bind = self.config.release_bind();
|
||||
self.capture.set_release_bind(release_bind);
|
||||
let authorized_keys = self.config.authorized_fingerprints();
|
||||
self.authorized_keys
|
||||
.write()
|
||||
.unwrap()
|
||||
.clone_from(&authorized_keys);
|
||||
self.sync_frontend();
|
||||
}
|
||||
|
||||
async fn handle_frontend_pending(&mut self) {
|
||||
while let Some(event) = self.pending_frontend_events.pop_front() {
|
||||
self.frontend_listener.broadcast(event).await;
|
||||
@@ -488,7 +499,7 @@ impl Service {
|
||||
}
|
||||
|
||||
fn activate_client(&mut self, handle: ClientHandle) {
|
||||
log::debug!("activating client {handle}");
|
||||
log::debug!("activating client");
|
||||
|
||||
/* resolve dns on activate */
|
||||
self.resolve(handle);
|
||||
|
||||
Reference in New Issue
Block a user