mirror of
https://github.com/feschber/lan-mouse.git
synced 2026-04-15 14:21:28 +03:00
Compare commits
2 Commits
main
...
a5bdcd0972
| Author | SHA1 | Date | |
|---|---|---|---|
|
a5bdcd0972 | ||
|
|
be27e337f4 |
@@ -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
|
|
||||||
66
.github/workflows/cachix.yml
vendored
66
.github/workflows/cachix.yml
vendored
@@ -1,50 +1,40 @@
|
|||||||
name: Nix Binary Cache
|
name: 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
|
|
||||||
|
|
||||||
|
on: [push, pull_request, workflow_dispatch]
|
||||||
jobs:
|
jobs:
|
||||||
nix:
|
nix:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os:
|
os:
|
||||||
- ubuntu-latest
|
- ubuntu-latest
|
||||||
- macos-15-intel
|
- macos-15-intel
|
||||||
- macos-latest
|
- macos-14
|
||||||
name: "Build"
|
name: "Build"
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
# - uses: DeterminateSystems/nix-installer-action@main
|
- uses: DeterminateSystems/nix-installer-action@main
|
||||||
# with:
|
with:
|
||||||
# logger: pretty
|
logger: pretty
|
||||||
# - uses: DeterminateSystems/magic-nix-cache-action@main
|
- uses: DeterminateSystems/magic-nix-cache-action@main
|
||||||
- uses: cachix/install-nix-action@v31
|
- uses: cachix/cachix-action@v14
|
||||||
- uses: cachix/cachix-action@v16
|
with:
|
||||||
with:
|
name: lan-mouse
|
||||||
name: lan-mouse
|
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
||||||
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
|
|
||||||
|
|
||||||
- name: Build lan-mouse (x86_64-linux)
|
- name: Build lan-mouse (x86_64-linux)
|
||||||
if: matrix.os == 'ubuntu-latest'
|
if: matrix.os == 'ubuntu-latest'
|
||||||
run: nix build --print-build-logs --show-trace .#packages.x86_64-linux.lan-mouse
|
run: nix build --print-build-logs --show-trace .#packages.x86_64-linux.lan-mouse
|
||||||
|
|
||||||
- name: Build lan-mouse (x86_64-darwin)
|
- name: Build lan-mouse (x86_64-darwin)
|
||||||
if: matrix.os == 'macos-15-intel'
|
if: matrix.os == 'macos-15-intel'
|
||||||
run: nix build --print-build-logs --show-trace .#packages.x86_64-darwin.lan-mouse
|
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"
|
name: "pre-release"
|
||||||
run-name: "Release - ${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || github.event.inputs.name || github.ref_name }}"
|
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ "main" ]
|
branches: [ "main" ]
|
||||||
tags:
|
|
||||||
- v**
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
name:
|
|
||||||
description: 'Development release name'
|
|
||||||
required: false
|
|
||||||
default: ''
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
CARGO_TERM_COLOR: always
|
CARGO_TERM_COLOR: always
|
||||||
@@ -20,40 +13,19 @@ jobs:
|
|||||||
linux-release-build:
|
linux-release-build:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v4
|
||||||
- name: install dependencies
|
- name: install dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install libx11-dev libxtst-dev
|
sudo apt-get install libx11-dev libxtst-dev
|
||||||
sudo apt-get install libadwaita-1-dev libgtk-4-dev
|
sudo apt-get install libadwaita-1-dev libgtk-4-dev
|
||||||
- name: Release Build
|
- name: Release Build
|
||||||
run: |
|
run: cargo build --release
|
||||||
cargo build --release
|
|
||||||
cp target/release/lan-mouse lan-mouse-linux-x86_64
|
|
||||||
- name: Upload build artifact
|
- name: Upload build artifact
|
||||||
uses: actions/upload-artifact@v6
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: lan-mouse-linux-x86_64
|
name: lan-mouse-linux
|
||||||
path: lan-mouse-linux-x86_64
|
path: target/release/lan-mouse
|
||||||
|
|
||||||
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:
|
windows-release-build:
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
@@ -92,7 +64,7 @@ jobs:
|
|||||||
gvsbuild build --msys-dir=C:\msys64 gtk4 libadwaita librsvg
|
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\usr\notbin" "C:\Program Files\Git\usr\bin"
|
||||||
Move-Item "C:\Program Files\Git\notbin" "C:\Program Files\Git\bin"
|
Move-Item "C:\Program Files\Git\notbin" "C:\Program Files\Git\bin"
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v4
|
||||||
- name: Release Build
|
- name: Release Build
|
||||||
run: cargo build --release
|
run: cargo build --release
|
||||||
- name: Create Archive
|
- name: Create Archive
|
||||||
@@ -100,21 +72,19 @@ jobs:
|
|||||||
mkdir "lan-mouse-windows"
|
mkdir "lan-mouse-windows"
|
||||||
Get-Childitem -Path "C:\\gtk-build\\gtk\\x64\\release\\bin\\*.dll" -File -Recurse | Copy-Item -Destination "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"
|
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
|
- name: Upload build artifact
|
||||||
uses: actions/upload-artifact@v6
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: lan-mouse-windows-x86_64
|
name: lan-mouse-windows
|
||||||
path: lan-mouse-windows-x86_64.zip
|
path: lan-mouse-windows.zip
|
||||||
|
|
||||||
macos-release-build:
|
macos-release-build:
|
||||||
runs-on: macos-15-intel
|
runs-on: macos-15-intel
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v4
|
||||||
- name: install dependencies
|
- name: install dependencies
|
||||||
run: |
|
run: brew install gtk4 libadwaita imagemagick
|
||||||
brew install --cask inkscape
|
|
||||||
brew install gtk4 libadwaita imagemagick librsvg
|
|
||||||
- name: Release Build
|
- name: Release Build
|
||||||
run: |
|
run: |
|
||||||
cargo build --release
|
cargo build --release
|
||||||
@@ -132,23 +102,21 @@ jobs:
|
|||||||
cd target/release/bundle/osx
|
cd target/release/bundle/osx
|
||||||
zip -r "lan-mouse-macos-intel.zip" "Lan Mouse.app"
|
zip -r "lan-mouse-macos-intel.zip" "Lan Mouse.app"
|
||||||
- name: Upload build artifact
|
- name: Upload build artifact
|
||||||
uses: actions/upload-artifact@v6
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: lan-mouse-macos-intel
|
name: lan-mouse-macos-intel
|
||||||
path: target/release/bundle/osx/lan-mouse-macos-intel.zip
|
path: target/release/bundle/osx/lan-mouse-macos-intel.zip
|
||||||
|
|
||||||
macos-arm64-release-build:
|
macos-aarch64-release-build:
|
||||||
runs-on: macos-15
|
runs-on: macos-14
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v4
|
||||||
- name: install dependencies
|
- name: install dependencies
|
||||||
run: |
|
run: brew install gtk4 libadwaita imagemagick
|
||||||
brew install --cask inkscape
|
|
||||||
brew install gtk4 libadwaita imagemagick librsvg
|
|
||||||
- name: Release Build
|
- name: Release Build
|
||||||
run: |
|
run: |
|
||||||
cargo build --release
|
cargo build --release
|
||||||
cp target/release/lan-mouse lan-mouse-macos-arm64
|
cp target/release/lan-mouse lan-mouse-macos-aarch64
|
||||||
- name: Make icns
|
- name: Make icns
|
||||||
run: scripts/makeicns.sh
|
run: scripts/makeicns.sh
|
||||||
- name: Install cargo bundle
|
- name: Install cargo bundle
|
||||||
@@ -160,45 +128,29 @@ jobs:
|
|||||||
- name: Zip bundle
|
- name: Zip bundle
|
||||||
run: |
|
run: |
|
||||||
cd target/release/bundle/osx
|
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
|
- name: Upload build artifact
|
||||||
uses: actions/upload-artifact@v6
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: lan-mouse-macos-arm64
|
name: lan-mouse-macos-aarch64
|
||||||
path: target/release/bundle/osx/lan-mouse-macos-arm64.zip
|
path: target/release/bundle/osx/lan-mouse-macos-aarch64.zip
|
||||||
|
|
||||||
release:
|
pre-release:
|
||||||
name: "Release"
|
name: "Pre Release"
|
||||||
needs: [windows-release-build, linux-release-build, linux-arm64-release-build, macos-release-build, macos-arm64-release-build]
|
needs: [windows-release-build, linux-release-build, macos-release-build, macos-aarch64-release-build]
|
||||||
runs-on: "ubuntu-latest"
|
runs-on: "ubuntu-latest"
|
||||||
steps:
|
steps:
|
||||||
- name: Download build artifacts
|
- name: Download build artifacts
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
- name: Create Pre-Release
|
- name: Create Release
|
||||||
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
|
uses: "marvinpinto/action-automatic-releases@latest"
|
||||||
uses: softprops/action-gh-release@v2
|
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
repo_token: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
tag_name: ${{ github.event.inputs.name || github.ref_name }}
|
automatic_release_tag: "latest"
|
||||||
name: ${{ github.event.inputs.name || github.ref_name }}
|
|
||||||
prerelease: true
|
prerelease: true
|
||||||
generate_release_notes: true
|
title: "Development Build"
|
||||||
files: |
|
files: |
|
||||||
lan-mouse-linux-x86_64/lan-mouse-linux-x86_64
|
lan-mouse-linux/lan-mouse
|
||||||
lan-mouse-linux-arm64/lan-mouse-linux-arm64
|
|
||||||
lan-mouse-macos-intel/lan-mouse-macos-intel.zip
|
lan-mouse-macos-intel/lan-mouse-macos-intel.zip
|
||||||
lan-mouse-macos-arm64/lan-mouse-macos-arm64.zip
|
lan-mouse-macos-aarch64/lan-mouse-macos-aarch64.zip
|
||||||
lan-mouse-windows-x86_64/lan-mouse-windows-x86_64.zip
|
lan-mouse-windows/lan-mouse-windows.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
|
|
||||||
10
.github/workflows/rust.yml
vendored
10
.github/workflows/rust.yml
vendored
@@ -9,16 +9,12 @@ on:
|
|||||||
env:
|
env:
|
||||||
CARGO_TERM_COLOR: always
|
CARGO_TERM_COLOR: always
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
fmt:
|
fmt:
|
||||||
name: Formatting
|
name: Formatting
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v4
|
||||||
- name: cargo fmt
|
- name: cargo fmt
|
||||||
run: cargo fmt --check
|
run: cargo fmt --check
|
||||||
|
|
||||||
@@ -39,7 +35,7 @@ jobs:
|
|||||||
- clippy
|
- clippy
|
||||||
- test
|
- test
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v4
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- name: Install Linux deps
|
- name: Install Linux deps
|
||||||
if: runner.os == 'Linux'
|
if: runner.os == 'Linux'
|
||||||
@@ -80,7 +76,7 @@ jobs:
|
|||||||
gvsbuild build --msys-dir=C:\msys64 gtk4 libadwaita librsvg
|
gvsbuild build --msys-dir=C:\msys64 gtk4 libadwaita librsvg
|
||||||
- name: cargo build
|
- name: cargo build
|
||||||
if: matrix.job == 'build'
|
if: matrix.job == 'build'
|
||||||
run: cargo build
|
run: cargo check --workspace --all-targets --all-features
|
||||||
|
|
||||||
- name: cargo check
|
- name: cargo check
|
||||||
if: matrix.job == '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`.
|
|
||||||
176
Cargo.lock
generated
176
Cargo.lock
generated
@@ -140,18 +140,15 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ashpd"
|
name = "ashpd"
|
||||||
version = "0.11.0"
|
version = "0.13.0-alpha"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "git+https://github.com/bilelmoussaoui/ashpd#76d565f62b848554ed098da90d0f8dccac6569fd"
|
||||||
checksum = "6cbdf310d77fd3aaee6ea2093db7011dc2d35d2eb3481e5607f1f8d942ed99df"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"enumflags2",
|
"enumflags2",
|
||||||
"futures-channel",
|
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"rand 0.9.2",
|
"getrandom 0.3.3",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_repr",
|
"serde_repr",
|
||||||
"tokio",
|
"tokio",
|
||||||
"url",
|
|
||||||
"zbus",
|
"zbus",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -456,12 +453,6 @@ version = "1.0.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
|
checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "cfg_aliases"
|
|
||||||
version = "0.2.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cipher"
|
name = "cipher"
|
||||||
version = "0.4.4"
|
version = "0.4.4"
|
||||||
@@ -1130,6 +1121,30 @@ dependencies = [
|
|||||||
"system-deps",
|
"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]]
|
[[package]]
|
||||||
name = "generator"
|
name = "generator"
|
||||||
version = "0.8.5"
|
version = "0.8.5"
|
||||||
@@ -1508,7 +1523,7 @@ checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"libc",
|
"libc",
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1893,6 +1908,7 @@ name = "lan-mouse-gtk"
|
|||||||
version = "0.2.0"
|
version = "0.2.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-channel",
|
"async-channel",
|
||||||
|
"gdk4-wayland",
|
||||||
"glib-build-tools",
|
"glib-build-tools",
|
||||||
"gtk4",
|
"gtk4",
|
||||||
"hostname",
|
"hostname",
|
||||||
@@ -1900,6 +1916,7 @@ dependencies = [
|
|||||||
"libadwaita",
|
"libadwaita",
|
||||||
"log",
|
"log",
|
||||||
"thiserror 2.0.12",
|
"thiserror 2.0.12",
|
||||||
|
"wayland-client",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1964,9 +1981,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.174"
|
version = "0.2.182"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
|
checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libgit2-sys"
|
name = "libgit2-sys"
|
||||||
@@ -2000,9 +2017,9 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "linux-raw-sys"
|
name = "linux-raw-sys"
|
||||||
version = "0.9.4"
|
version = "0.11.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
|
checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "litemap"
|
name = "litemap"
|
||||||
@@ -2157,19 +2174,6 @@ dependencies = [
|
|||||||
"pin-utils",
|
"pin-utils",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "nix"
|
|
||||||
version = "0.30.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags 2.9.1",
|
|
||||||
"cfg-if",
|
|
||||||
"cfg_aliases",
|
|
||||||
"libc",
|
|
||||||
"memoffset 0.9.1",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nom"
|
name = "nom"
|
||||||
version = "7.1.3"
|
version = "7.1.3"
|
||||||
@@ -2536,9 +2540,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quick-xml"
|
name = "quick-xml"
|
||||||
version = "0.37.5"
|
version = "0.38.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
|
checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"memchr",
|
"memchr",
|
||||||
]
|
]
|
||||||
@@ -2763,14 +2767,14 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustix"
|
name = "rustix"
|
||||||
version = "1.0.8"
|
version = "1.1.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
|
checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.1",
|
"bitflags 2.9.1",
|
||||||
"errno",
|
"errno",
|
||||||
"libc",
|
"libc",
|
||||||
"linux-raw-sys 0.9.4",
|
"linux-raw-sys 0.11.0",
|
||||||
"windows-sys 0.60.2",
|
"windows-sys 0.60.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -3047,12 +3051,6 @@ version = "1.2.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
|
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "static_assertions"
|
|
||||||
version = "1.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "strsim"
|
name = "strsim"
|
||||||
version = "0.11.1"
|
version = "0.11.1"
|
||||||
@@ -3114,15 +3112,15 @@ checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tempfile"
|
name = "tempfile"
|
||||||
version = "3.20.0"
|
version = "3.25.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
|
checksum = "0136791f7c95b1f6dd99f9cc786b91bb81c3800b639b3478e561ddb7be95e5f1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fastrand",
|
"fastrand",
|
||||||
"getrandom 0.3.3",
|
"getrandom 0.3.3",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"rustix 1.0.8",
|
"rustix 1.1.3",
|
||||||
"windows-sys 0.59.0",
|
"windows-sys 0.60.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3476,7 +3474,6 @@ dependencies = [
|
|||||||
"form_urlencoded",
|
"form_urlencoded",
|
||||||
"idna",
|
"idna",
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
"serde",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3499,6 +3496,7 @@ checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"getrandom 0.3.3",
|
"getrandom 0.3.3",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
|
"serde",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -3601,25 +3599,25 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wayland-backend"
|
name = "wayland-backend"
|
||||||
version = "0.3.11"
|
version = "0.3.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35"
|
checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"downcast-rs",
|
"downcast-rs",
|
||||||
"rustix 1.0.8",
|
"rustix 1.1.3",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"wayland-sys",
|
"wayland-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wayland-client"
|
name = "wayland-client"
|
||||||
version = "0.31.11"
|
version = "0.31.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
|
checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.1",
|
"bitflags 2.9.1",
|
||||||
"rustix 1.0.8",
|
"rustix 1.1.3",
|
||||||
"wayland-backend",
|
"wayland-backend",
|
||||||
"wayland-scanner",
|
"wayland-scanner",
|
||||||
]
|
]
|
||||||
@@ -3664,9 +3662,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wayland-scanner"
|
name = "wayland-scanner"
|
||||||
version = "0.31.7"
|
version = "0.31.8"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3"
|
checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quick-xml",
|
"quick-xml",
|
||||||
@@ -3675,9 +3673,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wayland-sys"
|
name = "wayland-sys"
|
||||||
version = "0.31.7"
|
version = "0.31.8"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142"
|
checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"pkg-config",
|
"pkg-config",
|
||||||
]
|
]
|
||||||
@@ -3733,7 +3731,7 @@ dependencies = [
|
|||||||
"lazy_static",
|
"lazy_static",
|
||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"nix 0.26.4",
|
"nix",
|
||||||
"portable-atomic",
|
"portable-atomic",
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
"thiserror 1.0.69",
|
"thiserror 1.0.69",
|
||||||
@@ -3778,7 +3776,7 @@ dependencies = [
|
|||||||
"windows-collections",
|
"windows-collections",
|
||||||
"windows-core",
|
"windows-core",
|
||||||
"windows-future",
|
"windows-future",
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
"windows-numerics",
|
"windows-numerics",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -3799,7 +3797,7 @@ checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-implement",
|
"windows-implement",
|
||||||
"windows-interface",
|
"windows-interface",
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
"windows-result",
|
"windows-result",
|
||||||
"windows-strings",
|
"windows-strings",
|
||||||
]
|
]
|
||||||
@@ -3811,7 +3809,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
|
checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-core",
|
"windows-core",
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
"windows-threading",
|
"windows-threading",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -3843,6 +3841,12 @@ version = "0.1.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
|
checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-link"
|
||||||
|
version = "0.2.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-numerics"
|
name = "windows-numerics"
|
||||||
version = "0.2.0"
|
version = "0.2.0"
|
||||||
@@ -3850,7 +3854,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
|
checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-core",
|
"windows-core",
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3859,7 +3863,7 @@ version = "0.3.4"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
|
checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3868,7 +3872,7 @@ version = "0.4.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
|
checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3907,6 +3911,15 @@ dependencies = [
|
|||||||
"windows-targets 0.53.3",
|
"windows-targets 0.53.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-sys"
|
||||||
|
version = "0.61.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
|
||||||
|
dependencies = [
|
||||||
|
"windows-link 0.2.1",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-targets"
|
name = "windows-targets"
|
||||||
version = "0.48.5"
|
version = "0.48.5"
|
||||||
@@ -3944,7 +3957,7 @@ version = "0.53.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
|
checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
"windows_aarch64_gnullvm 0.53.0",
|
"windows_aarch64_gnullvm 0.53.0",
|
||||||
"windows_aarch64_msvc 0.53.0",
|
"windows_aarch64_msvc 0.53.0",
|
||||||
"windows_i686_gnu 0.53.0",
|
"windows_i686_gnu 0.53.0",
|
||||||
@@ -3961,7 +3974,7 @@ version = "0.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
|
checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4210,9 +4223,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zbus"
|
name = "zbus"
|
||||||
version = "5.9.0"
|
version = "5.13.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4bb4f9a464286d42851d18a605f7193b8febaf5b0919d71c6399b7b26e5b0aad"
|
checksum = "1bfeff997a0aaa3eb20c4652baf788d2dfa6d2839a0ead0b3ff69ce2f9c4bdd1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-broadcast",
|
"async-broadcast",
|
||||||
"async-recursion",
|
"async-recursion",
|
||||||
@@ -4222,14 +4235,16 @@ dependencies = [
|
|||||||
"futures-core",
|
"futures-core",
|
||||||
"futures-lite",
|
"futures-lite",
|
||||||
"hex",
|
"hex",
|
||||||
"nix 0.30.1",
|
"libc",
|
||||||
"ordered-stream",
|
"ordered-stream",
|
||||||
|
"rustix 1.1.3",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_repr",
|
"serde_repr",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tracing",
|
"tracing",
|
||||||
"uds_windows",
|
"uds_windows",
|
||||||
"windows-sys 0.59.0",
|
"uuid",
|
||||||
|
"windows-sys 0.61.2",
|
||||||
"winnow",
|
"winnow",
|
||||||
"zbus_macros",
|
"zbus_macros",
|
||||||
"zbus_names",
|
"zbus_names",
|
||||||
@@ -4238,9 +4253,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zbus_macros"
|
name = "zbus_macros"
|
||||||
version = "5.9.0"
|
version = "5.13.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ef9859f68ee0c4ee2e8cde84737c78e3f4c54f946f2a38645d0d4c7a95327659"
|
checksum = "0bbd5a90dbe8feee5b13def448427ae314ccd26a49cac47905cafefb9ff846f1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro-crate",
|
"proc-macro-crate",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
@@ -4253,12 +4268,11 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zbus_names"
|
name = "zbus_names"
|
||||||
version = "4.2.0"
|
version = "4.3.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
|
checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"static_assertions",
|
|
||||||
"winnow",
|
"winnow",
|
||||||
"zvariant",
|
"zvariant",
|
||||||
]
|
]
|
||||||
@@ -4359,14 +4373,13 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zvariant"
|
name = "zvariant"
|
||||||
version = "5.6.0"
|
version = "5.9.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d91b3680bb339216abd84714172b5138a4edac677e641ef17e1d8cb1b3ca6e6f"
|
checksum = "68b64ef4f40c7951337ddc7023dd03528a57a3ce3408ee9da5e948bd29b232c4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"endi",
|
"endi",
|
||||||
"enumflags2",
|
"enumflags2",
|
||||||
"serde",
|
"serde",
|
||||||
"url",
|
|
||||||
"winnow",
|
"winnow",
|
||||||
"zvariant_derive",
|
"zvariant_derive",
|
||||||
"zvariant_utils",
|
"zvariant_utils",
|
||||||
@@ -4374,9 +4387,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zvariant_derive"
|
name = "zvariant_derive"
|
||||||
version = "5.6.0"
|
version = "5.9.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3a8c68501be459a8dbfffbe5d792acdd23b4959940fc87785fb013b32edbc208"
|
checksum = "484d5d975eb7afb52cc6b929c13d3719a20ad650fea4120e6310de3fc55e415c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro-crate",
|
"proc-macro-crate",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
@@ -4387,14 +4400,13 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zvariant_utils"
|
name = "zvariant_utils"
|
||||||
version = "3.2.0"
|
version = "3.3.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e16edfee43e5d7b553b77872d99bc36afdda75c223ca7ad5e3fbecd82ca5fc34"
|
checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"serde",
|
"serde",
|
||||||
"static_assertions",
|
|
||||||
"syn",
|
"syn",
|
||||||
"winnow",
|
"winnow",
|
||||||
]
|
]
|
||||||
|
|||||||
26
README.md
26
README.md
@@ -1,9 +1,4 @@
|
|||||||
# Lan Mouse
|
# 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.
|
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.
|
It allows for using multiple PCs via a single set of mouse and keyboard.
|
||||||
This is also known as a Software KVM switch.
|
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
|
## Installing Dependencies for Development / Compiling from Source
|
||||||
|
|
||||||
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>
|
<details>
|
||||||
<summary>MacOS</summary>
|
<summary>MacOS</summary>
|
||||||
|
|
||||||
|
|||||||
12
flake.lock
generated
12
flake.lock
generated
@@ -2,11 +2,11 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772963539,
|
"lastModified": 1770841267,
|
||||||
"narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
|
"narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
|
"rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -29,11 +29,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773025773,
|
"lastModified": 1770952264,
|
||||||
"narHash": "sha256-Wik8+xApNfldpUFjPmJkPdg0RrvUPSWGIZis+A/0N1w=",
|
"narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "3c06fdbbd36ff60386a1e590ee0cd52dcd1892bf",
|
"rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
139
flake.nix
139
flake.nix
@@ -7,87 +7,60 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
outputs =
|
outputs = {
|
||||||
{
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
rust-overlay,
|
rust-overlay,
|
||||||
self,
|
...
|
||||||
...
|
}: let
|
||||||
}:
|
inherit (nixpkgs) lib;
|
||||||
let
|
genSystems = lib.genAttrs [
|
||||||
inherit (nixpkgs) lib;
|
"aarch64-darwin"
|
||||||
forEachPkgs =
|
"aarch64-linux"
|
||||||
f:
|
"x86_64-darwin"
|
||||||
lib.genAttrs
|
"x86_64-linux"
|
||||||
[
|
];
|
||||||
"aarch64-darwin"
|
pkgsFor = system:
|
||||||
"aarch64-linux"
|
import nixpkgs {
|
||||||
"x86_64-darwin"
|
inherit system;
|
||||||
"x86_64-linux"
|
|
||||||
]
|
overlays = [
|
||||||
(
|
rust-overlay.overlays.default
|
||||||
system:
|
];
|
||||||
let
|
};
|
||||||
pkgs = import nixpkgs {
|
mkRustToolchain = pkgs:
|
||||||
inherit system;
|
pkgs.rust-bin.stable.latest.default.override {
|
||||||
overlays = [ rust-overlay.overlays.default ];
|
extensions = ["rust-src"];
|
||||||
};
|
};
|
||||||
# Default toolchain for devshell
|
pkgs = genSystems (system: import nixpkgs {inherit system;});
|
||||||
rustToolchain = pkgs.rust-bin.stable.latest.default.override {
|
in {
|
||||||
extensions = [
|
packages = genSystems (system: rec {
|
||||||
# includes already:
|
default = pkgs.${system}.callPackage ./nix {};
|
||||||
# rustc
|
lan-mouse = default;
|
||||||
# cargo
|
});
|
||||||
# rust-std
|
homeManagerModules.default = import ./nix/hm-module.nix self;
|
||||||
# rust-docs
|
devShells = genSystems (system: let
|
||||||
# rustfmt-preview
|
pkgs = pkgsFor system;
|
||||||
# clippy-preview
|
rust = mkRustToolchain pkgs;
|
||||||
"rust-analyzer"
|
in {
|
||||||
"rust-src"
|
default = pkgs.mkShell {
|
||||||
];
|
packages = with pkgs; [
|
||||||
};
|
rust
|
||||||
# Minimal toolchain for builds (rustc + cargo + rust-std only)
|
rust-analyzer-unwrapped
|
||||||
rustToolchainForBuild = pkgs.rust-bin.stable.latest.minimal;
|
pkg-config
|
||||||
in
|
xorg.libX11
|
||||||
f { inherit pkgs rustToolchain rustToolchainForBuild; }
|
gtk4
|
||||||
);
|
libadwaita
|
||||||
in
|
librsvg
|
||||||
{
|
xorg.libXtst
|
||||||
packages = forEachPkgs (
|
] ++ lib.optionals stdenv.isDarwin
|
||||||
{ pkgs, rustToolchainForBuild, ... }:
|
(with darwin.apple_sdk_11_0.frameworks; [
|
||||||
let
|
CoreGraphics
|
||||||
customRustPlatform = pkgs.makeRustPlatform {
|
ApplicationServices
|
||||||
cargo = rustToolchainForBuild;
|
]);
|
||||||
rustc = rustToolchainForBuild;
|
|
||||||
};
|
RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
|
||||||
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;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ futures-core = "0.3.30"
|
|||||||
log = "0.4.22"
|
log = "0.4.22"
|
||||||
input-event = { path = "../input-event", version = "0.3.0" }
|
input-event = { path = "../input-event", version = "0.3.0" }
|
||||||
memmap = "0.7"
|
memmap = "0.7"
|
||||||
tempfile = "3.8"
|
tempfile = "3.25.0"
|
||||||
thiserror = "2.0.0"
|
thiserror = "2.0.0"
|
||||||
tokio = { version = "1.32.0", features = [
|
tokio = { version = "1.32.0", features = [
|
||||||
"io-util",
|
"io-util",
|
||||||
@@ -41,7 +41,8 @@ wayland-protocols-wlr = { version = "0.3.1", features = [
|
|||||||
"client",
|
"client",
|
||||||
], optional = true }
|
], optional = true }
|
||||||
x11 = { version = "2.21.0", features = ["xlib", "xtest"], 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/bilelmoussaoui/ashpd", default-features = false, features = [
|
||||||
|
"input_capture",
|
||||||
"tokio",
|
"tokio",
|
||||||
], optional = true }
|
], optional = true }
|
||||||
reis = { version = "0.5.0", features = ["tokio"], optional = true }
|
reis = { version = "0.5.0", features = ["tokio"], optional = true }
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ use std::{
|
|||||||
collections::{HashMap, HashSet, VecDeque},
|
collections::{HashMap, HashSet, VecDeque},
|
||||||
fmt::Display,
|
fmt::Display,
|
||||||
mem::swap,
|
mem::swap,
|
||||||
|
sync::{Arc, Mutex},
|
||||||
task::{Poll, ready},
|
task::{Poll, ready},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -129,6 +130,23 @@ pub struct InputCapture {
|
|||||||
pending: VecDeque<(CaptureHandle, CaptureEvent)>,
|
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 {
|
impl InputCapture {
|
||||||
/// create a new client with the given id
|
/// create a new client with the given id
|
||||||
pub async fn create(&mut self, id: CaptureHandle, pos: Position) -> Result<(), CaptureError> {
|
pub async fn create(&mut self, id: CaptureHandle, pos: Position) -> Result<(), CaptureError> {
|
||||||
@@ -177,8 +195,11 @@ impl InputCapture {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// creates a new [`InputCapture`]
|
/// creates a new [`InputCapture`]
|
||||||
pub async fn new(backend: Option<Backend>) -> Result<Self, CaptureCreationError> {
|
pub async fn new(
|
||||||
let capture = create(backend).await?;
|
backend: Option<Backend>,
|
||||||
|
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||||
|
) -> Result<Self, CaptureCreationError> {
|
||||||
|
let capture = create(backend, window_identifier).await?;
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
capture,
|
capture,
|
||||||
id_map: Default::default(),
|
id_map: Default::default(),
|
||||||
@@ -280,13 +301,16 @@ trait Capture: Stream<Item = Result<(Position, CaptureEvent), CaptureError>> + U
|
|||||||
|
|
||||||
async fn create_backend(
|
async fn create_backend(
|
||||||
backend: Backend,
|
backend: Backend,
|
||||||
|
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||||
) -> Result<
|
) -> Result<
|
||||||
Box<dyn Capture<Item = Result<(Position, CaptureEvent), CaptureError>>>,
|
Box<dyn Capture<Item = Result<(Position, CaptureEvent), CaptureError>>>,
|
||||||
CaptureCreationError,
|
CaptureCreationError,
|
||||||
> {
|
> {
|
||||||
match backend {
|
match backend {
|
||||||
#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
|
#[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")))]
|
#[cfg(all(unix, feature = "layer_shell", not(target_os = "macos")))]
|
||||||
Backend::LayerShell => Ok(Box::new(layer_shell::LayerShellInputCapture::new()?)),
|
Backend::LayerShell => Ok(Box::new(layer_shell::LayerShellInputCapture::new()?)),
|
||||||
#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
|
#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
|
||||||
@@ -301,12 +325,13 @@ async fn create_backend(
|
|||||||
|
|
||||||
async fn create(
|
async fn create(
|
||||||
backend: Option<Backend>,
|
backend: Option<Backend>,
|
||||||
|
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||||
) -> Result<
|
) -> Result<
|
||||||
Box<dyn Capture<Item = Result<(Position, CaptureEvent), CaptureError>>>,
|
Box<dyn Capture<Item = Result<(Position, CaptureEvent), CaptureError>>>,
|
||||||
CaptureCreationError,
|
CaptureCreationError,
|
||||||
> {
|
> {
|
||||||
if let Some(backend) = backend {
|
if let Some(backend) = backend {
|
||||||
let b = create_backend(backend).await;
|
let b = create_backend(backend, window_identifier).await;
|
||||||
if b.is_ok() {
|
if b.is_ok() {
|
||||||
log::info!("using capture backend: {backend}");
|
log::info!("using capture backend: {backend}");
|
||||||
}
|
}
|
||||||
@@ -325,7 +350,7 @@ async fn create(
|
|||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
Backend::MacOs,
|
Backend::MacOs,
|
||||||
] {
|
] {
|
||||||
match create_backend(backend).await {
|
match create_backend(backend, window_identifier.clone()).await {
|
||||||
Ok(b) => {
|
Ok(b) => {
|
||||||
log::info!("using capture backend: {backend}");
|
log::info!("using capture backend: {backend}");
|
||||||
return Ok(b);
|
return Ok(b);
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ use std::{
|
|||||||
os::unix::net::UnixStream,
|
os::unix::net::UnixStream,
|
||||||
pin::Pin,
|
pin::Pin,
|
||||||
rc::Rc,
|
rc::Rc,
|
||||||
sync::Arc,
|
sync::{Arc, Mutex},
|
||||||
task::{Context, Poll},
|
task::{Context, Poll},
|
||||||
};
|
};
|
||||||
use tokio::{
|
use tokio::{
|
||||||
@@ -39,7 +39,7 @@ use futures_core::Stream;
|
|||||||
|
|
||||||
use input_event::Event;
|
use input_event::Event;
|
||||||
|
|
||||||
use crate::CaptureEvent;
|
use crate::{CaptureEvent, WindowIdentifier};
|
||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
Capture as LanMouseInputCapture, Position,
|
Capture as LanMouseInputCapture, Position,
|
||||||
@@ -58,8 +58,8 @@ enum LibeiNotifyEvent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
pub struct LibeiInputCapture<'a> {
|
pub struct LibeiInputCapture {
|
||||||
input_capture: Pin<Box<InputCapture<'a>>>,
|
input_capture: Pin<Box<InputCapture>>,
|
||||||
capture_task: JoinHandle<Result<(), CaptureError>>,
|
capture_task: JoinHandle<Result<(), CaptureError>>,
|
||||||
event_rx: Receiver<(Position, CaptureEvent)>,
|
event_rx: Receiver<(Position, CaptureEvent)>,
|
||||||
notify_capture: Sender<LibeiNotifyEvent>,
|
notify_capture: Sender<LibeiNotifyEvent>,
|
||||||
@@ -130,8 +130,8 @@ fn select_barriers(
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn update_barriers(
|
async fn update_barriers(
|
||||||
input_capture: &InputCapture<'_>,
|
input_capture: &InputCapture,
|
||||||
session: &Session<'_, InputCapture<'_>>,
|
session: &Session<InputCapture>,
|
||||||
active_clients: &[Position],
|
active_clients: &[Position],
|
||||||
next_barrier_id: &mut NonZeroU32,
|
next_barrier_id: &mut NonZeroU32,
|
||||||
) -> Result<(Vec<ICBarrier>, HashMap<BarrierID, Position>), ashpd::Error> {
|
) -> Result<(Vec<ICBarrier>, HashMap<BarrierID, Position>), ashpd::Error> {
|
||||||
@@ -151,21 +151,25 @@ async fn update_barriers(
|
|||||||
Ok((barriers, id_map))
|
Ok((barriers, id_map))
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn create_session<'a>(
|
async fn create_session(
|
||||||
input_capture: &'a InputCapture<'a>,
|
input_capture: &InputCapture,
|
||||||
) -> std::result::Result<(Session<'a, InputCapture<'a>>, BitFlags<Capabilities>), ashpd::Error> {
|
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||||
log::debug!("creating input capture session");
|
) -> 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
|
input_capture
|
||||||
.create_session(
|
.create_session(
|
||||||
None,
|
ashpd_window_identifier.as_ref(),
|
||||||
Capabilities::Keyboard | Capabilities::Pointer | Capabilities::Touchscreen,
|
Capabilities::Keyboard | Capabilities::Pointer | Capabilities::Touchscreen,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn connect_to_eis(
|
async fn connect_to_eis(
|
||||||
input_capture: &InputCapture<'_>,
|
input_capture: &InputCapture,
|
||||||
session: &Session<'_, InputCapture<'_>>,
|
session: &Session<InputCapture>,
|
||||||
) -> Result<(ei::Context, Connection, EiConvertEventStream), CaptureError> {
|
) -> Result<(ei::Context, Connection, EiConvertEventStream), CaptureError> {
|
||||||
log::debug!("connect_to_eis");
|
log::debug!("connect_to_eis");
|
||||||
let fd = input_capture.connect_to_eis(session).await?;
|
let fd = input_capture.connect_to_eis(session).await?;
|
||||||
@@ -201,11 +205,16 @@ async fn libei_event_handler(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl LibeiInputCapture<'_> {
|
impl LibeiInputCapture {
|
||||||
pub async fn new() -> std::result::Result<Self, LibeiCaptureCreationError> {
|
/// 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 = Box::pin(InputCapture::new().await?);
|
||||||
let input_capture_ptr = input_capture.as_ref().get_ref() as *const InputCapture<'static>;
|
let input_capture_ptr = input_capture.as_ref().get_ref() as *const InputCapture;
|
||||||
let first_session = Some(create_session(unsafe { &*input_capture_ptr }).await?);
|
let first_session =
|
||||||
|
Some(create_session(unsafe { &*input_capture_ptr }, window_identifier.clone()).await?);
|
||||||
|
|
||||||
let (event_tx, event_rx) = mpsc::channel(1);
|
let (event_tx, event_rx) = mpsc::channel(1);
|
||||||
let (notify_capture, notify_rx) = mpsc::channel(1);
|
let (notify_capture, notify_rx) = mpsc::channel(1);
|
||||||
@@ -220,6 +229,7 @@ impl LibeiInputCapture<'_> {
|
|||||||
first_session,
|
first_session,
|
||||||
event_tx,
|
event_tx,
|
||||||
cancellation_token.clone(),
|
cancellation_token.clone(),
|
||||||
|
window_identifier,
|
||||||
);
|
);
|
||||||
let capture_task = tokio::task::spawn_local(capture);
|
let capture_task = tokio::task::spawn_local(capture);
|
||||||
|
|
||||||
@@ -238,12 +248,13 @@ impl LibeiInputCapture<'_> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn do_capture(
|
async fn do_capture(
|
||||||
input_capture: *const InputCapture<'static>,
|
input_capture: *const InputCapture,
|
||||||
mut capture_event: Receiver<LibeiNotifyEvent>,
|
mut capture_event: Receiver<LibeiNotifyEvent>,
|
||||||
notify_release: Arc<Notify>,
|
notify_release: Arc<Notify>,
|
||||||
session: Option<(Session<'_, InputCapture<'_>>, BitFlags<Capabilities>)>,
|
session: Option<(Session<InputCapture>, BitFlags<Capabilities>)>,
|
||||||
event_tx: Sender<(Position, CaptureEvent)>,
|
event_tx: Sender<(Position, CaptureEvent)>,
|
||||||
cancellation_token: CancellationToken,
|
cancellation_token: CancellationToken,
|
||||||
|
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||||
) -> Result<(), CaptureError> {
|
) -> Result<(), CaptureError> {
|
||||||
let mut session = session.map(|s| s.0);
|
let mut session = session.map(|s| s.0);
|
||||||
|
|
||||||
@@ -289,7 +300,11 @@ async fn do_capture(
|
|||||||
// create session
|
// create session
|
||||||
let mut session = match session.take() {
|
let mut session = match session.take() {
|
||||||
Some(s) => s,
|
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(
|
let capture_session = do_capture_session(
|
||||||
@@ -336,8 +351,8 @@ async fn do_capture(
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn do_capture_session(
|
async fn do_capture_session(
|
||||||
input_capture: &InputCapture<'_>,
|
input_capture: &InputCapture,
|
||||||
session: &mut Session<'_, InputCapture<'_>>,
|
session: &mut Session<InputCapture>,
|
||||||
event_tx: &Sender<(Position, CaptureEvent)>,
|
event_tx: &Sender<(Position, CaptureEvent)>,
|
||||||
active_clients: &[Position],
|
active_clients: &[Position],
|
||||||
next_barrier_id: &mut NonZeroU32,
|
next_barrier_id: &mut NonZeroU32,
|
||||||
@@ -462,9 +477,9 @@ async fn do_capture_session(
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn release_capture<'a>(
|
async fn release_capture(
|
||||||
input_capture: &InputCapture<'a>,
|
input_capture: &InputCapture,
|
||||||
session: &Session<'a, InputCapture<'a>>,
|
session: &Session<InputCapture>,
|
||||||
activated: Activated,
|
activated: Activated,
|
||||||
current_pos: Position,
|
current_pos: Position,
|
||||||
) -> Result<(), CaptureError> {
|
) -> Result<(), CaptureError> {
|
||||||
@@ -561,7 +576,7 @@ async fn handle_ei_event(
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl LanMouseInputCapture for LibeiInputCapture<'_> {
|
impl LanMouseInputCapture for LibeiInputCapture {
|
||||||
async fn create(&mut self, pos: Position) -> Result<(), CaptureError> {
|
async fn create(&mut self, pos: Position) -> Result<(), CaptureError> {
|
||||||
let _ = self
|
let _ = self
|
||||||
.notify_capture
|
.notify_capture
|
||||||
@@ -598,7 +613,7 @@ impl LanMouseInputCapture for LibeiInputCapture<'_> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Drop for LibeiInputCapture<'_> {
|
impl Drop for LibeiInputCapture {
|
||||||
fn drop(&mut self) {
|
fn drop(&mut self) {
|
||||||
if !self.terminated {
|
if !self.terminated {
|
||||||
/* this workaround is needed until async drop is stabilized */
|
/* 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>;
|
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) {
|
match self.capture_task.poll_unpin(cx) {
|
||||||
Poll::Ready(r) => match r.expect("failed to join") {
|
Poll::Ready(r) => match r.expect("failed to join") {
|
||||||
Ok(()) => Poll::Ready(None),
|
Ok(()) => Poll::Ready(None),
|
||||||
|
|||||||
@@ -18,9 +18,7 @@ use core_graphics::{
|
|||||||
event_source::{CGEventSource, CGEventSourceStateID},
|
event_source::{CGEventSource, CGEventSourceStateID},
|
||||||
};
|
};
|
||||||
use futures_core::Stream;
|
use futures_core::Stream;
|
||||||
use input_event::{
|
use input_event::{BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent};
|
||||||
BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent,
|
|
||||||
};
|
|
||||||
use keycode::{KeyMap, KeyMapping};
|
use keycode::{KeyMap, KeyMapping};
|
||||||
use libc::c_void;
|
use libc::c_void;
|
||||||
use once_cell::unsync::Lazy;
|
use once_cell::unsync::Lazy;
|
||||||
@@ -306,28 +304,16 @@ fn get_events(
|
|||||||
})))
|
})))
|
||||||
}
|
}
|
||||||
CGEventType::OtherMouseDown => {
|
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 {
|
result.push(CaptureEvent::Input(Event::Pointer(PointerEvent::Button {
|
||||||
time: 0,
|
time: 0,
|
||||||
button,
|
button: BTN_MIDDLE,
|
||||||
state: 1,
|
state: 1,
|
||||||
})))
|
})))
|
||||||
}
|
}
|
||||||
CGEventType::OtherMouseUp => {
|
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 {
|
result.push(CaptureEvent::Input(Event::Pointer(PointerEvent::Button {
|
||||||
time: 0,
|
time: 0,
|
||||||
button,
|
button: BTN_MIDDLE,
|
||||||
state: 0,
|
state: 0,
|
||||||
})))
|
})))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,9 @@ wayland-protocols-misc = { version = "0.3.1", features = [
|
|||||||
"client",
|
"client",
|
||||||
], optional = true }
|
], optional = true }
|
||||||
x11 = { version = "2.21.0", features = ["xlib", "xtest"], 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/bilelmoussaoui/ashpd", default-features = false, features = [
|
||||||
|
"remote_desktop",
|
||||||
|
"screencast",
|
||||||
"tokio",
|
"tokio",
|
||||||
], optional = true }
|
], optional = true }
|
||||||
reis = { version = "0.5.0", features = ["tokio"], optional = true }
|
reis = { version = "0.5.0", features = ["tokio"], optional = true }
|
||||||
|
|||||||
@@ -40,15 +40,15 @@ struct Devices {
|
|||||||
keyboard: Arc<RwLock<Option<(ei::Device, ei::Keyboard)>>>,
|
keyboard: Arc<RwLock<Option<(ei::Device, ei::Keyboard)>>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) struct LibeiEmulation<'a> {
|
pub(crate) struct LibeiEmulation {
|
||||||
context: ei::Context,
|
context: ei::Context,
|
||||||
conn: event::Connection,
|
conn: event::Connection,
|
||||||
devices: Devices,
|
devices: Devices,
|
||||||
ei_task: JoinHandle<()>,
|
ei_task: JoinHandle<()>,
|
||||||
error: Arc<Mutex<Option<EmulationError>>>,
|
error: Arc<Mutex<Option<EmulationError>>>,
|
||||||
libei_error: Arc<AtomicBool>,
|
libei_error: Arc<AtomicBool>,
|
||||||
_remote_desktop: RemoteDesktop<'a>,
|
_remote_desktop: RemoteDesktop,
|
||||||
session: Session<'a, RemoteDesktop<'a>>,
|
session: Session<RemoteDesktop>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Get the path to the RemoteDesktop token file
|
/// Get the path to the RemoteDesktop token file
|
||||||
@@ -84,8 +84,7 @@ fn write_token(token: &str) -> io::Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn get_ei_fd<'a>()
|
async fn get_ei_fd() -> Result<(RemoteDesktop, Session<RemoteDesktop>, OwnedFd), ashpd::Error> {
|
||||||
-> Result<(RemoteDesktop<'a>, Session<'a, RemoteDesktop<'a>>, OwnedFd), ashpd::Error> {
|
|
||||||
let remote_desktop = RemoteDesktop::new().await?;
|
let remote_desktop = RemoteDesktop::new().await?;
|
||||||
|
|
||||||
let restore_token = read_token();
|
let restore_token = read_token();
|
||||||
@@ -117,7 +116,7 @@ async fn get_ei_fd<'a>()
|
|||||||
Ok((remote_desktop, session, fd))
|
Ok((remote_desktop, session, fd))
|
||||||
}
|
}
|
||||||
|
|
||||||
impl LibeiEmulation<'_> {
|
impl LibeiEmulation {
|
||||||
pub(crate) async fn new() -> Result<Self, LibeiEmulationCreationError> {
|
pub(crate) async fn new() -> Result<Self, LibeiEmulationCreationError> {
|
||||||
let (_remote_desktop, session, eifd) = get_ei_fd().await?;
|
let (_remote_desktop, session, eifd) = get_ei_fd().await?;
|
||||||
let stream = UnixStream::from(eifd);
|
let stream = UnixStream::from(eifd);
|
||||||
@@ -152,14 +151,14 @@ impl LibeiEmulation<'_> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Drop for LibeiEmulation<'_> {
|
impl Drop for LibeiEmulation {
|
||||||
fn drop(&mut self) {
|
fn drop(&mut self) {
|
||||||
self.ei_task.abort();
|
self.ei_task.abort();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl Emulation for LibeiEmulation<'_> {
|
impl Emulation for LibeiEmulation {
|
||||||
async fn consume(
|
async fn consume(
|
||||||
&mut self,
|
&mut self,
|
||||||
event: Event,
|
event: Event,
|
||||||
|
|||||||
@@ -10,13 +10,10 @@ use core_graphics::event::{
|
|||||||
ScrollEventUnit,
|
ScrollEventUnit,
|
||||||
};
|
};
|
||||||
use core_graphics::event_source::{CGEventSource, CGEventSourceStateID};
|
use core_graphics::event_source::{CGEventSource, CGEventSourceStateID};
|
||||||
use input_event::{
|
use input_event::{BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent, scancode};
|
||||||
BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent,
|
|
||||||
scancode,
|
|
||||||
};
|
|
||||||
use keycode::{KeyMap, KeyMapping};
|
use keycode::{KeyMap, KeyMapping};
|
||||||
use std::cell::Cell;
|
use std::cell::Cell;
|
||||||
use std::collections::HashSet;
|
use std::ops::{Index, IndexMut};
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::time::{Duration, Instant};
|
use std::time::{Duration, Instant};
|
||||||
@@ -33,10 +30,10 @@ pub(crate) struct MacOSEmulation {
|
|||||||
event_source: CGEventSource,
|
event_source: CGEventSource,
|
||||||
/// task handle for key repeats
|
/// task handle for key repeats
|
||||||
repeat_task: Option<JoinHandle<()>>,
|
repeat_task: Option<JoinHandle<()>>,
|
||||||
/// current state of the mouse buttons (tracked by evdev button code)
|
/// current state of the mouse buttons
|
||||||
pressed_buttons: HashSet<u32>,
|
button_state: ButtonState,
|
||||||
/// button previously pressed (evdev button code)
|
/// button previously pressed
|
||||||
previous_button: Option<u32>,
|
previous_button: Option<CGMouseButton>,
|
||||||
/// timestamp of previous click (button down)
|
/// timestamp of previous click (button down)
|
||||||
previous_button_click: Option<Instant>,
|
previous_button_click: Option<Instant>,
|
||||||
/// click state, i.e. number of clicks in quick succession
|
/// click state, i.e. number of clicks in quick succession
|
||||||
@@ -47,13 +44,31 @@ pub(crate) struct MacOSEmulation {
|
|||||||
notify_repeat_task: Arc<Notify>,
|
notify_repeat_task: Arc<Notify>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Maps an evdev button code to the CGEventType used for drag events.
|
struct ButtonState {
|
||||||
fn drag_event_type(button: u32) -> CGEventType {
|
left: bool,
|
||||||
match button {
|
right: bool,
|
||||||
BTN_LEFT => CGEventType::LeftMouseDragged,
|
center: bool,
|
||||||
BTN_RIGHT => CGEventType::RightMouseDragged,
|
}
|
||||||
// middle, back, forward, and any other button all use OtherMouseDragged
|
|
||||||
_ => CGEventType::OtherMouseDragged,
|
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> {
|
pub(crate) fn new() -> Result<Self, MacOSEmulationCreationError> {
|
||||||
let event_source = CGEventSource::new(CGEventSourceStateID::CombinedSessionState)
|
let event_source = CGEventSource::new(CGEventSourceStateID::CombinedSessionState)
|
||||||
.map_err(|_| MacOSEmulationCreationError::EventSourceCreation)?;
|
.map_err(|_| MacOSEmulationCreationError::EventSourceCreation)?;
|
||||||
|
let button_state = ButtonState {
|
||||||
|
left: false,
|
||||||
|
right: false,
|
||||||
|
center: false,
|
||||||
|
};
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
event_source,
|
event_source,
|
||||||
pressed_buttons: HashSet::new(),
|
button_state,
|
||||||
previous_button: None,
|
previous_button: None,
|
||||||
previous_button_click: None,
|
previous_button_click: None,
|
||||||
button_click_state: 0,
|
button_click_state: 0,
|
||||||
@@ -241,14 +261,14 @@ impl Emulation for MacOSEmulation {
|
|||||||
mouse_location.x = new_mouse_x;
|
mouse_location.x = new_mouse_x;
|
||||||
mouse_location.y = new_mouse_y;
|
mouse_location.y = new_mouse_y;
|
||||||
|
|
||||||
// If any button is held, emit a drag event for it;
|
let mut event_type = CGEventType::MouseMoved;
|
||||||
// otherwise emit a normal mouse-moved event.
|
if self.button_state.left {
|
||||||
let event_type = self
|
event_type = CGEventType::LeftMouseDragged
|
||||||
.pressed_buttons
|
} else if self.button_state.right {
|
||||||
.iter()
|
event_type = CGEventType::RightMouseDragged
|
||||||
.next()
|
} else if self.button_state.center {
|
||||||
.map(|&btn| drag_event_type(btn))
|
event_type = CGEventType::OtherMouseDragged
|
||||||
.unwrap_or(CGEventType::MouseMoved);
|
};
|
||||||
let event = match CGEvent::new_mouse_event(
|
let event = match CGEvent::new_mouse_event(
|
||||||
self.event_source.clone(),
|
self.event_source.clone(),
|
||||||
event_type,
|
event_type,
|
||||||
@@ -270,12 +290,6 @@ impl Emulation for MacOSEmulation {
|
|||||||
button,
|
button,
|
||||||
state,
|
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) {
|
let (event_type, mouse_button) = match (button, state) {
|
||||||
(BTN_LEFT, 1) => (CGEventType::LeftMouseDown, CGMouseButton::Left),
|
(BTN_LEFT, 1) => (CGEventType::LeftMouseDown, CGMouseButton::Left),
|
||||||
(BTN_LEFT, 0) => (CGEventType::LeftMouseUp, 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_RIGHT, 0) => (CGEventType::RightMouseUp, CGMouseButton::Right),
|
||||||
(BTN_MIDDLE, 1) => (CGEventType::OtherMouseDown, CGMouseButton::Center),
|
(BTN_MIDDLE, 1) => (CGEventType::OtherMouseDown, CGMouseButton::Center),
|
||||||
(BTN_MIDDLE, 0) => (CGEventType::OtherMouseUp, 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}");
|
log::warn!("invalid button event: {button},{state}");
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
// store button state using the evdev button code so
|
// store button state
|
||||||
// back, forward, and middle are tracked independently
|
self.button_state[mouse_button] = state == 1;
|
||||||
if state == 1 {
|
|
||||||
self.pressed_buttons.insert(button);
|
|
||||||
} else {
|
|
||||||
self.pressed_buttons.remove(&button);
|
|
||||||
}
|
|
||||||
|
|
||||||
// update double-click tracking using the evdev button
|
// update previous button state
|
||||||
// code so that back/forward don't alias with middle
|
|
||||||
if state == 1 {
|
if state == 1 {
|
||||||
if self.previous_button == Some(button)
|
if self.previous_button.is_some_and(|b| b.eq(&mouse_button))
|
||||||
&& self
|
&& self
|
||||||
.previous_button_click
|
.previous_button_click
|
||||||
.is_some_and(|i| i.elapsed() < DOUBLE_CLICK_INTERVAL)
|
.is_some_and(|i| i.elapsed() < DOUBLE_CLICK_INTERVAL)
|
||||||
@@ -314,7 +316,7 @@ impl Emulation for MacOSEmulation {
|
|||||||
} else {
|
} else {
|
||||||
self.button_click_state = 1;
|
self.button_click_state = 1;
|
||||||
}
|
}
|
||||||
self.previous_button = Some(button);
|
self.previous_button = Some(mouse_button);
|
||||||
self.previous_button_click = Some(Instant::now());
|
self.previous_button_click = Some(Instant::now());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -336,13 +338,6 @@ impl Emulation for MacOSEmulation {
|
|||||||
EventField::MOUSE_EVENT_CLICK_STATE,
|
EventField::MOUSE_EVENT_CLICK_STATE,
|
||||||
self.button_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);
|
event.post(CGEventTapLocation::HID);
|
||||||
}
|
}
|
||||||
PointerEvent::Axis {
|
PointerEvent::Axis {
|
||||||
@@ -421,10 +416,7 @@ impl Emulation for MacOSEmulation {
|
|||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let is_modifier = update_modifiers(&self.modifier_state, key, state);
|
update_modifiers(&self.modifier_state, key, state);
|
||||||
if is_modifier {
|
|
||||||
modifier_event(self.event_source.clone(), self.modifier_state.get());
|
|
||||||
}
|
|
||||||
match state {
|
match state {
|
||||||
// pressed
|
// pressed
|
||||||
1 => self.spawn_repeat_task(code).await,
|
1 => self.spawn_repeat_task(code).await,
|
||||||
@@ -453,6 +445,21 @@ impl Emulation for MacOSEmulation {
|
|||||||
async fn terminate(&mut self) {}
|
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 {
|
fn update_modifiers(modifiers: &Cell<XMods>, key: u32, state: u8) -> bool {
|
||||||
if let Ok(key) = scancode::Linux::try_from(key) {
|
if let Ok(key) = scancode::Linux::try_from(key) {
|
||||||
let mask = match key {
|
let mask = match key {
|
||||||
|
|||||||
@@ -17,13 +17,13 @@ use crate::error::EmulationError;
|
|||||||
|
|
||||||
use super::{Emulation, EmulationHandle, error::XdpEmulationCreationError};
|
use super::{Emulation, EmulationHandle, error::XdpEmulationCreationError};
|
||||||
|
|
||||||
pub(crate) struct DesktopPortalEmulation<'a> {
|
pub(crate) struct DesktopPortalEmulation {
|
||||||
proxy: RemoteDesktop<'a>,
|
proxy: RemoteDesktop,
|
||||||
session: Session<'a, RemoteDesktop<'a>>,
|
session: Session<RemoteDesktop>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> DesktopPortalEmulation<'a> {
|
impl DesktopPortalEmulation {
|
||||||
pub(crate) async fn new() -> Result<DesktopPortalEmulation<'a>, XdpEmulationCreationError> {
|
pub(crate) async fn new() -> Result<DesktopPortalEmulation, XdpEmulationCreationError> {
|
||||||
log::debug!("connecting to org.freedesktop.portal.RemoteDesktop portal ...");
|
log::debug!("connecting to org.freedesktop.portal.RemoteDesktop portal ...");
|
||||||
let proxy = RemoteDesktop::new().await?;
|
let proxy = RemoteDesktop::new().await?;
|
||||||
|
|
||||||
@@ -52,7 +52,7 @@ impl<'a> DesktopPortalEmulation<'a> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl Emulation for DesktopPortalEmulation<'_> {
|
impl Emulation for DesktopPortalEmulation {
|
||||||
async fn consume(
|
async fn consume(
|
||||||
&mut self,
|
&mut self,
|
||||||
event: input_event::Event,
|
event: input_event::Event,
|
||||||
@@ -141,7 +141,7 @@ impl Emulation for DesktopPortalEmulation<'_> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AsyncDrop for DesktopPortalEmulation<'_> {
|
impl AsyncDrop for DesktopPortalEmulation {
|
||||||
#[doc = r" Perform the async cleanup."]
|
#[doc = r" Perform the async cleanup."]
|
||||||
#[allow(clippy::type_complexity, clippy::type_repetition_in_bounds)]
|
#[allow(clippy::type_complexity, clippy::type_repetition_in_bounds)]
|
||||||
fn async_drop<'async_trait>(
|
fn async_drop<'async_trait>(
|
||||||
|
|||||||
@@ -8,12 +8,14 @@ repository = "https://github.com/feschber/lan-mouse"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
gtk = { package = "gtk4", version = "0.9.0", features = ["v4_2"] }
|
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"] }
|
adw = { package = "libadwaita", version = "0.7.0", features = ["v1_1"] }
|
||||||
async-channel = { version = "2.1.1" }
|
async-channel = { version = "2.1.1" }
|
||||||
hostname = "0.4.0"
|
hostname = "0.4.0"
|
||||||
log = "0.4.20"
|
log = "0.4.20"
|
||||||
lan-mouse-ipc = { path = "../lan-mouse-ipc", version = "0.2.0" }
|
lan-mouse-ipc = { path = "../lan-mouse-ipc", version = "0.2.0" }
|
||||||
thiserror = "2.0.0"
|
thiserror = "2.0.0"
|
||||||
|
wayland-client = "0.31.12"
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
glib-build-tools = { version = "0.20.0" }
|
glib-build-tools = { version = "0.20.0" }
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ use std::{env, process, str};
|
|||||||
|
|
||||||
use window::Window;
|
use window::Window;
|
||||||
|
|
||||||
use lan_mouse_ipc::FrontendEvent;
|
use lan_mouse_ipc::{FrontendEvent, FrontendRequest, WindowIdentifier};
|
||||||
|
|
||||||
use adw::Application;
|
use adw::Application;
|
||||||
use gtk::{IconTheme, gdk::Display, glib::clone, prelude::*};
|
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::client_object::ClientObject;
|
||||||
use self::key_object::KeyObject;
|
use self::key_object::KeyObject;
|
||||||
|
|
||||||
|
use gdk4_wayland::WaylandToplevel;
|
||||||
|
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
#[derive(Error, Debug)]
|
||||||
@@ -124,6 +126,27 @@ fn build_ui(app: &Application) {
|
|||||||
|
|
||||||
let window = Window::new(app, frontend_tx);
|
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!(
|
glib::spawn_future_local(clone!(
|
||||||
#[weak]
|
#[weak]
|
||||||
window,
|
window,
|
||||||
|
|||||||
@@ -422,7 +422,7 @@ impl Window {
|
|||||||
self.request(FrontendRequest::RemoveAuthorizedKey(fp));
|
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 mut requester = self.imp().frontend_request_writer.borrow_mut();
|
||||||
let requester = requester.as_mut().unwrap();
|
let requester = requester.as_mut().unwrap();
|
||||||
if let Err(e) = requester.request(request) {
|
if let Err(e) = requester.request(request) {
|
||||||
|
|||||||
@@ -255,6 +255,14 @@ pub enum FrontendRequest {
|
|||||||
UpdateEnterHook(u64, Option<String>),
|
UpdateEnterHook(u64, Option<String>),
|
||||||
/// save config file
|
/// save config file
|
||||||
SaveConfiguration,
|
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)]
|
#[derive(Clone, Copy, PartialEq, Eq, Debug, Default, Serialize, Deserialize)]
|
||||||
|
|||||||
@@ -1,40 +1,34 @@
|
|||||||
{
|
{
|
||||||
stdenv,
|
|
||||||
rustPlatform,
|
rustPlatform,
|
||||||
lib,
|
lib,
|
||||||
pkg-config,
|
pkgs,
|
||||||
libX11,
|
}: let
|
||||||
gtk4,
|
cargoToml = builtins.fromTOML (builtins.readFile ../Cargo.toml);
|
||||||
libadwaita,
|
|
||||||
libXtst,
|
|
||||||
wrapGAppsHook4,
|
|
||||||
librsvg,
|
|
||||||
git,
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
cargoToml = fromTOML (builtins.readFile ../Cargo.toml);
|
|
||||||
pname = cargoToml.package.name;
|
pname = cargoToml.package.name;
|
||||||
version = cargoToml.package.version;
|
version = cargoToml.package.version;
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage {
|
rustPlatform.buildRustPackage {
|
||||||
inherit pname;
|
pname = pname;
|
||||||
inherit version;
|
version = version;
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = with pkgs; [
|
||||||
pkg-config
|
|
||||||
wrapGAppsHook4
|
|
||||||
git
|
git
|
||||||
|
pkg-config
|
||||||
|
cmake
|
||||||
|
makeWrapper
|
||||||
|
buildPackages.gtk4
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = with pkgs; [
|
||||||
|
xorg.libX11
|
||||||
gtk4
|
gtk4
|
||||||
libadwaita
|
libadwaita
|
||||||
librsvg
|
xorg.libXtst
|
||||||
]
|
] ++ lib.optionals stdenv.isDarwin
|
||||||
++ lib.optionals stdenv.isLinux [
|
(with darwin.apple_sdk_11_0.frameworks; [
|
||||||
libX11
|
CoreGraphics
|
||||||
libXtst
|
ApplicationServices
|
||||||
];
|
]);
|
||||||
|
|
||||||
src = builtins.path {
|
src = builtins.path {
|
||||||
name = pname;
|
name = pname;
|
||||||
@@ -46,7 +40,11 @@ rustPlatform.buildRustPackage {
|
|||||||
# Set Environment Variables
|
# Set Environment Variables
|
||||||
RUST_BACKTRACE = "full";
|
RUST_BACKTRACE = "full";
|
||||||
|
|
||||||
|
# Needed to enable support for SVG icons in GTK
|
||||||
postInstall = ''
|
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 *.desktop -t $out/share/applications
|
||||||
install -Dm444 lan-mouse-gtk/resources/*.svg -t $out/share/icons/hicolor/scalable/apps
|
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
|
set -u
|
||||||
|
|
||||||
mkdir -p "$iconset"
|
mkdir -p "$iconset"
|
||||||
magick "$svg" -background none -resize 1024x1024 "$iconset"/icon_512x512@2x.png
|
magick convert -background none -resize 1024x1024 "$svg" "$iconset"/icon_512x512@2x.png
|
||||||
magick "$svg" -background none -resize 512x512 "$iconset"/icon_512x512.png
|
magick convert -background none -resize 512x512 "$svg" "$iconset"/icon_512x512.png
|
||||||
magick "$svg" -background none -resize 256x256 "$iconset"/icon_256x256.png
|
magick convert -background none -resize 256x256 "$svg" "$iconset"/icon_256x256.png
|
||||||
magick "$svg" -background none -resize 128x128 "$iconset"/icon_128x128.png
|
magick convert -background none -resize 128x128 "$svg" "$iconset"/icon_128x128.png
|
||||||
magick "$svg" -background none -resize 64x64 "$iconset"/icon_32x32@2x.png
|
magick convert -background none -resize 64x64 "$svg" "$iconset"/icon_32x32@2x.png
|
||||||
magick "$svg" -background none -resize 32x32 "$iconset"/icon_32x32.png
|
magick convert -background none -resize 32x32 "$svg" "$iconset"/icon_32x32.png
|
||||||
magick "$svg" -background none -resize 16x16 "$iconset"/icon_16x16.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_512x512.png "$iconset"/icon_256x256@2x.png
|
||||||
cp "$iconset"/icon_256x256.png "$iconset"/icon_128x128@2x.png
|
cp "$iconset"/icon_256x256.png "$iconset"/icon_128x128@2x.png
|
||||||
cp "$iconset"/icon_32x32.png "$iconset"/icon_16x16@2x.png
|
cp "$iconset"/icon_32x32.png "$iconset"/icon_16x16@2x.png
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
use std::{
|
use std::{
|
||||||
cell::{Cell, RefCell},
|
cell::{Cell, RefCell},
|
||||||
rc::Rc,
|
rc::Rc,
|
||||||
|
sync::{Arc, Mutex},
|
||||||
time::{Duration, Instant},
|
time::{Duration, Instant},
|
||||||
};
|
};
|
||||||
|
|
||||||
use futures::StreamExt;
|
use futures::StreamExt;
|
||||||
use input_capture::{
|
use input_capture::{
|
||||||
CaptureError, CaptureEvent, CaptureHandle, InputCapture, InputCaptureError, Position,
|
CaptureError, CaptureEvent, CaptureHandle, InputCapture, InputCaptureError, Position,
|
||||||
|
WindowIdentifier,
|
||||||
};
|
};
|
||||||
use input_event::scancode;
|
use input_event::scancode;
|
||||||
use lan_mouse_proto::ProtoEvent;
|
use lan_mouse_proto::ProtoEvent;
|
||||||
@@ -49,7 +51,7 @@ pub(crate) enum CaptureType {
|
|||||||
EnterOnly,
|
EnterOnly,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
enum CaptureRequest {
|
enum CaptureRequest {
|
||||||
/// capture must release the mouse
|
/// capture must release the mouse
|
||||||
Release,
|
Release,
|
||||||
@@ -66,6 +68,7 @@ impl Capture {
|
|||||||
backend: Option<input_capture::Backend>,
|
backend: Option<input_capture::Backend>,
|
||||||
conn: LanMouseConnection,
|
conn: LanMouseConnection,
|
||||||
release_bind: Vec<scancode::Linux>,
|
release_bind: Vec<scancode::Linux>,
|
||||||
|
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
let (request_tx, request_rx) = channel();
|
let (request_tx, request_rx) = channel();
|
||||||
let (event_tx, event_rx) = channel();
|
let (event_tx, event_rx) = channel();
|
||||||
@@ -80,6 +83,7 @@ impl Capture {
|
|||||||
request_rx,
|
request_rx,
|
||||||
release_bind: Rc::new(RefCell::new(release_bind)),
|
release_bind: Rc::new(RefCell::new(release_bind)),
|
||||||
state: Default::default(),
|
state: Default::default(),
|
||||||
|
window_identifier,
|
||||||
};
|
};
|
||||||
let task = spawn_local(capture_task.run());
|
let task = spawn_local(capture_task.run());
|
||||||
Self {
|
Self {
|
||||||
@@ -160,6 +164,7 @@ struct CaptureTask {
|
|||||||
release_bind: Rc<RefCell<Vec<scancode::Linux>>>,
|
release_bind: Rc<RefCell<Vec<scancode::Linux>>>,
|
||||||
request_rx: Receiver<CaptureRequest>,
|
request_rx: Receiver<CaptureRequest>,
|
||||||
state: State,
|
state: State,
|
||||||
|
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl CaptureTask {
|
impl CaptureTask {
|
||||||
@@ -194,6 +199,7 @@ impl CaptureTask {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn run(mut self) {
|
async fn run(mut self) {
|
||||||
|
tokio::time::sleep(Duration::from_secs(1)).await;
|
||||||
loop {
|
loop {
|
||||||
if let Err(e) = self.do_capture().await {
|
if let Err(e) = self.do_capture().await {
|
||||||
log::warn!("input capture exited: {e}");
|
log::warn!("input capture exited: {e}");
|
||||||
@@ -201,10 +207,10 @@ impl CaptureTask {
|
|||||||
loop {
|
loop {
|
||||||
tokio::select! {
|
tokio::select! {
|
||||||
r = self.request_rx.recv() => match r.expect("channel closed") {
|
r = self.request_rx.recv() => match r.expect("channel closed") {
|
||||||
CaptureRequest::Reenable => break,
|
CaptureRequest::Reenable=>break,
|
||||||
CaptureRequest::Create(h, p, t) => self.add_capture(h, p, t),
|
CaptureRequest::Create(h,p,t)=>self.add_capture(h,p,t),
|
||||||
CaptureRequest::Destroy(h) => self.remove_capture(h),
|
CaptureRequest::Destroy(h)=>self.remove_capture(h),
|
||||||
CaptureRequest::Release => { /* nothing to do */ }
|
CaptureRequest::Release=>{}
|
||||||
},
|
},
|
||||||
_ = self.cancellation_token.cancelled() => return,
|
_ = self.cancellation_token.cancelled() => return,
|
||||||
}
|
}
|
||||||
@@ -215,7 +221,7 @@ impl CaptureTask {
|
|||||||
async fn do_capture(&mut self) -> Result<(), InputCaptureError> {
|
async fn do_capture(&mut self) -> Result<(), InputCaptureError> {
|
||||||
/* allow cancelling capture request */
|
/* allow cancelling capture request */
|
||||||
let mut capture = tokio::select! {
|
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(()),
|
_ = self.cancellation_token.cancelled() => return Ok(()),
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -285,16 +291,10 @@ impl CaptureTask {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
e = self.request_rx.recv() => match e.expect("channel closed") {
|
e = self.request_rx.recv() => match e.expect("channel closed") {
|
||||||
CaptureRequest::Reenable => { /* already active */ },
|
CaptureRequest::Reenable=>{},
|
||||||
CaptureRequest::Release => self.release_capture(capture).await?,
|
CaptureRequest::Release=>self.release_capture(capture).await?,
|
||||||
CaptureRequest::Create(h, p, t) => {
|
CaptureRequest::Create(h,p,t)=>{self.add_capture(h,p,t);capture.create(h,p).await?;}
|
||||||
self.add_capture(h, p, t);
|
CaptureRequest::Destroy(h)=>{self.remove_capture(h);capture.destroy(h).await?;}
|
||||||
capture.create(h, p).await?;
|
|
||||||
}
|
|
||||||
CaptureRequest::Destroy(h) => {
|
|
||||||
self.remove_capture(h);
|
|
||||||
capture.destroy(h).await?;
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
_ = self.cancellation_token.cancelled() => break,
|
_ = self.cancellation_token.cancelled() => break,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
use std::sync::{Arc, Mutex};
|
||||||
|
|
||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
use clap::Args;
|
use clap::Args;
|
||||||
use futures::StreamExt;
|
use futures::StreamExt;
|
||||||
@@ -12,7 +14,7 @@ pub async fn run(config: Config, _args: TestCaptureArgs) -> Result<(), InputCapt
|
|||||||
log::info!("creating input capture");
|
log::info!("creating input capture");
|
||||||
let backend = config.capture_backend().map(|b| b.into());
|
let backend = config.capture_backend().map(|b| b.into());
|
||||||
loop {
|
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");
|
log::info!("creating clients");
|
||||||
input_capture.create(0, Position::Left).await?;
|
input_capture.create(0, Position::Left).await?;
|
||||||
input_capture.create(4, Position::Left).await?;
|
input_capture.create(4, Position::Left).await?;
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ use std::{
|
|||||||
collections::{HashMap, HashSet, VecDeque},
|
collections::{HashMap, HashSet, VecDeque},
|
||||||
io,
|
io,
|
||||||
net::{IpAddr, SocketAddr},
|
net::{IpAddr, SocketAddr},
|
||||||
sync::{Arc, RwLock},
|
sync::{Arc, Mutex, RwLock},
|
||||||
};
|
};
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
use tokio::{process::Command, signal, sync::Notify};
|
use tokio::{process::Command, signal, sync::Notify};
|
||||||
@@ -70,6 +70,7 @@ pub struct Service {
|
|||||||
/// map from capture handle to connection info
|
/// map from capture handle to connection info
|
||||||
incoming_conn_info: HashMap<ClientHandle, Incoming>,
|
incoming_conn_info: HashMap<ClientHandle, Incoming>,
|
||||||
next_trigger_handle: u64,
|
next_trigger_handle: u64,
|
||||||
|
window_identifier: Arc<Mutex<Option<input_capture::WindowIdentifier>>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
@@ -115,7 +116,13 @@ impl Service {
|
|||||||
|
|
||||||
// input capture + emulation
|
// input capture + emulation
|
||||||
let capture_backend = config.capture_backend().map(|b| b.into());
|
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_backend = config.emulation_backend().map(|b| b.into());
|
||||||
let emulation = Emulation::new(emulation_backend, listener);
|
let emulation = Emulation::new(emulation_backend, listener);
|
||||||
|
|
||||||
@@ -140,6 +147,7 @@ impl Service {
|
|||||||
incoming_conn_info: Default::default(),
|
incoming_conn_info: Default::default(),
|
||||||
incoming_conns: Default::default(),
|
incoming_conns: Default::default(),
|
||||||
next_trigger_handle: 0,
|
next_trigger_handle: 0,
|
||||||
|
window_identifier,
|
||||||
};
|
};
|
||||||
Ok(service)
|
Ok(service)
|
||||||
}
|
}
|
||||||
@@ -231,6 +239,20 @@ impl Service {
|
|||||||
self.update_enter_hook(handle, enter_hook)
|
self.update_enter_hook(handle, enter_hook)
|
||||||
}
|
}
|
||||||
FrontendRequest::SaveConfiguration => self.save_config(),
|
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)
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user