mirror of
https://github.com/feschber/lan-mouse.git
synced 2026-05-12 00:58:04 +03:00
Compare commits
2 Commits
config-wat
...
attach-dia
| Author | SHA1 | Date | |
|---|---|---|---|
|
5881ecda4b | ||
|
93618a5425 |
225
Cargo.lock
generated
225
Cargo.lock
generated
@@ -920,15 +920,6 @@ dependencies = [
|
||||
"percent-encoding",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fsevent-sys"
|
||||
version = "4.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "futures"
|
||||
version = "0.3.32"
|
||||
@@ -1087,6 +1078,30 @@ dependencies = [
|
||||
"system-deps",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gdk4-wayland"
|
||||
version = "0.9.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bd34518488cd624a85e75e82540bc24c72cfeb0aea6bad7faed683ca3977dba0"
|
||||
dependencies = [
|
||||
"gdk4",
|
||||
"gdk4-wayland-sys",
|
||||
"gio",
|
||||
"glib",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gdk4-wayland-sys"
|
||||
version = "0.9.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7c7a0f2332c531d62ee3f14f5e839ac1abac59e9b052adf1495124c00d89a34b"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"libc",
|
||||
"system-deps",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "generic-array"
|
||||
version = "0.14.7"
|
||||
@@ -1615,26 +1630,6 @@ dependencies = [
|
||||
"serde_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "inotify"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bd5b3eaf1a28b758ac0faa5a4254e8ab2705605496f1b1f3fbbc3988ad73d199"
|
||||
dependencies = [
|
||||
"bitflags 2.11.0",
|
||||
"inotify-sys",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "inotify-sys"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "inout"
|
||||
version = "0.1.4"
|
||||
@@ -1816,26 +1811,6 @@ dependencies = [
|
||||
"quote",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "kqueue"
|
||||
version = "1.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
|
||||
dependencies = [
|
||||
"kqueue-sys",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "kqueue-sys"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lan-mouse"
|
||||
version = "0.10.0"
|
||||
@@ -1854,7 +1829,6 @@ dependencies = [
|
||||
"libc",
|
||||
"local-channel",
|
||||
"log",
|
||||
"notify",
|
||||
"rcgen",
|
||||
"rustls",
|
||||
"serde",
|
||||
@@ -1887,6 +1861,7 @@ name = "lan-mouse-gtk"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"async-channel",
|
||||
"gdk4-wayland",
|
||||
"glib-build-tools",
|
||||
"gtk4",
|
||||
"hostname",
|
||||
@@ -2089,7 +2064,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"log",
|
||||
"wasi",
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
@@ -2134,33 +2108,6 @@ dependencies = [
|
||||
"minimal-lexical",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "notify"
|
||||
version = "8.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
|
||||
dependencies = [
|
||||
"bitflags 2.11.0",
|
||||
"fsevent-sys",
|
||||
"inotify",
|
||||
"kqueue",
|
||||
"libc",
|
||||
"log",
|
||||
"mio",
|
||||
"notify-types",
|
||||
"walkdir",
|
||||
"windows-sys 0.60.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "notify-types"
|
||||
version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
|
||||
dependencies = [
|
||||
"bitflags 2.11.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-bigint"
|
||||
version = "0.4.6"
|
||||
@@ -2756,15 +2703,6 @@ version = "1.0.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
|
||||
|
||||
[[package]]
|
||||
name = "same-file"
|
||||
version = "1.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
|
||||
dependencies = [
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
version = "1.2.0"
|
||||
@@ -3439,16 +3377,6 @@ version = "0.9.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
|
||||
|
||||
[[package]]
|
||||
name = "walkdir"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
|
||||
dependencies = [
|
||||
"same-file",
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.11.1+wasi-snapshot-preview1"
|
||||
@@ -3716,15 +3644,6 @@ version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-util"
|
||||
version = "0.1.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
|
||||
dependencies = [
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
@@ -3887,7 +3806,7 @@ version = "0.52.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
||||
dependencies = [
|
||||
"windows-targets 0.52.6",
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3896,16 +3815,7 @@ version = "0.59.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
|
||||
dependencies = [
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.60.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
|
||||
dependencies = [
|
||||
"windows-targets 0.53.5",
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3923,31 +3833,14 @@ version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm 0.52.6",
|
||||
"windows_aarch64_msvc 0.52.6",
|
||||
"windows_i686_gnu 0.52.6",
|
||||
"windows_i686_gnullvm 0.52.6",
|
||||
"windows_i686_msvc 0.52.6",
|
||||
"windows_x86_64_gnu 0.52.6",
|
||||
"windows_x86_64_gnullvm 0.52.6",
|
||||
"windows_x86_64_msvc 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.53.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
|
||||
dependencies = [
|
||||
"windows-link 0.2.1",
|
||||
"windows_aarch64_gnullvm 0.53.1",
|
||||
"windows_aarch64_msvc 0.53.1",
|
||||
"windows_i686_gnu 0.53.1",
|
||||
"windows_i686_gnullvm 0.53.1",
|
||||
"windows_i686_msvc 0.53.1",
|
||||
"windows_x86_64_gnu 0.53.1",
|
||||
"windows_x86_64_gnullvm 0.53.1",
|
||||
"windows_x86_64_msvc 0.53.1",
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_gnullvm",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3965,96 +3858,48 @@ version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.53.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.7.15"
|
||||
|
||||
@@ -67,7 +67,6 @@ rustls = { version = "0.23.12", default-features = false, features = [
|
||||
] }
|
||||
rcgen = "0.13.1"
|
||||
sha2 = "0.10.8"
|
||||
notify = "8.2.0"
|
||||
|
||||
[target.'cfg(unix)'.dependencies]
|
||||
libc = "0.2.148"
|
||||
|
||||
@@ -2,6 +2,7 @@ use std::{
|
||||
collections::{HashMap, HashSet, VecDeque},
|
||||
fmt::Display,
|
||||
mem::swap,
|
||||
sync::{Arc, Mutex},
|
||||
task::{Poll, ready},
|
||||
};
|
||||
|
||||
@@ -129,6 +130,24 @@ pub struct InputCapture {
|
||||
pending: VecDeque<(CaptureHandle, CaptureEvent)>,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub enum WindowIdentifier {
|
||||
Wayland(String),
|
||||
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)
|
||||
}
|
||||
WindowIdentifier::X11(_) => todo!(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl InputCapture {
|
||||
/// create a new client with the given id
|
||||
pub async fn create(&mut self, id: CaptureHandle, pos: Position) -> Result<(), CaptureError> {
|
||||
@@ -177,8 +196,11 @@ impl InputCapture {
|
||||
}
|
||||
|
||||
/// creates a new [`InputCapture`]
|
||||
pub async fn new(backend: Option<Backend>) -> Result<Self, CaptureCreationError> {
|
||||
let capture = create(backend).await?;
|
||||
pub async fn new(
|
||||
backend: Option<Backend>,
|
||||
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||
) -> Result<Self, CaptureCreationError> {
|
||||
let capture = create(backend, window_identifier).await?;
|
||||
Ok(Self {
|
||||
capture,
|
||||
id_map: Default::default(),
|
||||
@@ -280,13 +302,16 @@ trait Capture: Stream<Item = Result<(Position, CaptureEvent), CaptureError>> + U
|
||||
|
||||
async fn create_backend(
|
||||
backend: Backend,
|
||||
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||
) -> Result<
|
||||
Box<dyn Capture<Item = Result<(Position, CaptureEvent), CaptureError>>>,
|
||||
CaptureCreationError,
|
||||
> {
|
||||
match backend {
|
||||
#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
|
||||
Backend::InputCapturePortal => Ok(Box::new(libei::LibeiInputCapture::new().await?)),
|
||||
Backend::InputCapturePortal => Ok(Box::new(
|
||||
libei::LibeiInputCapture::new(window_identifier).await?,
|
||||
)),
|
||||
#[cfg(all(unix, feature = "layer_shell", not(target_os = "macos")))]
|
||||
Backend::LayerShell => Ok(Box::new(layer_shell::LayerShellInputCapture::new()?)),
|
||||
#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
|
||||
@@ -301,12 +326,13 @@ async fn create_backend(
|
||||
|
||||
async fn create(
|
||||
backend: Option<Backend>,
|
||||
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||
) -> Result<
|
||||
Box<dyn Capture<Item = Result<(Position, CaptureEvent), CaptureError>>>,
|
||||
CaptureCreationError,
|
||||
> {
|
||||
if let Some(backend) = backend {
|
||||
let b = create_backend(backend).await;
|
||||
let b = create_backend(backend, window_identifier).await;
|
||||
if b.is_ok() {
|
||||
log::info!("using capture backend: {backend}");
|
||||
}
|
||||
@@ -325,7 +351,7 @@ async fn create(
|
||||
#[cfg(target_os = "macos")]
|
||||
Backend::MacOs,
|
||||
] {
|
||||
match create_backend(backend).await {
|
||||
match create_backend(backend, window_identifier.clone()).await {
|
||||
Ok(b) => {
|
||||
log::info!("using capture backend: {backend}");
|
||||
return Ok(b);
|
||||
|
||||
@@ -23,7 +23,7 @@ use std::{
|
||||
os::unix::net::UnixStream,
|
||||
pin::Pin,
|
||||
rc::Rc,
|
||||
sync::Arc,
|
||||
sync::{Arc, Mutex},
|
||||
task::{Context, Poll},
|
||||
};
|
||||
use tokio::{
|
||||
@@ -39,7 +39,7 @@ use futures_core::Stream;
|
||||
|
||||
use input_event::Event;
|
||||
|
||||
use crate::CaptureEvent;
|
||||
use crate::{CaptureEvent, WindowIdentifier};
|
||||
|
||||
use super::{
|
||||
Capture as LanMouseInputCapture, Position,
|
||||
@@ -161,13 +161,17 @@ async fn update_barriers(
|
||||
|
||||
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");
|
||||
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,
|
||||
);
|
||||
let ashpd_window_identifier: Option<ashpd::WindowIdentifier> =
|
||||
window_identifier.map(|i| i.into());
|
||||
input_capture
|
||||
.create_session(None, create_session_options)
|
||||
.create_session(ashpd_window_identifier.as_ref(), create_session_options)
|
||||
.await
|
||||
}
|
||||
|
||||
@@ -212,10 +216,15 @@ async fn libei_event_handler(
|
||||
}
|
||||
|
||||
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_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 (notify_capture, notify_rx) = mpsc::channel(1);
|
||||
@@ -230,6 +239,7 @@ impl LibeiInputCapture {
|
||||
first_session,
|
||||
event_tx,
|
||||
cancellation_token.clone(),
|
||||
window_identifier,
|
||||
);
|
||||
let capture_task = tokio::task::spawn_local(capture);
|
||||
|
||||
@@ -254,6 +264,7 @@ async fn do_capture(
|
||||
session: Option<(Session<InputCapture>, BitFlags<Capabilities>)>,
|
||||
event_tx: Sender<(Position, CaptureEvent)>,
|
||||
cancellation_token: CancellationToken,
|
||||
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||
) -> Result<(), CaptureError> {
|
||||
let mut session = session.map(|s| s.0);
|
||||
|
||||
@@ -299,7 +310,11 @@ async fn do_capture(
|
||||
// create session
|
||||
let mut session = match session.take() {
|
||||
Some(s) => s,
|
||||
None => create_session(input_capture).await?.0,
|
||||
None => {
|
||||
create_session(input_capture, window_identifier.clone())
|
||||
.await?
|
||||
.0
|
||||
}
|
||||
};
|
||||
|
||||
let capture_session = do_capture_session(
|
||||
|
||||
@@ -15,5 +15,13 @@ 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 }
|
||||
|
||||
[build-dependencies]
|
||||
glib-build-tools = { version = "0.20.0" }
|
||||
|
||||
|
||||
[features]
|
||||
default = ["wayland_window_identifier"]
|
||||
wayland_window_identifier = ["dep:gdk4_wayland"]
|
||||
|
||||
@@ -10,7 +10,7 @@ use std::{env, process, str};
|
||||
|
||||
use window::Window;
|
||||
|
||||
use lan_mouse_ipc::FrontendEvent;
|
||||
use lan_mouse_ipc::{FrontendEvent, FrontendRequest, WindowIdentifier};
|
||||
|
||||
use adw::Application;
|
||||
use gtk::{IconTheme, gdk::Display, glib::clone, prelude::*};
|
||||
@@ -19,6 +19,9 @@ 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;
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
@@ -124,6 +127,28 @@ fn build_ui(app: &Application) {
|
||||
|
||||
let window = Window::new(app, frontend_tx);
|
||||
|
||||
// export TopLevel handle and send it to the service so that it can put the InpuCapture / RemoteDesktop
|
||||
// windows on top of it using xdg-foreign.
|
||||
#[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() {
|
||||
if surface.display().backend().is_wayland() {
|
||||
// let surface = surface.downcast::<WaylandSurface>();
|
||||
let toplevel = surface.downcast::<WaylandToplevel>().expect("xdg-toplevel");
|
||||
let window = window.clone();
|
||||
toplevel.export_handle(move |_toplevel, handle| {
|
||||
if let Ok(handle) = handle {
|
||||
let handle = handle.to_string();
|
||||
window.request(FrontendRequest::WindowIdentifier(
|
||||
WindowIdentifier::Wayland(handle),
|
||||
));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
glib::spawn_future_local(clone!(
|
||||
#[weak]
|
||||
window,
|
||||
|
||||
@@ -422,7 +422,7 @@ impl Window {
|
||||
self.request(FrontendRequest::RemoveAuthorizedKey(fp));
|
||||
}
|
||||
|
||||
fn request(&self, request: FrontendRequest) {
|
||||
pub(crate) fn request(&self, request: FrontendRequest) {
|
||||
let mut requester = self.imp().frontend_request_writer.borrow_mut();
|
||||
let requester = requester.as_mut().unwrap();
|
||||
if let Err(e) = requester.request(request) {
|
||||
|
||||
@@ -255,6 +255,14 @@ pub enum FrontendRequest {
|
||||
UpdateEnterHook(u64, Option<String>),
|
||||
/// save config file
|
||||
SaveConfiguration,
|
||||
/// window identifier used to present input-capture / remote-desktop prompts
|
||||
WindowIdentifier(WindowIdentifier),
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
|
||||
pub enum WindowIdentifier {
|
||||
Wayland(String),
|
||||
X11(u32),
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, PartialEq, Eq, Debug, Default, Serialize, Deserialize)]
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
use std::{
|
||||
cell::{Cell, RefCell},
|
||||
rc::Rc,
|
||||
sync::{Arc, Mutex},
|
||||
time::{Duration, Instant},
|
||||
};
|
||||
|
||||
use futures::StreamExt;
|
||||
use input_capture::{
|
||||
CaptureError, CaptureEvent, CaptureHandle, InputCapture, InputCaptureError, Position,
|
||||
WindowIdentifier,
|
||||
};
|
||||
use input_event::scancode;
|
||||
use lan_mouse_proto::ProtoEvent;
|
||||
@@ -59,8 +61,6 @@ enum CaptureRequest {
|
||||
Destroy(CaptureHandle),
|
||||
/// reenable input capture
|
||||
Reenable,
|
||||
/// set release bind
|
||||
SetReleaseBind(Vec<scancode::Linux>),
|
||||
}
|
||||
|
||||
impl Capture {
|
||||
@@ -68,6 +68,7 @@ impl Capture {
|
||||
backend: Option<input_capture::Backend>,
|
||||
conn: LanMouseConnection,
|
||||
release_bind: Vec<scancode::Linux>,
|
||||
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||
) -> Self {
|
||||
let (request_tx, request_rx) = channel();
|
||||
let (event_tx, event_rx) = channel();
|
||||
@@ -82,6 +83,7 @@ impl Capture {
|
||||
request_rx,
|
||||
release_bind: Rc::new(RefCell::new(release_bind)),
|
||||
state: Default::default(),
|
||||
window_identifier,
|
||||
};
|
||||
let task = spawn_local(capture_task.run());
|
||||
Self {
|
||||
@@ -133,10 +135,6 @@ impl Capture {
|
||||
pub(crate) async fn event(&mut self) -> ICaptureEvent {
|
||||
self.event_rx.recv().await.expect("channel closed")
|
||||
}
|
||||
|
||||
pub(crate) fn set_release_bind(&mut self, bind: Vec<scancode::Linux>) {
|
||||
let _ = self.request_tx.send(CaptureRequest::SetReleaseBind(bind));
|
||||
}
|
||||
}
|
||||
|
||||
/// debounce a statement `$st`, i.e. the statement is executed only if the
|
||||
@@ -166,6 +164,7 @@ struct CaptureTask {
|
||||
release_bind: Rc<RefCell<Vec<scancode::Linux>>>,
|
||||
request_rx: Receiver<CaptureRequest>,
|
||||
state: State,
|
||||
window_identifier: Arc<Mutex<Option<WindowIdentifier>>>,
|
||||
}
|
||||
|
||||
impl CaptureTask {
|
||||
@@ -200,6 +199,7 @@ impl CaptureTask {
|
||||
}
|
||||
|
||||
async fn run(mut self) {
|
||||
tokio::time::sleep(Duration::from_secs(1)).await;
|
||||
loop {
|
||||
if let Err(e) = self.do_capture().await {
|
||||
log::warn!("input capture exited: {e}");
|
||||
@@ -207,13 +207,10 @@ impl CaptureTask {
|
||||
loop {
|
||||
tokio::select! {
|
||||
r = self.request_rx.recv() => match r.expect("channel closed") {
|
||||
CaptureRequest::Reenable => break,
|
||||
CaptureRequest::Create(h, p, t) => self.add_capture(h, p, t),
|
||||
CaptureRequest::Destroy(h) => self.remove_capture(h),
|
||||
CaptureRequest::Release => { /* nothing to do */ }
|
||||
CaptureRequest::SetReleaseBind(bind) => {
|
||||
self.release_bind.borrow_mut().clone_from(&bind);
|
||||
}
|
||||
CaptureRequest::Reenable=>break,
|
||||
CaptureRequest::Create(h,p,t)=>self.add_capture(h,p,t),
|
||||
CaptureRequest::Destroy(h)=>self.remove_capture(h),
|
||||
CaptureRequest::Release=>{}
|
||||
},
|
||||
_ = self.cancellation_token.cancelled() => return,
|
||||
}
|
||||
@@ -224,7 +221,7 @@ impl CaptureTask {
|
||||
async fn do_capture(&mut self) -> Result<(), InputCaptureError> {
|
||||
/* allow cancelling capture request */
|
||||
let mut capture = tokio::select! {
|
||||
r = InputCapture::new(self.backend) => r?,
|
||||
r = InputCapture::new(self.backend, self.window_identifier.clone()) => r?,
|
||||
_ = self.cancellation_token.cancelled() => return Ok(()),
|
||||
};
|
||||
|
||||
@@ -294,19 +291,10 @@ impl CaptureTask {
|
||||
}
|
||||
},
|
||||
e = self.request_rx.recv() => match e.expect("channel closed") {
|
||||
CaptureRequest::Reenable => { /* already active */ },
|
||||
CaptureRequest::Release => self.release_capture(capture).await?,
|
||||
CaptureRequest::Create(h, p, t) => {
|
||||
self.add_capture(h, p, t);
|
||||
capture.create(h, p).await?;
|
||||
}
|
||||
CaptureRequest::Destroy(h) => {
|
||||
self.remove_capture(h);
|
||||
capture.destroy(h).await?;
|
||||
}
|
||||
CaptureRequest::SetReleaseBind(bind) => {
|
||||
self.release_bind.borrow_mut().clone_from(&bind);
|
||||
}
|
||||
CaptureRequest::Reenable=>{},
|
||||
CaptureRequest::Release=>self.release_capture(capture).await?,
|
||||
CaptureRequest::Create(h,p,t)=>{self.add_capture(h,p,t);capture.create(h,p).await?;}
|
||||
CaptureRequest::Destroy(h)=>{self.remove_capture(h);capture.destroy(h).await?;}
|
||||
},
|
||||
_ = self.cancellation_token.cancelled() => break,
|
||||
}
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
use crate::config::Config;
|
||||
use clap::Args;
|
||||
use futures::StreamExt;
|
||||
@@ -12,7 +14,7 @@ pub async fn run(config: Config, _args: TestCaptureArgs) -> Result<(), InputCapt
|
||||
log::info!("creating input capture");
|
||||
let backend = config.capture_backend().map(|b| b.into());
|
||||
loop {
|
||||
let mut input_capture = InputCapture::new(backend).await?;
|
||||
let mut input_capture = InputCapture::new(backend, Arc::new(Mutex::new(None))).await?;
|
||||
log::info!("creating clients");
|
||||
input_capture.create(0, Position::Left).await?;
|
||||
input_capture.create(4, Position::Left).await?;
|
||||
|
||||
@@ -9,8 +9,6 @@ use slab::Slab;
|
||||
|
||||
use lan_mouse_ipc::{ClientConfig, ClientHandle, ClientState, Position};
|
||||
|
||||
use crate::config::ConfigClient;
|
||||
|
||||
#[derive(Clone, Default)]
|
||||
pub struct ClientManager {
|
||||
clients: Rc<RefCell<Slab<(ClientConfig, ClientState)>>>,
|
||||
@@ -26,25 +24,6 @@ impl ClientManager {
|
||||
.collect::<Vec<_>>()
|
||||
}
|
||||
|
||||
pub fn add_with_config(&self, config_client: ConfigClient) -> ClientHandle {
|
||||
let config = ClientConfig {
|
||||
hostname: config_client.hostname,
|
||||
fix_ips: config_client.ips.into_iter().collect(),
|
||||
port: config_client.port,
|
||||
pos: config_client.pos,
|
||||
cmd: config_client.enter_hook,
|
||||
};
|
||||
let state = ClientState {
|
||||
active: config_client.active,
|
||||
ips: HashSet::from_iter(config.fix_ips.iter().cloned()),
|
||||
..Default::default()
|
||||
};
|
||||
let handle = self.add_client();
|
||||
self.set_config(handle, config);
|
||||
self.set_state(handle, state);
|
||||
handle
|
||||
}
|
||||
|
||||
/// add a new client to this manager
|
||||
pub fn add_client(&self) -> ClientHandle {
|
||||
self.clients.borrow_mut().insert(Default::default()) as ClientHandle
|
||||
@@ -251,15 +230,6 @@ impl ClientManager {
|
||||
.and_then(|(c, _)| c.cmd.clone())
|
||||
}
|
||||
|
||||
/// returns all clients that are currently registered
|
||||
pub(crate) fn registered_clients(&self) -> Vec<ClientHandle> {
|
||||
self.clients
|
||||
.borrow()
|
||||
.iter()
|
||||
.map(|(h, _)| h as ClientHandle)
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// returns all clients that are currently active
|
||||
pub(crate) fn active_clients(&self) -> Vec<ClientHandle> {
|
||||
self.clients
|
||||
|
||||
113
src/config.rs
113
src/config.rs
@@ -1,7 +1,6 @@
|
||||
use crate::capture_test::TestCaptureArgs;
|
||||
use crate::emulation_test::TestEmulationArgs;
|
||||
use clap::{Parser, Subcommand, ValueEnum};
|
||||
use notify::{EventKind, RecommendedWatcher, Watcher};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::HashMap;
|
||||
use std::env::{self, VarError};
|
||||
@@ -47,7 +46,7 @@ fn default_path() -> Result<PathBuf, VarError> {
|
||||
Ok(PathBuf::from(default_path))
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, Default, PartialEq)]
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, Default)]
|
||||
struct ConfigToml {
|
||||
capture_backend: Option<CaptureBackend>,
|
||||
emulation_backend: Option<EmulationBackend>,
|
||||
@@ -245,14 +244,8 @@ pub struct Config {
|
||||
cert_path: PathBuf,
|
||||
/// path to the config file used
|
||||
config_path: PathBuf,
|
||||
/// path to config directory (parent of above)
|
||||
config_dir: PathBuf,
|
||||
/// the (optional) toml config and it's path
|
||||
config_toml: Option<ConfigToml>,
|
||||
// filesystem watcher
|
||||
watcher: notify::RecommendedWatcher,
|
||||
// channel for filesystem events
|
||||
watch_rx: tokio::sync::mpsc::Receiver<Result<notify::Event, notify::Error>>,
|
||||
}
|
||||
|
||||
pub struct ConfigClient {
|
||||
@@ -318,8 +311,6 @@ pub enum ConfigError {
|
||||
Io(#[from] io::Error),
|
||||
#[error(transparent)]
|
||||
Var(#[from] VarError),
|
||||
#[error(transparent)]
|
||||
Watcher(#[from] notify::Error),
|
||||
}
|
||||
|
||||
const DEFAULT_RELEASE_KEYS: [scancode::Linux; 4] =
|
||||
@@ -351,55 +342,12 @@ impl Config {
|
||||
.or(config_toml.as_ref().and_then(|c| c.cert_path.clone()))
|
||||
.unwrap_or(default_path()?.join(CERT_FILE_NAME));
|
||||
|
||||
let (tx, watch_rx) = tokio::sync::mpsc::channel(16);
|
||||
let watcher = RecommendedWatcher::new(
|
||||
move |res| {
|
||||
let _ = tx.blocking_send(res);
|
||||
},
|
||||
notify::Config::default(),
|
||||
)?;
|
||||
let config_dir = config_path
|
||||
.parent()
|
||||
.expect("config directory")
|
||||
.to_path_buf();
|
||||
let mut config = Config {
|
||||
Ok(Config {
|
||||
args,
|
||||
cert_path,
|
||||
config_path,
|
||||
config_dir,
|
||||
config_toml,
|
||||
watcher,
|
||||
watch_rx,
|
||||
};
|
||||
config.watch()?;
|
||||
Ok(config)
|
||||
}
|
||||
|
||||
fn watch(&mut self) -> Result<(), notify::Error> {
|
||||
self.watcher
|
||||
.watch(&self.config_dir, notify::RecursiveMode::NonRecursive)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn unwatch(&mut self) -> Result<(), notify::Error> {
|
||||
self.watcher.unwatch(&self.config_dir)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn changed(&mut self) -> Result<(), notify::Error> {
|
||||
loop {
|
||||
let event = self.watch_rx.recv().await.expect("channel closed");
|
||||
let event = event.expect("filesystem event");
|
||||
if event.paths.contains(&self.config_path)
|
||||
&& matches!(
|
||||
event.kind,
|
||||
EventKind::Create(_) | EventKind::Modify(_) | EventKind::Remove(_)
|
||||
)
|
||||
&& self.read_from_disk()?
|
||||
{
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/// the command to run
|
||||
@@ -480,6 +428,9 @@ impl Config {
|
||||
|
||||
/// set authorized keys
|
||||
pub fn set_authorized_keys(&mut self, fingerprints: HashMap<String, String>) {
|
||||
if fingerprints.is_empty() {
|
||||
return;
|
||||
}
|
||||
if self.config_toml.is_none() {
|
||||
self.config_toml = Some(Default::default());
|
||||
}
|
||||
@@ -489,58 +440,38 @@ impl Config {
|
||||
.authorized_fingerprints = Some(fingerprints);
|
||||
}
|
||||
|
||||
pub fn read_from_disk(&mut self) -> Result<bool, io::Error> {
|
||||
log::info!("reading config from {:?}", &self.config_path);
|
||||
|
||||
let current_config = fs::read_to_string(&self.config_path)?;
|
||||
let current_config = match current_config.parse::<DocumentMut>() {
|
||||
Ok(c) => c,
|
||||
Err(e) => {
|
||||
log::warn!("{:?} {e}", self.config_path());
|
||||
return Ok(false);
|
||||
}
|
||||
};
|
||||
let mut changed = false;
|
||||
match toml_edit::de::from_document::<ConfigToml>(current_config) {
|
||||
Ok(current_config) => {
|
||||
changed = self
|
||||
.config_toml
|
||||
.as_ref()
|
||||
.is_none_or(|c| c != ¤t_config);
|
||||
self.config_toml.replace(current_config);
|
||||
}
|
||||
Err(e) => log::warn!("{:?} {e}", self.config_path()),
|
||||
};
|
||||
Ok(changed)
|
||||
}
|
||||
|
||||
pub fn write_back(&mut self) -> Result<(), io::Error> {
|
||||
pub fn write_back(&self) -> Result<(), io::Error> {
|
||||
log::info!("writing config to {:?}", &self.config_path);
|
||||
/* load the current configuration file */
|
||||
let current_config = match fs::read_to_string(&self.config_path) {
|
||||
Ok(c) => c.parse::<DocumentMut>().unwrap_or_default(),
|
||||
Err(e) => {
|
||||
log::info!("{:?} {e} => creating new config", self.config_path());
|
||||
Default::default()
|
||||
}
|
||||
};
|
||||
let _current_config =
|
||||
toml_edit::de::from_document::<ConfigToml>(current_config).unwrap_or_default();
|
||||
|
||||
/* the new config */
|
||||
let new_config = self.config_toml.clone().unwrap_or_default();
|
||||
// let new_config = toml_edit::ser::to_document::<ConfigToml>(&new_config).expect("fixme");
|
||||
let new_config = toml_edit::ser::to_string_pretty(&new_config).expect("config");
|
||||
|
||||
/*
|
||||
* TODO merge with current config file to preserve comments
|
||||
* => eventually we might want to split this up into clients configured
|
||||
* TODO merge documents => eventually we might want to split this up into clients configured
|
||||
* via the config file and clients managed through the GUI / frontend.
|
||||
* The latter should be saved to $XDG_DATA_HOME instead of $XDG_CONFIG_HOME,
|
||||
* and clients configured through .config could be made permanent.
|
||||
* For now we just override the config file.
|
||||
*/
|
||||
|
||||
let _ = self.unwatch();
|
||||
/* write new config to file */
|
||||
if let Some(p) = self.config_path().parent() {
|
||||
fs::create_dir_all(p)?;
|
||||
}
|
||||
{
|
||||
let mut f = File::create(self.config_path())?;
|
||||
f.write_all(new_config.as_bytes())?;
|
||||
f.sync_all()?;
|
||||
}
|
||||
|
||||
let _ = self.watch();
|
||||
let mut f = File::create(self.config_path())?;
|
||||
f.write_all(new_config.as_bytes())?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -11,15 +11,15 @@ use crate::{
|
||||
use futures::StreamExt;
|
||||
use hickory_resolver::ResolveError;
|
||||
use lan_mouse_ipc::{
|
||||
AsyncFrontendListener, ClientHandle, FrontendEvent, FrontendRequest, IpcError,
|
||||
IpcListenerCreationError, Position, Status,
|
||||
AsyncFrontendListener, ClientConfig, ClientHandle, ClientState, FrontendEvent, FrontendRequest,
|
||||
IpcError, IpcListenerCreationError, Position, Status,
|
||||
};
|
||||
use log;
|
||||
use std::{
|
||||
collections::{HashMap, HashSet, VecDeque},
|
||||
io,
|
||||
net::{IpAddr, SocketAddr},
|
||||
sync::{Arc, RwLock},
|
||||
sync::{Arc, Mutex, RwLock},
|
||||
};
|
||||
use thiserror::Error;
|
||||
use tokio::{process::Command, signal, sync::Notify};
|
||||
@@ -70,6 +70,7 @@ pub struct Service {
|
||||
/// map from capture handle to connection info
|
||||
incoming_conn_info: HashMap<ClientHandle, Incoming>,
|
||||
next_trigger_handle: u64,
|
||||
window_identifier: Arc<Mutex<Option<input_capture::WindowIdentifier>>>,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
@@ -83,7 +84,21 @@ impl Service {
|
||||
pub async fn new(config: Config) -> Result<Self, ServiceError> {
|
||||
let client_manager = ClientManager::default();
|
||||
for client in config.clients() {
|
||||
client_manager.add_with_config(client);
|
||||
let config = ClientConfig {
|
||||
hostname: client.hostname,
|
||||
fix_ips: client.ips.into_iter().collect(),
|
||||
port: client.port,
|
||||
pos: client.pos,
|
||||
cmd: client.enter_hook,
|
||||
};
|
||||
let state = ClientState {
|
||||
active: client.active,
|
||||
ips: HashSet::from_iter(config.fix_ips.iter().cloned()),
|
||||
..Default::default()
|
||||
};
|
||||
let handle = client_manager.add_client();
|
||||
client_manager.set_config(handle, config);
|
||||
client_manager.set_state(handle, state);
|
||||
}
|
||||
|
||||
// load certificate
|
||||
@@ -101,7 +116,13 @@ impl Service {
|
||||
|
||||
// input capture + emulation
|
||||
let capture_backend = config.capture_backend().map(|b| b.into());
|
||||
let capture = Capture::new(capture_backend, conn, config.release_bind());
|
||||
let window_identifier = Arc::new(Mutex::new(None));
|
||||
let capture = Capture::new(
|
||||
capture_backend,
|
||||
conn,
|
||||
config.release_bind(),
|
||||
window_identifier.clone(),
|
||||
);
|
||||
let emulation_backend = config.emulation_backend().map(|b| b.into());
|
||||
let emulation = Emulation::new(emulation_backend, listener);
|
||||
|
||||
@@ -126,6 +147,7 @@ impl Service {
|
||||
incoming_conn_info: Default::default(),
|
||||
incoming_conns: Default::default(),
|
||||
next_trigger_handle: 0,
|
||||
window_identifier,
|
||||
};
|
||||
Ok(service)
|
||||
}
|
||||
@@ -150,7 +172,6 @@ impl Service {
|
||||
event = self.emulation.event() => self.handle_emulation_event(event),
|
||||
event = self.capture.event() => self.handle_capture_event(event),
|
||||
event = self.resolver.event() => self.handle_resolver_event(event),
|
||||
_ = self.config.changed() => self.handle_config_change(),
|
||||
r = signal::ctrl_c() => break r.expect("failed to wait for CTRL+C"),
|
||||
}
|
||||
}
|
||||
@@ -218,6 +239,20 @@ impl Service {
|
||||
self.update_enter_hook(handle, enter_hook)
|
||||
}
|
||||
FrontendRequest::SaveConfiguration => self.save_config(),
|
||||
FrontendRequest::WindowIdentifier(handle) => {
|
||||
log::info!("xdg-foreign handle: {handle:?}");
|
||||
self.window_identifier
|
||||
.lock()
|
||||
.unwrap()
|
||||
.replace(match handle {
|
||||
lan_mouse_ipc::WindowIdentifier::Wayland(handle) => {
|
||||
input_capture::WindowIdentifier::Wayland(handle)
|
||||
}
|
||||
lan_mouse_ipc::WindowIdentifier::X11(xid) => {
|
||||
input_capture::WindowIdentifier::X11(xid)
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -242,30 +277,6 @@ impl Service {
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_config_change(&mut self) {
|
||||
for h in self.client_manager.registered_clients() {
|
||||
self.remove_client(h);
|
||||
}
|
||||
for c in self.config.clients() {
|
||||
let handle = self.client_manager.add_with_config(c);
|
||||
log::info!("added client {handle}");
|
||||
let (c, s) = self.client_manager.get_state(handle).unwrap();
|
||||
if s.active {
|
||||
self.client_manager.deactivate_client(handle);
|
||||
self.activate_client(handle);
|
||||
}
|
||||
self.notify_frontend(FrontendEvent::Created(handle, c, s));
|
||||
}
|
||||
let release_bind = self.config.release_bind();
|
||||
self.capture.set_release_bind(release_bind);
|
||||
let authorized_keys = self.config.authorized_fingerprints();
|
||||
self.authorized_keys
|
||||
.write()
|
||||
.unwrap()
|
||||
.clone_from(&authorized_keys);
|
||||
self.sync_frontend();
|
||||
}
|
||||
|
||||
async fn handle_frontend_pending(&mut self) {
|
||||
while let Some(event) = self.pending_frontend_events.pop_front() {
|
||||
self.frontend_listener.broadcast(event).await;
|
||||
@@ -488,7 +499,7 @@ impl Service {
|
||||
}
|
||||
|
||||
fn activate_client(&mut self, handle: ClientHandle) {
|
||||
log::debug!("activating client {handle}");
|
||||
log::debug!("activating client");
|
||||
|
||||
/* resolve dns on activate */
|
||||
self.resolve(handle);
|
||||
|
||||
Reference in New Issue
Block a user