mirror of
https://github.com/feschber/lan-mouse.git
synced 2026-03-27 23:20:54 +03:00
Compare commits
8 Commits
windows-ms
...
config-wat
| Author | SHA1 | Date | |
|---|---|---|---|
|
eb8c2d091b | ||
|
|
2e1b5278ce | ||
|
4d8f7d7813 | ||
|
|
0ef8edb7b2 | ||
|
|
3eba50a0d3 | ||
|
|
9540739d89 | ||
|
810e25a7fc | ||
|
|
9af5f9452e |
24
.editorconfig
Normal file
24
.editorconfig
Normal file
@@ -0,0 +1,24 @@
|
||||
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
|
||||
34
.githooks/pre-commit
Executable file
34
.githooks/pre-commit
Executable file
@@ -0,0 +1,34 @@
|
||||
#!/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
|
||||
6
.github/workflows/cachix.yml
vendored
6
.github/workflows/cachix.yml
vendored
@@ -7,6 +7,10 @@ on:
|
||||
branches: ["main"]
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
nix:
|
||||
strategy:
|
||||
@@ -19,7 +23,7 @@ jobs:
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
|
||||
@@ -1,10 +1,17 @@
|
||||
name: "pre-release"
|
||||
name: "Release"
|
||||
run-name: "Release - ${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || github.event.inputs.name || github.ref_name }}"
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ "main" ]
|
||||
|
||||
|
||||
tags:
|
||||
- v**
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
name:
|
||||
description: 'Development release name'
|
||||
required: false
|
||||
default: ''
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
@@ -13,19 +20,40 @@ jobs:
|
||||
linux-release-build:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- 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
|
||||
run: |
|
||||
cargo build --release
|
||||
cp target/release/lan-mouse lan-mouse-linux-x86_64
|
||||
- name: Upload build artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: lan-mouse-linux
|
||||
path: target/release/lan-mouse
|
||||
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
|
||||
|
||||
windows-release-build:
|
||||
runs-on: windows-latest
|
||||
@@ -64,7 +92,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@v4
|
||||
- uses: actions/checkout@v6
|
||||
- name: Release Build
|
||||
run: cargo build --release
|
||||
- name: Create Archive
|
||||
@@ -72,19 +100,21 @@ 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.zip
|
||||
Compress-Archive -Path "lan-mouse-windows\*" -DestinationPath lan-mouse-windows-x86_64.zip
|
||||
- name: Upload build artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: lan-mouse-windows
|
||||
path: lan-mouse-windows.zip
|
||||
name: lan-mouse-windows-x86_64
|
||||
path: lan-mouse-windows-x86_64.zip
|
||||
|
||||
macos-release-build:
|
||||
runs-on: macos-15-intel
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v6
|
||||
- name: install dependencies
|
||||
run: brew install gtk4 libadwaita imagemagick
|
||||
run: |
|
||||
brew install --cask inkscape
|
||||
brew install gtk4 libadwaita imagemagick librsvg
|
||||
- name: Release Build
|
||||
run: |
|
||||
cargo build --release
|
||||
@@ -102,21 +132,23 @@ jobs:
|
||||
cd target/release/bundle/osx
|
||||
zip -r "lan-mouse-macos-intel.zip" "Lan Mouse.app"
|
||||
- name: Upload build artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: lan-mouse-macos-intel
|
||||
path: target/release/bundle/osx/lan-mouse-macos-intel.zip
|
||||
|
||||
macos-aarch64-release-build:
|
||||
runs-on: macos-14
|
||||
macos-arm64-release-build:
|
||||
runs-on: macos-15
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v6
|
||||
- name: install dependencies
|
||||
run: brew install gtk4 libadwaita imagemagick
|
||||
run: |
|
||||
brew install --cask inkscape
|
||||
brew install gtk4 libadwaita imagemagick librsvg
|
||||
- name: Release Build
|
||||
run: |
|
||||
cargo build --release
|
||||
cp target/release/lan-mouse lan-mouse-macos-aarch64
|
||||
cp target/release/lan-mouse lan-mouse-macos-arm64
|
||||
- name: Make icns
|
||||
run: scripts/makeicns.sh
|
||||
- name: Install cargo bundle
|
||||
@@ -128,29 +160,45 @@ jobs:
|
||||
- name: Zip bundle
|
||||
run: |
|
||||
cd target/release/bundle/osx
|
||||
zip -r "lan-mouse-macos-aarch64.zip" "Lan Mouse.app"
|
||||
zip -r "lan-mouse-macos-arm64.zip" "Lan Mouse.app"
|
||||
- name: Upload build artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: lan-mouse-macos-aarch64
|
||||
path: target/release/bundle/osx/lan-mouse-macos-aarch64.zip
|
||||
name: lan-mouse-macos-arm64
|
||||
path: target/release/bundle/osx/lan-mouse-macos-arm64.zip
|
||||
|
||||
pre-release:
|
||||
name: "Pre Release"
|
||||
needs: [windows-release-build, linux-release-build, macos-release-build, macos-aarch64-release-build]
|
||||
release:
|
||||
name: "Release"
|
||||
needs: [windows-release-build, linux-release-build, linux-arm64-release-build, macos-release-build, macos-arm64-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"
|
||||
- name: Create Pre-Release
|
||||
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
repo_token: "${{ secrets.GITHUB_TOKEN }}"
|
||||
automatic_release_tag: "latest"
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
tag_name: ${{ github.event.inputs.name || github.ref_name }}
|
||||
name: ${{ github.event.inputs.name || github.ref_name }}
|
||||
prerelease: true
|
||||
title: "Development Build"
|
||||
generate_release_notes: true
|
||||
files: |
|
||||
lan-mouse-linux/lan-mouse
|
||||
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-aarch64/lan-mouse-macos-aarch64.zip
|
||||
lan-mouse-windows/lan-mouse-windows.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
|
||||
8
.github/workflows/rust.yml
vendored
8
.github/workflows/rust.yml
vendored
@@ -9,12 +9,16 @@ 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@v4
|
||||
- uses: actions/checkout@v6
|
||||
- name: cargo fmt
|
||||
run: cargo fmt --check
|
||||
|
||||
@@ -35,7 +39,7 @@ jobs:
|
||||
- clippy
|
||||
- test
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v6
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
- name: Install Linux deps
|
||||
if: runner.os == 'Linux'
|
||||
|
||||
150
.github/workflows/tagged-release.yml
vendored
150
.github/workflows/tagged-release.yml
vendored
@@ -1,150 +0,0 @@
|
||||
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
Normal file
65
AGENTS.md
Normal file
@@ -0,0 +1,65 @@
|
||||
# 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`.
|
||||
106
Cargo.lock
generated
106
Cargo.lock
generated
@@ -971,6 +971,15 @@ 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"
|
||||
@@ -1652,6 +1661,26 @@ 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"
|
||||
@@ -1843,6 +1872,26 @@ 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"
|
||||
@@ -1861,6 +1910,7 @@ dependencies = [
|
||||
"libc",
|
||||
"local-channel",
|
||||
"log",
|
||||
"notify",
|
||||
"rcgen",
|
||||
"rustls",
|
||||
"serde",
|
||||
@@ -2121,6 +2171,7 @@ 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",
|
||||
]
|
||||
@@ -2180,6 +2231,33 @@ 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"
|
||||
@@ -2820,6 +2898,15 @@ 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"
|
||||
@@ -3526,6 +3613,16 @@ 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"
|
||||
@@ -3763,6 +3860,15 @@ 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,6 +67,7 @@ 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,4 +1,9 @@
|
||||
# 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.
|
||||
@@ -177,8 +182,27 @@ For a detailed list of available features, checkout the [Cargo.toml](./Cargo.tom
|
||||
|
||||
|
||||
|
||||
## Development
|
||||
|
||||
## Installing Dependencies for Development / Compiling from Source
|
||||
### 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
|
||||
<details>
|
||||
<summary>MacOS</summary>
|
||||
|
||||
@@ -451,4 +475,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)
|
||||
@@ -49,7 +49,7 @@ pub(crate) enum CaptureType {
|
||||
EnterOnly,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
#[derive(Clone, Debug)]
|
||||
enum CaptureRequest {
|
||||
/// capture must release the mouse
|
||||
Release,
|
||||
@@ -59,6 +59,8 @@ enum CaptureRequest {
|
||||
Destroy(CaptureHandle),
|
||||
/// reenable input capture
|
||||
Reenable,
|
||||
/// set release bind
|
||||
SetReleaseBind(Vec<scancode::Linux>),
|
||||
}
|
||||
|
||||
impl Capture {
|
||||
@@ -131,6 +133,10 @@ 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
|
||||
@@ -205,6 +211,9 @@ impl CaptureTask {
|
||||
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);
|
||||
}
|
||||
},
|
||||
_ = self.cancellation_token.cancelled() => return,
|
||||
}
|
||||
@@ -295,6 +304,9 @@ impl CaptureTask {
|
||||
self.remove_capture(h);
|
||||
capture.destroy(h).await?;
|
||||
}
|
||||
CaptureRequest::SetReleaseBind(bind) => {
|
||||
self.release_bind.borrow_mut().clone_from(&bind);
|
||||
}
|
||||
},
|
||||
_ = self.cancellation_token.cancelled() => break,
|
||||
}
|
||||
|
||||
@@ -9,6 +9,8 @@ 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)>>>,
|
||||
@@ -24,6 +26,25 @@ 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
|
||||
@@ -230,6 +251,15 @@ 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
|
||||
|
||||
107
src/config.rs
107
src/config.rs
@@ -1,6 +1,7 @@
|
||||
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};
|
||||
@@ -46,7 +47,7 @@ fn default_path() -> Result<PathBuf, VarError> {
|
||||
Ok(PathBuf::from(default_path))
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, Default)]
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, Default, PartialEq)]
|
||||
struct ConfigToml {
|
||||
capture_backend: Option<CaptureBackend>,
|
||||
emulation_backend: Option<EmulationBackend>,
|
||||
@@ -244,8 +245,14 @@ 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 {
|
||||
@@ -311,6 +318,8 @@ 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] =
|
||||
@@ -342,12 +351,55 @@ impl Config {
|
||||
.or(config_toml.as_ref().and_then(|c| c.cert_path.clone()))
|
||||
.unwrap_or(default_path()?.join(CERT_FILE_NAME));
|
||||
|
||||
Ok(Config {
|
||||
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 {
|
||||
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
|
||||
@@ -428,9 +480,6 @@ 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();
|
||||
}
|
||||
@@ -440,38 +489,58 @@ impl Config {
|
||||
.authorized_fingerprints = Some(fingerprints);
|
||||
}
|
||||
|
||||
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(),
|
||||
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::info!("{:?} {e} => creating new config", self.config_path());
|
||||
Default::default()
|
||||
log::warn!("{:?} {e}", self.config_path());
|
||||
return Ok(false);
|
||||
}
|
||||
};
|
||||
let _current_config =
|
||||
toml_edit::de::from_document::<ConfigToml>(current_config).unwrap_or_default();
|
||||
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> {
|
||||
log::info!("writing config to {:?}", &self.config_path);
|
||||
/* 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 documents => eventually we might want to split this up into clients configured
|
||||
* TODO merge with current config file to preserve comments
|
||||
* => 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())?;
|
||||
{
|
||||
let mut f = File::create(self.config_path())?;
|
||||
f.write_all(new_config.as_bytes())?;
|
||||
f.sync_all()?;
|
||||
}
|
||||
|
||||
let _ = self.watch();
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -11,8 +11,8 @@ use crate::{
|
||||
use futures::StreamExt;
|
||||
use hickory_resolver::ResolveError;
|
||||
use lan_mouse_ipc::{
|
||||
AsyncFrontendListener, ClientConfig, ClientHandle, ClientState, FrontendEvent, FrontendRequest,
|
||||
IpcError, IpcListenerCreationError, Position, Status,
|
||||
AsyncFrontendListener, ClientHandle, FrontendEvent, FrontendRequest, IpcError,
|
||||
IpcListenerCreationError, Position, Status,
|
||||
};
|
||||
use log;
|
||||
use std::{
|
||||
@@ -83,21 +83,7 @@ impl Service {
|
||||
pub async fn new(config: Config) -> Result<Self, ServiceError> {
|
||||
let client_manager = ClientManager::default();
|
||||
for client in config.clients() {
|
||||
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);
|
||||
client_manager.add_with_config(client);
|
||||
}
|
||||
|
||||
// load certificate
|
||||
@@ -164,6 +150,7 @@ 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"),
|
||||
}
|
||||
}
|
||||
@@ -255,6 +242,30 @@ 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;
|
||||
@@ -477,7 +488,7 @@ impl Service {
|
||||
}
|
||||
|
||||
fn activate_client(&mut self, handle: ClientHandle) {
|
||||
log::debug!("activating client");
|
||||
log::debug!("activating client {handle}");
|
||||
|
||||
/* resolve dns on activate */
|
||||
self.resolve(handle);
|
||||
|
||||
3
wix/bundle/.gitignore
vendored
3
wix/bundle/.gitignore
vendored
@@ -1,3 +0,0 @@
|
||||
/bin
|
||||
/obj
|
||||
icon.ico
|
||||
@@ -1,16 +0,0 @@
|
||||
<Project Sdk="WixToolset.Sdk/5.0.0">
|
||||
<PropertyGroup>
|
||||
<OutputType>Bundle</OutputType>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
<Platforms>x64</Platforms>
|
||||
<InstallerPlatform>x64</InstallerPlatform>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="WixToolset.Heat">
|
||||
<Version>5.0.2</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="WixToolset.Bal.wixext">
|
||||
<Version>5.0.2</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -1,42 +0,0 @@
|
||||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
|
||||
xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
|
||||
|
||||
<Bundle
|
||||
Name="Lan Mouse"
|
||||
Version="0.10.0"
|
||||
UpgradeCode="{39A9744D-9D6E-4CD3-A84F-9E034786A7B1}"
|
||||
Compressed="no"
|
||||
SplashScreenSourceFile="icon.ico">
|
||||
|
||||
<BootstrapperApplication>
|
||||
<bal:WixStandardBootstrapperApplication
|
||||
LicenseUrl=""
|
||||
Theme="hyperlinkLicense" />
|
||||
</BootstrapperApplication>
|
||||
|
||||
<Chain>
|
||||
<!-- Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810 -->
|
||||
<ExePackage
|
||||
Id="VC_REDIST_X64"
|
||||
DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
|
||||
PerMachine="yes"
|
||||
Permanent="yes"
|
||||
Protocol="burn"
|
||||
InstallCondition="VersionNT64 AND (ARCH_NAME = "AMD64")"
|
||||
DetectCondition="(VCRUNTIME_X64_VER >= VCRUNTIME_VER) AND VersionNT64 AND (ARCH_NAME = "AMD64")"
|
||||
InstallArguments="/install /quiet /norestart"
|
||||
RepairArguments="/repair /quiet /norestart"
|
||||
UninstallArguments="/uninstall /quiet /norestart">
|
||||
<ExePackagePayload
|
||||
Name="VC_redist.x64.exe"
|
||||
ProductName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
|
||||
Description="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
|
||||
Hash="5935B69F5138AC3FBC33813C74DA853269BA079F910936AEFA95E230C6092B92F6225BFFB594E5DD35FF29BF260E4B35F91ADEDE90FDF5F062030D8666FD0104"
|
||||
Size="25397512"
|
||||
Version="14.40.33810.0"
|
||||
DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/1754ea58-11a6-44ab-a262-696e194ce543/3642E3F95D50CC193E4B5A0B0FFBF7FE2C08801517758B4C8AEB7105A091208A/VC_redist.x64.exe" />
|
||||
</ExePackage>
|
||||
<MsiPackage SourceFile="..\lan-mouse\bin\Debug\en-US\LanMouse.msi" Compressed="yes"/>
|
||||
</Chain>
|
||||
</Bundle>
|
||||
</Wix>
|
||||
3
wix/lan-mouse/.gitignore
vendored
3
wix/lan-mouse/.gitignore
vendored
@@ -1,3 +0,0 @@
|
||||
/bin
|
||||
/obj
|
||||
icon.ico
|
||||
@@ -1,13 +0,0 @@
|
||||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
|
||||
<Fragment>
|
||||
<StandardDirectory Id="ProgramFiles64Folder">
|
||||
<Directory Id="INSTALLFOLDER" Name="!(bind.Property.Manufacturer) !(bind.Property.ProductName)">
|
||||
<Directory Id="SHARE" Name="share"/>
|
||||
<Directory Id="LIB" Name="lib"/>
|
||||
</Directory>
|
||||
</StandardDirectory>
|
||||
<StandardDirectory Id="ProgramMenuFolder">
|
||||
<Directory Id="ApplicationProgramsFolder" Name="!(bind.Property.ProductName)"/>
|
||||
</StandardDirectory>
|
||||
</Fragment>
|
||||
</Wix>
|
||||
@@ -1,34 +0,0 @@
|
||||
<Project Sdk="WixToolset.Sdk/5.0.2">
|
||||
<PropertyGroup>
|
||||
<InstallerPlatform>x64</InstallerPlatform>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="WixToolset.Heat">
|
||||
<Version>5.0.2</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<HarvestDirectory Include="C:\gtk-build\gtk\x64\release\bin">
|
||||
<ComponentGroupName>GTKBIN</ComponentGroupName>
|
||||
<DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
|
||||
<SuppressRegistry>true</SuppressRegistry>
|
||||
</HarvestDirectory>
|
||||
<BindPath Include="C:\gtk-build\gtk\x64\release\bin" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<HarvestDirectory Include="C:\gtk-build\gtk\x64\release\share\icons">
|
||||
<ComponentGroupName>GTKICONS</ComponentGroupName>
|
||||
<DirectoryRefId>SHARE</DirectoryRefId>
|
||||
<SuppressRegistry>true</SuppressRegistry>
|
||||
</HarvestDirectory>
|
||||
<BindPath Include="C:\gtk-build\gtk\x64\release\share\icons" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<HarvestDirectory Include="C:\gtk-build\gtk\x64\release\lib\gdk-pixbuf-2.0">
|
||||
<ComponentGroupName>GTKLIBS</ComponentGroupName>
|
||||
<DirectoryRefId>LIB</DirectoryRefId>
|
||||
<SuppressRegistry>true</SuppressRegistry>
|
||||
</HarvestDirectory>
|
||||
<BindPath Include="C:\gtk-build\gtk\x64\release\lib\gdk-pixbuf-2.0" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -1,32 +0,0 @@
|
||||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
|
||||
<Fragment>
|
||||
<ComponentGroup Id="LanMouseComponents" Directory="INSTALLFOLDER" Subdirectory="bin">
|
||||
<Component Guid="{ECB52D3E-28AD-4BEC-B9DF-E01CCAB356BE}">
|
||||
<!-- the main binary -->
|
||||
<File Source="..\..\target\release\lan-mouse.exe"/>
|
||||
|
||||
<!-- visual c runtime dll -->
|
||||
<!--<File Source="C:\windows\system32\VCRUNTIME140.dll"/>-->
|
||||
<!--<File Source="C:\windows\system32\VCRUNTIME140_1.dll"/>-->
|
||||
</Component>
|
||||
<!-- start menu entry-->
|
||||
<Component Id="ApplicationShortcut" Directory="ApplicationProgramsFolder">
|
||||
<Shortcut Id="ApplicationStartMenuShortcut"
|
||||
Name="!(bind.Property.ProductName)"
|
||||
Description ="Mouse and Keyboard sharing Software"
|
||||
Target="[INSTALLFOLDER]bin\lan-mouse.exe"
|
||||
WorkingDirectory="INSTALLFOLDER">
|
||||
<Icon Id="LanMouse" SourceFile=".\icon.ico"/>
|
||||
</Shortcut>
|
||||
<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
|
||||
<RegistryValue
|
||||
Root="HKCU"
|
||||
Key="Software\Feschber\LanMouse"
|
||||
Name="installed"
|
||||
Type="integer"
|
||||
Value="1"
|
||||
KeyPath="yes"/>
|
||||
</Component>
|
||||
</ComponentGroup>
|
||||
</Fragment>
|
||||
</Wix>
|
||||
@@ -1,8 +0,0 @@
|
||||
<!--
|
||||
This file contains the declaration of all the localizable strings.
|
||||
-->
|
||||
<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
|
||||
|
||||
<String Id="DowngradeError" Value="A newer version of [ProductName] is already installed." />
|
||||
|
||||
</WixLocalization>
|
||||
@@ -1,16 +0,0 @@
|
||||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
|
||||
<Package Name="Lan Mouse"
|
||||
Manufacturer="Ferdinand Schober"
|
||||
Version="0.10.0.0"
|
||||
UpgradeCode="{a330cd60-4c35-4a54-8bb6-75b3049b46c6}">
|
||||
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
|
||||
|
||||
<MediaTemplate EmbedCab="yes"/>
|
||||
<Feature Id="Main">
|
||||
<ComponentGroupRef Id="GTKBIN"/>
|
||||
<ComponentGroupRef Id="GTKICONS"/>
|
||||
<ComponentGroupRef Id="GTKLIBS"/>
|
||||
<ComponentGroupRef Id="LanMouseComponents"/>
|
||||
</Feature>
|
||||
</Package>
|
||||
</Wix>
|
||||
@@ -1,2 +0,0 @@
|
||||
magick -background none -density 384 ..\lan-mouse-gtk\resources\de.feschber.LanMouse.svg -trim -define icon:auto-resize icon.ico
|
||||
dotnet build
|
||||
Reference in New Issue
Block a user