mirror of
https://github.com/feschber/lan-mouse.git
synced 2026-03-27 07:00:53 +03:00
Compare commits
2 Commits
attach-dia
...
a5bdcd0972
| Author | SHA1 | Date | |
|---|---|---|---|
|
a5bdcd0972 | ||
|
|
be27e337f4 |
64
.github/workflows/cachix.yml
vendored
64
.github/workflows/cachix.yml
vendored
@@ -1,46 +1,40 @@
|
||||
name: Nix Binary Cache
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: ["main"]
|
||||
pull_request:
|
||||
branches: ["main"]
|
||||
workflow_dispatch:
|
||||
name: Binary Cache
|
||||
|
||||
on: [push, pull_request, workflow_dispatch]
|
||||
jobs:
|
||||
nix:
|
||||
strategy:
|
||||
matrix:
|
||||
os:
|
||||
- ubuntu-latest
|
||||
- macos-15-intel
|
||||
- macos-latest
|
||||
os:
|
||||
- ubuntu-latest
|
||||
- macos-15-intel
|
||||
- macos-14
|
||||
name: "Build"
|
||||
runs-on: ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
# - uses: DeterminateSystems/nix-installer-action@main
|
||||
# with:
|
||||
# logger: pretty
|
||||
# - uses: DeterminateSystems/magic-nix-cache-action@main
|
||||
- uses: cachix/install-nix-action@v31
|
||||
- uses: cachix/cachix-action@v16
|
||||
with:
|
||||
name: lan-mouse
|
||||
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
|
||||
- uses: DeterminateSystems/nix-installer-action@main
|
||||
with:
|
||||
logger: pretty
|
||||
- uses: DeterminateSystems/magic-nix-cache-action@main
|
||||
- uses: cachix/cachix-action@v14
|
||||
with:
|
||||
name: lan-mouse
|
||||
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
||||
|
||||
- name: Build lan-mouse (x86_64-linux)
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
run: nix build --print-build-logs --show-trace .#packages.x86_64-linux.lan-mouse
|
||||
- name: Build lan-mouse (x86_64-linux)
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
run: nix build --print-build-logs --show-trace .#packages.x86_64-linux.lan-mouse
|
||||
|
||||
- name: Build lan-mouse (x86_64-darwin)
|
||||
if: matrix.os == 'macos-15-intel'
|
||||
run: nix build --print-build-logs --show-trace .#packages.x86_64-darwin.lan-mouse
|
||||
- name: Build lan-mouse (x86_64-darwin)
|
||||
if: matrix.os == 'macos-15-intel'
|
||||
run: nix build --print-build-logs --show-trace .#packages.x86_64-darwin.lan-mouse
|
||||
|
||||
- name: Build lan-mouse (aarch64-darwin)
|
||||
if: matrix.os == 'macos-14'
|
||||
run: nix build --print-build-logs --show-trace .#packages.aarch64-darwin.lan-mouse
|
||||
|
||||
- name: Build lan-mouse (aarch64-darwin)
|
||||
if: matrix.os == 'macos-latest'
|
||||
run: nix build --print-build-logs --show-trace .#packages.aarch64-darwin.lan-mouse
|
||||
|
||||
2
.github/workflows/rust.yml
vendored
2
.github/workflows/rust.yml
vendored
@@ -76,7 +76,7 @@ jobs:
|
||||
gvsbuild build --msys-dir=C:\msys64 gtk4 libadwaita librsvg
|
||||
- name: cargo build
|
||||
if: matrix.job == 'build'
|
||||
run: cargo build
|
||||
run: cargo check --workspace --all-targets --all-features
|
||||
|
||||
- name: cargo check
|
||||
if: matrix.job == 'check'
|
||||
|
||||
201
Cargo.lock
generated
201
Cargo.lock
generated
@@ -140,13 +140,12 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
|
||||
|
||||
[[package]]
|
||||
name = "ashpd"
|
||||
version = "0.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0848bedd08067dca1c02c31cbb371a94ad4f2f8a61a82f2c43d96ec36a395244"
|
||||
version = "0.13.0-alpha"
|
||||
source = "git+https://github.com/bilelmoussaoui/ashpd#76d565f62b848554ed098da90d0f8dccac6569fd"
|
||||
dependencies = [
|
||||
"enumflags2",
|
||||
"futures-util",
|
||||
"getrandom 0.4.1",
|
||||
"getrandom 0.3.3",
|
||||
"serde",
|
||||
"serde_repr",
|
||||
"tokio",
|
||||
@@ -927,12 +926,6 @@ dependencies = [
|
||||
"rustc_version",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "foldhash"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
|
||||
|
||||
[[package]]
|
||||
name = "foreign-types"
|
||||
version = "0.5.0"
|
||||
@@ -1200,19 +1193,6 @@ dependencies = [
|
||||
"wasi 0.14.2+wasi-0.2.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"r-efi",
|
||||
"wasip2",
|
||||
"wasip3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ghash"
|
||||
version = "0.5.1"
|
||||
@@ -1458,9 +1438,6 @@ name = "hashbrown"
|
||||
version = "0.15.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
|
||||
dependencies = [
|
||||
"foldhash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
@@ -1659,12 +1636,6 @@ dependencies = [
|
||||
"zerovec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "id-arena"
|
||||
version = "2.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
|
||||
|
||||
[[package]]
|
||||
name = "idna"
|
||||
version = "1.0.3"
|
||||
@@ -1694,7 +1665,6 @@ checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
|
||||
dependencies = [
|
||||
"equivalent",
|
||||
"hashbrown",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1946,6 +1916,7 @@ dependencies = [
|
||||
"libadwaita",
|
||||
"log",
|
||||
"thiserror 2.0.12",
|
||||
"wayland-client",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1977,12 +1948,6 @@ version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
|
||||
|
||||
[[package]]
|
||||
name = "leb128fmt"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
|
||||
|
||||
[[package]]
|
||||
name = "libadwaita"
|
||||
version = "0.7.2"
|
||||
@@ -2546,16 +2511,6 @@ dependencies = [
|
||||
"zerocopy",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "prettyplease"
|
||||
version = "0.2.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "primeorder"
|
||||
version = "0.13.6"
|
||||
@@ -2820,7 +2775,7 @@ dependencies = [
|
||||
"errno",
|
||||
"libc",
|
||||
"linux-raw-sys 0.11.0",
|
||||
"windows-sys 0.61.2",
|
||||
"windows-sys 0.60.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3110,9 +3065,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.117"
|
||||
version = "2.0.104"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
|
||||
checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -3165,7 +3120,7 @@ dependencies = [
|
||||
"getrandom 0.3.3",
|
||||
"once_cell",
|
||||
"rustix 1.1.3",
|
||||
"windows-sys 0.61.2",
|
||||
"windows-sys 0.60.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3584,24 +3539,6 @@ dependencies = [
|
||||
"wit-bindgen-rt",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasip2"
|
||||
version = "1.0.2+wasi-0.2.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
|
||||
dependencies = [
|
||||
"wit-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasip3"
|
||||
version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
|
||||
dependencies = [
|
||||
"wit-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.100"
|
||||
@@ -3660,40 +3597,6 @@ dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-encoder"
|
||||
version = "0.244.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
|
||||
dependencies = [
|
||||
"leb128fmt",
|
||||
"wasmparser",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-metadata"
|
||||
version = "0.244.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"indexmap",
|
||||
"wasm-encoder",
|
||||
"wasmparser",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasmparser"
|
||||
version = "0.244.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
|
||||
dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
"hashbrown",
|
||||
"indexmap",
|
||||
"semver",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wayland-backend"
|
||||
version = "0.3.12"
|
||||
@@ -4231,26 +4134,6 @@ dependencies = [
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wit-bindgen"
|
||||
version = "0.51.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
|
||||
dependencies = [
|
||||
"wit-bindgen-rust-macro",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wit-bindgen-core"
|
||||
version = "0.51.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"heck",
|
||||
"wit-parser",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wit-bindgen-rt"
|
||||
version = "0.39.0"
|
||||
@@ -4260,74 +4143,6 @@ dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wit-bindgen-rust"
|
||||
version = "0.51.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"heck",
|
||||
"indexmap",
|
||||
"prettyplease",
|
||||
"syn",
|
||||
"wasm-metadata",
|
||||
"wit-bindgen-core",
|
||||
"wit-component",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wit-bindgen-rust-macro"
|
||||
version = "0.51.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"prettyplease",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"wit-bindgen-core",
|
||||
"wit-bindgen-rust",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wit-component"
|
||||
version = "0.244.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bitflags 2.9.1",
|
||||
"indexmap",
|
||||
"log",
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"wasm-encoder",
|
||||
"wasm-metadata",
|
||||
"wasmparser",
|
||||
"wit-parser",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wit-parser"
|
||||
version = "0.244.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"id-arena",
|
||||
"indexmap",
|
||||
"log",
|
||||
"semver",
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"unicode-xid",
|
||||
"wasmparser",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "writeable"
|
||||
version = "0.6.1"
|
||||
|
||||
@@ -41,7 +41,7 @@ wayland-protocols-wlr = { version = "0.3.1", features = [
|
||||
"client",
|
||||
], optional = true }
|
||||
x11 = { version = "2.21.0", features = ["xlib", "xtest"], optional = true }
|
||||
ashpd = { version = "0.13.0", default-features = false, features = [
|
||||
ashpd = { git = "https://github.com/bilelmoussaoui/ashpd", default-features = false, features = [
|
||||
"input_capture",
|
||||
"tokio",
|
||||
], optional = true }
|
||||
|
||||
@@ -136,12 +136,11 @@ pub enum WindowIdentifier {
|
||||
X11(u32),
|
||||
}
|
||||
|
||||
#[cfg(all(unix, feature = "libei"))]
|
||||
impl Into<ashpd::WindowIdentifier> for WindowIdentifier {
|
||||
fn into(self) -> ashpd::WindowIdentifier {
|
||||
match self {
|
||||
WindowIdentifier::Wayland(handle) => {
|
||||
ashpd::WindowIdentifier::from_xdg_foreign_exported(handle)
|
||||
ashpd::WindowIdentifier::from_xdg_foreign_exported_v2(handle)
|
||||
}
|
||||
WindowIdentifier::X11(_) => todo!(),
|
||||
}
|
||||
|
||||
@@ -2,8 +2,8 @@ use ashpd::{
|
||||
desktop::{
|
||||
Session,
|
||||
input_capture::{
|
||||
Activated, ActivatedBarrier, Barrier, BarrierID, Capabilities, CreateSessionOptions,
|
||||
InputCapture, Region, ReleaseOptions, Zones,
|
||||
Activated, ActivatedBarrier, Barrier, BarrierID, Capabilities, InputCapture, Region,
|
||||
Zones,
|
||||
},
|
||||
},
|
||||
enumflags2::BitFlags,
|
||||
@@ -135,10 +135,7 @@ async fn update_barriers(
|
||||
active_clients: &[Position],
|
||||
next_barrier_id: &mut NonZeroU32,
|
||||
) -> Result<(Vec<ICBarrier>, HashMap<BarrierID, Position>), ashpd::Error> {
|
||||
let zones = input_capture
|
||||
.zones(session, Default::default())
|
||||
.await?
|
||||
.response()?;
|
||||
let zones = input_capture.zones(session).await?.response()?;
|
||||
log::debug!("zones: {zones:?}");
|
||||
|
||||
let (barriers, id_map) = select_barriers(&zones, active_clients, next_barrier_id);
|
||||
@@ -147,12 +144,7 @@ async fn update_barriers(
|
||||
|
||||
let ashpd_barriers: Vec<Barrier> = barriers.iter().copied().map(|b| b.into()).collect();
|
||||
let response = input_capture
|
||||
.set_pointer_barriers(
|
||||
session,
|
||||
&ashpd_barriers,
|
||||
zones.zone_set(),
|
||||
Default::default(),
|
||||
)
|
||||
.set_pointer_barriers(session, &ashpd_barriers, zones.zone_set())
|
||||
.await?;
|
||||
let response = response.response()?;
|
||||
log::debug!("{response:?}");
|
||||
@@ -163,15 +155,15 @@ async fn create_session(
|
||||
input_capture: &InputCapture,
|
||||
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||
) -> std::result::Result<(Session<InputCapture>, BitFlags<Capabilities>), ashpd::Error> {
|
||||
log::debug!("creating input capture session: {window_identifier:?}");
|
||||
let window_identifier = window_identifier.lock().unwrap().clone();
|
||||
let create_session_options = CreateSessionOptions::default().set_capabilities(
|
||||
Capabilities::Keyboard | Capabilities::Pointer | Capabilities::Touchscreen,
|
||||
);
|
||||
log::debug!("creating input capture session: {window_identifier:?}");
|
||||
let ashpd_window_identifier: Option<ashpd::WindowIdentifier> =
|
||||
window_identifier.map(|i| i.into());
|
||||
input_capture
|
||||
.create_session(ashpd_window_identifier.as_ref(), create_session_options)
|
||||
.create_session(
|
||||
ashpd_window_identifier.as_ref(),
|
||||
Capabilities::Keyboard | Capabilities::Pointer | Capabilities::Touchscreen,
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
@@ -180,9 +172,7 @@ async fn connect_to_eis(
|
||||
session: &Session<InputCapture>,
|
||||
) -> Result<(ei::Context, Connection, EiConvertEventStream), CaptureError> {
|
||||
log::debug!("connect_to_eis");
|
||||
let fd = input_capture
|
||||
.connect_to_eis(session, Default::default())
|
||||
.await?;
|
||||
let fd = input_capture.connect_to_eis(session).await?;
|
||||
|
||||
// create unix stream from fd
|
||||
let stream = UnixStream::from(fd);
|
||||
@@ -332,7 +322,7 @@ async fn do_capture(
|
||||
|
||||
// disable capture
|
||||
log::debug!("disabling input capture");
|
||||
if let Err(e) = input_capture.disable(&session, Default::default()).await {
|
||||
if let Err(e) = input_capture.disable(&session).await {
|
||||
log::warn!("input_capture.disable(&session) {e}");
|
||||
}
|
||||
if let Err(e) = session.close().await {
|
||||
@@ -381,7 +371,7 @@ async fn do_capture_session(
|
||||
update_barriers(input_capture, session, active_clients, next_barrier_id).await?;
|
||||
|
||||
log::debug!("enabling session");
|
||||
input_capture.enable(session, Default::default()).await?;
|
||||
input_capture.enable(session).await?;
|
||||
|
||||
// cancellation token to release session
|
||||
let release_session = Arc::new(Notify::new());
|
||||
@@ -509,10 +499,9 @@ async fn release_capture(
|
||||
};
|
||||
// release 1px to the right of the entered zone
|
||||
let cursor_position = (x as f64 + dx, y as f64 + dy);
|
||||
let release_options = ReleaseOptions::default()
|
||||
.set_activation_id(activated.activation_id())
|
||||
.set_cursor_position(Some(cursor_position));
|
||||
input_capture.release(session, release_options).await?;
|
||||
input_capture
|
||||
.release(session, activated.activation_id(), Some(cursor_position))
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
||||
@@ -18,9 +18,7 @@ use core_graphics::{
|
||||
event_source::{CGEventSource, CGEventSourceStateID},
|
||||
};
|
||||
use futures_core::Stream;
|
||||
use input_event::{
|
||||
BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent,
|
||||
};
|
||||
use input_event::{BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent};
|
||||
use keycode::{KeyMap, KeyMapping};
|
||||
use libc::c_void;
|
||||
use once_cell::unsync::Lazy;
|
||||
@@ -306,28 +304,16 @@ fn get_events(
|
||||
})))
|
||||
}
|
||||
CGEventType::OtherMouseDown => {
|
||||
let btn_num = ev.get_integer_value_field(EventField::MOUSE_EVENT_BUTTON_NUMBER);
|
||||
let button = match btn_num {
|
||||
3 => BTN_BACK,
|
||||
4 => BTN_FORWARD,
|
||||
_ => BTN_MIDDLE,
|
||||
};
|
||||
result.push(CaptureEvent::Input(Event::Pointer(PointerEvent::Button {
|
||||
time: 0,
|
||||
button,
|
||||
button: BTN_MIDDLE,
|
||||
state: 1,
|
||||
})))
|
||||
}
|
||||
CGEventType::OtherMouseUp => {
|
||||
let btn_num = ev.get_integer_value_field(EventField::MOUSE_EVENT_BUTTON_NUMBER);
|
||||
let button = match btn_num {
|
||||
3 => BTN_BACK,
|
||||
4 => BTN_FORWARD,
|
||||
_ => BTN_MIDDLE,
|
||||
};
|
||||
result.push(CaptureEvent::Input(Event::Pointer(PointerEvent::Button {
|
||||
time: 0,
|
||||
button,
|
||||
button: BTN_MIDDLE,
|
||||
state: 0,
|
||||
})))
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ wayland-protocols-misc = { version = "0.3.1", features = [
|
||||
"client",
|
||||
], optional = true }
|
||||
x11 = { version = "2.21.0", features = ["xlib", "xtest"], optional = true }
|
||||
ashpd = { version = "0.13.0", default-features = false, features = [
|
||||
ashpd = { git = "https://github.com/bilelmoussaoui/ashpd", default-features = false, features = [
|
||||
"remote_desktop",
|
||||
"screencast",
|
||||
"tokio",
|
||||
|
||||
@@ -13,7 +13,7 @@ use tokio::task::JoinHandle;
|
||||
|
||||
use ashpd::desktop::{
|
||||
PersistMode, Session,
|
||||
remote_desktop::{DeviceType, RemoteDesktop, SelectDevicesOptions},
|
||||
remote_desktop::{DeviceType, RemoteDesktop},
|
||||
};
|
||||
use async_trait::async_trait;
|
||||
|
||||
@@ -90,20 +90,20 @@ async fn get_ei_fd() -> Result<(RemoteDesktop, Session<RemoteDesktop>, OwnedFd),
|
||||
let restore_token = read_token();
|
||||
|
||||
log::debug!("creating session ...");
|
||||
let session = remote_desktop.create_session(Default::default()).await?;
|
||||
let session = remote_desktop.create_session().await?;
|
||||
|
||||
log::debug!("selecting devices ...");
|
||||
let options = SelectDevicesOptions::default()
|
||||
.set_devices(DeviceType::Keyboard | DeviceType::Pointer)
|
||||
.set_persist_mode(PersistMode::ExplicitlyRevoked)
|
||||
.set_restore_token(restore_token.as_deref());
|
||||
remote_desktop.select_devices(&session, options).await?;
|
||||
remote_desktop
|
||||
.select_devices(
|
||||
&session,
|
||||
DeviceType::Keyboard | DeviceType::Pointer,
|
||||
restore_token.as_deref(),
|
||||
PersistMode::ExplicitlyRevoked,
|
||||
)
|
||||
.await?;
|
||||
|
||||
log::info!("requesting permission for input emulation");
|
||||
let start_response = remote_desktop
|
||||
.start(&session, None, Default::default())
|
||||
.await?
|
||||
.response()?;
|
||||
let start_response = remote_desktop.start(&session, None).await?.response()?;
|
||||
|
||||
// The restore token is only valid once, we need to re-save it each time
|
||||
if let Some(token_str) = start_response.restore_token() {
|
||||
@@ -112,9 +112,7 @@ async fn get_ei_fd() -> Result<(RemoteDesktop, Session<RemoteDesktop>, OwnedFd),
|
||||
}
|
||||
}
|
||||
|
||||
let fd = remote_desktop
|
||||
.connect_to_eis(&session, Default::default())
|
||||
.await?;
|
||||
let fd = remote_desktop.connect_to_eis(&session).await?;
|
||||
Ok((remote_desktop, session, fd))
|
||||
}
|
||||
|
||||
|
||||
@@ -10,13 +10,10 @@ use core_graphics::event::{
|
||||
ScrollEventUnit,
|
||||
};
|
||||
use core_graphics::event_source::{CGEventSource, CGEventSourceStateID};
|
||||
use input_event::{
|
||||
BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent,
|
||||
scancode,
|
||||
};
|
||||
use input_event::{BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent, scancode};
|
||||
use keycode::{KeyMap, KeyMapping};
|
||||
use std::cell::Cell;
|
||||
use std::collections::HashSet;
|
||||
use std::ops::{Index, IndexMut};
|
||||
use std::rc::Rc;
|
||||
use std::sync::Arc;
|
||||
use std::time::{Duration, Instant};
|
||||
@@ -33,10 +30,10 @@ pub(crate) struct MacOSEmulation {
|
||||
event_source: CGEventSource,
|
||||
/// task handle for key repeats
|
||||
repeat_task: Option<JoinHandle<()>>,
|
||||
/// current state of the mouse buttons (tracked by evdev button code)
|
||||
pressed_buttons: HashSet<u32>,
|
||||
/// button previously pressed (evdev button code)
|
||||
previous_button: Option<u32>,
|
||||
/// current state of the mouse buttons
|
||||
button_state: ButtonState,
|
||||
/// button previously pressed
|
||||
previous_button: Option<CGMouseButton>,
|
||||
/// timestamp of previous click (button down)
|
||||
previous_button_click: Option<Instant>,
|
||||
/// click state, i.e. number of clicks in quick succession
|
||||
@@ -47,13 +44,31 @@ pub(crate) struct MacOSEmulation {
|
||||
notify_repeat_task: Arc<Notify>,
|
||||
}
|
||||
|
||||
/// Maps an evdev button code to the CGEventType used for drag events.
|
||||
fn drag_event_type(button: u32) -> CGEventType {
|
||||
match button {
|
||||
BTN_LEFT => CGEventType::LeftMouseDragged,
|
||||
BTN_RIGHT => CGEventType::RightMouseDragged,
|
||||
// middle, back, forward, and any other button all use OtherMouseDragged
|
||||
_ => CGEventType::OtherMouseDragged,
|
||||
struct ButtonState {
|
||||
left: bool,
|
||||
right: bool,
|
||||
center: bool,
|
||||
}
|
||||
|
||||
impl Index<CGMouseButton> for ButtonState {
|
||||
type Output = bool;
|
||||
|
||||
fn index(&self, index: CGMouseButton) -> &Self::Output {
|
||||
match index {
|
||||
CGMouseButton::Left => &self.left,
|
||||
CGMouseButton::Right => &self.right,
|
||||
CGMouseButton::Center => &self.center,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl IndexMut<CGMouseButton> for ButtonState {
|
||||
fn index_mut(&mut self, index: CGMouseButton) -> &mut Self::Output {
|
||||
match index {
|
||||
CGMouseButton::Left => &mut self.left,
|
||||
CGMouseButton::Right => &mut self.right,
|
||||
CGMouseButton::Center => &mut self.center,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,9 +78,14 @@ impl MacOSEmulation {
|
||||
pub(crate) fn new() -> Result<Self, MacOSEmulationCreationError> {
|
||||
let event_source = CGEventSource::new(CGEventSourceStateID::CombinedSessionState)
|
||||
.map_err(|_| MacOSEmulationCreationError::EventSourceCreation)?;
|
||||
let button_state = ButtonState {
|
||||
left: false,
|
||||
right: false,
|
||||
center: false,
|
||||
};
|
||||
Ok(Self {
|
||||
event_source,
|
||||
pressed_buttons: HashSet::new(),
|
||||
button_state,
|
||||
previous_button: None,
|
||||
previous_button_click: None,
|
||||
button_click_state: 0,
|
||||
@@ -241,14 +261,14 @@ impl Emulation for MacOSEmulation {
|
||||
mouse_location.x = new_mouse_x;
|
||||
mouse_location.y = new_mouse_y;
|
||||
|
||||
// If any button is held, emit a drag event for it;
|
||||
// otherwise emit a normal mouse-moved event.
|
||||
let event_type = self
|
||||
.pressed_buttons
|
||||
.iter()
|
||||
.next()
|
||||
.map(|&btn| drag_event_type(btn))
|
||||
.unwrap_or(CGEventType::MouseMoved);
|
||||
let mut event_type = CGEventType::MouseMoved;
|
||||
if self.button_state.left {
|
||||
event_type = CGEventType::LeftMouseDragged
|
||||
} else if self.button_state.right {
|
||||
event_type = CGEventType::RightMouseDragged
|
||||
} else if self.button_state.center {
|
||||
event_type = CGEventType::OtherMouseDragged
|
||||
};
|
||||
let event = match CGEvent::new_mouse_event(
|
||||
self.event_source.clone(),
|
||||
event_type,
|
||||
@@ -270,12 +290,6 @@ impl Emulation for MacOSEmulation {
|
||||
button,
|
||||
state,
|
||||
} => {
|
||||
// button number for OtherMouse events (3 = back, 4 = forward, etc.)
|
||||
let cg_button_number: Option<i64> = match button {
|
||||
BTN_BACK => Some(3),
|
||||
BTN_FORWARD => Some(4),
|
||||
_ => None,
|
||||
};
|
||||
let (event_type, mouse_button) = match (button, state) {
|
||||
(BTN_LEFT, 1) => (CGEventType::LeftMouseDown, CGMouseButton::Left),
|
||||
(BTN_LEFT, 0) => (CGEventType::LeftMouseUp, CGMouseButton::Left),
|
||||
@@ -283,29 +297,17 @@ impl Emulation for MacOSEmulation {
|
||||
(BTN_RIGHT, 0) => (CGEventType::RightMouseUp, CGMouseButton::Right),
|
||||
(BTN_MIDDLE, 1) => (CGEventType::OtherMouseDown, CGMouseButton::Center),
|
||||
(BTN_MIDDLE, 0) => (CGEventType::OtherMouseUp, CGMouseButton::Center),
|
||||
(BTN_BACK, 1) | (BTN_FORWARD, 1) => {
|
||||
(CGEventType::OtherMouseDown, CGMouseButton::Center)
|
||||
}
|
||||
(BTN_BACK, 0) | (BTN_FORWARD, 0) => {
|
||||
(CGEventType::OtherMouseUp, CGMouseButton::Center)
|
||||
}
|
||||
_ => {
|
||||
log::warn!("invalid button event: {button},{state}");
|
||||
return Ok(());
|
||||
}
|
||||
};
|
||||
// store button state using the evdev button code so
|
||||
// back, forward, and middle are tracked independently
|
||||
if state == 1 {
|
||||
self.pressed_buttons.insert(button);
|
||||
} else {
|
||||
self.pressed_buttons.remove(&button);
|
||||
}
|
||||
// store button state
|
||||
self.button_state[mouse_button] = state == 1;
|
||||
|
||||
// update double-click tracking using the evdev button
|
||||
// code so that back/forward don't alias with middle
|
||||
// update previous button state
|
||||
if state == 1 {
|
||||
if self.previous_button == Some(button)
|
||||
if self.previous_button.is_some_and(|b| b.eq(&mouse_button))
|
||||
&& self
|
||||
.previous_button_click
|
||||
.is_some_and(|i| i.elapsed() < DOUBLE_CLICK_INTERVAL)
|
||||
@@ -314,7 +316,7 @@ impl Emulation for MacOSEmulation {
|
||||
} else {
|
||||
self.button_click_state = 1;
|
||||
}
|
||||
self.previous_button = Some(button);
|
||||
self.previous_button = Some(mouse_button);
|
||||
self.previous_button_click = Some(Instant::now());
|
||||
}
|
||||
|
||||
@@ -336,13 +338,6 @@ impl Emulation for MacOSEmulation {
|
||||
EventField::MOUSE_EVENT_CLICK_STATE,
|
||||
self.button_click_state,
|
||||
);
|
||||
// Set the button number for extra buttons (back=3, forward=4)
|
||||
if let Some(btn_num) = cg_button_number {
|
||||
event.set_integer_value_field(
|
||||
EventField::MOUSE_EVENT_BUTTON_NUMBER,
|
||||
btn_num,
|
||||
);
|
||||
}
|
||||
event.post(CGEventTapLocation::HID);
|
||||
}
|
||||
PointerEvent::Axis {
|
||||
@@ -421,10 +416,7 @@ impl Emulation for MacOSEmulation {
|
||||
return Ok(());
|
||||
}
|
||||
};
|
||||
let is_modifier = update_modifiers(&self.modifier_state, key, state);
|
||||
if is_modifier {
|
||||
modifier_event(self.event_source.clone(), self.modifier_state.get());
|
||||
}
|
||||
update_modifiers(&self.modifier_state, key, state);
|
||||
match state {
|
||||
// pressed
|
||||
1 => self.spawn_repeat_task(code).await,
|
||||
@@ -453,6 +445,21 @@ impl Emulation for MacOSEmulation {
|
||||
async fn terminate(&mut self) {}
|
||||
}
|
||||
|
||||
trait ButtonEq {
|
||||
fn eq(&self, other: &Self) -> bool;
|
||||
}
|
||||
|
||||
impl ButtonEq for CGMouseButton {
|
||||
fn eq(&self, other: &Self) -> bool {
|
||||
matches!(
|
||||
(self, other),
|
||||
(CGMouseButton::Left, CGMouseButton::Left)
|
||||
| (CGMouseButton::Right, CGMouseButton::Right)
|
||||
| (CGMouseButton::Center, CGMouseButton::Center)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fn update_modifiers(modifiers: &Cell<XMods>, key: u32, state: u8) -> bool {
|
||||
if let Ok(key) = scancode::Linux::try_from(key) {
|
||||
let mask = match key {
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
use ashpd::{
|
||||
desktop::{
|
||||
PersistMode, Session,
|
||||
remote_desktop::{
|
||||
Axis, DeviceType, KeyState, NotifyPointerAxisOptions, RemoteDesktop,
|
||||
SelectDevicesOptions,
|
||||
},
|
||||
remote_desktop::{Axis, DeviceType, KeyState, RemoteDesktop},
|
||||
},
|
||||
zbus::AsyncDrop,
|
||||
};
|
||||
@@ -32,19 +29,20 @@ impl DesktopPortalEmulation {
|
||||
|
||||
// retry when user presses the cancel button
|
||||
log::debug!("creating session ...");
|
||||
let session = proxy.create_session(Default::default()).await?;
|
||||
let session = proxy.create_session().await?;
|
||||
|
||||
log::debug!("selecting devices ...");
|
||||
let options = SelectDevicesOptions::default()
|
||||
.set_devices(DeviceType::Keyboard | DeviceType::Pointer)
|
||||
.set_persist_mode(PersistMode::ExplicitlyRevoked);
|
||||
proxy.select_devices(&session, options).await?;
|
||||
proxy
|
||||
.select_devices(
|
||||
&session,
|
||||
DeviceType::Keyboard | DeviceType::Pointer,
|
||||
None,
|
||||
PersistMode::ExplicitlyRevoked,
|
||||
)
|
||||
.await?;
|
||||
|
||||
log::info!("requesting permission for input emulation");
|
||||
let _devices = proxy
|
||||
.start(&session, None, Default::default())
|
||||
.await?
|
||||
.response()?;
|
||||
let _devices = proxy.start(&session, None).await?.response()?;
|
||||
|
||||
log::debug!("started session");
|
||||
let session = session;
|
||||
@@ -64,7 +62,7 @@ impl Emulation for DesktopPortalEmulation {
|
||||
Pointer(p) => match p {
|
||||
PointerEvent::Motion { time: _, dx, dy } => {
|
||||
self.proxy
|
||||
.notify_pointer_motion(&self.session, dx, dy, Default::default())
|
||||
.notify_pointer_motion(&self.session, dx, dy)
|
||||
.await?;
|
||||
}
|
||||
PointerEvent::Button {
|
||||
@@ -77,12 +75,7 @@ impl Emulation for DesktopPortalEmulation {
|
||||
_ => KeyState::Pressed,
|
||||
};
|
||||
self.proxy
|
||||
.notify_pointer_button(
|
||||
&self.session,
|
||||
button as i32,
|
||||
state,
|
||||
Default::default(),
|
||||
)
|
||||
.notify_pointer_button(&self.session, button as i32, state)
|
||||
.await?;
|
||||
}
|
||||
PointerEvent::AxisDiscrete120 { axis, value } => {
|
||||
@@ -91,12 +84,7 @@ impl Emulation for DesktopPortalEmulation {
|
||||
_ => Axis::Horizontal,
|
||||
};
|
||||
self.proxy
|
||||
.notify_pointer_axis_discrete(
|
||||
&self.session,
|
||||
axis,
|
||||
value / 120,
|
||||
Default::default(),
|
||||
)
|
||||
.notify_pointer_axis_discrete(&self.session, axis, value / 120)
|
||||
.await?;
|
||||
}
|
||||
PointerEvent::Axis {
|
||||
@@ -113,12 +101,7 @@ impl Emulation for DesktopPortalEmulation {
|
||||
Axis::Horizontal => (value, 0.),
|
||||
};
|
||||
self.proxy
|
||||
.notify_pointer_axis(
|
||||
&self.session,
|
||||
dx,
|
||||
dy,
|
||||
NotifyPointerAxisOptions::default().set_finish(true),
|
||||
)
|
||||
.notify_pointer_axis(&self.session, dx, dy, true)
|
||||
.await?;
|
||||
}
|
||||
},
|
||||
@@ -134,12 +117,7 @@ impl Emulation for DesktopPortalEmulation {
|
||||
_ => KeyState::Pressed,
|
||||
};
|
||||
self.proxy
|
||||
.notify_keyboard_keycode(
|
||||
&self.session,
|
||||
key as i32,
|
||||
state,
|
||||
Default::default(),
|
||||
)
|
||||
.notify_keyboard_keycode(&self.session, key as i32, state)
|
||||
.await?;
|
||||
}
|
||||
KeyboardEvent::Modifiers { .. } => {
|
||||
|
||||
@@ -8,20 +8,14 @@ repository = "https://github.com/feschber/lan-mouse"
|
||||
|
||||
[dependencies]
|
||||
gtk = { package = "gtk4", version = "0.9.0", features = ["v4_2"] }
|
||||
gdk4_wayland = { package = "gdk4-wayland", version="0.9.6" }
|
||||
adw = { package = "libadwaita", version = "0.7.0", features = ["v1_1"] }
|
||||
async-channel = { version = "2.1.1" }
|
||||
hostname = "0.4.0"
|
||||
log = "0.4.20"
|
||||
lan-mouse-ipc = { path = "../lan-mouse-ipc", version = "0.2.0" }
|
||||
thiserror = "2.0.0"
|
||||
|
||||
[target.'cfg(all(unix, not(target_os="macos")))'.dependencies]
|
||||
gdk4_wayland = { package = "gdk4-wayland", version="0.9.6", optional=true }
|
||||
wayland-client = "0.31.12"
|
||||
|
||||
[build-dependencies]
|
||||
glib-build-tools = { version = "0.20.0" }
|
||||
|
||||
|
||||
[features]
|
||||
default = ["wayland_window_identifier"]
|
||||
wayland_window_identifier = ["dep:gdk4_wayland"]
|
||||
|
||||
@@ -19,7 +19,6 @@ use gtk::{gio, glib, prelude::ApplicationExt};
|
||||
use self::client_object::ClientObject;
|
||||
use self::key_object::KeyObject;
|
||||
|
||||
#[cfg(all(unix, feature = "wayland_window_identifier", not(target_os = "macos")))]
|
||||
use gdk4_wayland::WaylandToplevel;
|
||||
|
||||
use thiserror::Error;
|
||||
@@ -129,7 +128,6 @@ fn build_ui(app: &Application) {
|
||||
|
||||
// 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.
|
||||
#[cfg(all(unix, feature = "wayland_window_identifier", not(target_os = "macos")))]
|
||||
window.connect_show(|window| {
|
||||
// needs the surface so we have to present first!
|
||||
if let Some(surface) = window.surface() {
|
||||
|
||||
Reference in New Issue
Block a user