fix transmuting to pointer types UB

Cargo.toml

@@ -1,65 +1,75 @@
-[workspace]
-members = ["input-capture", "input-emulation", "input-event"]
-
 [package]
 name = "lan-mouse"
 description = "Software KVM Switch / mouse & keyboard sharing software for Local Area Networks"
 version = "0.8.0"
 edition = "2021"
 license = "GPL-3.0-or-later"
-repository = "https://github.com/feschber/lan-mouse"
+repository = "https://github.com/ferdinandschober/lan-mouse"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [profile.release]
 strip = true
 lto = "fat"
 
 [dependencies]
-input-event = { path = "input-event", version = "0.2.1" }
-input-emulation = { path = "input-emulation", version = "0.1.0", default-features = false }
-input-capture = { path = "input-capture", version = "0.1.0", default-features = false }
-
+tempfile = "3.8"
 hickory-resolver = "0.24.1"
+memmap = "0.7"
 toml = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 anyhow = "1.0.71"
 log = "0.4.20"
 env_logger = "0.11.3"
 serde_json = "1.0.107"
-tokio = { version = "1.32.0", features = [
-    "io-util",
-    "io-std",
-    "macros",
-    "net",
-    "process",
-    "rt",
-    "sync",
-    "signal",
-] }
+tokio = {version = "1.32.0", features = ["io-util", "io-std", "macros", "net", "process", "rt", "sync", "signal"] }
+async-trait = "0.1.73"
+futures-core = "0.3.28"
 futures = "0.3.28"
-clap = { version = "4.4.11", features = ["derive"] }
-gtk = { package = "gtk4", version = "0.9.0", features = [
-    "v4_2",
-], optional = true }
-adw = { package = "libadwaita", version = "0.7.0", features = [
-    "v1_1",
-], optional = true }
+clap = { version="4.4.11", features = ["derive"] }
+gtk = { package = "gtk4", version = "0.8.1", features = ["v4_2"], optional = true }
+adw = { package = "libadwaita", version = "0.6.0", features = ["v1_1"], optional = true }
 async-channel = { version = "2.1.1", optional = true }
+keycode = "0.4.0"
+once_cell = "1.19.0"
+num_enum = "0.7.2"
 hostname = "0.4.0"
 slab = "0.4.9"
 endi = "1.1.0"
-thiserror = "1.0.61"
-tokio-util = "0.7.11"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.148"
 
+[target.'cfg(all(unix, not(target_os="macos")))'.dependencies]
+wayland-client = { version="0.31.1", optional = true }
+wayland-protocols = { version="0.31.0", features=["client", "staging", "unstable"], optional = true }
+wayland-protocols-wlr = { version="0.2.0", features=["client"], optional = true }
+wayland-protocols-misc = { version="0.2.0", features=["client"], optional = true }
+x11 = { version = "2.21.0", features = ["xlib", "xtest"], optional = true }
+ashpd = { version = "0.8", default-features = false, features = ["tokio"], optional = true }
+reis = { version = "0.2", features = [ "tokio" ], optional = true }
+
+[target.'cfg(target_os="macos")'.dependencies]
+core-graphics = { version = "0.23", features = ["highsierra"] }
+
+[target.'cfg(windows)'.dependencies]
+windows = {  version = "0.54.0", features = [
+    "Win32_System_LibraryLoader",
+    "Win32_System_Threading",
+    "Win32_Foundation",
+    "Win32_Graphics",
+    "Win32_Graphics_Gdi",
+    "Win32_UI_Input_KeyboardAndMouse",
+    "Win32_UI_WindowsAndMessaging",
+] }
+
 [build-dependencies]
-glib-build-tools = { version = "0.20.0", optional = true }
+glib-build-tools = { version = "0.19.0", optional = true }
 
 [features]
 default = ["wayland", "x11", "xdg_desktop_portal", "libei", "gtk"]
-wayland = ["input-capture/wayland", "input-emulation/wayland"]
-x11 = ["input-capture/x11", "input-emulation/x11"]
-xdg_desktop_portal = ["input-emulation/xdg_desktop_portal"]
-libei = ["input-event/libei", "input-capture/libei", "input-emulation/libei"]
+wayland = ["dep:wayland-client", "dep:wayland-protocols", "dep:wayland-protocols-wlr", "dep:wayland-protocols-misc" ]
+x11 = ["dep:x11"]
+xdg_desktop_portal = ["dep:ashpd"]
+libei = ["dep:reis", "dep:ashpd"]
 gtk = ["dep:gtk", "dep:adw", "dep:async-channel", "dep:glib-build-tools"]

README.md

@@ -57,10 +57,6 @@ input capture (to send events *to* other clients) on different operating systems
 > If you are using [Wayfire](https://github.com/WayfireWM/wayfire), make sure to use a recent version (must be newer than October 23rd) and **add `shortcuts-inhibit` to the list of plugins in your wayfire config!**
 > Otherwise input capture will not work.
 
-> [!Important]
-> The mouse cursor will be invisible when sending input to a Windows system if
-> there is no real mouse connected to the machine.
-
 ## Installation
 ### Install via cargo
 ```sh

config.toml

@@ -1,7 +1,5 @@
 # example configuration
 
-# capture_backend = "LayerShell"
-
 # release bind
 release_bind = [ "KeyA", "KeyS", "KeyD", "KeyF" ]
 

flake.nix

@@ -16,7 +16,6 @@
     inherit (nixpkgs) lib;
     genSystems = lib.genAttrs [
       "aarch64-darwin"
-      "aarch64-linux"
       "x86_64-darwin"
       "x86_64-linux"
     ];
@@ -51,7 +50,6 @@
           xorg.libX11
           gtk4
           libadwaita
-          librsvg
           xorg.libXtst
         ] ++ lib.optionals stdenv.isDarwin [
           darwin.apple_sdk_11_0.frameworks.CoreGraphics

input-capture/Cargo.toml

@@ -1,70 +0,0 @@
-[package]
-name = "input-capture"
-description = "cross-platform input-capture library used by lan-mouse"
-version = "0.1.0"
-edition = "2021"
-license = "GPL-3.0-or-later"
-repository = "https://github.com/feschber/lan-mouse"
-
-[dependencies]
-futures = "0.3.28"
-futures-core = "0.3.30"
-log = "0.4.22"
-input-event = { path = "../input-event", version = "0.2.1" }
-memmap = "0.7"
-tempfile = "3.8"
-thiserror = "1.0.61"
-tokio = { version = "1.32.0", features = [
-    "io-util",
-    "io-std",
-    "macros",
-    "net",
-    "process",
-    "rt",
-    "sync",
-    "signal",
-] }
-once_cell = "1.19.0"
-async-trait = "0.1.81"
-tokio-util = "0.7.11"
-
-
-[target.'cfg(all(unix, not(target_os="macos")))'.dependencies]
-wayland-client = { version = "0.31.1", optional = true }
-wayland-protocols = { version = "0.32.1", features = [
-    "client",
-    "staging",
-    "unstable",
-], optional = true }
-wayland-protocols-wlr = { version = "0.3.1", features = [
-    "client",
-], optional = true }
-x11 = { version = "2.21.0", features = ["xlib", "xtest"], optional = true }
-ashpd = { version = "0.9", default-features = false, features = [
-    "tokio",
-], optional = true }
-reis = { version = "0.2", features = ["tokio"], optional = true }
-
-[target.'cfg(target_os="macos")'.dependencies]
-core-graphics = { version = "0.23", features = ["highsierra"] }
-
-[target.'cfg(windows)'.dependencies]
-windows = { version = "0.58.0", features = [
-    "Win32_System_LibraryLoader",
-    "Win32_System_Threading",
-    "Win32_Foundation",
-    "Win32_Graphics",
-    "Win32_Graphics_Gdi",
-    "Win32_UI_Input_KeyboardAndMouse",
-    "Win32_UI_WindowsAndMessaging",
-] }
-
-[features]
-default = ["wayland", "x11", "libei"]
-wayland = [
-    "dep:wayland-client",
-    "dep:wayland-protocols",
-    "dep:wayland-protocols-wlr",
-]
-x11 = ["dep:x11"]
-libei = ["dep:reis", "dep:ashpd"]

input-capture/src/dummy.rs

@@ -1,52 +0,0 @@
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-use async_trait::async_trait;
-use futures_core::Stream;
-
-use input_event::Event;
-
-use crate::CaptureError;
-
-use super::{CaptureHandle, InputCapture, Position};
-
-pub struct DummyInputCapture {}
-
-impl DummyInputCapture {
-    pub fn new() -> Self {
-        Self {}
-    }
-}
-
-impl Default for DummyInputCapture {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-#[async_trait]
-impl InputCapture for DummyInputCapture {
-    async fn create(&mut self, _handle: CaptureHandle, _pos: Position) -> Result<(), CaptureError> {
-        Ok(())
-    }
-
-    async fn destroy(&mut self, _handle: CaptureHandle) -> Result<(), CaptureError> {
-        Ok(())
-    }
-
-    async fn release(&mut self) -> Result<(), CaptureError> {
-        Ok(())
-    }
-
-    async fn terminate(&mut self) -> Result<(), CaptureError> {
-        Ok(())
-    }
-}
-
-impl Stream for DummyInputCapture {
-    type Item = Result<(CaptureHandle, Event), CaptureError>;
-
-    fn poll_next(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        Poll::Pending
-    }
-}

input-capture/src/error.rs

@@ -1,150 +0,0 @@
-use thiserror::Error;
-
-#[derive(Debug, Error)]
-pub enum InputCaptureError {
-    #[error("error creating input-capture: `{0}`")]
-    Create(#[from] CaptureCreationError),
-    #[error("error while capturing input: `{0}`")]
-    Capture(#[from] CaptureError),
-}
-
-#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-use std::io;
-#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-use wayland_client::{
-    backend::WaylandError,
-    globals::{BindError, GlobalError},
-    ConnectError, DispatchError,
-};
-
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-use ashpd::desktop::ResponseError;
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-use reis::tokio::{EiConvertEventStreamError, HandshakeError};
-
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-#[derive(Debug, Error)]
-#[error("error in libei stream: {inner:?}")]
-pub struct ReisConvertEventStreamError {
-    inner: EiConvertEventStreamError,
-}
-
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-impl From<EiConvertEventStreamError> for ReisConvertEventStreamError {
-    fn from(e: EiConvertEventStreamError) -> Self {
-        Self { inner: e }
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum CaptureError {
-    #[error("activation stream closed unexpectedly")]
-    ActivationClosed,
-    #[error("libei stream was closed")]
-    EndOfStream,
-    #[error("io error: `{0}`")]
-    Io(#[from] std::io::Error),
-    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-    #[error("error in libei stream: `{0}`")]
-    Reis(#[from] ReisConvertEventStreamError),
-    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-    #[error("libei handshake failed: `{0}`")]
-    Handshake(#[from] HandshakeError),
-    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-    #[error(transparent)]
-    Portal(#[from] ashpd::Error),
-    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-    #[error("libei disconnected - reason: `{0}`")]
-    Disconnected(String),
-}
-
-#[derive(Debug, Error)]
-pub enum CaptureCreationError {
-    #[error("no backend available")]
-    NoAvailableBackend,
-    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-    #[error("error creating input-capture-portal backend: `{0}`")]
-    Libei(#[from] LibeiCaptureCreationError),
-    #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-    #[error("error creating layer-shell capture backend: `{0}`")]
-    LayerShell(#[from] LayerShellCaptureCreationError),
-    #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-    #[error("error creating x11 capture backend: `{0}`")]
-    X11(#[from] X11InputCaptureCreationError),
-    #[cfg(target_os = "macos")]
-    #[error("error creating macos capture backend: `{0}`")]
-    Macos(#[from] MacOSInputCaptureCreationError),
-    #[cfg(windows)]
-    #[error("error creating windows capture backend")]
-    Windows,
-}
-
-impl CaptureCreationError {
-    /// request was intentionally denied by the user
-    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-    pub(crate) fn cancelled_by_user(&self) -> bool {
-        matches!(
-            self,
-            CaptureCreationError::Libei(LibeiCaptureCreationError::Ashpd(ashpd::Error::Response(
-                ResponseError::Cancelled
-            )))
-        )
-    }
-    #[cfg(not(all(unix, feature = "libei", not(target_os = "macos"))))]
-    pub(crate) fn cancelled_by_user(&self) -> bool {
-        false
-    }
-}
-
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-#[derive(Debug, Error)]
-pub enum LibeiCaptureCreationError {
-    #[error("xdg-desktop-portal: `{0}`")]
-    Ashpd(#[from] ashpd::Error),
-}
-
-#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-#[derive(Debug, Error)]
-#[error("{protocol} protocol not supported: {inner}")]
-pub struct WaylandBindError {
-    inner: BindError,
-    protocol: &'static str,
-}
-
-#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-impl WaylandBindError {
-    pub(crate) fn new(inner: BindError, protocol: &'static str) -> Self {
-        Self { inner, protocol }
-    }
-}
-
-#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-#[derive(Debug, Error)]
-pub enum LayerShellCaptureCreationError {
-    #[error(transparent)]
-    Connect(#[from] ConnectError),
-    #[error(transparent)]
-    Global(#[from] GlobalError),
-    #[error(transparent)]
-    Wayland(#[from] WaylandError),
-    #[error(transparent)]
-    Bind(#[from] WaylandBindError),
-    #[error(transparent)]
-    Dispatch(#[from] DispatchError),
-    #[error(transparent)]
-    Io(#[from] io::Error),
-}
-
-#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-#[derive(Debug, Error)]
-pub enum X11InputCaptureCreationError {
-    #[error("X11 input capture is not yet implemented :(")]
-    NotImplemented,
-}
-
-#[cfg(target_os = "macos")]
-#[derive(Debug, Error)]
-pub enum MacOSInputCaptureCreationError {
-    #[error("MacOS input capture is not yet implemented :(")]
-    NotImplemented,
-}

input-capture/src/lib.rs

@@ -1,170 +0,0 @@
-use std::fmt::Display;
-
-use async_trait::async_trait;
-use futures_core::Stream;
-
-use input_event::Event;
-
-pub use error::{CaptureCreationError, CaptureError, InputCaptureError};
-
-pub mod error;
-
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-pub mod libei;
-
-#[cfg(target_os = "macos")]
-pub mod macos;
-
-#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-pub mod wayland;
-
-#[cfg(windows)]
-pub mod windows;
-
-#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-pub mod x11;
-
-/// fallback input capture (does not produce events)
-pub mod dummy;
-
-pub type CaptureHandle = u64;
-
-#[derive(Debug, Clone, Copy, Eq, Hash, PartialEq)]
-pub enum Position {
-    Left,
-    Right,
-    Top,
-    Bottom,
-}
-
-impl Position {
-    pub fn opposite(&self) -> Self {
-        match self {
-            Position::Left => Self::Right,
-            Position::Right => Self::Left,
-            Position::Top => Self::Bottom,
-            Position::Bottom => Self::Top,
-        }
-    }
-}
-
-impl Display for Position {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let pos = match self {
-            Position::Left => "left",
-            Position::Right => "right",
-            Position::Top => "top",
-            Position::Bottom => "bottom",
-        };
-        write!(f, "{}", pos)
-    }
-}
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum Backend {
-    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-    InputCapturePortal,
-    #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-    LayerShell,
-    #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-    X11,
-    #[cfg(windows)]
-    Windows,
-    #[cfg(target_os = "macos")]
-    MacOs,
-    Dummy,
-}
-
-impl Display for Backend {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-            Backend::InputCapturePortal => write!(f, "input-capture-portal"),
-            #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-            Backend::LayerShell => write!(f, "layer-shell"),
-            #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-            Backend::X11 => write!(f, "X11"),
-            #[cfg(windows)]
-            Backend::Windows => write!(f, "windows"),
-            #[cfg(target_os = "macos")]
-            Backend::MacOs => write!(f, "MacOS"),
-            Backend::Dummy => write!(f, "dummy"),
-        }
-    }
-}
-
-#[async_trait]
-pub trait InputCapture:
-    Stream<Item = Result<(CaptureHandle, Event), CaptureError>> + Unpin
-{
-    /// create a new client with the given id
-    async fn create(&mut self, id: CaptureHandle, pos: Position) -> Result<(), CaptureError>;
-
-    /// destroy the client with the given id, if it exists
-    async fn destroy(&mut self, id: CaptureHandle) -> Result<(), CaptureError>;
-
-    /// release mouse
-    async fn release(&mut self) -> Result<(), CaptureError>;
-
-    /// destroy the input capture
-    async fn terminate(&mut self) -> Result<(), CaptureError>;
-}
-
-pub async fn create_backend(
-    backend: Backend,
-) -> Result<
-    Box<dyn InputCapture<Item = Result<(CaptureHandle, Event), CaptureError>>>,
-    CaptureCreationError,
-> {
-    match backend {
-        #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-        Backend::InputCapturePortal => Ok(Box::new(libei::LibeiInputCapture::new().await?)),
-        #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-        Backend::LayerShell => Ok(Box::new(wayland::WaylandInputCapture::new()?)),
-        #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-        Backend::X11 => Ok(Box::new(x11::X11InputCapture::new()?)),
-        #[cfg(windows)]
-        Backend::Windows => Ok(Box::new(windows::WindowsInputCapture::new())),
-        #[cfg(target_os = "macos")]
-        Backend::MacOs => Ok(Box::new(macos::MacOSInputCapture::new()?)),
-        Backend::Dummy => Ok(Box::new(dummy::DummyInputCapture::new())),
-    }
-}
-
-pub async fn create(
-    backend: Option<Backend>,
-) -> Result<
-    Box<dyn InputCapture<Item = Result<(CaptureHandle, Event), CaptureError>>>,
-    CaptureCreationError,
-> {
-    if let Some(backend) = backend {
-        let b = create_backend(backend).await;
-        if b.is_ok() {
-            log::info!("using capture backend: {backend}");
-        }
-        return b;
-    }
-
-    for backend in [
-        #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-        Backend::InputCapturePortal,
-        #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-        Backend::LayerShell,
-        #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-        Backend::X11,
-        #[cfg(windows)]
-        Backend::Windows,
-        #[cfg(target_os = "macos")]
-        Backend::MacOs,
-    ] {
-        match create_backend(backend).await {
-            Ok(b) => {
-                log::info!("using capture backend: {backend}");
-                return Ok(b);
-            }
-            Err(e) if e.cancelled_by_user() => return Err(e),
-            Err(e) => log::warn!("{backend} input capture backend unavailable: {e}"),
-        }
-    }
-    Err(CaptureCreationError::NoAvailableBackend)
-}

input-capture/src/libei.rs

@@ -1,641 +0,0 @@
-use ashpd::{
-    desktop::{
-        input_capture::{Activated, Barrier, BarrierID, Capabilities, InputCapture, Region, Zones},
-        Session,
-    },
-    enumflags2::BitFlags,
-};
-use async_trait::async_trait;
-use futures::{FutureExt, StreamExt};
-use reis::{
-    ei,
-    event::{DeviceCapability, EiEvent},
-    tokio::{EiConvertEventStream, EiEventStream},
-};
-use std::{
-    cell::Cell,
-    collections::HashMap,
-    io,
-    os::unix::net::UnixStream,
-    pin::Pin,
-    rc::Rc,
-    sync::Arc,
-    task::{Context, Poll},
-};
-use tokio::{
-    sync::{
-        mpsc::{self, Receiver, Sender},
-        Notify,
-    },
-    task::JoinHandle,
-};
-use tokio_util::sync::CancellationToken;
-
-use futures_core::Stream;
-use once_cell::sync::Lazy;
-
-use input_event::Event;
-
-use super::{
-    error::{CaptureError, LibeiCaptureCreationError, ReisConvertEventStreamError},
-    CaptureHandle, InputCapture as LanMouseInputCapture, Position,
-};
-
-/* there is a bug in xdg-remote-desktop-portal-gnome / mutter that
- * prevents receiving further events after a session has been disabled once.
- * Therefore the session needs to be recreated when the barriers are updated */
-
-/// events that necessitate restarting the capture session
-#[derive(Clone, Copy, Debug)]
-enum LibeiNotifyEvent {
-    Create(CaptureHandle, Position),
-    Destroy(CaptureHandle),
-}
-
-#[allow(dead_code)]
-pub struct LibeiInputCapture<'a> {
-    input_capture: Pin<Box<InputCapture<'a>>>,
-    capture_task: JoinHandle<Result<(), CaptureError>>,
-    event_rx: Receiver<(CaptureHandle, Event)>,
-    notify_capture: Sender<LibeiNotifyEvent>,
-    notify_release: Arc<Notify>,
-    cancellation_token: CancellationToken,
-    terminated: bool,
-}
-
-static INTERFACES: Lazy<HashMap<&'static str, u32>> = Lazy::new(|| {
-    let mut m = HashMap::new();
-    m.insert("ei_connection", 1);
-    m.insert("ei_callback", 1);
-    m.insert("ei_pingpong", 1);
-    m.insert("ei_seat", 1);
-    m.insert("ei_device", 2);
-    m.insert("ei_pointer", 1);
-    m.insert("ei_pointer_absolute", 1);
-    m.insert("ei_scroll", 1);
-    m.insert("ei_button", 1);
-    m.insert("ei_keyboard", 1);
-    m.insert("ei_touchscreen", 1);
-    m
-});
-
-/// returns (start pos, end pos), inclusive
-fn pos_to_barrier(r: &Region, pos: Position) -> (i32, i32, i32, i32) {
-    let (x, y) = (r.x_offset(), r.y_offset());
-    let (w, h) = (r.width() as i32, r.height() as i32);
-    match pos {
-        Position::Left => (x, y, x, y + h - 1),
-        Position::Right => (x + w, y, x + w, y + h - 1),
-        Position::Top => (x, y, x + w - 1, y),
-        Position::Bottom => (x, y + h, x + w - 1, y + h),
-    }
-}
-
-/// Ashpd does not expose fields
-#[derive(Clone, Copy, Debug)]
-struct ICBarrier {
-    barrier_id: BarrierID,
-    position: (i32, i32, i32, i32),
-}
-
-impl ICBarrier {
-    fn new(barrier_id: BarrierID, position: (i32, i32, i32, i32)) -> Self {
-        Self {
-            barrier_id,
-            position,
-        }
-    }
-}
-
-impl From<ICBarrier> for Barrier {
-    fn from(barrier: ICBarrier) -> Self {
-        Barrier::new(barrier.barrier_id, barrier.position)
-    }
-}
-
-fn select_barriers(
-    zones: &Zones,
-    clients: &[(CaptureHandle, Position)],
-    next_barrier_id: &mut u32,
-) -> (Vec<ICBarrier>, HashMap<BarrierID, CaptureHandle>) {
-    let mut client_for_barrier = HashMap::new();
-    let mut barriers: Vec<ICBarrier> = vec![];
-
-    for (handle, pos) in clients {
-        let mut client_barriers = zones
-            .regions()
-            .iter()
-            .map(|r| {
-                let id = *next_barrier_id;
-                *next_barrier_id = id + 1;
-                let position = pos_to_barrier(r, *pos);
-                client_for_barrier.insert(id, *handle);
-                ICBarrier::new(id, position)
-            })
-            .collect();
-        barriers.append(&mut client_barriers);
-    }
-    (barriers, client_for_barrier)
-}
-
-async fn update_barriers(
-    input_capture: &InputCapture<'_>,
-    session: &Session<'_, InputCapture<'_>>,
-    active_clients: &[(CaptureHandle, Position)],
-    next_barrier_id: &mut u32,
-) -> Result<(Vec<ICBarrier>, HashMap<BarrierID, CaptureHandle>), ashpd::Error> {
-    let zones = input_capture.zones(session).await?.response()?;
-    log::debug!("zones: {zones:?}");
-
-    let (barriers, id_map) = select_barriers(&zones, active_clients, next_barrier_id);
-    log::debug!("barriers: {barriers:?}");
-    log::debug!("client for barrier id: {id_map:?}");
-
-    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())
-        .await?;
-    let response = response.response()?;
-    log::debug!("{response:?}");
-    Ok((barriers, id_map))
-}
-
-async fn create_session<'a>(
-    input_capture: &'a InputCapture<'a>,
-) -> std::result::Result<(Session<'_, InputCapture<'_>>, BitFlags<Capabilities>), ashpd::Error> {
-    log::debug!("creating input capture session");
-    input_capture
-        .create_session(
-            &ashpd::WindowIdentifier::default(),
-            Capabilities::Keyboard | Capabilities::Pointer | Capabilities::Touchscreen,
-        )
-        .await
-}
-
-async fn connect_to_eis(
-    input_capture: &InputCapture<'_>,
-    session: &Session<'_, InputCapture<'_>>,
-) -> Result<(ei::Context, EiConvertEventStream), CaptureError> {
-    log::debug!("connect_to_eis");
-    let fd = input_capture.connect_to_eis(session).await?;
-
-    // create unix stream from fd
-    let stream = UnixStream::from(fd);
-    stream.set_nonblocking(true)?;
-
-    // create ei context
-    let context = ei::Context::new(stream)?;
-    let mut event_stream = EiEventStream::new(context.clone())?;
-    let response = reis::tokio::ei_handshake(
-        &mut event_stream,
-        "de.feschber.LanMouse",
-        ei::handshake::ContextType::Receiver,
-        &INTERFACES,
-    )
-    .await?;
-    let event_stream = EiConvertEventStream::new(event_stream, response.serial);
-
-    Ok((context, event_stream))
-}
-
-async fn libei_event_handler(
-    mut ei_event_stream: EiConvertEventStream,
-    context: ei::Context,
-    event_tx: Sender<(CaptureHandle, Event)>,
-    release_session: Arc<Notify>,
-    current_client: Rc<Cell<Option<CaptureHandle>>>,
-) -> Result<(), CaptureError> {
-    loop {
-        let ei_event = ei_event_stream
-            .next()
-            .await
-            .ok_or(CaptureError::EndOfStream)?
-            .map_err(ReisConvertEventStreamError::from)?;
-        log::trace!("from ei: {ei_event:?}");
-        let client = current_client.get();
-        handle_ei_event(ei_event, client, &context, &event_tx, &release_session).await?;
-    }
-}
-
-impl<'a> LibeiInputCapture<'a> {
-    pub async fn new() -> std::result::Result<Self, LibeiCaptureCreationError> {
-        let input_capture = Box::pin(InputCapture::new().await?);
-        let input_capture_ptr = input_capture.as_ref().get_ref() as *const InputCapture<'static>;
-        let first_session = Some(create_session(unsafe { &*input_capture_ptr }).await?);
-
-        let (event_tx, event_rx) = mpsc::channel(1);
-        let (notify_capture, notify_rx) = mpsc::channel(1);
-        let notify_release = Arc::new(Notify::new());
-
-        let cancellation_token = CancellationToken::new();
-
-        let capture = do_capture(
-            input_capture_ptr,
-            notify_rx,
-            notify_release.clone(),
-            first_session,
-            event_tx,
-            cancellation_token.clone(),
-        );
-        let capture_task = tokio::task::spawn_local(capture);
-
-        let producer = Self {
-            input_capture,
-            event_rx,
-            capture_task,
-            notify_capture,
-            notify_release,
-            cancellation_token,
-            terminated: false,
-        };
-
-        Ok(producer)
-    }
-}
-
-async fn do_capture(
-    input_capture: *const InputCapture<'static>,
-    mut capture_event: Receiver<LibeiNotifyEvent>,
-    notify_release: Arc<Notify>,
-    session: Option<(Session<'_, InputCapture<'_>>, BitFlags<Capabilities>)>,
-    event_tx: Sender<(CaptureHandle, Event)>,
-    cancellation_token: CancellationToken,
-) -> Result<(), CaptureError> {
-    let mut session = session.map(|s| s.0);
-
-    /* safety: libei_task does not outlive Self */
-    let input_capture = unsafe { &*input_capture };
-    let mut active_clients: Vec<(CaptureHandle, Position)> = vec![];
-    let mut next_barrier_id = 1u32;
-
-    let mut zones_changed = input_capture.receive_zones_changed().await?;
-
-    loop {
-        // do capture session
-        let cancel_session = CancellationToken::new();
-        let cancel_update = CancellationToken::new();
-
-        let mut capture_event_occured: Option<LibeiNotifyEvent> = None;
-        let mut zones_have_changed = false;
-
-        // kill session if clients need to be updated
-        let handle_session_update_request = async {
-            tokio::select! {
-                _ = cancellation_token.cancelled() => {
-                    log::debug!("cancelled")
-                }, /* exit requested */
-                _ = cancel_update.cancelled() => {
-                    log::debug!("update task cancelled");
-                }, /* session exited */
-                _ = zones_changed.next() => {
-                    log::debug!("zones changed!");
-                    zones_have_changed = true
-                }, /* zones have changed */
-                e = capture_event.recv() => if let Some(e) = e { /* clients changed */
-                    log::debug!("capture event: {e:?}");
-                    capture_event_occured.replace(e);
-                },
-            }
-            // kill session (might already be dead!)
-            log::debug!("=> cancelling session");
-            cancel_session.cancel();
-        };
-
-        if !active_clients.is_empty() {
-            // create session
-            let mut session = match session.take() {
-                Some(s) => s,
-                None => create_session(input_capture).await?.0,
-            };
-
-            let capture_session = do_capture_session(
-                input_capture,
-                &mut session,
-                &event_tx,
-                &active_clients,
-                &mut next_barrier_id,
-                &notify_release,
-                (cancel_session.clone(), cancel_update.clone()),
-            );
-
-            let (capture_result, ()) = tokio::join!(capture_session, handle_session_update_request);
-            log::debug!("capture session + session_update task done!");
-
-            // disable capture
-            log::debug!("disabling input capture");
-            if let Err(e) = input_capture.disable(&session).await {
-                log::warn!("input_capture.disable(&session) {e}");
-            }
-            if let Err(e) = session.close().await {
-                log::warn!("session.close(): {e}");
-            }
-
-            // propagate error from capture session
-            capture_result?;
-        } else {
-            handle_session_update_request.await;
-        }
-
-        // update clients if requested
-        if let Some(event) = capture_event_occured.take() {
-            match event {
-                LibeiNotifyEvent::Create(c, p) => active_clients.push((c, p)),
-                LibeiNotifyEvent::Destroy(c) => active_clients.retain(|(h, _)| *h != c),
-            }
-        }
-
-        // break
-        if cancellation_token.is_cancelled() {
-            break Ok(());
-        }
-    }
-}
-
-async fn do_capture_session(
-    input_capture: &InputCapture<'_>,
-    session: &mut Session<'_, InputCapture<'_>>,
-    event_tx: &Sender<(CaptureHandle, Event)>,
-    active_clients: &[(CaptureHandle, Position)],
-    next_barrier_id: &mut u32,
-    notify_release: &Notify,
-    cancel: (CancellationToken, CancellationToken),
-) -> Result<(), CaptureError> {
-    let (cancel_session, cancel_update) = cancel;
-    // current client
-    let current_client = Rc::new(Cell::new(None));
-
-    // connect to eis server
-    let (context, ei_event_stream) = connect_to_eis(input_capture, session).await?;
-
-    // set barriers
-    let (barriers, client_for_barrier_id) =
-        update_barriers(input_capture, session, active_clients, next_barrier_id).await?;
-
-    log::debug!("enabling session");
-    input_capture.enable(session).await?;
-
-    // cancellation token to release session
-    let release_session = Arc::new(Notify::new());
-
-    // async event task
-    let cancel_ei_handler = CancellationToken::new();
-    let event_chan = event_tx.clone();
-    let client = current_client.clone();
-    let cancel_session_clone = cancel_session.clone();
-    let release_session_clone = release_session.clone();
-    let cancel_ei_handler_clone = cancel_ei_handler.clone();
-    let ei_task = async move {
-        tokio::select! {
-            r = libei_event_handler(
-                ei_event_stream,
-                context,
-                event_chan,
-                release_session_clone,
-                client,
-            ) => {
-                log::debug!("libei exited: {r:?} cancelling session task");
-                cancel_session_clone.cancel();
-            }
-            _ = cancel_ei_handler_clone.cancelled() => {},
-        }
-        Ok::<(), CaptureError>(())
-    };
-
-    let capture_session_task = async {
-        // receiver for activation tokens
-        let mut activated = input_capture.receive_activated().await?;
-        let mut ei_devices_changed = false;
-        loop {
-            tokio::select! {
-                activated = activated.next() => {
-                    let activated = activated.ok_or(CaptureError::ActivationClosed)?;
-                    log::debug!("activated: {activated:?}");
-
-                    // get barrier id from activation
-                    let barrier_id = match activated.barrier_id() {
-                        Some(bid) => bid,
-                        // workaround for KDE plasma not reporting barrier ids
-                        None => find_corresponding_client(&barriers, activated.cursor_position().expect("no cursor position reported by compositor")),
-                    };
-
-                    // find client corresponding to barrier
-                    let client = *client_for_barrier_id.get(&barrier_id).expect("invalid barrier id");
-                    current_client.replace(Some(client));
-
-                    // client entered => send event
-                    event_tx.send((client, Event::Enter())).await.expect("no channel");
-
-                    tokio::select! {
-                        _ = notify_release.notified() => { /* capture release */
-                            log::debug!("release session requested");
-                        },
-                        _ = release_session.notified() => { /* release session */
-                            log::debug!("ei devices changed");
-                            ei_devices_changed = true;
-                        },
-                        _ = cancel_session.cancelled() => { /* kill session notify */
-                            log::debug!("session cancel requested");
-                            break
-                        },
-                    }
-
-                    release_capture(input_capture, session, activated, client, active_clients).await?;
-
-                }
-                _ = notify_release.notified() => { /* capture release -> we are not capturing anyway, so ignore */
-                    log::debug!("release session requested");
-                },
-                _ = release_session.notified() => { /* release session */
-                    log::debug!("ei devices changed");
-                    ei_devices_changed = true;
-                },
-                _ = cancel_session.cancelled() => { /* kill session notify */
-                    log::debug!("session cancel requested");
-                    break
-                },
-            }
-            if ei_devices_changed {
-                /* for whatever reason, GNOME seems to kill the session
-                 * as soon as devices are added or removed, so we need
-                 * to cancel */
-                break;
-            }
-        }
-        // cancel libei task
-        log::debug!("session exited: killing libei task");
-        cancel_ei_handler.cancel();
-        Ok::<(), CaptureError>(())
-    };
-
-    let (a, b) = tokio::join!(ei_task, capture_session_task);
-
-    cancel_update.cancel();
-
-    log::debug!("both session and ei task finished!");
-    a?;
-    b?;
-
-    Ok(())
-}
-
-async fn release_capture<'a>(
-    input_capture: &InputCapture<'a>,
-    session: &Session<'a, InputCapture<'a>>,
-    activated: Activated,
-    current_client: CaptureHandle,
-    active_clients: &[(CaptureHandle, Position)],
-) -> Result<(), CaptureError> {
-    if let Some(activation_id) = activated.activation_id() {
-        log::debug!("releasing input capture {activation_id}");
-    }
-    let (x, y) = activated
-        .cursor_position()
-        .expect("compositor did not report cursor position!");
-    log::debug!("client entered @ ({x}, {y})");
-    let pos = active_clients
-        .iter()
-        .filter(|(c, _)| *c == current_client)
-        .map(|(_, p)| p)
-        .next()
-        .unwrap(); // FIXME
-    let (dx, dy) = match pos {
-        // offset cursor position to not enter again immediately
-        Position::Left => (1., 0.),
-        Position::Right => (-1., 0.),
-        Position::Top => (0., 1.),
-        Position::Bottom => (0., -1.),
-    };
-    // release 1px to the right of the entered zone
-    let cursor_position = (x as f64 + dx, y as f64 + dy);
-    input_capture
-        .release(session, activated.activation_id(), Some(cursor_position))
-        .await?;
-    Ok(())
-}
-
-fn find_corresponding_client(barriers: &[ICBarrier], pos: (f32, f32)) -> BarrierID {
-    barriers
-        .iter()
-        .copied()
-        .min_by_key(|b| {
-            let (x1, y1, x2, y2) = b.position;
-            let (x1, y1, x2, y2) = (x1 as f32, y1 as f32, x2 as f32, y2 as f32);
-            distance_to_line(((x1, y1), (x2, y2)), pos) as i32
-        })
-        .expect("could not find barrier corresponding to client")
-        .barrier_id
-}
-
-fn distance_to_line(line: ((f32, f32), (f32, f32)), p: (f32, f32)) -> f32 {
-    let ((x1, y1), (x2, y2)) = line;
-    let (x0, y0) = p;
-    /*
-     * we use the fact that for the triangle spanned by the line and p,
-     * the height of the triangle is the desired distance and can be calculated by
-     * h = 2A / b with b being the line_length and
-     */
-    let double_triangle_area = ((y2 - y1) * x0 - (x2 - x1) * y0 + x2 * y1 - y2 * x1).abs();
-    let line_length = ((y2 - y1).powf(2.0) + (x2 - x1).powf(2.0)).sqrt();
-    let distance = double_triangle_area / line_length;
-    log::debug!("distance to line({line:?}, {p:?}) = {distance}");
-    distance
-}
-
-static ALL_CAPABILITIES: &[DeviceCapability] = &[
-    DeviceCapability::Pointer,
-    DeviceCapability::PointerAbsolute,
-    DeviceCapability::Keyboard,
-    DeviceCapability::Touch,
-    DeviceCapability::Scroll,
-    DeviceCapability::Button,
-];
-
-async fn handle_ei_event(
-    ei_event: EiEvent,
-    current_client: Option<CaptureHandle>,
-    context: &ei::Context,
-    event_tx: &Sender<(CaptureHandle, Event)>,
-    release_session: &Notify,
-) -> Result<(), CaptureError> {
-    match ei_event {
-        EiEvent::SeatAdded(s) => {
-            s.seat.bind_capabilities(ALL_CAPABILITIES);
-            context.flush().map_err(|e| io::Error::new(e.kind(), e))?;
-        }
-        EiEvent::SeatRemoved(_) | /* EiEvent::DeviceAdded(_) | */ EiEvent::DeviceRemoved(_) => {
-            log::debug!("releasing session: {ei_event:?}");
-            release_session.notify_waiters();
-        }
-        EiEvent::DevicePaused(_) | EiEvent::DeviceResumed(_) => {}
-        EiEvent::DeviceStartEmulating(_) => log::debug!("START EMULATING"),
-        EiEvent::DeviceStopEmulating(_) => log::debug!("STOP EMULATING"),
-        EiEvent::Disconnected(d) => {
-            return Err(CaptureError::Disconnected(format!("{:?}", d.reason)))
-        }
-        _ => {
-            if let Some(handle) = current_client {
-                for event in Event::from_ei_event(ei_event) {
-                    event_tx.send((handle, event)).await.expect("no channel");
-                }
-            }
-        }
-    }
-    Ok(())
-}
-
-#[async_trait]
-impl<'a> LanMouseInputCapture for LibeiInputCapture<'a> {
-    async fn create(&mut self, handle: CaptureHandle, pos: Position) -> Result<(), CaptureError> {
-        let _ = self
-            .notify_capture
-            .send(LibeiNotifyEvent::Create(handle, pos))
-            .await;
-        Ok(())
-    }
-
-    async fn destroy(&mut self, handle: CaptureHandle) -> Result<(), CaptureError> {
-        let _ = self
-            .notify_capture
-            .send(LibeiNotifyEvent::Destroy(handle))
-            .await;
-        Ok(())
-    }
-
-    async fn release(&mut self) -> Result<(), CaptureError> {
-        self.notify_release.notify_waiters();
-        Ok(())
-    }
-
-    async fn terminate(&mut self) -> Result<(), CaptureError> {
-        self.cancellation_token.cancel();
-        let task = &mut self.capture_task;
-        log::debug!("waiting for capture to terminate...");
-        let res = task.await.expect("libei task panic");
-        log::debug!("done!");
-        self.terminated = true;
-        res
-    }
-}
-
-impl<'a> Drop for LibeiInputCapture<'a> {
-    fn drop(&mut self) {
-        if !self.terminated {
-            /* this workaround is needed until async drop is stabilized */
-            panic!("LibeiInputCapture dropped without being terminated!");
-        }
-    }
-}
-
-impl<'a> Stream for LibeiInputCapture<'a> {
-    type Item = Result<(CaptureHandle, Event), CaptureError>;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        match self.capture_task.poll_unpin(cx) {
-            Poll::Ready(r) => match r.expect("failed to join") {
-                Ok(()) => Poll::Ready(None),
-                Err(e) => Poll::Ready(Some(Err(e))),
-            },
-            Poll::Pending => self.event_rx.poll_recv(cx).map(|e| e.map(Result::Ok)),
-        }
-    }
-}

input-capture/src/macos.rs

@@ -1,43 +0,0 @@
-use crate::{
-    error::MacOSInputCaptureCreationError, CaptureError, CaptureHandle, InputCapture, Position,
-};
-use async_trait::async_trait;
-use futures_core::Stream;
-use input_event::Event;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-pub struct MacOSInputCapture;
-
-impl MacOSInputCapture {
-    pub fn new() -> std::result::Result<Self, MacOSInputCaptureCreationError> {
-        Err(MacOSInputCaptureCreationError::NotImplemented)
-    }
-}
-
-impl Stream for MacOSInputCapture {
-    type Item = Result<(CaptureHandle, Event), CaptureError>;
-
-    fn poll_next(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        Poll::Pending
-    }
-}
-
-#[async_trait]
-impl InputCapture for MacOSInputCapture {
-    async fn create(&mut self, _id: CaptureHandle, _pos: Position) -> Result<(), CaptureError> {
-        Ok(())
-    }
-
-    async fn destroy(&mut self, _id: CaptureHandle) -> Result<(), CaptureError> {
-        Ok(())
-    }
-
-    async fn release(&mut self) -> Result<(), CaptureError> {
-        Ok(())
-    }
-
-    async fn terminate(&mut self) -> Result<(), CaptureError> {
-        Ok(())
-    }
-}

input-capture/src/x11.rs

@@ -1,50 +0,0 @@
-use std::task::Poll;
-
-use async_trait::async_trait;
-use futures_core::Stream;
-
-use crate::CaptureError;
-
-use super::InputCapture;
-use input_event::Event;
-
-use super::error::X11InputCaptureCreationError;
-use super::{CaptureHandle, Position};
-
-pub struct X11InputCapture {}
-
-impl X11InputCapture {
-    pub fn new() -> std::result::Result<Self, X11InputCaptureCreationError> {
-        Err(X11InputCaptureCreationError::NotImplemented)
-    }
-}
-
-#[async_trait]
-impl InputCapture for X11InputCapture {
-    async fn create(&mut self, _id: CaptureHandle, _pos: Position) -> Result<(), CaptureError> {
-        Ok(())
-    }
-
-    async fn destroy(&mut self, _id: CaptureHandle) -> Result<(), CaptureError> {
-        Ok(())
-    }
-
-    async fn release(&mut self) -> Result<(), CaptureError> {
-        Ok(())
-    }
-
-    async fn terminate(&mut self) -> Result<(), CaptureError> {
-        Ok(())
-    }
-}
-
-impl Stream for X11InputCapture {
-    type Item = Result<(CaptureHandle, Event), CaptureError>;
-
-    fn poll_next(
-        self: std::pin::Pin<&mut Self>,
-        _cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Option<Self::Item>> {
-        Poll::Pending
-    }
-}

input-emulation/Cargo.toml

@@ -1,71 +0,0 @@
-[package]
-name = "input-emulation"
-description = "cross-platform input emulation library used by lan-mouse"
-version = "0.1.0"
-edition = "2021"
-license = "GPL-3.0-or-later"
-repository = "https://github.com/feschber/lan-mouse"
-
-[dependencies]
-async-trait = "0.1.80"
-futures = "0.3.28"
-log = "0.4.22"
-input-event = { path = "../input-event", version = "0.2.1" }
-thiserror = "1.0.61"
-tokio = { version = "1.32.0", features = [
-    "io-util",
-    "io-std",
-    "macros",
-    "net",
-    "process",
-    "rt",
-    "sync",
-    "signal",
-] }
-once_cell = "1.19.0"
-
-[target.'cfg(all(unix, not(target_os="macos")))'.dependencies]
-wayland-client = { version = "0.31.1", optional = true }
-wayland-protocols = { version = "0.32.1", features = [
-    "client",
-    "staging",
-    "unstable",
-], optional = true }
-wayland-protocols-wlr = { version = "0.3.1", features = [
-    "client",
-], optional = true }
-wayland-protocols-misc = { version = "0.3.1", features = [
-    "client",
-], optional = true }
-x11 = { version = "2.21.0", features = ["xlib", "xtest"], optional = true }
-ashpd = { version = "0.9", default-features = false, features = [
-    "tokio",
-], optional = true }
-reis = { version = "0.2", features = ["tokio"], optional = true }
-
-[target.'cfg(target_os="macos")'.dependencies]
-core-graphics = { version = "0.23", features = ["highsierra"] }
-keycode = "0.4.0"
-
-[target.'cfg(windows)'.dependencies]
-windows = { version = "0.58.0", features = [
-    "Win32_System_LibraryLoader",
-    "Win32_System_Threading",
-    "Win32_Foundation",
-    "Win32_Graphics",
-    "Win32_Graphics_Gdi",
-    "Win32_UI_Input_KeyboardAndMouse",
-    "Win32_UI_WindowsAndMessaging",
-] }
-
-[features]
-default = ["wayland", "x11", "xdg_desktop_portal", "libei"]
-wayland = [
-    "dep:wayland-client",
-    "dep:wayland-protocols",
-    "dep:wayland-protocols-wlr",
-    "dep:wayland-protocols-misc",
-]
-x11 = ["dep:x11"]
-xdg_desktop_portal = ["dep:ashpd"]
-libei = ["dep:reis", "dep:ashpd"]

input-emulation/src/dummy.rs

@@ -1,32 +0,0 @@
-use async_trait::async_trait;
-use input_event::Event;
-
-use crate::error::EmulationError;
-
-use super::{EmulationHandle, InputEmulation};
-
-#[derive(Default)]
-pub struct DummyEmulation;
-
-impl DummyEmulation {
-    pub fn new() -> Self {
-        Self {}
-    }
-}
-
-#[async_trait]
-impl InputEmulation for DummyEmulation {
-    async fn consume(
-        &mut self,
-        event: Event,
-        client_handle: EmulationHandle,
-    ) -> Result<(), EmulationError> {
-        log::info!("received event: ({client_handle}) {event}");
-        Ok(())
-    }
-    async fn create(&mut self, _: EmulationHandle) {}
-    async fn destroy(&mut self, _: EmulationHandle) {}
-    async fn terminate(&mut self) {
-        /* nothing to do */
-    }
-}

input-emulation/src/error.rs

@@ -1,179 +0,0 @@
-#[derive(Debug, Error)]
-pub enum InputEmulationError {
-    #[error("error creating input-emulation: `{0}`")]
-    Create(#[from] EmulationCreationError),
-    #[error("error emulating input: `{0}`")]
-    Emulate(#[from] EmulationError),
-}
-
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-use ashpd::{desktop::ResponseError, Error::Response};
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-use reis::tokio::EiConvertEventStreamError;
-use std::io;
-use thiserror::Error;
-
-#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-use wayland_client::{
-    backend::WaylandError,
-    globals::{BindError, GlobalError},
-    ConnectError, DispatchError,
-};
-
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-use reis::tokio::HandshakeError;
-
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-#[derive(Debug, Error)]
-#[error("error in libei stream: {inner:?}")]
-pub struct ReisConvertStreamError {
-    inner: EiConvertEventStreamError,
-}
-
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-impl From<EiConvertEventStreamError> for ReisConvertStreamError {
-    fn from(e: EiConvertEventStreamError) -> Self {
-        Self { inner: e }
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum EmulationError {
-    #[error("event stream closed")]
-    EndOfStream,
-    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-    #[error("libei error flushing events: `{0}`")]
-    Libei(#[from] reis::event::Error),
-    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-    #[error("")]
-    LibeiConvertStream(#[from] ReisConvertStreamError),
-    #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-    #[error("wayland error: `{0}`")]
-    Wayland(#[from] wayland_client::backend::WaylandError),
-    #[cfg(all(
-        unix,
-        any(feature = "xdg_desktop_portal", feature = "libei"),
-        not(target_os = "macos")
-    ))]
-    #[error("xdg-desktop-portal: `{0}`")]
-    Ashpd(#[from] ashpd::Error),
-    #[error("io error: `{0}`")]
-    Io(#[from] io::Error),
-}
-
-#[derive(Debug, Error)]
-pub enum EmulationCreationError {
-    #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-    #[error("wlroots backend: `{0}`")]
-    Wlroots(#[from] WlrootsEmulationCreationError),
-    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-    #[error("libei backend: `{0}`")]
-    Libei(#[from] LibeiEmulationCreationError),
-    #[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
-    #[error("xdg-desktop-portal: `{0}`")]
-    Xdp(#[from] XdpEmulationCreationError),
-    #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-    #[error("x11: `{0}`")]
-    X11(#[from] X11EmulationCreationError),
-    #[cfg(target_os = "macos")]
-    #[error("macos: `{0}`")]
-    MacOs(#[from] MacOSEmulationCreationError),
-    #[cfg(windows)]
-    #[error("windows: `{0}`")]
-    Windows(#[from] WindowsEmulationCreationError),
-    #[error("capture error")]
-    NoAvailableBackend,
-}
-
-impl EmulationCreationError {
-    /// request was intentionally denied by the user
-    pub(crate) fn cancelled_by_user(&self) -> bool {
-        #[cfg(feature = "libei")]
-        if matches!(
-            self,
-            EmulationCreationError::Libei(LibeiEmulationCreationError::Ashpd(Response(
-                ResponseError::Cancelled,
-            )))
-        ) {
-            return true;
-        }
-        #[cfg(feature = "xdg_desktop_portal")]
-        if matches!(
-            self,
-            EmulationCreationError::Xdp(XdpEmulationCreationError::Ashpd(Response(
-                ResponseError::Cancelled,
-            )))
-        ) {
-            return true;
-        }
-        false
-    }
-}
-
-#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-#[derive(Debug, Error)]
-pub enum WlrootsEmulationCreationError {
-    #[error(transparent)]
-    Connect(#[from] ConnectError),
-    #[error(transparent)]
-    Global(#[from] GlobalError),
-    #[error(transparent)]
-    Wayland(#[from] WaylandError),
-    #[error(transparent)]
-    Bind(#[from] WaylandBindError),
-    #[error(transparent)]
-    Dispatch(#[from] DispatchError),
-    #[error(transparent)]
-    Io(#[from] std::io::Error),
-}
-
-#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-#[derive(Debug, Error)]
-#[error("wayland protocol \"{protocol}\" not supported: {inner}")]
-pub struct WaylandBindError {
-    inner: BindError,
-    protocol: &'static str,
-}
-
-#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-impl WaylandBindError {
-    pub(crate) fn new(inner: BindError, protocol: &'static str) -> Self {
-        Self { inner, protocol }
-    }
-}
-
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-#[derive(Debug, Error)]
-pub enum LibeiEmulationCreationError {
-    #[error(transparent)]
-    Ashpd(#[from] ashpd::Error),
-    #[error(transparent)]
-    Io(#[from] std::io::Error),
-    #[error(transparent)]
-    Handshake(#[from] HandshakeError),
-}
-
-#[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
-#[derive(Debug, Error)]
-pub enum XdpEmulationCreationError {
-    #[error(transparent)]
-    Ashpd(#[from] ashpd::Error),
-}
-
-#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-#[derive(Debug, Error)]
-pub enum X11EmulationCreationError {
-    #[error("could not open display")]
-    OpenDisplay,
-}
-
-#[cfg(target_os = "macos")]
-#[derive(Debug, Error)]
-pub enum MacOSEmulationCreationError {
-    #[error("could not create event source")]
-    EventSourceCreation,
-}
-
-#[cfg(windows)]
-#[derive(Debug, Error)]
-pub enum WindowsEmulationCreationError {}

input-emulation/src/lib.rs

@@ -1,140 +0,0 @@
-use async_trait::async_trait;
-use std::fmt::Display;
-
-use input_event::Event;
-
-pub use self::error::{EmulationCreationError, EmulationError, InputEmulationError};
-
-#[cfg(windows)]
-pub mod windows;
-
-#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-pub mod x11;
-
-#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-pub mod wlroots;
-
-#[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
-pub mod xdg_desktop_portal;
-
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-pub mod libei;
-
-#[cfg(target_os = "macos")]
-pub mod macos;
-
-/// fallback input emulation (logs events)
-pub mod dummy;
-pub mod error;
-
-pub type EmulationHandle = u64;
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum Backend {
-    #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-    Wlroots,
-    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-    Libei,
-    #[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
-    Xdp,
-    #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-    X11,
-    #[cfg(windows)]
-    Windows,
-    #[cfg(target_os = "macos")]
-    MacOs,
-    Dummy,
-}
-
-impl Display for Backend {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-            Backend::Wlroots => write!(f, "wlroots"),
-            #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-            Backend::Libei => write!(f, "libei"),
-            #[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
-            Backend::Xdp => write!(f, "xdg-desktop-portal"),
-            #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-            Backend::X11 => write!(f, "X11"),
-            #[cfg(windows)]
-            Backend::Windows => write!(f, "windows"),
-            #[cfg(target_os = "macos")]
-            Backend::MacOs => write!(f, "macos"),
-            Backend::Dummy => write!(f, "dummy"),
-        }
-    }
-}
-
-#[async_trait]
-pub trait InputEmulation: Send {
-    async fn consume(
-        &mut self,
-        event: Event,
-        handle: EmulationHandle,
-    ) -> Result<(), EmulationError>;
-    async fn create(&mut self, handle: EmulationHandle);
-    async fn destroy(&mut self, handle: EmulationHandle);
-    async fn terminate(&mut self);
-}
-
-pub async fn create_backend(
-    backend: Backend,
-) -> Result<Box<dyn InputEmulation>, EmulationCreationError> {
-    match backend {
-        #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-        Backend::Wlroots => Ok(Box::new(wlroots::WlrootsEmulation::new()?)),
-        #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-        Backend::Libei => Ok(Box::new(libei::LibeiEmulation::new().await?)),
-        #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-        Backend::X11 => Ok(Box::new(x11::X11Emulation::new()?)),
-        #[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
-        Backend::Xdp => Ok(Box::new(
-            xdg_desktop_portal::DesktopPortalEmulation::new().await?,
-        )),
-        #[cfg(windows)]
-        Backend::Windows => Ok(Box::new(windows::WindowsEmulation::new()?)),
-        #[cfg(target_os = "macos")]
-        Backend::MacOs => Ok(Box::new(macos::MacOSEmulation::new()?)),
-        Backend::Dummy => Ok(Box::new(dummy::DummyEmulation::new())),
-    }
-}
-
-pub async fn create(
-    backend: Option<Backend>,
-) -> Result<Box<dyn InputEmulation>, EmulationCreationError> {
-    if let Some(backend) = backend {
-        let b = create_backend(backend).await;
-        if b.is_ok() {
-            log::info!("using emulation backend: {backend}");
-        }
-        return b;
-    }
-
-    for backend in [
-        #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-        Backend::Wlroots,
-        #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-        Backend::Libei,
-        #[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
-        Backend::Xdp,
-        #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-        Backend::X11,
-        #[cfg(windows)]
-        Backend::Windows,
-        #[cfg(target_os = "macos")]
-        Backend::MacOs,
-        Backend::Dummy,
-    ] {
-        match create_backend(backend).await {
-            Ok(b) => {
-                log::info!("using emulation backend: {backend}");
-                return Ok(b);
-            }
-            Err(e) if e.cancelled_by_user() => return Err(e),
-            Err(e) => log::warn!("{e}"),
-        }
-    }
-
-    Err(EmulationCreationError::NoAvailableBackend)
-}

input-emulation/src/libei.rs

@@ -1,372 +0,0 @@
-use futures::{future, StreamExt};
-use once_cell::sync::Lazy;
-use std::{
-    collections::HashMap,
-    io,
-    os::{fd::OwnedFd, unix::net::UnixStream},
-    sync::{
-        atomic::{AtomicBool, AtomicU32, Ordering},
-        Arc, Mutex, RwLock,
-    },
-    time::{SystemTime, UNIX_EPOCH},
-};
-use tokio::task::JoinHandle;
-
-use ashpd::{
-    desktop::{
-        remote_desktop::{DeviceType, RemoteDesktop},
-        PersistMode, Session,
-    },
-    WindowIdentifier,
-};
-use async_trait::async_trait;
-
-use reis::{
-    ei::{
-        self, button::ButtonState, handshake::ContextType, keyboard::KeyState, Button, Keyboard,
-        Pointer, Scroll,
-    },
-    event::{DeviceCapability, DeviceEvent, EiEvent, SeatEvent},
-    tokio::{ei_handshake, EiConvertEventStream, EiEventStream},
-};
-
-use input_event::{Event, KeyboardEvent, PointerEvent};
-
-use crate::error::{EmulationError, ReisConvertStreamError};
-
-use super::{error::LibeiEmulationCreationError, EmulationHandle, InputEmulation};
-
-static INTERFACES: Lazy<HashMap<&'static str, u32>> = Lazy::new(|| {
-    let mut m = HashMap::new();
-    m.insert("ei_connection", 1);
-    m.insert("ei_callback", 1);
-    m.insert("ei_pingpong", 1);
-    m.insert("ei_seat", 1);
-    m.insert("ei_device", 2);
-    m.insert("ei_pointer", 1);
-    m.insert("ei_pointer_absolute", 1);
-    m.insert("ei_scroll", 1);
-    m.insert("ei_button", 1);
-    m.insert("ei_keyboard", 1);
-    m.insert("ei_touchscreen", 1);
-    m
-});
-
-#[derive(Clone, Default)]
-struct Devices {
-    pointer: Arc<RwLock<Option<(ei::Device, ei::Pointer)>>>,
-    scroll: Arc<RwLock<Option<(ei::Device, ei::Scroll)>>>,
-    button: Arc<RwLock<Option<(ei::Device, ei::Button)>>>,
-    keyboard: Arc<RwLock<Option<(ei::Device, ei::Keyboard)>>>,
-}
-
-pub struct LibeiEmulation<'a> {
-    context: ei::Context,
-    devices: Devices,
-    ei_task: JoinHandle<()>,
-    error: Arc<Mutex<Option<EmulationError>>>,
-    libei_error: Arc<AtomicBool>,
-    serial: AtomicU32,
-    _remote_desktop: RemoteDesktop<'a>,
-    session: Session<'a, RemoteDesktop<'a>>,
-}
-
-async fn get_ei_fd<'a>(
-) -> Result<(RemoteDesktop<'a>, Session<'a, RemoteDesktop<'a>>, OwnedFd), ashpd::Error> {
-    let remote_desktop = RemoteDesktop::new().await?;
-
-    log::debug!("creating session ...");
-    let session = remote_desktop.create_session().await?;
-
-    log::debug!("selecting devices ...");
-    remote_desktop
-        .select_devices(
-            &session,
-            DeviceType::Keyboard | DeviceType::Pointer,
-            None,
-            PersistMode::ExplicitlyRevoked,
-        )
-        .await?;
-
-    log::info!("requesting permission for input emulation");
-    let _devices = remote_desktop
-        .start(&session, &WindowIdentifier::default())
-        .await?
-        .response()?;
-
-    let fd = remote_desktop.connect_to_eis(&session).await?;
-    Ok((remote_desktop, session, fd))
-}
-
-impl<'a> LibeiEmulation<'a> {
-    pub async fn new() -> Result<Self, LibeiEmulationCreationError> {
-        let (_remote_desktop, session, eifd) = get_ei_fd().await?;
-        let stream = UnixStream::from(eifd);
-        stream.set_nonblocking(true)?;
-        let context = ei::Context::new(stream)?;
-        let mut events = EiEventStream::new(context.clone())?;
-        let handshake = ei_handshake(
-            &mut events,
-            "de.feschber.LanMouse",
-            ContextType::Sender,
-            &INTERFACES,
-        )
-        .await?;
-        let events = EiConvertEventStream::new(events, handshake.serial);
-        let devices = Devices::default();
-        let libei_error = Arc::new(AtomicBool::default());
-        let error = Arc::new(Mutex::new(None));
-        let ei_handler = ei_task(
-            events,
-            context.clone(),
-            devices.clone(),
-            libei_error.clone(),
-            error.clone(),
-        );
-        let ei_task = tokio::task::spawn_local(ei_handler);
-
-        let serial = AtomicU32::new(handshake.serial);
-
-        Ok(Self {
-            context,
-            devices,
-            ei_task,
-            error,
-            libei_error,
-            serial,
-            _remote_desktop,
-            session,
-        })
-    }
-}
-
-impl<'a> Drop for LibeiEmulation<'a> {
-    fn drop(&mut self) {
-        self.ei_task.abort();
-    }
-}
-
-#[async_trait]
-impl<'a> InputEmulation for LibeiEmulation<'a> {
-    async fn consume(
-        &mut self,
-        event: Event,
-        _handle: EmulationHandle,
-    ) -> Result<(), EmulationError> {
-        let now = SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .unwrap()
-            .as_micros() as u64;
-        if self.libei_error.load(Ordering::SeqCst) {
-            // don't break sending additional events but signal error
-            if let Some(e) = self.error.lock().unwrap().take() {
-                return Err(e);
-            }
-        }
-        match event {
-            Event::Pointer(p) => match p {
-                PointerEvent::Motion { time: _, dx, dy } => {
-                    let pointer_device = self.devices.pointer.read().unwrap();
-                    if let Some((d, p)) = pointer_device.as_ref() {
-                        p.motion_relative(dx as f32, dy as f32);
-                        d.frame(self.serial.load(Ordering::SeqCst), now);
-                    }
-                }
-                PointerEvent::Button {
-                    time: _,
-                    button,
-                    state,
-                } => {
-                    let button_device = self.devices.button.read().unwrap();
-                    if let Some((d, b)) = button_device.as_ref() {
-                        b.button(
-                            button,
-                            match state {
-                                0 => ButtonState::Released,
-                                _ => ButtonState::Press,
-                            },
-                        );
-                        d.frame(self.serial.load(Ordering::SeqCst), now);
-                    }
-                }
-                PointerEvent::Axis {
-                    time: _,
-                    axis,
-                    value,
-                } => {
-                    let scroll_device = self.devices.scroll.read().unwrap();
-                    if let Some((d, s)) = scroll_device.as_ref() {
-                        match axis {
-                            0 => s.scroll(0., value as f32),
-                            _ => s.scroll(value as f32, 0.),
-                        }
-                        d.frame(self.serial.load(Ordering::SeqCst), now);
-                    }
-                }
-                PointerEvent::AxisDiscrete120 { axis, value } => {
-                    let scroll_device = self.devices.scroll.read().unwrap();
-                    if let Some((d, s)) = scroll_device.as_ref() {
-                        match axis {
-                            0 => s.scroll_discrete(0, value),
-                            _ => s.scroll_discrete(value, 0),
-                        }
-                        d.frame(self.serial.load(Ordering::SeqCst), now);
-                    }
-                }
-                PointerEvent::Frame {} => {}
-            },
-            Event::Keyboard(k) => match k {
-                KeyboardEvent::Key {
-                    time: _,
-                    key,
-                    state,
-                } => {
-                    let keyboard_device = self.devices.keyboard.read().unwrap();
-                    if let Some((d, k)) = keyboard_device.as_ref() {
-                        k.key(
-                            key,
-                            match state {
-                                0 => KeyState::Released,
-                                _ => KeyState::Press,
-                            },
-                        );
-                        d.frame(self.serial.load(Ordering::SeqCst), now);
-                    }
-                }
-                KeyboardEvent::Modifiers { .. } => {}
-            },
-            _ => {}
-        }
-        self.context
-            .flush()
-            .map_err(|e| io::Error::new(e.kind(), e))?;
-        Ok(())
-    }
-
-    async fn create(&mut self, _: EmulationHandle) {}
-    async fn destroy(&mut self, _: EmulationHandle) {}
-
-    async fn terminate(&mut self) {
-        let _ = self.session.close().await;
-        self.ei_task.abort();
-    }
-}
-
-async fn ei_task(
-    mut events: EiConvertEventStream,
-    context: ei::Context,
-    devices: Devices,
-    libei_error: Arc<AtomicBool>,
-    error: Arc<Mutex<Option<EmulationError>>>,
-) {
-    loop {
-        match ei_event_handler(&mut events, &context, &devices).await {
-            Ok(()) => {}
-            Err(e) => {
-                libei_error.store(true, Ordering::SeqCst);
-                error.lock().unwrap().replace(e);
-                // wait for termination -> otherwise we will loop forever
-                future::pending::<()>().await;
-            }
-        }
-    }
-}
-
-async fn ei_event_handler(
-    events: &mut EiConvertEventStream,
-    context: &ei::Context,
-    devices: &Devices,
-) -> Result<(), EmulationError> {
-    loop {
-        let event = events
-            .next()
-            .await
-            .ok_or(EmulationError::EndOfStream)?
-            .map_err(ReisConvertStreamError::from)?;
-        const CAPABILITIES: &[DeviceCapability] = &[
-            DeviceCapability::Pointer,
-            DeviceCapability::PointerAbsolute,
-            DeviceCapability::Keyboard,
-            DeviceCapability::Touch,
-            DeviceCapability::Scroll,
-            DeviceCapability::Button,
-        ];
-        log::debug!("{event:?}");
-        match event {
-            EiEvent::Disconnected(e) => {
-                log::debug!("ei disconnected: {e:?}");
-                return Err(EmulationError::EndOfStream);
-            }
-            EiEvent::SeatAdded(e) => {
-                e.seat().bind_capabilities(CAPABILITIES);
-            }
-            EiEvent::SeatRemoved(e) => {
-                log::debug!("seat removed: {:?}", e.seat());
-            }
-            EiEvent::DeviceAdded(e) => {
-                let device_type = e.device().device_type();
-                log::debug!("device added: {device_type:?}");
-                e.device().device();
-                let device = e.device();
-                if let Some(pointer) = e.device().interface::<Pointer>() {
-                    devices
-                        .pointer
-                        .write()
-                        .unwrap()
-                        .replace((device.device().clone(), pointer));
-                }
-                if let Some(keyboard) = e.device().interface::<Keyboard>() {
-                    devices
-                        .keyboard
-                        .write()
-                        .unwrap()
-                        .replace((device.device().clone(), keyboard));
-                }
-                if let Some(scroll) = e.device().interface::<Scroll>() {
-                    devices
-                        .scroll
-                        .write()
-                        .unwrap()
-                        .replace((device.device().clone(), scroll));
-                }
-                if let Some(button) = e.device().interface::<Button>() {
-                    devices
-                        .button
-                        .write()
-                        .unwrap()
-                        .replace((device.device().clone(), button));
-                }
-            }
-            EiEvent::DeviceRemoved(e) => {
-                log::debug!("device removed: {:?}", e.device().device_type());
-            }
-            EiEvent::DevicePaused(e) => {
-                log::debug!("device paused: {:?}", e.device().device_type());
-            }
-            EiEvent::DeviceResumed(e) => {
-                log::debug!("device resumed: {:?}", e.device().device_type());
-                e.device().device().start_emulating(0, 0);
-            }
-            EiEvent::KeyboardModifiers(e) => {
-                log::debug!("modifiers: {e:?}");
-            }
-            // only for receiver context
-            // EiEvent::Frame(_) => { },
-            // EiEvent::DeviceStartEmulating(_) => { },
-            // EiEvent::DeviceStopEmulating(_) => { },
-            // EiEvent::PointerMotion(_) => { },
-            // EiEvent::PointerMotionAbsolute(_) => { },
-            // EiEvent::Button(_) => { },
-            // EiEvent::ScrollDelta(_) => { },
-            // EiEvent::ScrollStop(_) => { },
-            // EiEvent::ScrollCancel(_) => { },
-            // EiEvent::ScrollDiscrete(_) => { },
-            // EiEvent::KeyboardKey(_) => { },
-            // EiEvent::TouchDown(_) => { },
-            // EiEvent::TouchUp(_) => { },
-            // EiEvent::TouchMotion(_) => { },
-            _ => unreachable!("unexpected ei event"),
-        }
-        context.flush().map_err(|e| io::Error::new(e.kind(), e))?;
-    }
-}

input-event/Cargo.toml

@@ -1,21 +0,0 @@
-[package]
-name = "input-event"
-description = "cross-platform input-event types for input-capture / input-emulation"
-version = "0.2.1"
-edition = "2021"
-license = "GPL-3.0-or-later"
-repository = "https://github.com/feschber/lan-mouse"
-
-[dependencies]
-futures-core = "0.3.30"
-log = "0.4.22"
-num_enum = "0.7.2"
-serde = { version = "1.0", features = ["derive"] }
-thiserror = "1.0.61"
-
-[target.'cfg(all(unix, not(target_os="macos")))'.dependencies]
-reis = { version = "0.2.0", optional = true }
-
-[features]
-default = ["libei"]
-libei = ["dep:reis"]

input-event/src/error.rs

@@ -1,17 +0,0 @@
-use std::array::TryFromSliceError;
-
-use thiserror::Error;
-
-#[derive(Debug, Error)]
-pub enum ProtocolError {
-    #[error(transparent)]
-    MissingData(#[from] TryFromSliceError),
-    #[error("invalid event id: `{0}`")]
-    InvalidEventId(u8),
-    #[error("invalid pointer event type: `{0}`")]
-    InvalidPointerEventId(u8),
-    #[error("invalid keyboard event type: `{0}`")]
-    InvalidKeyboardEventId(u8),
-    #[error("expected data at idx `{0:?}`")]
-    Data(String),
-}

input-event/src/lib.rs

@@ -1,146 +0,0 @@
-pub use error::ProtocolError;
-use std::fmt::{self, Display};
-
-pub mod error;
-pub mod proto;
-pub mod scancode;
-
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-mod libei;
-
-// FIXME
-pub const BTN_LEFT: u32 = 0x110;
-pub const BTN_RIGHT: u32 = 0x111;
-pub const BTN_MIDDLE: u32 = 0x112;
-pub const BTN_BACK: u32 = 0x113;
-pub const BTN_FORWARD: u32 = 0x114;
-
-#[derive(Debug, PartialEq, Clone, Copy)]
-pub enum PointerEvent {
-    /// relative motion event
-    Motion { time: u32, dx: f64, dy: f64 },
-    /// mouse button event
-    Button { time: u32, button: u32, state: u32 },
-    /// axis event, scroll event for touchpads
-    Axis { time: u32, axis: u8, value: f64 },
-    /// discrete axis event, scroll event for mice - 120 = one scroll tick
-    AxisDiscrete120 { axis: u8, value: i32 },
-    /// frame event
-    Frame {},
-}
-
-#[derive(Debug, PartialEq, Clone, Copy)]
-pub enum KeyboardEvent {
-    /// a key press / release event
-    Key { time: u32, key: u32, state: u8 },
-    /// modifiers changed state
-    Modifiers {
-        mods_depressed: u32,
-        mods_latched: u32,
-        mods_locked: u32,
-        group: u32,
-    },
-}
-
-#[derive(PartialEq, Debug, Clone, Copy)]
-pub enum Event {
-    /// pointer event (motion / button / axis)
-    Pointer(PointerEvent),
-    /// keyboard events (key / modifiers)
-    Keyboard(KeyboardEvent),
-    /// enter event: request to enter a client.
-    /// The client must release the pointer if it is grabbed
-    /// and reply with a leave event, as soon as its ready to
-    /// receive events
-    Enter(),
-    /// leave event: this client is now ready to receive events and will
-    /// not send any events after until it sends an enter event
-    Leave(),
-    /// ping a client, to see if it is still alive. A client that does
-    /// not respond with a pong event will be assumed to be offline.
-    Ping(),
-    /// response to a ping event: this event signals that a client
-    /// is still alive but must otherwise be ignored
-    Pong(),
-    /// explicit disconnect request. The client will no longer
-    /// send events until the next Enter event. All of its keys should be released.
-    Disconnect(),
-}
-
-impl Display for PointerEvent {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            PointerEvent::Motion { time: _, dx, dy } => write!(f, "motion({dx},{dy})"),
-            PointerEvent::Button {
-                time: _,
-                button,
-                state,
-            } => {
-                let str = match *button {
-                    BTN_LEFT => Some("left"),
-                    BTN_RIGHT => Some("right"),
-                    BTN_MIDDLE => Some("middle"),
-                    BTN_FORWARD => Some("forward"),
-                    BTN_BACK => Some("back"),
-                    _ => None,
-                };
-                if let Some(button) = str {
-                    write!(f, "button({button}, {state})")
-                } else {
-                    write!(f, "button({button}, {state}")
-                }
-            }
-            PointerEvent::Axis {
-                time: _,
-                axis,
-                value,
-            } => write!(f, "scroll({axis}, {value})"),
-            PointerEvent::AxisDiscrete120 { axis, value } => {
-                write!(f, "scroll-120 ({axis}, {value})")
-            }
-            PointerEvent::Frame {} => write!(f, "frame()"),
-        }
-    }
-}
-
-impl Display for KeyboardEvent {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            KeyboardEvent::Key {
-                time: _,
-                key,
-                state,
-            } => {
-                let scan = scancode::Linux::try_from(*key);
-                if let Ok(scan) = scan {
-                    write!(f, "key({scan:?}, {state})")
-                } else {
-                    write!(f, "key({key}, {state})")
-                }
-            }
-            KeyboardEvent::Modifiers {
-                mods_depressed,
-                mods_latched,
-                mods_locked,
-                group,
-            } => write!(
-                f,
-                "modifiers({mods_depressed},{mods_latched},{mods_locked},{group})"
-            ),
-        }
-    }
-}
-
-impl Display for Event {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Event::Pointer(p) => write!(f, "{}", p),
-            Event::Keyboard(k) => write!(f, "{}", k),
-            Event::Enter() => write!(f, "enter"),
-            Event::Leave() => write!(f, "leave"),
-            Event::Ping() => write!(f, "ping"),
-            Event::Pong() => write!(f, "pong"),
-            Event::Disconnect() => write!(f, "disconnect"),
-        }
-    }
-}

input-event/src/libei.rs

@@ -1,146 +0,0 @@
-use reis::{
-    ei::{button::ButtonState, keyboard::KeyState},
-    event::EiEvent,
-};
-
-use crate::{Event, KeyboardEvent, PointerEvent};
-
-impl Event {
-    pub fn from_ei_event(ei_event: EiEvent) -> impl Iterator<Item = Self> {
-        to_input_events(ei_event).into_iter()
-    }
-}
-
-enum Events {
-    None,
-    One(Event),
-    Two(Event, Event),
-}
-
-impl Events {
-    fn into_iter(self) -> impl Iterator<Item = Event> {
-        EventIterator::new(self)
-    }
-}
-
-struct EventIterator {
-    events: [Option<Event>; 2],
-    pos: usize,
-}
-
-impl EventIterator {
-    fn new(events: Events) -> Self {
-        let events = match events {
-            Events::None => [None, None],
-            Events::One(e) => [Some(e), None],
-            Events::Two(e, f) => [Some(e), Some(f)],
-        };
-        Self { events, pos: 0 }
-    }
-}
-
-impl Iterator for EventIterator {
-    type Item = Event;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let res = if self.pos >= self.events.len() {
-            None
-        } else {
-            self.events[self.pos]
-        };
-        self.pos += 1;
-        res
-    }
-}
-
-fn to_input_events(ei_event: EiEvent) -> Events {
-    match ei_event {
-        EiEvent::KeyboardModifiers(mods) => {
-            let modifier_event = KeyboardEvent::Modifiers {
-                mods_depressed: mods.depressed,
-                mods_latched: mods.latched,
-                mods_locked: mods.locked,
-                group: mods.group,
-            };
-            Events::One(Event::Keyboard(modifier_event))
-        }
-        EiEvent::Frame(_) => Events::None, /* FIXME */
-        EiEvent::PointerMotion(motion) => {
-            let motion_event = PointerEvent::Motion {
-                time: motion.time as u32,
-                dx: motion.dx as f64,
-                dy: motion.dy as f64,
-            };
-            Events::One(Event::Pointer(motion_event))
-        }
-        EiEvent::PointerMotionAbsolute(_) => Events::None,
-        EiEvent::Button(button) => {
-            let button_event = PointerEvent::Button {
-                time: button.time as u32,
-                button: button.button,
-                state: match button.state {
-                    ButtonState::Released => 0,
-                    ButtonState::Press => 1,
-                },
-            };
-            Events::One(Event::Pointer(button_event))
-        }
-        EiEvent::ScrollDelta(delta) => {
-            let dy = Event::Pointer(PointerEvent::Axis {
-                time: 0,
-                axis: 0,
-                value: delta.dy as f64,
-            });
-            let dx = Event::Pointer(PointerEvent::Axis {
-                time: 0,
-                axis: 1,
-                value: delta.dx as f64,
-            });
-            if delta.dy != 0. && delta.dx != 0. {
-                Events::Two(dy, dx)
-            } else if delta.dy != 0. {
-                Events::One(dy)
-            } else if delta.dx != 0. {
-                Events::One(dx)
-            } else {
-                Events::None
-            }
-        }
-        EiEvent::ScrollStop(_) => Events::None,   /* TODO */
-        EiEvent::ScrollCancel(_) => Events::None, /* TODO */
-        EiEvent::ScrollDiscrete(scroll) => {
-            let dy = Event::Pointer(PointerEvent::AxisDiscrete120 {
-                axis: 0,
-                value: scroll.discrete_dy,
-            });
-            let dx = Event::Pointer(PointerEvent::AxisDiscrete120 {
-                axis: 1,
-                value: scroll.discrete_dx,
-            });
-            if scroll.discrete_dy != 0 && scroll.discrete_dx != 0 {
-                Events::Two(dy, dx)
-            } else if scroll.discrete_dy != 0 {
-                Events::One(dy)
-            } else if scroll.discrete_dx != 0 {
-                Events::One(dx)
-            } else {
-                Events::None
-            }
-        }
-        EiEvent::KeyboardKey(key) => {
-            let key_event = KeyboardEvent::Key {
-                key: key.key,
-                state: match key.state {
-                    KeyState::Press => 1,
-                    KeyState::Released => 0,
-                },
-                time: key.time as u32,
-            };
-            Events::One(Event::Keyboard(key_event))
-        }
-        EiEvent::TouchDown(_) => Events::None,   /* TODO */
-        EiEvent::TouchUp(_) => Events::None,     /* TODO */
-        EiEvent::TouchMotion(_) => Events::None, /* TODO */
-        _ => Events::None,
-    }
-}

input-event/src/proto.rs

@@ -1,307 +0,0 @@
-use std::{fmt::Debug, slice::SliceIndex};
-
-use crate::ProtocolError;
-
-use super::{Event, KeyboardEvent, PointerEvent};
-
-enum PointerEventType {
-    Motion,
-    Button,
-    Axis,
-    AxisDiscrete120,
-    Frame,
-}
-
-enum KeyboardEventType {
-    Key,
-    Modifiers,
-}
-
-enum EventType {
-    Pointer,
-    Keyboard,
-    Enter,
-    Leave,
-    Ping,
-    Pong,
-    Disconnect,
-}
-
-impl Event {
-    fn event_type(&self) -> EventType {
-        match self {
-            Self::Pointer(_) => EventType::Pointer,
-            Self::Keyboard(_) => EventType::Keyboard,
-            Self::Enter() => EventType::Enter,
-            Self::Leave() => EventType::Leave,
-            Self::Ping() => EventType::Ping,
-            Self::Pong() => EventType::Pong,
-            Self::Disconnect() => EventType::Disconnect,
-        }
-    }
-}
-
-impl PointerEvent {
-    fn event_type(&self) -> PointerEventType {
-        match self {
-            Self::Motion { .. } => PointerEventType::Motion,
-            Self::Button { .. } => PointerEventType::Button,
-            Self::Axis { .. } => PointerEventType::Axis,
-            Self::AxisDiscrete120 { .. } => PointerEventType::AxisDiscrete120,
-            Self::Frame { .. } => PointerEventType::Frame,
-        }
-    }
-}
-
-impl KeyboardEvent {
-    fn event_type(&self) -> KeyboardEventType {
-        match self {
-            KeyboardEvent::Key { .. } => KeyboardEventType::Key,
-            KeyboardEvent::Modifiers { .. } => KeyboardEventType::Modifiers,
-        }
-    }
-}
-
-impl TryFrom<u8> for PointerEventType {
-    type Error = ProtocolError;
-
-    fn try_from(value: u8) -> Result<Self, ProtocolError> {
-        match value {
-            x if x == Self::Motion as u8 => Ok(Self::Motion),
-            x if x == Self::Button as u8 => Ok(Self::Button),
-            x if x == Self::Axis as u8 => Ok(Self::Axis),
-            x if x == Self::AxisDiscrete120 as u8 => Ok(Self::AxisDiscrete120),
-            x if x == Self::Frame as u8 => Ok(Self::Frame),
-            _ => Err(ProtocolError::InvalidPointerEventId(value)),
-        }
-    }
-}
-
-impl TryFrom<u8> for KeyboardEventType {
-    type Error = ProtocolError;
-
-    fn try_from(value: u8) -> Result<Self, ProtocolError> {
-        match value {
-            x if x == Self::Key as u8 => Ok(Self::Key),
-            x if x == Self::Modifiers as u8 => Ok(Self::Modifiers),
-            _ => Err(ProtocolError::InvalidKeyboardEventId(value)),
-        }
-    }
-}
-
-impl From<&Event> for Vec<u8> {
-    fn from(event: &Event) -> Self {
-        let event_id = vec![event.event_type() as u8];
-        let event_data = match event {
-            Event::Pointer(p) => p.into(),
-            Event::Keyboard(k) => k.into(),
-            Event::Enter() => vec![],
-            Event::Leave() => vec![],
-            Event::Ping() => vec![],
-            Event::Pong() => vec![],
-            Event::Disconnect() => vec![],
-        };
-        [event_id, event_data].concat()
-    }
-}
-
-impl TryFrom<Vec<u8>> for Event {
-    type Error = ProtocolError;
-
-    fn try_from(value: Vec<u8>) -> Result<Self, ProtocolError> {
-        let event_id = u8::from_be_bytes(value[..1].try_into()?);
-        match event_id {
-            i if i == (EventType::Pointer as u8) => Ok(Event::Pointer(value.try_into()?)),
-            i if i == (EventType::Keyboard as u8) => Ok(Event::Keyboard(value.try_into()?)),
-            i if i == (EventType::Enter as u8) => Ok(Event::Enter()),
-            i if i == (EventType::Leave as u8) => Ok(Event::Leave()),
-            i if i == (EventType::Ping as u8) => Ok(Event::Ping()),
-            i if i == (EventType::Pong as u8) => Ok(Event::Pong()),
-            i if i == (EventType::Disconnect as u8) => Ok(Event::Disconnect()),
-            _ => Err(ProtocolError::InvalidEventId(event_id)),
-        }
-    }
-}
-
-impl From<&PointerEvent> for Vec<u8> {
-    fn from(event: &PointerEvent) -> Self {
-        let id = vec![event.event_type() as u8];
-        let data = match event {
-            PointerEvent::Motion { time, dx, dy } => {
-                let time = time.to_be_bytes();
-                let dx = dx.to_be_bytes();
-                let dy = dy.to_be_bytes();
-                [&time[..], &dx[..], &dy[..]].concat()
-            }
-            PointerEvent::Button {
-                time,
-                button,
-                state,
-            } => {
-                let time = time.to_be_bytes();
-                let button = button.to_be_bytes();
-                let state = state.to_be_bytes();
-                [&time[..], &button[..], &state[..]].concat()
-            }
-            PointerEvent::Axis { time, axis, value } => {
-                let time = time.to_be_bytes();
-                let axis = axis.to_be_bytes();
-                let value = value.to_be_bytes();
-                [&time[..], &axis[..], &value[..]].concat()
-            }
-            PointerEvent::AxisDiscrete120 { axis, value } => {
-                let axis = axis.to_be_bytes();
-                let value = value.to_be_bytes();
-                [&axis[..], &value[..]].concat()
-            }
-            PointerEvent::Frame {} => {
-                vec![]
-            }
-        };
-        [id, data].concat()
-    }
-}
-
-fn decode_u8<I>(data: &[u8], idx: I) -> Result<u8, ProtocolError>
-where
-    I: SliceIndex<[u8], Output = [u8]> + Debug + Clone,
-{
-    let data = data
-        .get(idx.clone())
-        .ok_or(ProtocolError::Data(format!("{:?}", idx)))?;
-    Ok(u8::from_be_bytes(data.try_into()?))
-}
-
-fn decode_u32<I>(data: &[u8], idx: I) -> Result<u32, ProtocolError>
-where
-    I: SliceIndex<[u8], Output = [u8]> + Debug + Clone,
-{
-    let data = data
-        .get(idx.clone())
-        .ok_or(ProtocolError::Data(format!("{:?}", idx)))?;
-    Ok(u32::from_be_bytes(data.try_into()?))
-}
-
-fn decode_i32<I>(data: &[u8], idx: I) -> Result<i32, ProtocolError>
-where
-    I: SliceIndex<[u8], Output = [u8]> + Debug + Clone,
-{
-    let data = data
-        .get(idx.clone())
-        .ok_or(ProtocolError::Data(format!("{:?}", idx)))?;
-    Ok(i32::from_be_bytes(data.try_into()?))
-}
-fn decode_f64<I>(data: &[u8], idx: I) -> Result<f64, ProtocolError>
-where
-    I: SliceIndex<[u8], Output = [u8]> + Debug + Clone,
-{
-    let data = data
-        .get(idx.clone())
-        .ok_or(ProtocolError::Data(format!("{:?}", idx)))?;
-    Ok(f64::from_be_bytes(data.try_into()?))
-}
-
-impl TryFrom<Vec<u8>> for PointerEvent {
-    type Error = ProtocolError;
-
-    fn try_from(data: Vec<u8>) -> Result<Self, ProtocolError> {
-        match data.get(1) {
-            Some(id) => match id.to_owned().try_into()? {
-                PointerEventType::Motion => {
-                    let time = decode_u32(&data, 2..6)?;
-                    let dx = decode_f64(&data, 6..14)?;
-                    let dy = decode_f64(&data, 14..22)?;
-
-                    Ok(Self::Motion { time, dx, dy })
-                }
-                PointerEventType::Button => {
-                    let time = decode_u32(&data, 2..6)?;
-                    let button = decode_u32(&data, 6..10)?;
-                    let state = decode_u32(&data, 10..14)?;
-
-                    Ok(Self::Button {
-                        time,
-                        button,
-                        state,
-                    })
-                }
-                PointerEventType::Axis => {
-                    let time = decode_u32(&data, 2..6)?;
-                    let axis = decode_u8(&data, 6..7)?;
-                    let value = decode_f64(&data, 7..15)?;
-                    Ok(Self::Axis { time, axis, value })
-                }
-                PointerEventType::AxisDiscrete120 => {
-                    let axis = decode_u8(&data, 2..3)?;
-                    let value = decode_i32(&data, 3..7)?;
-                    Ok(Self::AxisDiscrete120 { axis, value })
-                }
-                PointerEventType::Frame => Ok(Self::Frame {}),
-            },
-            None => Err(ProtocolError::Data("0".to_string())),
-        }
-    }
-}
-
-impl From<&KeyboardEvent> for Vec<u8> {
-    fn from(event: &KeyboardEvent) -> Self {
-        let id = vec![event.event_type() as u8];
-        let data = match event {
-            KeyboardEvent::Key { time, key, state } => {
-                let time = time.to_be_bytes();
-                let key = key.to_be_bytes();
-                let state = state.to_be_bytes();
-                [&time[..], &key[..], &state[..]].concat()
-            }
-            KeyboardEvent::Modifiers {
-                mods_depressed,
-                mods_latched,
-                mods_locked,
-                group,
-            } => {
-                let mods_depressed = mods_depressed.to_be_bytes();
-                let mods_latched = mods_latched.to_be_bytes();
-                let mods_locked = mods_locked.to_be_bytes();
-                let group = group.to_be_bytes();
-                [
-                    &mods_depressed[..],
-                    &mods_latched[..],
-                    &mods_locked[..],
-                    &group[..],
-                ]
-                .concat()
-            }
-        };
-        [id, data].concat()
-    }
-}
-
-impl TryFrom<Vec<u8>> for KeyboardEvent {
-    type Error = ProtocolError;
-
-    fn try_from(data: Vec<u8>) -> Result<Self, ProtocolError> {
-        match data.get(1) {
-            Some(id) => match id.to_owned().try_into()? {
-                KeyboardEventType::Key => {
-                    let time = decode_u32(&data, 2..6)?;
-                    let key = decode_u32(&data, 6..10)?;
-                    let state = decode_u8(&data, 10..11)?;
-                    Ok(KeyboardEvent::Key { time, key, state })
-                }
-                KeyboardEventType::Modifiers => {
-                    let mods_depressed = decode_u32(&data, 2..6)?;
-                    let mods_latched = decode_u32(&data, 6..10)?;
-                    let mods_locked = decode_u32(&data, 10..14)?;
-                    let group = decode_u32(&data, 14..18)?;
-                    Ok(KeyboardEvent::Modifiers {
-                        mods_depressed,
-                        mods_latched,
-                        mods_locked,
-                        group,
-                    })
-                }
-            },
-            None => Err(ProtocolError::Data("0".to_string())),
-        }
-    }
-}

nix/default.nix

@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage {
   nativeBuildInputs = with pkgs; [
     pkg-config
     cmake
-    makeWrapper
     buildPackages.gtk4
   ];
 
@@ -37,12 +36,6 @@ rustPlatform.buildRustPackage {
   # Set Environment Variables
   RUST_BACKTRACE = "full";
 
-  # Needed to enable support for SVG icons in GTK
-  postInstall = ''
-    wrapProgram "$out/bin/lan-mouse" \
-      --set GDK_PIXBUF_MODULE_FILE ${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
-  '';
-
   meta = with lib; {
     description = "Lan Mouse is a mouse and keyboard sharing software";
     longDescription = ''

resources/client_row.ui

@@ -44,7 +44,6 @@
 				<child>
 					<object class="GtkEntry" id="port">
 						<!-- <property name="title" translatable="yes">port</property> -->
-                        <property name="max-width-chars">5</property>
 						<property name="input_purpose">GTK_INPUT_PURPOSE_NUMBER</property>
 						<property name="xalign">0.5</property>
 						<property name="valign">center</property>

resources/window.ui

@@ -1,227 +1,167 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk" version="4.0"/>
-  <requires lib="libadwaita" version="1.0"/>
-  <menu id="main-menu">
-    <item>
-      <attribute name="label" translatable="yes">_Close window</attribute>
-      <attribute name="action">window.close</attribute>
-    </item>
-  </menu>
-  <template class="LanMouseWindow" parent="AdwApplicationWindow">
-    <property name="width-request">600</property>
-    <property name="height-request">700</property>
-    <property name="title" translatable="yes">Lan Mouse</property>
-    <property name="show-menubar">True</property>
-    <property name="content">
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <child type="top">
-          <object class="AdwHeaderBar">
-            <child type ="end">
-              <object class="GtkMenuButton">
-                <property name="icon-name">open-menu-symbolic</property>
-                <property name="menu-model">main-menu</property>
-              </object>
-            </child>
-            <style>
-              <class name="flat"/>
-            </style>
-          </object>
-        </child>
-        <child>
-          <object class="AdwToastOverlay" id="toast_overlay">
-            <child>
-              <object class="AdwStatusPage">
-                <property name="title" translatable="yes">Lan Mouse</property>
-                <property name="description" translatable="yes">easily use your mouse and keyboard on multiple computers</property>
-                <property name="icon-name">de.feschber.LanMouse</property>
-                <property name="child">
-                  <object class="AdwClamp">
-                  <property name="maximum-size">600</property>
-                  <property name="tightening-threshold">0</property>
-                  <property name="child">
-                    <object class="GtkBox">
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">12</property>
-                    <child>
-                      <object class="AdwPreferencesGroup" id="capture_emulation_group">
-                      <property name="title" translatable="yes">Capture / Emulation Status</property>
-                        <child>
-                          <object class="AdwActionRow" id="capture_status_row">
-                            <property name="title">input capture is disabled</property>
-                            <property name="subtitle">required for outgoing and incoming connections</property>
-                            <property name="icon-name">dialog-warning-symbolic</property>
-                            <child>
-                              <object class="GtkButton" id="input_capture_button">
-                                <property name="child">
-                                  <object class="AdwButtonContent">
-                                    <property name="icon-name">object-rotate-right-symbolic</property>
-                                    <property name="label" translatable="yes">Reenable</property>
-                                  </object>
-                                </property>
-                                <signal name="clicked" handler="handle_capture" swapped="true"/>
-                                <property name="valign">center</property>
-                                <style>
-                                  <class name="circular"/>
-                                  <class name="flat"/>
-                                </style>
-                              </object>
-                            </child>
-                            <style>
-                              <class name="warning"/>
-                            </style>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="AdwActionRow" id="emulation_status_row">
-                            <property name="title">input emulation is disabled</property>
-                            <property name="subtitle">required for incoming connections</property>
-                            <property name="icon-name">dialog-warning-symbolic</property>
-                            <child>
-                              <object class="GtkButton" id="input_emulation_button">
-                                <property name="child">
-                                  <object class="AdwButtonContent">
-                                    <property name="icon-name">object-rotate-right-symbolic</property>
-                                    <property name="label" translatable="yes">Reenable</property>
-                                  </object>
-                                </property>
-                                <property name="valign">center</property>
-                                <signal name="clicked" handler="handle_emulation" swapped="true"/>
-                                <style>
-                                  <class name="circular"/>
-                                  <class name="flat"/>
-                                </style>
-                              </object>
-                            </child>
-                            <child>
-                            </child>
-                            <style>
-                              <class name="warning"/>
-                            </style>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="AdwPreferencesGroup">
-                        <property name="title" translatable="yes">General</property>
-                        <!--
-                        <child>
-                          <object class="AdwActionRow">
-                            <property name="title" translatable="yes">enable</property>
-                            <child type="suffix">
-                              <object class="GtkSwitch">
-                                <property name="valign">center</property>
-                                <property name="tooltip-text" translatable="yes">enable</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        -->
-                        <child>
-                          <object class="AdwActionRow">
-                            <property name="title">port</property>
-                            <child>
-                              <object class="GtkEntry" id="port_entry">
-                                <property name="max-width-chars">5</property>
-                                <signal name="activate" handler="handle_port_edit_apply" swapped="true"/>
-                                <signal name="changed" handler="handle_port_changed" swapped="true"/>
-                                <!-- <signal name="delete-text" handler="handle_port_changed" swapped="true"/> -->
-                                <!-- <property name="title" translatable="yes">port</property> -->
-                                <property name="placeholder-text">4242</property>
-                                <property name="width-chars">5</property>
-                                <property name="xalign">0.5</property>
-                                <property name="valign">center</property>
-                                <!-- <property name="show-apply-button">True</property> -->
-                                <property name="input-purpose">GTK_INPUT_PURPOSE_DIGITS</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="port_edit_apply">
-                                <signal name="clicked" handler="handle_port_edit_apply" swapped="true"/>
-                                <property name="icon-name">object-select-symbolic</property>
-                                <property name="valign">center</property>
-                                <property name="visible">false</property>
-                                <property name="name">port-edit-apply</property>
-                                <style><class name="success"/></style>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="port_edit_cancel">
-                                <signal name="clicked" handler="handle_port_edit_cancel" swapped="true"/>
-                                <property name="icon-name">process-stop-symbolic</property>
-                                <property name="valign">center</property>
-                                <property name="visible">false</property>
-                                <property name="name">port-edit-cancel</property>
-                                <style><class name="error"/></style>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="AdwActionRow">
-                            <property name="title">hostname</property>
-                            <child>
-                              <object class="GtkLabel" id="hostname_label">
-                                <property name="label">&lt;span font_style=&quot;italic&quot; font_weight=&quot;light&quot; foreground=&quot;darkgrey&quot;&gt;could not determine hostname&lt;/span&gt;</property>
-                                <property name="use-markup">true</property>
-                                <property name="valign">center</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="copy-hostname-button">
-                                <property name="icon-name">edit-copy-symbolic</property>
-                                <property name="valign">center</property>
-                                <signal name="clicked" handler="handle_copy_hostname" swapped="true"/>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="AdwPreferencesGroup">
-                        <property name="title" translatable="yes">Connections</property>
-                        <property name="header-suffix">
-                          <object class="GtkButton">
-                            <signal name="clicked" handler="handle_add_client_pressed" swapped="true"/>
-                            <property name="child">
-                              <object class="AdwButtonContent">
-                                <property name="icon-name">list-add-symbolic</property>
-                                <property name="label" translatable="yes">Add</property>
-                              </object>
-                            </property>
-                          <style>
-                            <class name="flat"/>
-                          </style>
-                          </object>
-                        </property>
-                        <child>
-                          <object class="GtkListBox" id="client_list">
-                            <property name="selection-mode">none</property>
-                            <child type="placeholder">
-                              <object class="AdwActionRow" id="client_placeholder">
-                                <property name="title">No connections!</property>
-                                <property name="subtitle">add a new client via the + button</property>
-                              </object>
-                            </child>
-                            <style>
-                              <class name="boxed-list" />
-                            </style>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    </object>
-                  </property>
-                  </object>
-                </property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </property>
-  </template>
+	<requires lib="gtk" version="4.0"/>
+	<requires lib="libadwaita" version="1.0"/>
+	<menu id="main-menu">
+		<item>
+			<attribute name="label" translatable="yes">_Close window</attribute>
+			<attribute name="action">window.close</attribute>
+		</item>
+	</menu>
+	<template class="LanMouseWindow" parent="AdwApplicationWindow">
+		<property name="width-request">600</property>
+		<property name="height-request">700</property>
+		<property name="title" translatable="yes">Lan Mouse</property>
+		<property name="show-menubar">True</property>
+		<property name="content">
+			<object class="GtkBox">
+				<property name="orientation">vertical</property>
+				<child type="top">
+					<object class="AdwHeaderBar">
+						<child type ="end">
+							<object class="GtkMenuButton">
+								<property name="icon-name">open-menu-symbolic</property>
+								<property name="menu-model">main-menu</property>
+							</object>
+						</child>
+						<style>
+							<class name="flat"/>
+						</style>
+					</object>
+				</child>
+				<child>
+					<object class="AdwToastOverlay" id="toast_overlay">
+						<child>
+							<object class="AdwStatusPage">
+								<property name="title" translatable="yes">Lan Mouse</property>
+								<property name="description" translatable="yes">easily use your mouse and keyboard on multiple computers</property>
+								<property name="icon-name">de.feschber.LanMouse</property>
+								<property name="child">
+								  <object class="AdwClamp">
+									<property name="maximum-size">600</property>
+									<property name="tightening-threshold">0</property>
+									<property name="child">
+									  <object class="GtkBox">
+										<property name="orientation">vertical</property>
+										<property name="spacing">12</property>
+										<child>
+											<object class="AdwPreferencesGroup">
+												<property name="title" translatable="yes">General</property>
+												<!--
+												<child>
+													<object class="AdwActionRow">
+														<property name="title" translatable="yes">enable</property>
+														<child type="suffix">
+															<object class="GtkSwitch">
+																<property name="valign">center</property>
+																<property name="tooltip-text" translatable="yes">enable</property>
+															</object>
+														</child>
+													</object>
+												</child>
+												-->
+												<child>
+													<object class="AdwActionRow">
+														<property name="title">port</property>
+														<child>
+															<object class="GtkEntry" id="port_entry">
+																<signal name="activate" handler="handle_port_edit_apply" swapped="true"/>
+																<signal name="changed" handler="handle_port_changed" swapped="true"/>
+																<!-- <signal name="delete-text" handler="handle_port_changed" swapped="true"/> -->
+																<!-- <property name="title" translatable="yes">port</property> -->
+																<property name="placeholder-text">4242</property>
+																<property name="width-chars">5</property>
+																<property name="xalign">0.5</property>
+																<property name="valign">center</property>
+																<!-- <property name="show-apply-button">True</property> -->
+																<property name="input-purpose">GTK_INPUT_PURPOSE_DIGITS</property>
+															</object>
+														</child>
+														<child>
+															<object class="GtkButton" id="port_edit_apply">
+																<signal name="clicked" handler="handle_port_edit_apply" swapped="true"/>
+																<property name="icon-name">object-select-symbolic</property>
+																<property name="valign">center</property>
+																<property name="visible">false</property>
+																<property name="name">port-edit-apply</property>
+																<style><class name="success"/></style>
+															</object>
+														</child>
+														<child>
+															<object class="GtkButton" id="port_edit_cancel">
+																<signal name="clicked" handler="handle_port_edit_cancel" swapped="true"/>
+																<property name="icon-name">process-stop-symbolic</property>
+																<property name="valign">center</property>
+																<property name="visible">false</property>
+																<property name="name">port-edit-cancel</property>
+																<style><class name="error"/></style>
+															</object>
+														</child>
+													</object>
+												</child>
+												<child>
+													<object class="AdwActionRow">
+														<property name="title">hostname</property>
+														<child>
+															<object class="GtkLabel" id="hostname_label">
+																<property name="label">&lt;span font_style=&quot;italic&quot; font_weight=&quot;light&quot; foreground=&quot;darkgrey&quot;&gt;could not determine hostname&lt;/span&gt;</property>
+																<property name="use-markup">true</property>
+																<property name="valign">center</property>
+															</object>
+														</child>
+														<child>
+															<object class="GtkButton" id="copy-hostname-button">
+																<property name="icon-name">edit-copy-symbolic</property>
+																<property name="valign">center</property>
+																<signal name="clicked" handler="handle_copy_hostname" swapped="true"/>
+															</object>
+														</child>
+													</object>
+												</child>
+											</object>
+										</child>
+										<child>
+											<object class="AdwPreferencesGroup">
+												<property name="title" translatable="yes">Connections</property>
+												<property name="header-suffix">
+													<object class="GtkButton">
+														<signal name="clicked" handler="handle_add_client_pressed" swapped="true"/>
+														<property name="child">
+															<object class="AdwButtonContent">
+																<property name="icon-name">list-add-symbolic</property>
+																<property name="label" translatable="yes">Add</property>
+															</object>
+														</property>
+													<style>
+														<class name="flat"/>
+													</style>
+													</object>
+												</property>
+												<child>
+												  <object class="GtkListBox" id="client_list">
+														<property name="selection-mode">none</property>
+														<child type="placeholder">
+															<object class="AdwActionRow" id="client_placeholder">
+																<property name="title">No connections!</property>
+																<property name="subtitle">add a new client via the + button</property>
+															</object>
+														</child>
+														<style>
+															<class name="boxed-list" />
+														</style>
+												  </object>
+												</child>
+											</object>
+										</child>
+									  </object>
+									</property>
+								  </object>
+							  </property>
+							</object>
+						</child>
+					</object>
+				</child>
+			</object>
+		</property>
+	</template>
 </interface>

src/capture.rs

@@ -0,0 +1,78 @@
+use std::io;
+
+use futures_core::Stream;
+
+use crate::{
+    client::{ClientEvent, ClientHandle},
+    event::Event,
+};
+
+#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
+pub mod libei;
+
+#[cfg(target_os = "macos")]
+pub mod macos;
+
+#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
+pub mod wayland;
+
+#[cfg(windows)]
+pub mod windows;
+
+#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
+pub mod x11;
+
+/// fallback input capture (does not produce events)
+pub mod dummy;
+
+pub async fn create() -> Box<dyn InputCapture<Item = io::Result<(ClientHandle, Event)>>> {
+    #[cfg(target_os = "macos")]
+    match macos::MacOSInputCapture::new() {
+        Ok(p) => return Box::new(p),
+        Err(e) => log::info!("macos input capture not available: {e}"),
+    }
+
+    #[cfg(windows)]
+    match windows::WindowsInputCapture::new() {
+        Ok(p) => return Box::new(p),
+        Err(e) => log::info!("windows input capture not available: {e}"),
+    }
+
+    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
+    match libei::LibeiInputCapture::new().await {
+        Ok(p) => {
+            log::info!("using libei input capture");
+            return Box::new(p);
+        }
+        Err(e) => log::info!("libei input capture not available: {e}"),
+    }
+
+    #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
+    match wayland::WaylandInputCapture::new() {
+        Ok(p) => {
+            log::info!("using layer-shell input capture");
+            return Box::new(p);
+        }
+        Err(e) => log::info!("layer_shell input capture not available: {e}"),
+    }
+
+    #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
+    match x11::X11InputCapture::new() {
+        Ok(p) => {
+            log::info!("using x11 input capture");
+            return Box::new(p);
+        }
+        Err(e) => log::info!("x11 input capture not available: {e}"),
+    }
+
+    log::error!("falling back to dummy input capture");
+    Box::new(dummy::DummyInputCapture::new())
+}
+
+pub trait InputCapture: Stream<Item = io::Result<(ClientHandle, Event)>> + Unpin {
+    /// notify input capture of configuration changes
+    fn notify(&mut self, event: ClientEvent) -> io::Result<()>;
+
+    /// release mouse
+    fn release(&mut self) -> io::Result<()>;
+}

src/capture/dummy.rs

@@ -0,0 +1,42 @@
+use std::io;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+use futures_core::Stream;
+
+use crate::capture::InputCapture;
+use crate::event::Event;
+
+use crate::client::{ClientEvent, ClientHandle};
+
+pub struct DummyInputCapture {}
+
+impl DummyInputCapture {
+    pub fn new() -> Self {
+        Self {}
+    }
+}
+
+impl Default for DummyInputCapture {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl InputCapture for DummyInputCapture {
+    fn notify(&mut self, _event: ClientEvent) -> io::Result<()> {
+        Ok(())
+    }
+
+    fn release(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+impl Stream for DummyInputCapture {
+    type Item = io::Result<(ClientHandle, Event)>;
+
+    fn poll_next(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        Poll::Pending
+    }
+}

src/capture/libei.rs

@@ -0,0 +1,577 @@
+use anyhow::{anyhow, Result};
+use ashpd::{
+    desktop::{
+        input_capture::{Activated, Barrier, BarrierID, Capabilities, InputCapture, Region, Zones},
+        ResponseError, Session,
+    },
+    enumflags2::BitFlags,
+};
+use futures::StreamExt;
+use reis::{
+    ei::{self, keyboard::KeyState},
+    eis::button::ButtonState,
+    event::{DeviceCapability, EiEvent},
+    tokio::{EiConvertEventStream, EiEventStream},
+};
+use std::{
+    cell::Cell,
+    collections::HashMap,
+    io,
+    os::unix::net::UnixStream,
+    pin::Pin,
+    rc::Rc,
+    task::{ready, Context, Poll},
+};
+use tokio::{
+    sync::mpsc::{Receiver, Sender},
+    task::JoinHandle,
+};
+
+use futures_core::Stream;
+use once_cell::sync::Lazy;
+
+use crate::{
+    capture::InputCapture as LanMouseInputCapture,
+    client::{ClientEvent, ClientHandle, Position},
+    event::{Event, KeyboardEvent, PointerEvent},
+};
+
+#[derive(Debug)]
+enum ProducerEvent {
+    Release,
+    ClientEvent(ClientEvent),
+}
+
+#[allow(dead_code)]
+pub struct LibeiInputCapture<'a> {
+    input_capture: Pin<Box<InputCapture<'a>>>,
+    libei_task: JoinHandle<Result<()>>,
+    event_rx: tokio::sync::mpsc::Receiver<(ClientHandle, Event)>,
+    notify_tx: tokio::sync::mpsc::Sender<ProducerEvent>,
+}
+
+static INTERFACES: Lazy<HashMap<&'static str, u32>> = Lazy::new(|| {
+    let mut m = HashMap::new();
+    m.insert("ei_connection", 1);
+    m.insert("ei_callback", 1);
+    m.insert("ei_pingpong", 1);
+    m.insert("ei_seat", 1);
+    m.insert("ei_device", 2);
+    m.insert("ei_pointer", 1);
+    m.insert("ei_pointer_absolute", 1);
+    m.insert("ei_scroll", 1);
+    m.insert("ei_button", 1);
+    m.insert("ei_keyboard", 1);
+    m.insert("ei_touchscreen", 1);
+    m
+});
+
+fn pos_to_barrier(r: &Region, pos: Position) -> (i32, i32, i32, i32) {
+    let (x, y) = (r.x_offset(), r.y_offset());
+    let (width, height) = (r.width() as i32, r.height() as i32);
+    match pos {
+        Position::Left => (x, y, x, y + height - 1), // start pos, end pos, inclusive
+        Position::Right => (x + width, y, x + width, y + height - 1),
+        Position::Top => (x, y, x + width - 1, y),
+        Position::Bottom => (x, y + height, x + width - 1, y + height),
+    }
+}
+
+fn select_barriers(
+    zones: &Zones,
+    clients: &Vec<(ClientHandle, Position)>,
+    next_barrier_id: &mut u32,
+) -> (Vec<Barrier>, HashMap<BarrierID, ClientHandle>) {
+    let mut client_for_barrier = HashMap::new();
+    let mut barriers: Vec<Barrier> = vec![];
+
+    for (handle, pos) in clients {
+        let mut client_barriers = zones
+            .regions()
+            .iter()
+            .map(|r| {
+                let id = *next_barrier_id;
+                *next_barrier_id = id + 1;
+                let position = pos_to_barrier(r, *pos);
+                client_for_barrier.insert(id, *handle);
+                Barrier::new(id, position)
+            })
+            .collect();
+        barriers.append(&mut client_barriers);
+    }
+    (barriers, client_for_barrier)
+}
+
+async fn update_barriers(
+    input_capture: &InputCapture<'_>,
+    session: &Session<'_>,
+    active_clients: &Vec<(ClientHandle, Position)>,
+    next_barrier_id: &mut u32,
+) -> Result<HashMap<BarrierID, ClientHandle>> {
+    let zones = input_capture.zones(session).await?.response()?;
+    log::debug!("zones: {zones:?}");
+
+    let (barriers, id_map) = select_barriers(&zones, active_clients, next_barrier_id);
+    log::debug!("barriers: {barriers:?}");
+    log::debug!("client for barrier id: {id_map:?}");
+
+    let response = input_capture
+        .set_pointer_barriers(session, &barriers, zones.zone_set())
+        .await?;
+    let response = response.response()?;
+    log::debug!("{response:?}");
+    Ok(id_map)
+}
+
+impl<'a> Drop for LibeiInputCapture<'a> {
+    fn drop(&mut self) {
+        self.libei_task.abort();
+    }
+}
+
+async fn create_session<'a>(
+    input_capture: &'a InputCapture<'a>,
+) -> Result<(Session<'a>, BitFlags<Capabilities>)> {
+    log::debug!("creating input capture session");
+    let (session, capabilities) = loop {
+        match input_capture
+            .create_session(
+                &ashpd::WindowIdentifier::default(),
+                Capabilities::Keyboard | Capabilities::Pointer | Capabilities::Touchscreen,
+            )
+            .await
+        {
+            Ok(s) => break s,
+            Err(ashpd::Error::Response(ResponseError::Cancelled)) => continue,
+            o => o?,
+        };
+    };
+    log::debug!("capabilities: {capabilities:?}");
+    Ok((session, capabilities))
+}
+
+async fn connect_to_eis(
+    input_capture: &InputCapture<'_>,
+    session: &Session<'_>,
+) -> Result<(ei::Context, EiConvertEventStream)> {
+    log::debug!("connect_to_eis");
+    let fd = input_capture.connect_to_eis(session).await?;
+
+    // create unix stream from fd
+    let stream = UnixStream::from(fd);
+    stream.set_nonblocking(true)?;
+
+    // create ei context
+    let context = ei::Context::new(stream)?;
+    let mut event_stream = EiEventStream::new(context.clone())?;
+    let response = match reis::tokio::ei_handshake(
+        &mut event_stream,
+        "de.feschber.LanMouse",
+        ei::handshake::ContextType::Receiver,
+        &INTERFACES,
+    )
+    .await
+    {
+        Ok(res) => res,
+        Err(e) => return Err(anyhow!("ei handshake failed: {e:?}")),
+    };
+    let event_stream = EiConvertEventStream::new(event_stream, response.serial);
+
+    Ok((context, event_stream))
+}
+
+async fn libei_event_handler(
+    mut ei_event_stream: EiConvertEventStream,
+    context: ei::Context,
+    event_tx: Sender<(ClientHandle, Event)>,
+    current_client: Rc<Cell<Option<ClientHandle>>>,
+) -> Result<()> {
+    loop {
+        let ei_event = match ei_event_stream.next().await {
+            Some(Ok(event)) => event,
+            Some(Err(e)) => return Err(anyhow!("libei connection closed: {e:?}")),
+            None => return Err(anyhow!("libei connection closed")),
+        };
+        log::trace!("from ei: {ei_event:?}");
+        let client = current_client.get();
+        handle_ei_event(ei_event, client, &context, &event_tx).await;
+    }
+}
+
+async fn wait_for_active_client(
+    notify_rx: &mut Receiver<ProducerEvent>,
+    active_clients: &mut Vec<(ClientHandle, Position)>,
+) -> Result<()> {
+    // wait for a client update
+    while let Some(producer_event) = notify_rx.recv().await {
+        if let ProducerEvent::ClientEvent(c) = producer_event {
+            handle_producer_event(ProducerEvent::ClientEvent(c), active_clients)?;
+            break;
+        }
+    }
+    Ok(())
+}
+
+impl<'a> LibeiInputCapture<'a> {
+    pub async fn new() -> Result<Self> {
+        let input_capture = Box::pin(InputCapture::new().await?);
+        let input_capture_ptr = input_capture.as_ref().get_ref() as *const InputCapture<'static>;
+        let mut first_session = Some(create_session(unsafe { &*input_capture_ptr }).await?);
+
+        let (event_tx, event_rx) = tokio::sync::mpsc::channel(32);
+        let (notify_tx, mut notify_rx) = tokio::sync::mpsc::channel(32);
+        let libei_task = tokio::task::spawn_local(async move {
+            /* safety: libei_task does not outlive Self */
+            let input_capture = unsafe { &*input_capture_ptr };
+
+            let mut active_clients: Vec<(ClientHandle, Position)> = vec![];
+            let mut next_barrier_id = 1u32;
+
+            /* there is a bug in xdg-remote-desktop-portal-gnome / mutter that
+             * prevents receiving further events after a session has been disabled once.
+             * Therefore the session needs to recreated when the barriers are updated */
+
+            loop {
+                // otherwise it asks to capture input even with no active clients
+                if active_clients.is_empty() {
+                    wait_for_active_client(&mut notify_rx, &mut active_clients).await?;
+                    continue;
+                }
+
+                let current_client = Rc::new(Cell::new(None));
+
+                // create session
+                let (session, _) = match first_session.take() {
+                    Some(s) => s,
+                    _ => create_session(input_capture).await?,
+                };
+
+                // connect to eis server
+                let (context, ei_event_stream) = connect_to_eis(input_capture, &session).await?;
+
+                // async event task
+                let mut ei_task: JoinHandle<Result<(), anyhow::Error>> =
+                    tokio::task::spawn_local(libei_event_handler(
+                        ei_event_stream,
+                        context,
+                        event_tx.clone(),
+                        current_client.clone(),
+                    ));
+
+                let mut activated = input_capture.receive_activated().await?;
+                let mut zones_changed = input_capture.receive_zones_changed().await?;
+
+                // set barriers
+                let client_for_barrier_id = update_barriers(
+                    input_capture,
+                    &session,
+                    &active_clients,
+                    &mut next_barrier_id,
+                )
+                .await?;
+
+                log::debug!("enabling session");
+                input_capture.enable(&session).await?;
+
+                loop {
+                    tokio::select! {
+                        activated = activated.next() => {
+                            let activated = activated.ok_or(anyhow!("error receiving activation token"))?;
+                            log::debug!("activated: {activated:?}");
+
+                            let client = *client_for_barrier_id
+                                .get(&activated.barrier_id())
+                                .expect("invalid barrier id");
+                            current_client.replace(Some(client));
+
+                            event_tx.send((client, Event::Enter())).await?;
+
+                            tokio::select! {
+                                producer_event = notify_rx.recv() => {
+                                    let producer_event = producer_event.expect("channel closed");
+                                    if handle_producer_event(producer_event, &mut active_clients)? {
+                                        break; /* clients updated */
+                                    }
+                                }
+                                zones_changed = zones_changed.next() => {
+                                    log::debug!("zones changed: {zones_changed:?}");
+                                    break;
+                                }
+                                res = &mut ei_task => {
+                                    if let Err(e) = res.expect("ei task paniced") {
+                                        log::warn!("libei task exited: {e}");
+                                    }
+                                    break;
+                                }
+                            }
+                            release_capture(
+                                input_capture,
+                                &session,
+                                activated,
+                                client,
+                                &active_clients,
+                            ).await?;
+                        }
+                        producer_event = notify_rx.recv() => {
+                            let producer_event = producer_event.expect("channel closed");
+                            if handle_producer_event(producer_event, &mut active_clients)? {
+                                /* clients updated */
+                                break;
+                            }
+                        },
+                        res = &mut ei_task => {
+                            if let Err(e) = res.expect("ei task paniced") {
+                                log::warn!("libei task exited: {e}");
+                            }
+                            break;
+                        }
+                    }
+                }
+                ei_task.abort();
+                input_capture.disable(&session).await?;
+            }
+        });
+
+        let producer = Self {
+            input_capture,
+            event_rx,
+            libei_task,
+            notify_tx,
+        };
+
+        Ok(producer)
+    }
+}
+
+async fn release_capture(
+    input_capture: &InputCapture<'_>,
+    session: &Session<'_>,
+    activated: Activated,
+    current_client: ClientHandle,
+    active_clients: &[(ClientHandle, Position)],
+) -> Result<()> {
+    log::debug!("releasing input capture {}", activated.activation_id());
+    let (x, y) = activated.cursor_position();
+    let pos = active_clients
+        .iter()
+        .filter(|(c, _)| *c == current_client)
+        .map(|(_, p)| p)
+        .next()
+        .unwrap(); // FIXME
+    let (dx, dy) = match pos {
+        // offset cursor position to not enter again immediately
+        Position::Left => (1., 0.),
+        Position::Right => (-1., 0.),
+        Position::Top => (0., 1.),
+        Position::Bottom => (0., -1.),
+    };
+    // release 1px to the right of the entered zone
+    let cursor_position = (x as f64 + dx, y as f64 + dy);
+    input_capture
+        .release(session, activated.activation_id(), cursor_position)
+        .await?;
+    Ok(())
+}
+
+fn handle_producer_event(
+    producer_event: ProducerEvent,
+    active_clients: &mut Vec<(ClientHandle, Position)>,
+) -> Result<bool> {
+    log::debug!("handling event: {producer_event:?}");
+    let updated = match producer_event {
+        ProducerEvent::Release => false,
+        ProducerEvent::ClientEvent(ClientEvent::Create(c, p)) => {
+            active_clients.push((c, p));
+            true
+        }
+        ProducerEvent::ClientEvent(ClientEvent::Destroy(c)) => {
+            active_clients.retain(|(h, _)| *h != c);
+            true
+        }
+    };
+    Ok(updated)
+}
+
+async fn handle_ei_event(
+    ei_event: EiEvent,
+    current_client: Option<ClientHandle>,
+    context: &ei::Context,
+    event_tx: &Sender<(ClientHandle, Event)>,
+) {
+    match ei_event {
+        EiEvent::SeatAdded(s) => {
+            s.seat.bind_capabilities(&[
+                DeviceCapability::Pointer,
+                DeviceCapability::PointerAbsolute,
+                DeviceCapability::Keyboard,
+                DeviceCapability::Touch,
+                DeviceCapability::Scroll,
+                DeviceCapability::Button,
+            ]);
+            context.flush().unwrap();
+        }
+        EiEvent::SeatRemoved(_) => {}
+        EiEvent::DeviceAdded(_) => {}
+        EiEvent::DeviceRemoved(_) => {}
+        EiEvent::DevicePaused(_) => {}
+        EiEvent::DeviceResumed(_) => {}
+        EiEvent::KeyboardModifiers(mods) => {
+            let modifier_event = KeyboardEvent::Modifiers {
+                mods_depressed: mods.depressed,
+                mods_latched: mods.latched,
+                mods_locked: mods.locked,
+                group: mods.group,
+            };
+            if let Some(current_client) = current_client {
+                event_tx
+                    .send((current_client, Event::Keyboard(modifier_event)))
+                    .await
+                    .unwrap();
+            }
+        }
+        EiEvent::Frame(_) => {}
+        EiEvent::DeviceStartEmulating(_) => {
+            log::debug!("START EMULATING =============>");
+        }
+        EiEvent::DeviceStopEmulating(_) => {
+            log::debug!("==================> STOP EMULATING");
+        }
+        EiEvent::PointerMotion(motion) => {
+            let motion_event = PointerEvent::Motion {
+                time: motion.time as u32,
+                relative_x: motion.dx as f64,
+                relative_y: motion.dy as f64,
+            };
+            if let Some(current_client) = current_client {
+                event_tx
+                    .send((current_client, Event::Pointer(motion_event)))
+                    .await
+                    .unwrap();
+            }
+        }
+        EiEvent::PointerMotionAbsolute(_) => {}
+        EiEvent::Button(button) => {
+            let button_event = PointerEvent::Button {
+                time: button.time as u32,
+                button: button.button,
+                state: match button.state {
+                    ButtonState::Released => 0,
+                    ButtonState::Press => 1,
+                },
+            };
+            if let Some(current_client) = current_client {
+                event_tx
+                    .send((current_client, Event::Pointer(button_event)))
+                    .await
+                    .unwrap();
+            }
+        }
+        EiEvent::ScrollDelta(delta) => {
+            if let Some(handle) = current_client {
+                let mut events = vec![];
+                if delta.dy != 0. {
+                    events.push(PointerEvent::Axis {
+                        time: 0,
+                        axis: 0,
+                        value: delta.dy as f64,
+                    });
+                }
+                if delta.dx != 0. {
+                    events.push(PointerEvent::Axis {
+                        time: 0,
+                        axis: 1,
+                        value: delta.dx as f64,
+                    });
+                }
+                for event in events {
+                    event_tx
+                        .send((handle, Event::Pointer(event)))
+                        .await
+                        .unwrap();
+                }
+            }
+        }
+        EiEvent::ScrollStop(_) => {}
+        EiEvent::ScrollCancel(_) => {}
+        EiEvent::ScrollDiscrete(scroll) => {
+            if scroll.discrete_dy != 0 {
+                let event = PointerEvent::AxisDiscrete120 {
+                    axis: 0,
+                    value: scroll.discrete_dy,
+                };
+                if let Some(current_client) = current_client {
+                    event_tx
+                        .send((current_client, Event::Pointer(event)))
+                        .await
+                        .unwrap();
+                }
+            }
+            if scroll.discrete_dx != 0 {
+                let event = PointerEvent::AxisDiscrete120 {
+                    axis: 1,
+                    value: scroll.discrete_dx,
+                };
+                if let Some(current_client) = current_client {
+                    event_tx
+                        .send((current_client, Event::Pointer(event)))
+                        .await
+                        .unwrap();
+                }
+            };
+        }
+        EiEvent::KeyboardKey(key) => {
+            let key_event = KeyboardEvent::Key {
+                key: key.key,
+                state: match key.state {
+                    KeyState::Press => 1,
+                    KeyState::Released => 0,
+                },
+                time: key.time as u32,
+            };
+            if let Some(current_client) = current_client {
+                event_tx
+                    .send((current_client, Event::Keyboard(key_event)))
+                    .await
+                    .unwrap();
+            }
+        }
+        EiEvent::TouchDown(_) => {}
+        EiEvent::TouchUp(_) => {}
+        EiEvent::TouchMotion(_) => {}
+        EiEvent::Disconnected(d) => {
+            log::error!("disconnect: {d:?}");
+        }
+    }
+}
+
+impl<'a> LanMouseInputCapture for LibeiInputCapture<'a> {
+    fn notify(&mut self, event: ClientEvent) -> io::Result<()> {
+        let notify_tx = self.notify_tx.clone();
+        tokio::task::spawn_local(async move {
+            log::debug!("notifying {event:?}");
+            let _ = notify_tx.send(ProducerEvent::ClientEvent(event)).await;
+            log::debug!("done !");
+        });
+        Ok(())
+    }
+
+    fn release(&mut self) -> io::Result<()> {
+        let notify_tx = self.notify_tx.clone();
+        tokio::task::spawn_local(async move {
+            log::debug!("notifying Release");
+            let _ = notify_tx.send(ProducerEvent::Release).await;
+        });
+        Ok(())
+    }
+}
+
+impl<'a> Stream for LibeiInputCapture<'a> {
+    type Item = io::Result<(ClientHandle, Event)>;
+
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        match ready!(self.event_rx.poll_recv(cx)) {
+            None => Poll::Ready(None),
+            Some(e) => Poll::Ready(Some(Ok(e))),
+        }
+    }
+}

src/capture/macos.rs

@@ -0,0 +1,33 @@
+use crate::capture::InputCapture;
+use crate::client::{ClientEvent, ClientHandle};
+use crate::event::Event;
+use anyhow::{anyhow, Result};
+use futures_core::Stream;
+use std::task::{Context, Poll};
+use std::{io, pin::Pin};
+
+pub struct MacOSInputCapture;
+
+impl MacOSInputCapture {
+    pub fn new() -> Result<Self> {
+        Err(anyhow!("not yet implemented"))
+    }
+}
+
+impl Stream for MacOSInputCapture {
+    type Item = io::Result<(ClientHandle, Event)>;
+
+    fn poll_next(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        Poll::Pending
+    }
+}
+
+impl InputCapture for MacOSInputCapture {
+    fn notify(&mut self, _event: ClientEvent) -> io::Result<()> {
+        Ok(())
+    }
+
+    fn release(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}

src/capture/wayland.rs

@@ -1,4 +1,9 @@
-use async_trait::async_trait;
+use crate::{
+    capture::InputCapture,
+    client::{ClientEvent, ClientHandle, Position},
+};
+
+use anyhow::{anyhow, Result};
 use futures_core::Stream;
 use memmap::MmapOptions;
 use std::{
@@ -15,7 +20,7 @@ use std::{
     fs::File,
     io::{BufWriter, Write},
     os::unix::prelude::{AsRawFd, FromRawFd},
-    sync::Arc,
+    rc::Rc,
 };
 
 use wayland_protocols::{
@@ -61,14 +66,7 @@ use wayland_client::{
 
 use tempfile;
 
-use input_event::{Event, KeyboardEvent, PointerEvent};
-
-use crate::CaptureError;
-
-use super::{
-    error::{LayerShellCaptureCreationError, WaylandBindError},
-    CaptureHandle, InputCapture, Position,
-};
+use crate::event::{Event, KeyboardEvent, PointerEvent};
 
 struct Globals {
     compositor: wl_compositor::WlCompositor,
@@ -105,13 +103,13 @@ struct State {
     pointer_lock: Option<ZwpLockedPointerV1>,
     rel_pointer: Option<ZwpRelativePointerV1>,
     shortcut_inhibitor: Option<ZwpKeyboardShortcutsInhibitorV1>,
-    client_for_window: Vec<(Arc<Window>, CaptureHandle)>,
-    focused: Option<(Arc<Window>, CaptureHandle)>,
+    client_for_window: Vec<(Rc<Window>, ClientHandle)>,
+    focused: Option<(Rc<Window>, ClientHandle)>,
     g: Globals,
     wayland_fd: OwnedFd,
     read_guard: Option<ReadEventsGuard>,
     qh: QueueHandle<Self>,
-    pending_events: VecDeque<(CaptureHandle, Event)>,
+    pending_events: VecDeque<(ClientHandle, Event)>,
     output_info: Vec<(WlOutput, OutputInfo)>,
     scroll_discrete_pending: bool,
 }
@@ -260,37 +258,64 @@ fn draw(f: &mut File, (width, height): (u32, u32)) {
 }
 
 impl WaylandInputCapture {
-    pub fn new() -> std::result::Result<Self, LayerShellCaptureCreationError> {
-        let conn = Connection::connect_to_env()?;
-        let (g, mut queue) = registry_queue_init::<State>(&conn)?;
+    pub fn new() -> Result<Self> {
+        let conn = match Connection::connect_to_env() {
+            Ok(c) => c,
+            Err(e) => return Err(anyhow!("could not connect to wayland compositor: {e:?}")),
+        };
+
+        let (g, mut queue) = match registry_queue_init::<State>(&conn) {
+            Ok(q) => q,
+            Err(e) => return Err(anyhow!("failed to initialize wl_registry: {e:?}")),
+        };
 
         let qh = queue.handle();
 
-        let compositor: wl_compositor::WlCompositor = g
-            .bind(&qh, 4..=5, ())
-            .map_err(|e| WaylandBindError::new(e, "wl_compositor 4..=5"))?;
-        let xdg_output_manager: ZxdgOutputManagerV1 = g
-            .bind(&qh, 1..=3, ())
-            .map_err(|e| WaylandBindError::new(e, "xdg_output_manager 1..=3"))?;
-        let shm: wl_shm::WlShm = g
-            .bind(&qh, 1..=1, ())
-            .map_err(|e| WaylandBindError::new(e, "wl_shm"))?;
-        let layer_shell: ZwlrLayerShellV1 = g
-            .bind(&qh, 3..=4, ())
-            .map_err(|e| WaylandBindError::new(e, "wlr_layer_shell 3..=4"))?;
-        let seat: wl_seat::WlSeat = g
-            .bind(&qh, 7..=8, ())
-            .map_err(|e| WaylandBindError::new(e, "wl_seat 7..=8"))?;
+        let compositor: wl_compositor::WlCompositor = match g.bind(&qh, 4..=5, ()) {
+            Ok(compositor) => compositor,
+            Err(_) => return Err(anyhow!("wl_compositor >= v4 not supported")),
+        };
+
+        let xdg_output_manager: ZxdgOutputManagerV1 = match g.bind(&qh, 1..=3, ()) {
+            Ok(xdg_output_manager) => xdg_output_manager,
+            Err(_) => return Err(anyhow!("xdg_output not supported!")),
+        };
+
+        let shm: wl_shm::WlShm = match g.bind(&qh, 1..=1, ()) {
+            Ok(wl_shm) => wl_shm,
+            Err(_) => return Err(anyhow!("wl_shm v1 not supported")),
+        };
+
+        let layer_shell: ZwlrLayerShellV1 = match g.bind(&qh, 3..=4, ()) {
+            Ok(layer_shell) => layer_shell,
+            Err(_) => return Err(anyhow!("zwlr_layer_shell_v1 >= v3 not supported - required to display a surface at the edge of the screen")),
+        };
+
+        let seat: wl_seat::WlSeat = match g.bind(&qh, 7..=8, ()) {
+            Ok(wl_seat) => wl_seat,
+            Err(_) => return Err(anyhow!("wl_seat >= v7 not supported")),
+        };
+
+        let pointer_constraints: ZwpPointerConstraintsV1 = match g.bind(&qh, 1..=1, ()) {
+            Ok(pointer_constraints) => pointer_constraints,
+            Err(_) => return Err(anyhow!("zwp_pointer_constraints_v1 not supported")),
+        };
+
+        let relative_pointer_manager: ZwpRelativePointerManagerV1 = match g.bind(&qh, 1..=1, ()) {
+            Ok(relative_pointer_manager) => relative_pointer_manager,
+            Err(_) => return Err(anyhow!("zwp_relative_pointer_manager_v1 not supported")),
+        };
+
+        let shortcut_inhibit_manager: ZwpKeyboardShortcutsInhibitManagerV1 =
+            match g.bind(&qh, 1..=1, ()) {
+                Ok(shortcut_inhibit_manager) => shortcut_inhibit_manager,
+                Err(_) => {
+                    return Err(anyhow!(
+                        "zwp_keyboard_shortcuts_inhibit_manager_v1 not supported"
+                    ))
+                }
+            };
 
-        let pointer_constraints: ZwpPointerConstraintsV1 = g
-            .bind(&qh, 1..=1, ())
-            .map_err(|e| WaylandBindError::new(e, "zwp_pointer_constraints_v1"))?;
-        let relative_pointer_manager: ZwpRelativePointerManagerV1 = g
-            .bind(&qh, 1..=1, ())
-            .map_err(|e| WaylandBindError::new(e, "zwp_relative_pointer_manager_v1"))?;
-        let shortcut_inhibit_manager: ZwpKeyboardShortcutsInhibitManagerV1 = g
-            .bind(&qh, 1..=1, ())
-            .map_err(|e| WaylandBindError::new(e, "zwp_keyboard_shortcuts_inhibit_manager_v1"))?;
         let outputs = vec![];
 
         let g = Globals {
@@ -370,11 +395,11 @@ impl WaylandInputCapture {
         Ok(WaylandInputCapture(inner))
     }
 
-    fn add_client(&mut self, handle: CaptureHandle, pos: Position) {
+    fn add_client(&mut self, handle: ClientHandle, pos: Position) {
         self.0.get_mut().state.add_client(handle, pos);
     }
 
-    fn delete_client(&mut self, handle: CaptureHandle) {
+    fn delete_client(&mut self, handle: ClientHandle) {
         let inner = self.0.get_mut();
         // remove all windows corresponding to this client
         while let Some(i) = inner
@@ -472,13 +497,13 @@ impl State {
         }
     }
 
-    fn add_client(&mut self, client: CaptureHandle, pos: Position) {
+    fn add_client(&mut self, client: ClientHandle, pos: Position) {
         let outputs = get_output_configuration(self, pos);
 
         log::debug!("outputs: {outputs:?}");
         outputs.iter().for_each(|(o, i)| {
             let window = Window::new(self, &self.qh, o, pos, i.size);
-            let window = Arc::new(window);
+            let window = Rc::new(window);
             self.client_for_window.push((window, client));
         });
     }
@@ -564,34 +589,30 @@ impl Inner {
     }
 }
 
-#[async_trait]
 impl InputCapture for WaylandInputCapture {
-    async fn create(&mut self, handle: CaptureHandle, pos: Position) -> Result<(), CaptureError> {
-        self.add_client(handle, pos);
+    fn notify(&mut self, client_event: ClientEvent) -> io::Result<()> {
+        match client_event {
+            ClientEvent::Create(handle, pos) => {
+                self.add_client(handle, pos);
+            }
+            ClientEvent::Destroy(handle) => {
+                self.delete_client(handle);
+            }
+        }
         let inner = self.0.get_mut();
-        Ok(inner.flush_events()?)
+        inner.flush_events()
     }
 
-    async fn destroy(&mut self, handle: CaptureHandle) -> Result<(), CaptureError> {
-        self.delete_client(handle);
-        let inner = self.0.get_mut();
-        Ok(inner.flush_events()?)
-    }
-
-    async fn release(&mut self) -> Result<(), CaptureError> {
+    fn release(&mut self) -> io::Result<()> {
         log::debug!("releasing pointer");
         let inner = self.0.get_mut();
         inner.state.ungrab();
-        Ok(inner.flush_events()?)
-    }
-
-    async fn terminate(&mut self) -> Result<(), CaptureError> {
-        Ok(())
+        inner.flush_events()
     }
 }
 
 impl Stream for WaylandInputCapture {
-    type Item = Result<(CaptureHandle, Event), CaptureError>;
+    type Item = io::Result<(ClientHandle, Event)>;
 
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         if let Some(event) = self.0.get_mut().state.pending_events.pop_front() {
@@ -609,7 +630,7 @@ impl Stream for WaylandInputCapture {
                     // prepare next read
                     match inner.prepare_read() {
                         Ok(_) => {}
-                        Err(e) => return Poll::Ready(Some(Err(e.into()))),
+                        Err(e) => return Poll::Ready(Some(Err(e))),
                     }
                 }
 
@@ -619,14 +640,14 @@ impl Stream for WaylandInputCapture {
                 // flush outgoing events
                 if let Err(e) = inner.flush_events() {
                     if e.kind() != ErrorKind::WouldBlock {
-                        return Poll::Ready(Some(Err(e.into())));
+                        return Poll::Ready(Some(Err(e)));
                     }
                 }
 
                 // prepare for the next read
                 match inner.prepare_read() {
                     Ok(_) => {}
-                    Err(e) => return Poll::Ready(Some(Err(e.into()))),
+                    Err(e) => return Poll::Ready(Some(Err(e))),
                 }
             }
 
@@ -846,16 +867,21 @@ impl Dispatch<ZwpRelativePointerV1, ()> for State {
         if let zwp_relative_pointer_v1::Event::RelativeMotion {
             utime_hi,
             utime_lo,
-            dx_unaccel: dx,
-            dy_unaccel: dy,
-            ..
+            dx: _,
+            dy: _,
+            dx_unaccel: surface_x,
+            dy_unaccel: surface_y,
         } = event
         {
             if let Some((_window, client)) = &app.focused {
                 let time = (((utime_hi as u64) << 32 | utime_lo as u64) / 1000) as u32;
                 app.pending_events.push_back((
                     *client,
-                    Event::Pointer(PointerEvent::Motion { time, dx, dy }),
+                    Event::Pointer(PointerEvent::Motion {
+                        time,
+                        relative_x: surface_x,
+                        relative_y: surface_y,
+                    }),
                 ));
             }
         }

src/capture/windows.rs

@@ -1,4 +1,4 @@
-use async_trait::async_trait;
+use anyhow::Result;
 use core::task::{Context, Poll};
 use futures::Stream;
 use once_cell::unsync::Lazy;
@@ -9,9 +9,9 @@ use std::ptr::{addr_of, addr_of_mut};
 use futures::executor::block_on;
 use std::default::Default;
 use std::sync::atomic::{AtomicU32, Ordering};
-use std::sync::{mpsc, Mutex};
+use std::sync::mpsc;
 use std::task::ready;
-use std::{pin::Pin, thread};
+use std::{io, pin::Pin, thread};
 use tokio::sync::mpsc::{channel, Receiver, Sender};
 use windows::core::{w, PCWSTR};
 use windows::Win32::Foundation::{FALSE, HINSTANCE, HWND, LPARAM, LRESULT, RECT, WPARAM};
@@ -32,25 +32,25 @@ use windows::Win32::UI::WindowsAndMessaging::{
     WNDPROC,
 };
 
-use input_event::{
-    scancode::{self, Linux},
-    Event, KeyboardEvent, PointerEvent, BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT,
+use crate::client::Position;
+use crate::event::{
+    KeyboardEvent, PointerEvent, BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT,
+};
+use crate::scancode::Linux;
+use crate::{
+    capture::InputCapture,
+    client::{ClientEvent, ClientHandle},
+    event::Event,
+    scancode,
 };
 
-use super::{CaptureError, CaptureHandle, InputCapture, Position};
-
-enum Request {
-    Create(CaptureHandle, Position),
-    Destroy(CaptureHandle),
-}
-
 pub struct WindowsInputCapture {
-    event_rx: Receiver<(CaptureHandle, Event)>,
+    event_rx: Receiver<(ClientHandle, Event)>,
     msg_thread: Option<std::thread::JoinHandle<()>>,
 }
 
 enum EventType {
-    Request = 0,
+    ClientEvent = 0,
     Release = 1,
     Exit = 2,
 }
@@ -59,48 +59,29 @@ unsafe fn signal_message_thread(event_type: EventType) {
     if let Some(event_tid) = get_event_tid() {
         PostThreadMessageW(event_tid, WM_USER, WPARAM(event_type as usize), LPARAM(0)).unwrap();
     } else {
-        panic!();
+        log::warn!("lost event");
     }
 }
 
-#[async_trait]
 impl InputCapture for WindowsInputCapture {
-    async fn create(&mut self, handle: CaptureHandle, pos: Position) -> Result<(), CaptureError> {
+    fn notify(&mut self, event: ClientEvent) -> io::Result<()> {
         unsafe {
-            {
-                let mut requests = REQUEST_BUFFER.lock().unwrap();
-                requests.push(Request::Create(handle, pos));
-            }
-            signal_message_thread(EventType::Request);
+            EVENT_BUFFER.push(event);
+            signal_message_thread(EventType::ClientEvent);
         }
         Ok(())
     }
 
-    async fn destroy(&mut self, handle: CaptureHandle) -> Result<(), CaptureError> {
-        unsafe {
-            {
-                let mut requests = REQUEST_BUFFER.lock().unwrap();
-                requests.push(Request::Destroy(handle));
-            }
-            signal_message_thread(EventType::Request);
-        }
-        Ok(())
-    }
-
-    async fn release(&mut self) -> Result<(), CaptureError> {
+    fn release(&mut self) -> io::Result<()> {
         unsafe { signal_message_thread(EventType::Release) };
         Ok(())
     }
-
-    async fn terminate(&mut self) -> Result<(), CaptureError> {
-        Ok(())
-    }
 }
 
-static mut REQUEST_BUFFER: Mutex<Vec<Request>> = Mutex::new(Vec::new());
-static mut ACTIVE_CLIENT: Option<CaptureHandle> = None;
-static mut CLIENT_FOR_POS: Lazy<HashMap<Position, CaptureHandle>> = Lazy::new(HashMap::new);
-static mut EVENT_TX: Option<Sender<(CaptureHandle, Event)>> = None;
+static mut EVENT_BUFFER: Vec<ClientEvent> = Vec::new();
+static mut ACTIVE_CLIENT: Option<ClientHandle> = None;
+static mut CLIENT_FOR_POS: Lazy<HashMap<Position, ClientHandle>> = Lazy::new(HashMap::new);
+static mut EVENT_TX: Option<Sender<(ClientHandle, Event)>> = None;
 static mut EVENT_THREAD_ID: AtomicU32 = AtomicU32::new(0);
 unsafe fn set_event_tid(tid: u32) {
     EVENT_THREAD_ID.store(tid, Ordering::SeqCst);
@@ -151,8 +132,11 @@ fn to_mouse_event(wparam: WPARAM, lparam: LPARAM) -> Option<PointerEvent> {
             let (x, y) = (mouse_low_level.pt.x, mouse_low_level.pt.y);
             let (ex, ey) = ENTRY_POINT;
             let (dx, dy) = (x - ex, y - ey);
-            let (dx, dy) = (dx as f64, dy as f64);
-            Some(PointerEvent::Motion { time: 0, dx, dy })
+            Some(PointerEvent::Motion {
+                time: 0,
+                relative_x: dx as f64,
+                relative_y: dy as f64,
+            })
         },
         WPARAM(p) if p == WM_MOUSEWHEEL as usize => Some(PointerEvent::AxisDiscrete120 {
             axis: 0,
@@ -372,6 +356,7 @@ fn enumerate_displays() -> Vec<RECT> {
                 break;
             }
             if device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP != 0 {
+                log::info!("{:?}", device.DeviceName);
                 devices.push(device.DeviceName);
             }
         }
@@ -519,7 +504,7 @@ fn message_thread(ready_tx: mpsc::Sender<()>) {
         }
 
         /* window is used ro receive WM_DISPLAYCHANGE messages */
-        CreateWindowExW(
+        let ret = CreateWindowExW(
             Default::default(),
             w!("lan-mouse-message-window-class"),
             w!("lan-mouse-msg-window"),
@@ -532,8 +517,10 @@ fn message_thread(ready_tx: mpsc::Sender<()>) {
             HMENU::default(),
             instance,
             None,
-        )
-        .expect("CreateWindowExW");
+        );
+        if ret.0 == 0 {
+            panic!("CreateWindowExW");
+        }
 
         /* run message loop */
         loop {
@@ -541,44 +528,35 @@ fn message_thread(ready_tx: mpsc::Sender<()>) {
             let Some(msg) = get_msg() else {
                 break;
             };
-            if msg.hwnd.0.is_null() {
+            if msg.hwnd.0 == 0 {
                 /* messages sent via PostThreadMessage */
                 match msg.wParam.0 {
                     x if x == EventType::Exit as usize => break,
                     x if x == EventType::Release as usize => {
                         ACTIVE_CLIENT.take();
                     }
-                    x if x == EventType::Request as usize => {
-                        let requests = {
-                            let mut res = vec![];
-                            let mut requests = REQUEST_BUFFER.lock().unwrap();
-                            for request in requests.drain(..) {
-                                res.push(request);
-                            }
-                            res
-                        };
-
-                        for request in requests {
-                            update_clients(request)
+                    x if x == EventType::ClientEvent as usize => {
+                        while let Some(event) = EVENT_BUFFER.pop() {
+                            update_clients(event)
                         }
                     }
                     _ => {}
                 }
             } else {
                 /* other messages for window_procs */
-                let _ = TranslateMessage(&msg);
+                TranslateMessage(&msg);
                 DispatchMessageW(&msg);
             }
         }
     }
 }
 
-fn update_clients(request: Request) {
-    match request {
-        Request::Create(handle, pos) => {
+fn update_clients(client_event: ClientEvent) {
+    match client_event {
+        ClientEvent::Create(handle, pos) => {
             unsafe { CLIENT_FOR_POS.insert(pos, handle) };
         }
-        Request::Destroy(handle) => unsafe {
+        ClientEvent::Destroy(handle) => unsafe {
             for pos in [
                 Position::Left,
                 Position::Right,
@@ -597,7 +575,7 @@ fn update_clients(request: Request) {
 }
 
 impl WindowsInputCapture {
-    pub(crate) fn new() -> Self {
+    pub(crate) fn new() -> Result<Self> {
         unsafe {
             let (tx, rx) = channel(10);
             EVENT_TX.replace(tx);
@@ -605,16 +583,16 @@ impl WindowsInputCapture {
             let msg_thread = Some(thread::spawn(|| message_thread(ready_tx)));
             /* wait for thread to set its id */
             ready_rx.recv().expect("channel closed");
-            Self {
+            Ok(Self {
                 msg_thread,
                 event_rx: rx,
-            }
+            })
         }
     }
 }
 
 impl Stream for WindowsInputCapture {
-    type Item = Result<(CaptureHandle, Event), CaptureError>;
+    type Item = io::Result<(ClientHandle, Event)>;
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         match ready!(self.event_rx.poll_recv(cx)) {
             None => Poll::Ready(None),

src/capture/x11.rs

@@ -0,0 +1,39 @@
+use anyhow::{anyhow, Result};
+use std::io;
+use std::task::Poll;
+
+use futures_core::Stream;
+
+use crate::capture::InputCapture;
+use crate::event::Event;
+
+use crate::client::{ClientEvent, ClientHandle};
+
+pub struct X11InputCapture {}
+
+impl X11InputCapture {
+    pub fn new() -> Result<Self> {
+        Err(anyhow!("not implemented"))
+    }
+}
+
+impl InputCapture for X11InputCapture {
+    fn notify(&mut self, _event: ClientEvent) -> io::Result<()> {
+        Ok(())
+    }
+
+    fn release(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+impl Stream for X11InputCapture {
+    type Item = io::Result<(ClientHandle, Event)>;
+
+    fn poll_next(
+        self: std::pin::Pin<&mut Self>,
+        _cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Option<Self::Item>> {
+        Poll::Pending
+    }
+}

src/capture_test.rs

@@ -1,44 +1,33 @@
-use crate::config::Config;
+use crate::capture;
+use crate::client::{ClientEvent, Position};
+use crate::event::{Event, KeyboardEvent};
+use anyhow::{anyhow, Result};
 use futures::StreamExt;
-use input_capture::{self, CaptureError, InputCapture, InputCaptureError, Position};
-use input_event::{Event, KeyboardEvent};
 use tokio::task::LocalSet;
 
-pub fn run() -> anyhow::Result<()> {
+pub fn run() -> Result<()> {
     log::info!("running input capture test");
     let runtime = tokio::runtime::Builder::new_current_thread()
         .enable_io()
         .enable_time()
         .build()?;
 
-    let config = Config::new()?;
-
-    Ok(runtime.block_on(LocalSet::new().run_until(input_capture_test(config)))?)
+    runtime.block_on(LocalSet::new().run_until(input_capture_test()))
 }
 
-async fn input_capture_test(config: Config) -> Result<(), InputCaptureError> {
+async fn input_capture_test() -> Result<()> {
     log::info!("creating input capture");
-    let backend = config.capture_backend.map(|b| b.into());
-    loop {
-        let mut input_capture = input_capture::create(backend).await?;
-        log::info!("creating clients");
-        input_capture.create(0, Position::Left).await?;
-        input_capture.create(1, Position::Right).await?;
-        input_capture.create(2, Position::Top).await?;
-        input_capture.create(3, Position::Bottom).await?;
-        if let Err(e) = do_capture(&mut input_capture).await {
-            log::warn!("{e} - recreating capture");
-        }
-        let _ = input_capture.terminate().await;
-    }
-}
-
-async fn do_capture(input_capture: &mut Box<dyn InputCapture>) -> Result<(), CaptureError> {
+    let mut input_capture = capture::create().await;
+    log::info!("creating clients");
+    input_capture.notify(ClientEvent::Create(0, Position::Left))?;
+    input_capture.notify(ClientEvent::Create(1, Position::Right))?;
+    input_capture.notify(ClientEvent::Create(2, Position::Top))?;
+    input_capture.notify(ClientEvent::Create(3, Position::Bottom))?;
     loop {
         let (client, event) = input_capture
             .next()
             .await
-            .ok_or(CaptureError::EndOfStream)??;
+            .ok_or(anyhow!("capture stream closed"))??;
         let pos = match client {
             0 => Position::Left,
             1 => Position::Right,
@@ -47,8 +36,7 @@ async fn do_capture(input_capture: &mut Box<dyn InputCapture>) -> Result<(), Cap
         };
         log::info!("position: {pos}, event: {event}");
         if let Event::Keyboard(KeyboardEvent::Key { key: 1, .. }) = event {
-            input_capture.release().await?;
-            break Ok(());
+            input_capture.release()?;
         }
     }
 }

src/client.rs

@@ -1,5 +1,6 @@
 use std::{
     collections::HashSet,
+    error::Error,
     fmt::Display,
     net::{IpAddr, SocketAddr},
     str::FromStr,
@@ -7,37 +8,36 @@ use std::{
 
 use serde::{Deserialize, Serialize};
 use slab::Slab;
-use thiserror::Error;
 
 use crate::config::DEFAULT_PORT;
-use input_capture;
 
-#[derive(Debug, Default, Eq, Hash, PartialEq, Clone, Copy, Serialize, Deserialize)]
+#[derive(Debug, Eq, Hash, PartialEq, Clone, Copy, Serialize, Deserialize)]
 pub enum Position {
-    #[default]
     Left,
     Right,
     Top,
     Bottom,
 }
 
-impl From<Position> for input_capture::Position {
-    fn from(position: Position) -> input_capture::Position {
-        match position {
-            Position::Left => input_capture::Position::Left,
-            Position::Right => input_capture::Position::Right,
-            Position::Top => input_capture::Position::Top,
-            Position::Bottom => input_capture::Position::Bottom,
-        }
+impl Default for Position {
+    fn default() -> Self {
+        Self::Left
     }
 }
 
-#[derive(Debug, Error)]
-#[error("not a valid position: {pos}")]
+#[derive(Debug)]
 pub struct PositionParseError {
-    pos: String,
+    string: String,
 }
 
+impl Display for PositionParseError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "not a valid position: {}", self.string)
+    }
+}
+
+impl Error for PositionParseError {}
+
 impl FromStr for Position {
     type Err = PositionParseError;
 
@@ -47,7 +47,18 @@ impl FromStr for Position {
             "right" => Ok(Self::Right),
             "top" => Ok(Self::Top),
             "bottom" => Ok(Self::Bottom),
-            _ => Err(PositionParseError { pos: s.into() }),
+            _ => Err(PositionParseError { string: s.into() }),
+        }
+    }
+}
+
+impl Position {
+    pub fn opposite(&self) -> Self {
+        match self {
+            Position::Left => Self::Right,
+            Position::Right => Self::Left,
+            Position::Top => Self::Bottom,
+            Position::Bottom => Self::Top,
         }
     }
 }
@@ -107,6 +118,12 @@ impl Default for ClientConfig {
     }
 }
 
+#[derive(Clone, Copy, Debug)]
+pub enum ClientEvent {
+    Create(ClientHandle, Position),
+    Destroy(ClientHandle),
+}
+
 pub type ClientHandle = u64;
 
 #[derive(Debug, Default, Clone, Serialize, Deserialize)]
@@ -119,8 +136,6 @@ pub struct ClientState {
     pub active_addr: Option<SocketAddr>,
     /// tracks whether or not the client is responding to pings
     pub alive: bool,
-    /// ips from dns
-    pub dns_ips: Vec<IpAddr>,
     /// all ip addresses associated with a particular client
     /// e.g. Laptops usually have at least an ethernet and a wifi port
     /// which have different ip addresses
@@ -131,15 +146,27 @@ pub struct ClientState {
     pub resolving: bool,
 }
 
-#[derive(Default)]
 pub struct ClientManager {
     clients: Slab<(ClientConfig, ClientState)>,
 }
 
+impl Default for ClientManager {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl ClientManager {
+    pub fn new() -> Self {
+        let clients = Slab::new();
+        Self { clients }
+    }
+
     /// add a new client to this manager
     pub fn add_client(&mut self) -> ClientHandle {
-        self.clients.insert(Default::default()) as ClientHandle
+        let client_config = Default::default();
+        let client_state = Default::default();
+        self.clients.insert((client_config, client_state)) as ClientHandle
     }
 
     /// find a client by its address

src/config.rs

@@ -1,28 +1,22 @@
 use anyhow::Result;
-use clap::{Parser, ValueEnum};
+use clap::Parser;
 use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
 use std::env;
-use std::fmt::Display;
 use std::net::IpAddr;
 use std::{error::Error, fs};
 use toml;
 
 use crate::client::Position;
-
-use input_event::scancode::{
-    self,
-    Linux::{KeyLeftAlt, KeyLeftCtrl, KeyLeftMeta, KeyLeftShift},
-};
+use crate::scancode;
+use crate::scancode::Linux::{KeyLeftAlt, KeyLeftCtrl, KeyLeftMeta, KeyLeftShift};
 
 pub const DEFAULT_PORT: u16 = 4242;
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct ConfigToml {
-    pub capture_backend: Option<CaptureBackend>,
-    pub emulation_backend: Option<EmulationBackend>,
     pub port: Option<u16>,
-    pub frontend: Option<Frontend>,
+    pub frontend: Option<String>,
     pub release_bind: Option<Vec<scancode::Linux>>,
     pub left: Option<TomlClient>,
     pub right: Option<TomlClient>,
@@ -32,7 +26,6 @@ pub struct ConfigToml {
 
 #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
 pub struct TomlClient {
-    pub capture_backend: Option<CaptureBackend>,
     pub hostname: Option<String>,
     pub host_name: Option<String>,
     pub ips: Option<Vec<IpAddr>>,
@@ -58,7 +51,7 @@ struct CliArgs {
 
     /// the frontend to use [cli | gtk]
     #[arg(short, long)]
-    frontend: Option<Frontend>,
+    frontend: Option<String>,
 
     /// non-default config file location
     #[arg(short, long)]
@@ -75,144 +68,16 @@ struct CliArgs {
     /// test input emulation
     #[arg(long)]
     test_emulation: bool,
-
-    /// capture backend override
-    #[arg(long)]
-    capture_backend: Option<CaptureBackend>,
-
-    /// emulation backend override
-    #[arg(long)]
-    emulation_backend: Option<EmulationBackend>,
 }
 
-#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize, ValueEnum)]
-pub enum CaptureBackend {
-    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-    InputCapturePortal,
-    #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-    LayerShell,
-    #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-    X11,
-    #[cfg(windows)]
-    Windows,
-    #[cfg(target_os = "macos")]
-    MacOs,
-    Dummy,
-}
-
-impl Display for CaptureBackend {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-            CaptureBackend::InputCapturePortal => write!(f, "input-capture-portal"),
-            #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-            CaptureBackend::LayerShell => write!(f, "layer-shell"),
-            #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-            CaptureBackend::X11 => write!(f, "X11"),
-            #[cfg(windows)]
-            CaptureBackend::Windows => write!(f, "windows"),
-            #[cfg(target_os = "macos")]
-            CaptureBackend::MacOs => write!(f, "MacOS"),
-            CaptureBackend::Dummy => write!(f, "dummy"),
-        }
-    }
-}
-
-impl From<CaptureBackend> for input_capture::Backend {
-    fn from(backend: CaptureBackend) -> Self {
-        match backend {
-            #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-            CaptureBackend::InputCapturePortal => Self::InputCapturePortal,
-            #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-            CaptureBackend::LayerShell => Self::LayerShell,
-            #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-            CaptureBackend::X11 => Self::X11,
-            #[cfg(windows)]
-            CaptureBackend::Windows => Self::Windows,
-            #[cfg(target_os = "macos")]
-            CaptureBackend::MacOs => Self::MacOs,
-            CaptureBackend::Dummy => Self::Dummy,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize, ValueEnum)]
-pub enum EmulationBackend {
-    #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-    Wlroots,
-    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-    Libei,
-    #[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
-    Xdp,
-    #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-    X11,
-    #[cfg(windows)]
-    Windows,
-    #[cfg(target_os = "macos")]
-    MacOs,
-    Dummy,
-}
-
-impl From<EmulationBackend> for input_emulation::Backend {
-    fn from(backend: EmulationBackend) -> Self {
-        match backend {
-            #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-            EmulationBackend::Wlroots => Self::Wlroots,
-            #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-            EmulationBackend::Libei => Self::Libei,
-            #[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
-            EmulationBackend::Xdp => Self::Xdp,
-            #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-            EmulationBackend::X11 => Self::X11,
-            #[cfg(windows)]
-            EmulationBackend::Windows => Self::Windows,
-            #[cfg(target_os = "macos")]
-            EmulationBackend::MacOs => Self::MacOs,
-            EmulationBackend::Dummy => Self::Dummy,
-        }
-    }
-}
-
-impl Display for EmulationBackend {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-            EmulationBackend::Wlroots => write!(f, "wlroots"),
-            #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-            EmulationBackend::Libei => write!(f, "libei"),
-            #[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
-            EmulationBackend::Xdp => write!(f, "xdg-desktop-portal"),
-            #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-            EmulationBackend::X11 => write!(f, "X11"),
-            #[cfg(windows)]
-            EmulationBackend::Windows => write!(f, "windows"),
-            #[cfg(target_os = "macos")]
-            EmulationBackend::MacOs => write!(f, "macos"),
-            EmulationBackend::Dummy => write!(f, "dummy"),
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Eq, Serialize, ValueEnum)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum Frontend {
     Gtk,
     Cli,
 }
 
-impl Default for Frontend {
-    fn default() -> Self {
-        if cfg!(feature = "gtk") {
-            Self::Gtk
-        } else {
-            Self::Cli
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct Config {
-    pub capture_backend: Option<CaptureBackend>,
-    pub emulation_backend: Option<EmulationBackend>,
     pub frontend: Frontend,
     pub port: u16,
     pub clients: Vec<(TomlClient, Position)>,
@@ -264,14 +129,33 @@ impl Config {
             Ok(c) => Some(c),
         };
 
-        let frontend_arg = args.frontend;
-        let frontend_cfg = config_toml.as_ref().and_then(|c| c.frontend);
-        let frontend = frontend_arg.or(frontend_cfg).unwrap_or_default();
+        let frontend = match args.frontend {
+            None => match &config_toml {
+                Some(c) => c.frontend.clone(),
+                None => None,
+            },
+            frontend => frontend,
+        };
 
-        let port = args
-            .port
-            .or(config_toml.as_ref().and_then(|c| c.port))
-            .unwrap_or(DEFAULT_PORT);
+        let frontend = match frontend {
+            #[cfg(feature = "gtk")]
+            None => Frontend::Gtk,
+            #[cfg(not(feature = "gtk"))]
+            None => Frontend::Cli,
+            Some(s) => match s.as_str() {
+                "cli" => Frontend::Cli,
+                "gtk" => Frontend::Gtk,
+                _ => Frontend::Cli,
+            },
+        };
+
+        let port = match args.port {
+            Some(port) => port,
+            None => match &config_toml {
+                Some(c) => c.port.unwrap_or(DEFAULT_PORT),
+                None => DEFAULT_PORT,
+            },
+        };
 
         log::debug!("{config_toml:?}");
         let release_bind = config_toml
@@ -279,14 +163,6 @@ impl Config {
             .and_then(|c| c.release_bind.clone())
             .unwrap_or(Vec::from_iter(DEFAULT_RELEASE_KEYS.iter().cloned()));
 
-        let capture_backend = args
-            .capture_backend
-            .or(config_toml.as_ref().and_then(|c| c.capture_backend));
-
-        let emulation_backend = args
-            .emulation_backend
-            .or(config_toml.as_ref().and_then(|c| c.emulation_backend));
-
         let mut clients: Vec<(TomlClient, Position)> = vec![];
 
         if let Some(config_toml) = config_toml {
@@ -309,8 +185,6 @@ impl Config {
         let test_emulation = args.test_emulation;
 
         Ok(Config {
-            capture_backend,
-            emulation_backend,
             daemon,
             frontend,
             clients,

src/dns.rs

@@ -1,62 +1,23 @@
-use std::net::IpAddr;
-use tokio::sync::mpsc::Receiver;
+use anyhow::Result;
+use std::{error::Error, net::IpAddr};
 
-use hickory_resolver::{error::ResolveError, TokioAsyncResolver};
+use hickory_resolver::TokioAsyncResolver;
 
-use crate::{client::ClientHandle, server::Server};
-
-pub(crate) struct DnsResolver {
+pub struct DnsResolver {
     resolver: TokioAsyncResolver,
-    dns_request: Receiver<ClientHandle>,
 }
-
 impl DnsResolver {
-    pub(crate) fn new(dns_request: Receiver<ClientHandle>) -> Result<Self, ResolveError> {
+    pub(crate) async fn new() -> Result<Self> {
         let resolver = TokioAsyncResolver::tokio_from_system_conf()?;
-        Ok(Self {
-            resolver,
-            dns_request,
-        })
+        Ok(Self { resolver })
     }
 
-    async fn resolve(&self, host: &str) -> Result<Vec<IpAddr>, ResolveError> {
+    pub(crate) async fn resolve(&self, host: &str) -> Result<Vec<IpAddr>, Box<dyn Error>> {
+        log::info!("resolving {host} ...");
         let response = self.resolver.lookup_ip(host).await?;
         for ip in response.iter() {
             log::info!("{host}: adding ip {ip}");
         }
         Ok(response.iter().collect())
     }
-
-    pub(crate) async fn run(mut self, server: Server) {
-        tokio::select! {
-            _ = server.cancelled() => {},
-            _ = self.do_dns(&server) => {},
-        }
-    }
-
-    async fn do_dns(&mut self, server: &Server) {
-        loop {
-            let handle = self.dns_request.recv().await.expect("channel closed");
-
-            /* update resolving status */
-            let hostname = match server.get_hostname(handle) {
-                Some(hostname) => hostname,
-                None => continue,
-            };
-
-            log::info!("resolving ({handle}) `{hostname}` ...");
-            server.set_resolving(handle, true);
-
-            let ips = match self.resolve(&hostname).await {
-                Ok(ips) => ips,
-                Err(e) => {
-                    log::warn!("could not resolve host '{hostname}': {e}");
-                    vec![]
-                }
-            };
-
-            server.update_dns_ips(handle, ips);
-            server.set_resolving(handle, false);
-        }
-    }
 }

src/emulate.rs

@@ -0,0 +1,98 @@
+use async_trait::async_trait;
+use std::future;
+
+use crate::{
+    client::{ClientEvent, ClientHandle},
+    event::Event,
+};
+use anyhow::Result;
+
+#[cfg(windows)]
+pub mod windows;
+
+#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
+pub mod x11;
+
+#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
+pub mod wlroots;
+
+#[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
+pub mod xdg_desktop_portal;
+
+#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
+pub mod libei;
+
+#[cfg(target_os = "macos")]
+pub mod macos;
+
+/// fallback input emulation (logs events)
+pub mod dummy;
+
+#[async_trait]
+pub trait InputEmulation: Send {
+    async fn consume(&mut self, event: Event, client_handle: ClientHandle);
+    async fn notify(&mut self, client_event: ClientEvent);
+    /// this function is waited on continuously and can be used to handle events
+    async fn dispatch(&mut self) -> Result<()> {
+        let _: () = future::pending().await;
+        Ok(())
+    }
+
+    async fn destroy(&mut self);
+}
+
+pub async fn create() -> Box<dyn InputEmulation> {
+    #[cfg(windows)]
+    match windows::WindowsEmulation::new() {
+        Ok(c) => return Box::new(c),
+        Err(e) => log::warn!("windows input emulation unavailable: {e}"),
+    }
+
+    #[cfg(target_os = "macos")]
+    match macos::MacOSEmulation::new() {
+        Ok(c) => {
+            log::info!("using macos input emulation");
+            return Box::new(c);
+        }
+        Err(e) => log::error!("macos input emulatino not available: {e}"),
+    }
+
+    #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
+    match wlroots::WlrootsEmulation::new() {
+        Ok(c) => {
+            log::info!("using wlroots input emulation");
+            return Box::new(c);
+        }
+        Err(e) => log::info!("wayland backend not available: {e}"),
+    }
+
+    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
+    match libei::LibeiEmulation::new().await {
+        Ok(c) => {
+            log::info!("using libei input emulation");
+            return Box::new(c);
+        }
+        Err(e) => log::info!("libei not available: {e}"),
+    }
+
+    #[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
+    match xdg_desktop_portal::DesktopPortalEmulation::new().await {
+        Ok(c) => {
+            log::info!("using xdg-remote-desktop-portal input emulation");
+            return Box::new(c);
+        }
+        Err(e) => log::info!("remote desktop portal not available: {e}"),
+    }
+
+    #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
+    match x11::X11Emulation::new() {
+        Ok(c) => {
+            log::info!("using x11 input emulation");
+            return Box::new(c);
+        }
+        Err(e) => log::info!("x11 input emulation not available: {e}"),
+    }
+
+    log::error!("falling back to dummy input emulation");
+    Box::new(dummy::DummyEmulation::new())
+}

src/emulate/dummy.rs

@@ -0,0 +1,26 @@
+use crate::{
+    client::{ClientEvent, ClientHandle},
+    emulate::InputEmulation,
+    event::Event,
+};
+use async_trait::async_trait;
+
+#[derive(Default)]
+pub struct DummyEmulation;
+
+impl DummyEmulation {
+    pub fn new() -> Self {
+        Self {}
+    }
+}
+
+#[async_trait]
+impl InputEmulation for DummyEmulation {
+    async fn consume(&mut self, event: Event, client_handle: ClientHandle) {
+        log::info!("received event: ({client_handle}) {event}");
+    }
+    async fn notify(&mut self, client_event: ClientEvent) {
+        log::info!("{client_event:?}");
+    }
+    async fn destroy(&mut self) {}
+}

src/emulate/libei.rs

@@ -0,0 +1,399 @@
+use std::{
+    collections::HashMap,
+    os::{fd::OwnedFd, unix::net::UnixStream},
+    time::{SystemTime, UNIX_EPOCH},
+};
+
+use anyhow::{anyhow, Result};
+use ashpd::{
+    desktop::{
+        remote_desktop::{DeviceType, RemoteDesktop},
+        ResponseError,
+    },
+    WindowIdentifier,
+};
+use async_trait::async_trait;
+use futures::StreamExt;
+
+use reis::{
+    ei::{self, button::ButtonState, handshake::ContextType, keyboard::KeyState},
+    tokio::EiEventStream,
+    PendingRequestResult,
+};
+
+use crate::{
+    client::{ClientEvent, ClientHandle},
+    emulate::InputEmulation,
+    event::Event,
+};
+
+pub struct LibeiEmulation {
+    handshake: bool,
+    context: ei::Context,
+    events: EiEventStream,
+    pointer: Option<(ei::Device, ei::Pointer)>,
+    has_pointer: bool,
+    scroll: Option<(ei::Device, ei::Scroll)>,
+    has_scroll: bool,
+    button: Option<(ei::Device, ei::Button)>,
+    has_button: bool,
+    keyboard: Option<(ei::Device, ei::Keyboard)>,
+    has_keyboard: bool,
+    capabilities: HashMap<String, u64>,
+    capability_mask: u64,
+    sequence: u32,
+    serial: u32,
+}
+
+async fn get_ei_fd() -> Result<OwnedFd, ashpd::Error> {
+    let proxy = RemoteDesktop::new().await?;
+
+    // retry when user presses the cancel button
+    let (session, _) = loop {
+        log::debug!("creating session ...");
+        let session = proxy.create_session().await?;
+
+        log::debug!("selecting devices ...");
+        proxy
+            .select_devices(&session, DeviceType::Keyboard | DeviceType::Pointer)
+            .await?;
+
+        log::info!("requesting permission for input emulation");
+        match proxy
+            .start(&session, &WindowIdentifier::default())
+            .await?
+            .response()
+        {
+            Ok(d) => break (session, d),
+            Err(ashpd::Error::Response(ResponseError::Cancelled)) => {
+                log::warn!("request cancelled!");
+                continue;
+            }
+            e => e?,
+        };
+    };
+
+    proxy.connect_to_eis(&session).await
+}
+
+impl LibeiEmulation {
+    pub async fn new() -> Result<Self> {
+        // fd is owned by the message, so we need to dup it
+        let eifd = get_ei_fd().await?;
+        let stream = UnixStream::from(eifd);
+        // let stream = UnixStream::connect("/run/user/1000/eis-0")?;
+        stream.set_nonblocking(true)?;
+        let context = ei::Context::new(stream)?;
+        context.flush()?;
+        let events = EiEventStream::new(context.clone())?;
+        Ok(Self {
+            handshake: false,
+            context,
+            events,
+            pointer: None,
+            button: None,
+            scroll: None,
+            keyboard: None,
+            has_pointer: false,
+            has_button: false,
+            has_scroll: false,
+            has_keyboard: false,
+            capabilities: HashMap::new(),
+            capability_mask: 0,
+            sequence: 0,
+            serial: 0,
+        })
+    }
+}
+
+#[async_trait]
+impl InputEmulation for LibeiEmulation {
+    async fn consume(&mut self, event: Event, _client_handle: ClientHandle) {
+        let now = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .unwrap()
+            .as_micros() as u64;
+        match event {
+            Event::Pointer(p) => match p {
+                crate::event::PointerEvent::Motion {
+                    time: _,
+                    relative_x,
+                    relative_y,
+                } => {
+                    if !self.has_pointer {
+                        return;
+                    }
+                    if let Some((d, p)) = self.pointer.as_mut() {
+                        p.motion_relative(relative_x as f32, relative_y as f32);
+                        d.frame(self.serial, now);
+                    }
+                }
+                crate::event::PointerEvent::Button {
+                    time: _,
+                    button,
+                    state,
+                } => {
+                    if !self.has_button {
+                        return;
+                    }
+                    if let Some((d, b)) = self.button.as_mut() {
+                        b.button(
+                            button,
+                            match state {
+                                0 => ButtonState::Released,
+                                _ => ButtonState::Press,
+                            },
+                        );
+                        d.frame(self.serial, now);
+                    }
+                }
+                crate::event::PointerEvent::Axis {
+                    time: _,
+                    axis,
+                    value,
+                } => {
+                    if !self.has_scroll {
+                        return;
+                    }
+                    if let Some((d, s)) = self.scroll.as_mut() {
+                        match axis {
+                            0 => s.scroll(0., value as f32),
+                            _ => s.scroll(value as f32, 0.),
+                        }
+                        d.frame(self.serial, now);
+                    }
+                }
+                crate::event::PointerEvent::AxisDiscrete120 { axis, value } => {
+                    if !self.has_scroll {
+                        return;
+                    }
+                    if let Some((d, s)) = self.scroll.as_mut() {
+                        match axis {
+                            0 => s.scroll_discrete(0, value),
+                            _ => s.scroll_discrete(value, 0),
+                        }
+                        d.frame(self.serial, now);
+                    }
+                }
+                crate::event::PointerEvent::Frame {} => {}
+            },
+            Event::Keyboard(k) => match k {
+                crate::event::KeyboardEvent::Key {
+                    time: _,
+                    key,
+                    state,
+                } => {
+                    if !self.has_keyboard {
+                        return;
+                    }
+                    if let Some((d, k)) = &mut self.keyboard {
+                        k.key(
+                            key,
+                            match state {
+                                0 => KeyState::Released,
+                                _ => KeyState::Press,
+                            },
+                        );
+                        d.frame(self.serial, now);
+                    }
+                }
+                crate::event::KeyboardEvent::Modifiers { .. } => {}
+            },
+            _ => {}
+        }
+        self.context.flush().unwrap();
+    }
+
+    async fn dispatch(&mut self) -> Result<()> {
+        let event = match self.events.next().await {
+            Some(e) => e?,
+            None => return Err(anyhow!("libei connection lost")),
+        };
+        let event = match event {
+            PendingRequestResult::Request(result) => result,
+            PendingRequestResult::ParseError(e) => {
+                return Err(anyhow!("libei protocol violation: {e}"))
+            }
+            PendingRequestResult::InvalidObject(e) => return Err(anyhow!("invalid object {e}")),
+        };
+        match event {
+            ei::Event::Handshake(handshake, request) => match request {
+                ei::handshake::Event::HandshakeVersion { version } => {
+                    if self.handshake {
+                        return Ok(());
+                    }
+                    log::info!("libei version {}", version);
+                    // sender means we are sending events _to_ the eis server
+                    handshake.handshake_version(version); // FIXME
+                    handshake.context_type(ContextType::Sender);
+                    handshake.name("ei-demo-client");
+                    handshake.interface_version("ei_connection", 1);
+                    handshake.interface_version("ei_callback", 1);
+                    handshake.interface_version("ei_pingpong", 1);
+                    handshake.interface_version("ei_seat", 1);
+                    handshake.interface_version("ei_device", 2);
+                    handshake.interface_version("ei_pointer", 1);
+                    handshake.interface_version("ei_pointer_absolute", 1);
+                    handshake.interface_version("ei_scroll", 1);
+                    handshake.interface_version("ei_button", 1);
+                    handshake.interface_version("ei_keyboard", 1);
+                    handshake.interface_version("ei_touchscreen", 1);
+                    handshake.finish();
+                    self.handshake = true;
+                }
+                ei::handshake::Event::InterfaceVersion { name, version } => {
+                    log::debug!("handshake: Interface {name} @ {version}");
+                }
+                ei::handshake::Event::Connection { serial, connection } => {
+                    connection.sync(1);
+                    self.serial = serial;
+                }
+                _ => unreachable!(),
+            },
+            ei::Event::Connection(_connection, request) => match request {
+                ei::connection::Event::Seat { seat } => {
+                    log::debug!("connected to seat: {seat:?}");
+                }
+                ei::connection::Event::Ping { ping } => {
+                    ping.done(0);
+                }
+                ei::connection::Event::Disconnected {
+                    last_serial: _,
+                    reason,
+                    explanation,
+                } => {
+                    log::debug!("ei - disconnected: reason: {reason:?}: {explanation}")
+                }
+                ei::connection::Event::InvalidObject {
+                    last_serial,
+                    invalid_id,
+                } => {
+                    return Err(anyhow!(
+                        "invalid object: id: {invalid_id}, serial: {last_serial}"
+                    ));
+                }
+                _ => unreachable!(),
+            },
+            ei::Event::Device(device, request) => match request {
+                ei::device::Event::Destroyed { serial } => {
+                    log::debug!("device destroyed: {device:?} - serial: {serial}")
+                }
+                ei::device::Event::Name { name } => {
+                    log::debug!("device name: {name}")
+                }
+                ei::device::Event::DeviceType { device_type } => {
+                    log::debug!("device type: {device_type:?}")
+                }
+                ei::device::Event::Dimensions { width, height } => {
+                    log::debug!("device dimensions: {width}x{height}")
+                }
+                ei::device::Event::Region {
+                    offset_x,
+                    offset_y,
+                    width,
+                    hight,
+                    scale,
+                } => log::debug!(
+                    "device region: {width}x{hight} @ ({offset_x},{offset_y}), scale: {scale}"
+                ),
+                ei::device::Event::Interface { object } => {
+                    log::debug!("device interface: {object:?}");
+                    if object.interface().eq("ei_pointer") {
+                        log::debug!("GOT POINTER DEVICE");
+                        self.pointer.replace((device, object.downcast().unwrap()));
+                    } else if object.interface().eq("ei_button") {
+                        log::debug!("GOT BUTTON DEVICE");
+                        self.button.replace((device, object.downcast().unwrap()));
+                    } else if object.interface().eq("ei_scroll") {
+                        log::debug!("GOT SCROLL DEVICE");
+                        self.scroll.replace((device, object.downcast().unwrap()));
+                    } else if object.interface().eq("ei_keyboard") {
+                        log::debug!("GOT KEYBOARD DEVICE");
+                        self.keyboard.replace((device, object.downcast().unwrap()));
+                    }
+                }
+                ei::device::Event::Done => {
+                    log::debug!("device: done {device:?}");
+                }
+                ei::device::Event::Resumed { serial } => {
+                    self.serial = serial;
+                    device.start_emulating(serial, self.sequence);
+                    self.sequence += 1;
+                    log::debug!("resumed: {device:?}");
+                    if let Some((d, _)) = &mut self.pointer {
+                        if d == &device {
+                            log::debug!("pointer resumed {serial}");
+                            self.has_pointer = true;
+                        }
+                    }
+                    if let Some((d, _)) = &mut self.button {
+                        if d == &device {
+                            log::debug!("button resumed {serial}");
+                            self.has_button = true;
+                        }
+                    }
+                    if let Some((d, _)) = &mut self.scroll {
+                        if d == &device {
+                            log::debug!("scroll resumed {serial}");
+                            self.has_scroll = true;
+                        }
+                    }
+                    if let Some((d, _)) = &mut self.keyboard {
+                        if d == &device {
+                            log::debug!("keyboard resumed {serial}");
+                            self.has_keyboard = true;
+                        }
+                    }
+                }
+                ei::device::Event::Paused { serial } => {
+                    self.has_pointer = false;
+                    self.has_button = false;
+                    self.serial = serial;
+                }
+                ei::device::Event::StartEmulating { serial, sequence } => {
+                    log::debug!("start emulating {serial}, {sequence}")
+                }
+                ei::device::Event::StopEmulating { serial } => {
+                    log::debug!("stop emulating {serial}")
+                }
+                ei::device::Event::Frame { serial, timestamp } => {
+                    log::debug!("frame: {serial}, {timestamp}");
+                }
+                ei::device::Event::RegionMappingId { mapping_id } => {
+                    log::debug!("RegionMappingId {mapping_id}")
+                }
+                e => log::debug!("invalid event: {e:?}"),
+            },
+            ei::Event::Seat(seat, request) => match request {
+                ei::seat::Event::Destroyed { serial } => {
+                    self.serial = serial;
+                    log::debug!("seat destroyed: {seat:?}");
+                }
+                ei::seat::Event::Name { name } => {
+                    log::debug!("seat name: {name}");
+                }
+                ei::seat::Event::Capability { mask, interface } => {
+                    log::debug!("seat capabilities: {mask}, interface: {interface:?}");
+                    self.capabilities.insert(interface, mask);
+                    self.capability_mask |= mask;
+                }
+                ei::seat::Event::Done => {
+                    log::debug!("seat done");
+                    log::debug!("binding capabilities: {}", self.capability_mask);
+                    seat.bind(self.capability_mask);
+                }
+                ei::seat::Event::Device { device } => {
+                    log::debug!("seat: new device - {device:?}");
+                }
+                _ => todo!(),
+            },
+            e => log::debug!("unhandled event: {e:?}"),
+        }
+        self.context.flush()?;
+        Ok(())
+    }
+
+    async fn notify(&mut self, _client_event: ClientEvent) {}
+
+    async fn destroy(&mut self) {}
+}

src/emulate/macos.rs

@@ -1,18 +1,18 @@
-use super::{error::EmulationError, EmulationHandle, InputEmulation};
+use crate::client::{ClientEvent, ClientHandle};
+use crate::emulate::InputEmulation;
+use crate::event::{Event, KeyboardEvent, PointerEvent};
+use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use core_graphics::display::{CGDisplayBounds, CGMainDisplayID, CGPoint};
 use core_graphics::event::{
     CGEvent, CGEventTapLocation, CGEventType, CGKeyCode, CGMouseButton, EventField, ScrollEventUnit,
 };
 use core_graphics::event_source::{CGEventSource, CGEventSourceStateID};
-use input_event::{Event, KeyboardEvent, PointerEvent};
 use keycode::{KeyMap, KeyMapping};
 use std::ops::{Index, IndexMut};
 use std::time::Duration;
 use tokio::task::AbortHandle;
 
-use super::error::MacOSEmulationCreationError;
-
 const DEFAULT_REPEAT_DELAY: Duration = Duration::from_millis(500);
 const DEFAULT_REPEAT_INTERVAL: Duration = Duration::from_millis(32);
 
@@ -53,9 +53,11 @@ impl IndexMut<CGMouseButton> for ButtonState {
 unsafe impl Send for MacOSEmulation {}
 
 impl MacOSEmulation {
-    pub fn new() -> Result<Self, MacOSEmulationCreationError> {
-        let event_source = CGEventSource::new(CGEventSourceStateID::CombinedSessionState)
-            .map_err(|_| MacOSEmulationCreationError::EventSourceCreation)?;
+    pub fn new() -> Result<Self> {
+        let event_source = match CGEventSource::new(CGEventSourceStateID::CombinedSessionState) {
+            Ok(e) => e,
+            Err(_) => return Err(anyhow!("event source creation failed!")),
+        };
         let button_state = ButtonState {
             left: false,
             right: false,
@@ -107,14 +109,14 @@ fn key_event(event_source: CGEventSource, key: u16, state: u8) {
 
 #[async_trait]
 impl InputEmulation for MacOSEmulation {
-    async fn consume(
-        &mut self,
-        event: Event,
-        _handle: EmulationHandle,
-    ) -> Result<(), EmulationError> {
+    async fn consume(&mut self, event: Event, _client_handle: ClientHandle) {
         match event {
             Event::Pointer(pointer_event) => match pointer_event {
-                PointerEvent::Motion { time: _, dx, dy } => {
+                PointerEvent::Motion {
+                    time: _,
+                    relative_x,
+                    relative_y,
+                } => {
                     // FIXME secondary displays?
                     let (min_x, min_y, max_x, max_y) = unsafe {
                         let display = CGMainDisplayID();
@@ -129,12 +131,12 @@ impl InputEmulation for MacOSEmulation {
                         Some(l) => l,
                         None => {
                             log::warn!("could not get mouse location!");
-                            return Ok(());
+                            return;
                         }
                     };
 
-                    mouse_location.x = (mouse_location.x + dx).clamp(min_x, max_x - 1.);
-                    mouse_location.y = (mouse_location.y + dy).clamp(min_y, max_y - 1.);
+                    mouse_location.x = (mouse_location.x + relative_x).clamp(min_x, max_x - 1.);
+                    mouse_location.y = (mouse_location.y + relative_y).clamp(min_y, max_y - 1.);
 
                     let mut event_type = CGEventType::MouseMoved;
                     if self.button_state.left {
@@ -153,11 +155,17 @@ impl InputEmulation for MacOSEmulation {
                         Ok(e) => e,
                         Err(_) => {
                             log::warn!("mouse event creation failed!");
-                            return Ok(());
+                            return;
                         }
                     };
-                    event.set_integer_value_field(EventField::MOUSE_EVENT_DELTA_X, dx as i64);
-                    event.set_integer_value_field(EventField::MOUSE_EVENT_DELTA_Y, dy as i64);
+                    event.set_integer_value_field(
+                        EventField::MOUSE_EVENT_DELTA_X,
+                        relative_x as i64,
+                    );
+                    event.set_integer_value_field(
+                        EventField::MOUSE_EVENT_DELTA_Y,
+                        relative_y as i64,
+                    );
                     event.post(CGEventTapLocation::HID);
                 }
                 PointerEvent::Button {
@@ -166,27 +174,27 @@ impl InputEmulation for MacOSEmulation {
                     state,
                 } => {
                     let (event_type, mouse_button) = match (button, state) {
-                        (b, 1) if b == input_event::BTN_LEFT => {
+                        (b, 1) if b == crate::event::BTN_LEFT => {
                             (CGEventType::LeftMouseDown, CGMouseButton::Left)
                         }
-                        (b, 0) if b == input_event::BTN_LEFT => {
+                        (b, 0) if b == crate::event::BTN_LEFT => {
                             (CGEventType::LeftMouseUp, CGMouseButton::Left)
                         }
-                        (b, 1) if b == input_event::BTN_RIGHT => {
+                        (b, 1) if b == crate::event::BTN_RIGHT => {
                             (CGEventType::RightMouseDown, CGMouseButton::Right)
                         }
-                        (b, 0) if b == input_event::BTN_RIGHT => {
+                        (b, 0) if b == crate::event::BTN_RIGHT => {
                             (CGEventType::RightMouseUp, CGMouseButton::Right)
                         }
-                        (b, 1) if b == input_event::BTN_MIDDLE => {
+                        (b, 1) if b == crate::event::BTN_MIDDLE => {
                             (CGEventType::OtherMouseDown, CGMouseButton::Center)
                         }
-                        (b, 0) if b == input_event::BTN_MIDDLE => {
+                        (b, 0) if b == crate::event::BTN_MIDDLE => {
                             (CGEventType::OtherMouseUp, CGMouseButton::Center)
                         }
                         _ => {
                             log::warn!("invalid button event: {button},{state}");
-                            return Ok(());
+                            return;
                         }
                     };
                     // store button state
@@ -202,7 +210,7 @@ impl InputEmulation for MacOSEmulation {
                         Ok(e) => e,
                         Err(()) => {
                             log::warn!("mouse event creation failed!");
-                            return Ok(());
+                            return;
                         }
                     };
                     event.post(CGEventTapLocation::HID);
@@ -218,7 +226,7 @@ impl InputEmulation for MacOSEmulation {
                         1 => (2, 0, value, 0), // 1 = horizontal => 2 scroll wheel devices (y, x) -> (0, x)
                         _ => {
                             log::warn!("invalid scroll event: {axis}, {value}");
-                            return Ok(());
+                            return;
                         }
                     };
                     let event = match CGEvent::new_scroll_event(
@@ -232,7 +240,7 @@ impl InputEmulation for MacOSEmulation {
                         Ok(e) => e,
                         Err(()) => {
                             log::warn!("scroll event creation failed!");
-                            return Ok(());
+                            return;
                         }
                     };
                     event.post(CGEventTapLocation::HID);
@@ -243,7 +251,7 @@ impl InputEmulation for MacOSEmulation {
                         1 => (2, 0, value, 0), // 1 = horizontal => 2 scroll wheel devices (y, x) -> (0, x)
                         _ => {
                             log::warn!("invalid scroll event: {axis}, {value}");
-                            return Ok(());
+                            return;
                         }
                     };
                     let event = match CGEvent::new_scroll_event(
@@ -257,7 +265,7 @@ impl InputEmulation for MacOSEmulation {
                         Ok(e) => e,
                         Err(()) => {
                             log::warn!("scroll event creation failed!");
-                            return Ok(());
+                            return;
                         }
                     };
                     event.post(CGEventTapLocation::HID);
@@ -274,7 +282,7 @@ impl InputEmulation for MacOSEmulation {
                         Ok(k) => k.mac as CGKeyCode,
                         Err(_) => {
                             log::warn!("unable to map key event");
-                            return Ok(());
+                            return;
                         }
                     };
                     match state {
@@ -288,13 +296,9 @@ impl InputEmulation for MacOSEmulation {
             },
             _ => (),
         }
-        // FIXME
-        Ok(())
     }
 
-    async fn create(&mut self, _handle: EmulationHandle) {}
+    async fn notify(&mut self, _client_event: ClientEvent) {}
 
-    async fn destroy(&mut self, _handle: EmulationHandle) {}
-
-    async fn terminate(&mut self) {}
+    async fn destroy(&mut self) {}
 }

src/emulate/windows.rs

@@ -1,9 +1,9 @@
-use super::error::{EmulationError, WindowsEmulationCreationError};
-use input_event::{
-    scancode, Event, KeyboardEvent, PointerEvent, BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE,
-    BTN_RIGHT,
+use crate::{
+    emulate::InputEmulation,
+    event::{KeyboardEvent, PointerEvent},
+    scancode,
 };
-
+use anyhow::Result;
 use async_trait::async_trait;
 use std::ops::BitOrAssign;
 use std::time::Duration;
@@ -19,7 +19,11 @@ use windows::Win32::UI::Input::KeyboardAndMouse::{
 };
 use windows::Win32::UI::WindowsAndMessaging::{XBUTTON1, XBUTTON2};
 
-use super::{EmulationHandle, InputEmulation};
+use crate::event::{BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT};
+use crate::{
+    client::{ClientEvent, ClientHandle},
+    event::Event,
+};
 
 const DEFAULT_REPEAT_DELAY: Duration = Duration::from_millis(500);
 const DEFAULT_REPEAT_INTERVAL: Duration = Duration::from_millis(32);
@@ -29,18 +33,22 @@ pub struct WindowsEmulation {
 }
 
 impl WindowsEmulation {
-    pub fn new() -> Result<Self, WindowsEmulationCreationError> {
+    pub fn new() -> Result<Self> {
         Ok(Self { repeat_task: None })
     }
 }
 
 #[async_trait]
 impl InputEmulation for WindowsEmulation {
-    async fn consume(&mut self, event: Event, _: EmulationHandle) -> Result<(), EmulationError> {
+    async fn consume(&mut self, event: Event, _: ClientHandle) {
         match event {
             Event::Pointer(pointer_event) => match pointer_event {
-                PointerEvent::Motion { time: _, dx, dy } => {
-                    rel_mouse(dx as i32, dy as i32);
+                PointerEvent::Motion {
+                    time: _,
+                    relative_x,
+                    relative_y,
+                } => {
+                    rel_mouse(relative_x as i32, relative_y as i32);
                 }
                 PointerEvent::Button {
                     time: _,
@@ -73,15 +81,13 @@ impl InputEmulation for WindowsEmulation {
             },
             _ => {}
         }
-        // FIXME
-        Ok(())
     }
 
-    async fn create(&mut self, _handle: EmulationHandle) {}
+    async fn notify(&mut self, _: ClientEvent) {
+        // nothing to do
+    }
 
-    async fn destroy(&mut self, _handle: EmulationHandle) {}
-
-    async fn terminate(&mut self) {}
+    async fn destroy(&mut self) {}
 }
 
 impl WindowsEmulation {

src/emulate/wlroots.rs

@@ -1,6 +1,5 @@
-use crate::error::EmulationError;
-
-use super::{error::WlrootsEmulationCreationError, InputEmulation};
+use crate::client::{ClientEvent, ClientHandle};
+use crate::emulate::InputEmulation;
 use async_trait::async_trait;
 use std::collections::HashMap;
 use std::io;
@@ -8,6 +7,7 @@ use std::os::fd::{AsFd, OwnedFd};
 use wayland_client::backend::WaylandError;
 use wayland_client::WEnum;
 
+use anyhow::{anyhow, Result};
 use wayland_client::protocol::wl_keyboard::{self, WlKeyboard};
 use wayland_client::protocol::wl_pointer::{Axis, ButtonState};
 use wayland_client::protocol::wl_seat::WlSeat;
@@ -28,14 +28,11 @@ use wayland_client::{
     Connection, Dispatch, EventQueue, QueueHandle,
 };
 
-use input_event::{Event, KeyboardEvent, PointerEvent};
-
-use super::error::WaylandBindError;
-use super::EmulationHandle;
+use crate::event::{Event, KeyboardEvent, PointerEvent};
 
 struct State {
     keymap: Option<(u32, OwnedFd, u32)>,
-    input_for_client: HashMap<EmulationHandle, VirtualInput>,
+    input_for_client: HashMap<ClientHandle, VirtualInput>,
     seat: wl_seat::WlSeat,
     qh: QueueHandle<Self>,
     vpm: VpManager,
@@ -50,23 +47,20 @@ pub(crate) struct WlrootsEmulation {
 }
 
 impl WlrootsEmulation {
-    pub fn new() -> Result<Self, WlrootsEmulationCreationError> {
+    pub fn new() -> Result<Self> {
         let conn = Connection::connect_to_env()?;
         let (globals, queue) = registry_queue_init::<State>(&conn)?;
         let qh = queue.handle();
 
-        let seat: wl_seat::WlSeat = globals
-            .bind(&qh, 7..=8, ())
-            .map_err(|e| WaylandBindError::new(e, "wl_seat 7..=8"))?;
+        let seat: wl_seat::WlSeat = match globals.bind(&qh, 7..=8, ()) {
+            Ok(wl_seat) => wl_seat,
+            Err(_) => return Err(anyhow!("wl_seat >= v7 not supported")),
+        };
 
-        let vpm: VpManager = globals
-            .bind(&qh, 1..=1, ())
-            .map_err(|e| WaylandBindError::new(e, "wlr-virtual-pointer-unstable-v1"))?;
-        let vkm: VkManager = globals
-            .bind(&qh, 1..=1, ())
-            .map_err(|e| WaylandBindError::new(e, "virtual-keyboard-unstable-v1"))?;
+        let vpm: VpManager = globals.bind(&qh, 1..=1, ())?;
+        let vkm: VkManager = globals.bind(&qh, 1..=1, ())?;
 
-        let input_for_client: HashMap<EmulationHandle, VirtualInput> = HashMap::new();
+        let input_for_client: HashMap<ClientHandle, VirtualInput> = HashMap::new();
 
         let mut emulate = WlrootsEmulation {
             last_flush_failed: false,
@@ -81,7 +75,7 @@ impl WlrootsEmulation {
             queue,
         };
         while emulate.state.keymap.is_none() {
-            emulate.queue.blocking_dispatch(&mut emulate.state)?;
+            emulate.queue.blocking_dispatch(&mut emulate.state).unwrap();
         }
         // let fd = unsafe { &File::from_raw_fd(emulate.state.keymap.unwrap().1.as_raw_fd()) };
         // let mmap = unsafe { MmapOptions::new().map_copy(fd).unwrap() };
@@ -91,7 +85,7 @@ impl WlrootsEmulation {
 }
 
 impl State {
-    fn add_client(&mut self, client: EmulationHandle) {
+    fn add_client(&mut self, client: ClientHandle) {
         let pointer: Vp = self.vpm.create_virtual_pointer(None, &self.qh, ());
         let keyboard: Vk = self.vkm.create_virtual_keyboard(&self.seat, &self.qh, ());
 
@@ -106,68 +100,56 @@ impl State {
 
         self.input_for_client.insert(client, vinput);
     }
-
-    fn destroy_client(&mut self, handle: EmulationHandle) {
-        if let Some(input) = self.input_for_client.remove(&handle) {
-            input.pointer.destroy();
-            input.keyboard.destroy();
-        }
-    }
 }
 
 #[async_trait]
 impl InputEmulation for WlrootsEmulation {
-    async fn consume(
-        &mut self,
-        event: Event,
-        handle: EmulationHandle,
-    ) -> Result<(), EmulationError> {
-        if let Some(virtual_input) = self.state.input_for_client.get(&handle) {
+    async fn consume(&mut self, event: Event, client_handle: ClientHandle) {
+        if let Some(virtual_input) = self.state.input_for_client.get(&client_handle) {
             if self.last_flush_failed {
-                match self.queue.flush() {
-                    Err(WaylandError::Io(e)) if e.kind() == io::ErrorKind::WouldBlock => {
+                if let Err(WaylandError::Io(e)) = self.queue.flush() {
+                    if e.kind() == io::ErrorKind::WouldBlock {
                         /*
                          * outgoing buffer is full - sending more events
                          * will overwhelm the output buffer and leave the
                          * wayland connection in a broken state
                          */
-                        log::warn!("can't keep up, discarding event: ({handle}) - {event:?}");
-                        return Ok(());
+                        log::warn!(
+                            "can't keep up, discarding event: ({client_handle}) - {event:?}"
+                        );
+                        return;
                     }
-                    _ => {}
                 }
             }
-            virtual_input
-                .consume_event(event)
-                .unwrap_or_else(|_| panic!("failed to convert event: {event:?}"));
+            virtual_input.consume_event(event).unwrap();
             match self.queue.flush() {
                 Err(WaylandError::Io(e)) if e.kind() == io::ErrorKind::WouldBlock => {
                     self.last_flush_failed = true;
-                    log::warn!("can't keep up, discarding event: ({handle}) - {event:?}");
+                    log::warn!("can't keep up, retrying ...");
+                }
+                Err(WaylandError::Io(e)) => {
+                    log::error!("{e}")
+                }
+                Err(WaylandError::Protocol(e)) => {
+                    panic!("wayland protocol violation: {e}")
+                }
+                Ok(()) => {
+                    self.last_flush_failed = false;
                 }
-                Err(WaylandError::Protocol(e)) => panic!("wayland protocol violation: {e}"),
-                Ok(()) => self.last_flush_failed = false,
-                Err(e) => Err(e)?,
             }
         }
-        Ok(())
     }
 
-    async fn create(&mut self, handle: EmulationHandle) {
-        self.state.add_client(handle);
-        if let Err(e) = self.queue.flush() {
-            log::error!("{}", e);
+    async fn notify(&mut self, client_event: ClientEvent) {
+        if let ClientEvent::Create(client, _) = client_event {
+            self.state.add_client(client);
+            if let Err(e) = self.queue.flush() {
+                log::error!("{}", e);
+            }
         }
     }
-    async fn destroy(&mut self, handle: EmulationHandle) {
-        self.state.destroy_client(handle);
-        if let Err(e) = self.queue.flush() {
-            log::error!("{}", e);
-        }
-    }
-    async fn terminate(&mut self) {
-        /* nothing to do */
-    }
+
+    async fn destroy(&mut self) {}
 }
 
 struct VirtualInput {
@@ -180,7 +162,11 @@ impl VirtualInput {
         match event {
             Event::Pointer(e) => {
                 match e {
-                    PointerEvent::Motion { time, dx, dy } => self.pointer.motion(time, dx, dy),
+                    PointerEvent::Motion {
+                        time,
+                        relative_x,
+                        relative_y,
+                    } => self.pointer.motion(time, relative_x, relative_y),
                     PointerEvent::Button {
                         time,
                         button,

src/emulate/x11.rs

@@ -1,3 +1,4 @@
+use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use std::ptr;
 use x11::{
@@ -5,14 +6,14 @@ use x11::{
     xtest,
 };
 
-use input_event::{
-    Event, KeyboardEvent, PointerEvent, BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT,
+use crate::{
+    client::ClientHandle,
+    emulate::InputEmulation,
+    event::{
+        Event, KeyboardEvent, PointerEvent, BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT,
+    },
 };
 
-use crate::error::EmulationError;
-
-use super::{error::X11EmulationCreationError, EmulationHandle, InputEmulation};
-
 pub struct X11Emulation {
     display: *mut xlib::Display,
 }
@@ -20,11 +21,11 @@ pub struct X11Emulation {
 unsafe impl Send for X11Emulation {}
 
 impl X11Emulation {
-    pub fn new() -> Result<Self, X11EmulationCreationError> {
+    pub fn new() -> Result<Self> {
         let display = unsafe {
             match xlib::XOpenDisplay(ptr::null()) {
                 d if d == ptr::null::<xlib::Display>() as *mut xlib::Display => {
-                    Err(X11EmulationCreationError::OpenDisplay)
+                    Err(anyhow!("could not open display"))
                 }
                 display => Ok(display),
             }
@@ -100,11 +101,15 @@ impl Drop for X11Emulation {
 
 #[async_trait]
 impl InputEmulation for X11Emulation {
-    async fn consume(&mut self, event: Event, _: EmulationHandle) -> Result<(), EmulationError> {
+    async fn consume(&mut self, event: Event, _: ClientHandle) {
         match event {
             Event::Pointer(pointer_event) => match pointer_event {
-                PointerEvent::Motion { time: _, dx, dy } => {
-                    self.relative_motion(dx as i32, dy as i32);
+                PointerEvent::Motion {
+                    time: _,
+                    relative_x,
+                    relative_y,
+                } => {
+                    self.relative_motion(relative_x as i32, relative_y as i32);
                 }
                 PointerEvent::Button {
                     time: _,
@@ -137,19 +142,11 @@ impl InputEmulation for X11Emulation {
         unsafe {
             xlib::XFlush(self.display);
         }
-        // FIXME
-        Ok(())
     }
 
-    async fn create(&mut self, _: EmulationHandle) {
+    async fn notify(&mut self, _: crate::client::ClientEvent) {
         // for our purposes it does not matter what client sent the event
     }
 
-    async fn destroy(&mut self, _: EmulationHandle) {
-        // for our purposes it does not matter what client sent the event
-    }
-
-    async fn terminate(&mut self) {
-        /* nothing to do */
-    }
+    async fn destroy(&mut self) {}
 }

src/emulate/xdg_desktop_portal.rs

@@ -1,55 +1,58 @@
+use anyhow::Result;
 use ashpd::{
     desktop::{
         remote_desktop::{Axis, DeviceType, KeyState, RemoteDesktop},
-        PersistMode, Session,
+        ResponseError, Session,
     },
-    zbus::AsyncDrop,
     WindowIdentifier,
 };
 use async_trait::async_trait;
 
-use futures::FutureExt;
-use input_event::{
-    Event::{Keyboard, Pointer},
-    KeyboardEvent, PointerEvent,
+use crate::{
+    client::ClientEvent,
+    emulate::InputEmulation,
+    event::{
+        Event::{Keyboard, Pointer},
+        KeyboardEvent, PointerEvent,
+    },
 };
 
-use crate::error::EmulationError;
-
-use super::{error::XdpEmulationCreationError, EmulationHandle, InputEmulation};
-
 pub struct DesktopPortalEmulation<'a> {
     proxy: RemoteDesktop<'a>,
-    session: Session<'a, RemoteDesktop<'a>>,
+    session: Session<'a>,
 }
 
 impl<'a> DesktopPortalEmulation<'a> {
-    pub async fn new() -> Result<DesktopPortalEmulation<'a>, XdpEmulationCreationError> {
+    pub async fn new() -> Result<DesktopPortalEmulation<'a>> {
         log::debug!("connecting to org.freedesktop.portal.RemoteDesktop portal ...");
         let proxy = RemoteDesktop::new().await?;
 
         // retry when user presses the cancel button
-        log::debug!("creating session ...");
-        let session = proxy.create_session().await?;
+        let (session, _) = loop {
+            log::debug!("creating session ...");
+            let session = proxy.create_session().await?;
 
-        log::debug!("selecting devices ...");
-        proxy
-            .select_devices(
-                &session,
-                DeviceType::Keyboard | DeviceType::Pointer,
-                None,
-                PersistMode::ExplicitlyRevoked,
-            )
-            .await?;
+            log::debug!("selecting devices ...");
+            proxy
+                .select_devices(&session, DeviceType::Keyboard | DeviceType::Pointer)
+                .await?;
 
-        log::info!("requesting permission for input emulation");
-        let _devices = proxy
-            .start(&session, &WindowIdentifier::default())
-            .await?
-            .response()?;
+            log::info!("requesting permission for input emulation");
+            match proxy
+                .start(&session, &WindowIdentifier::default())
+                .await?
+                .response()
+            {
+                Ok(d) => break (session, d),
+                Err(ashpd::Error::Response(ResponseError::Cancelled)) => {
+                    log::warn!("request cancelled!");
+                    continue;
+                }
+                e => e?,
+            };
+        };
 
         log::debug!("started session");
-        let session = session;
 
         Ok(Self { proxy, session })
     }
@@ -57,17 +60,21 @@ impl<'a> DesktopPortalEmulation<'a> {
 
 #[async_trait]
 impl<'a> InputEmulation for DesktopPortalEmulation<'a> {
-    async fn consume(
-        &mut self,
-        event: input_event::Event,
-        _client: EmulationHandle,
-    ) -> Result<(), EmulationError> {
+    async fn consume(&mut self, event: crate::event::Event, _client: crate::client::ClientHandle) {
         match event {
             Pointer(p) => match p {
-                PointerEvent::Motion { time: _, dx, dy } => {
-                    self.proxy
-                        .notify_pointer_motion(&self.session, dx, dy)
-                        .await?;
+                PointerEvent::Motion {
+                    time: _,
+                    relative_x,
+                    relative_y,
+                } => {
+                    if let Err(e) = self
+                        .proxy
+                        .notify_pointer_motion(&self.session, relative_x, relative_y)
+                        .await
+                    {
+                        log::warn!("{e}");
+                    }
                 }
                 PointerEvent::Button {
                     time: _,
@@ -78,18 +85,26 @@ impl<'a> InputEmulation for DesktopPortalEmulation<'a> {
                         0 => KeyState::Released,
                         _ => KeyState::Pressed,
                     };
-                    self.proxy
+                    if let Err(e) = self
+                        .proxy
                         .notify_pointer_button(&self.session, button as i32, state)
-                        .await?;
+                        .await
+                    {
+                        log::warn!("{e}");
+                    }
                 }
                 PointerEvent::AxisDiscrete120 { axis, value } => {
                     let axis = match axis {
                         0 => Axis::Vertical,
                         _ => Axis::Horizontal,
                     };
-                    self.proxy
-                        .notify_pointer_axis_discrete(&self.session, axis, value / 120)
-                        .await?;
+                    if let Err(e) = self
+                        .proxy
+                        .notify_pointer_axis_discrete(&self.session, axis, value)
+                        .await
+                    {
+                        log::warn!("{e}");
+                    }
                 }
                 PointerEvent::Axis {
                     time: _,
@@ -104,9 +119,13 @@ impl<'a> InputEmulation for DesktopPortalEmulation<'a> {
                         Axis::Vertical => (0., value),
                         Axis::Horizontal => (value, 0.),
                     };
-                    self.proxy
+                    if let Err(e) = self
+                        .proxy
                         .notify_pointer_axis(&self.session, dx, dy, true)
-                        .await?;
+                        .await
+                    {
+                        log::warn!("{e}");
+                    }
                 }
                 PointerEvent::Frame {} => {}
             },
@@ -121,9 +140,13 @@ impl<'a> InputEmulation for DesktopPortalEmulation<'a> {
                             0 => KeyState::Released,
                             _ => KeyState::Pressed,
                         };
-                        self.proxy
+                        if let Err(e) = self
+                            .proxy
                             .notify_keyboard_keycode(&self.session, key as i32, state)
-                            .await?;
+                            .await
+                        {
+                            log::warn!("{e}");
+                        }
                     }
                     KeyboardEvent::Modifiers { .. } => {
                         // ignore
@@ -132,36 +155,14 @@ impl<'a> InputEmulation for DesktopPortalEmulation<'a> {
             }
             _ => {}
         }
-        Ok(())
     }
 
-    async fn create(&mut self, _client: EmulationHandle) {}
-    async fn destroy(&mut self, _client: EmulationHandle) {}
-    async fn terminate(&mut self) {
+    async fn notify(&mut self, _client: ClientEvent) {}
+
+    async fn destroy(&mut self) {
+        log::debug!("closing remote desktop session");
         if let Err(e) = self.session.close().await {
-            log::warn!("session.close(): {e}");
-        };
-        if let Err(e) = self.session.receive_closed().await {
-            log::warn!("session.receive_closed(): {e}");
-        };
-    }
-}
-
-impl<'a> AsyncDrop for DesktopPortalEmulation<'a> {
-    #[doc = r" Perform the async cleanup."]
-    #[must_use]
-    #[allow(clippy::type_complexity, clippy::type_repetition_in_bounds)]
-    fn async_drop<'async_trait>(
-        self,
-    ) -> ::core::pin::Pin<
-        Box<dyn ::core::future::Future<Output = ()> + ::core::marker::Send + 'async_trait>,
-    >
-    where
-        Self: 'async_trait,
-    {
-        async move {
-            let _ = self.session.close().await;
+            log::error!("failed to close remote desktop session: {e}");
         }
-        .boxed()
     }
 }

src/emulation_test.rs

@@ -1,6 +1,7 @@
-use crate::config::Config;
+use crate::client::{ClientEvent, Position};
+use crate::emulate;
+use crate::event::{Event, PointerEvent};
 use anyhow::Result;
-use input_event::{Event, PointerEvent};
 use std::f64::consts::PI;
 use std::time::{Duration, Instant};
 use tokio::task::LocalSet;
@@ -12,34 +13,36 @@ pub fn run() -> Result<()> {
         .enable_time()
         .build()?;
 
-    let config = Config::new()?;
-
-    runtime.block_on(LocalSet::new().run_until(input_emulation_test(config)))
+    runtime.block_on(LocalSet::new().run_until(input_emulation_test()))
 }
 
 const FREQUENCY_HZ: f64 = 1.0;
 const RADIUS: f64 = 100.0;
 
-async fn input_emulation_test(config: Config) -> Result<()> {
-    let backend = config.emulation_backend.map(|b| b.into());
-    let mut emulation = input_emulation::create(backend).await?;
-    emulation.create(0).await;
+async fn input_emulation_test() -> Result<()> {
+    let mut emulation = emulate::create().await;
+    emulation
+        .notify(ClientEvent::Create(0, Position::Left))
+        .await;
     let start = Instant::now();
     let mut offset = (0, 0);
     loop {
-        tokio::time::sleep(Duration::from_millis(1)).await;
-        let elapsed = start.elapsed();
-        let elapsed_sec_f64 = elapsed.as_secs_f64();
-        let second_fraction = elapsed_sec_f64 - elapsed_sec_f64 as u64 as f64;
-        let radians = second_fraction * 2. * PI * FREQUENCY_HZ;
-        let new_offset_f = (radians.cos() * RADIUS * 2., (radians * 2.).sin() * RADIUS);
-        let new_offset = (new_offset_f.0 as i32, new_offset_f.1 as i32);
-        if new_offset != offset {
-            let relative_motion = (new_offset.0 - offset.0, new_offset.1 - offset.1);
-            offset = new_offset;
-            let (dx, dy) = (relative_motion.0 as f64, relative_motion.1 as f64);
-            let event = Event::Pointer(PointerEvent::Motion { time: 0, dx, dy });
-            emulation.consume(event, 0).await?;
+        tokio::select! {
+            _ = emulation.dispatch() => {}
+            _ = tokio::time::sleep(Duration::from_millis(1)) => {
+                let elapsed = start.elapsed();
+                let elapsed_sec_f64 = elapsed.as_secs_f64();
+                let second_fraction = elapsed_sec_f64 - elapsed_sec_f64 as u64 as f64;
+                let radians = second_fraction * 2. * PI * FREQUENCY_HZ;
+                let new_offset_f = (radians.cos() * RADIUS * 2., (radians * 2.).sin() * RADIUS);
+                let new_offset = (new_offset_f.0 as i32, new_offset_f.1 as i32);
+                if new_offset != offset {
+                    let relative_motion = (new_offset.0 - offset.0, new_offset.1 - offset.1);
+                    offset = new_offset;
+                    let (relative_x, relative_y) = (relative_motion.0 as f64, relative_motion.1 as f64);
+                    emulation.consume(Event::Pointer(PointerEvent::Motion {time: 0, relative_x, relative_y }), 0).await;
+                }
+            }
         }
     }
 }

src/event.rs

@@ -0,0 +1,586 @@
+use crate::scancode;
+use anyhow::{anyhow, Result};
+use std::{
+    error::Error,
+    fmt::{self, Display},
+};
+
+// FIXME
+pub const BTN_LEFT: u32 = 0x110;
+pub const BTN_RIGHT: u32 = 0x111;
+pub const BTN_MIDDLE: u32 = 0x112;
+pub const BTN_BACK: u32 = 0x113;
+pub const BTN_FORWARD: u32 = 0x114;
+
+#[derive(Debug, PartialEq, Clone, Copy)]
+pub enum PointerEvent {
+    Motion {
+        time: u32,
+        relative_x: f64,
+        relative_y: f64,
+    },
+    Button {
+        time: u32,
+        button: u32,
+        state: u32,
+    },
+    Axis {
+        time: u32,
+        axis: u8,
+        value: f64,
+    },
+    AxisDiscrete120 {
+        axis: u8,
+        value: i32,
+    },
+    Frame {},
+}
+
+#[derive(Debug, PartialEq, Clone, Copy)]
+pub enum KeyboardEvent {
+    Key {
+        time: u32,
+        key: u32,
+        state: u8,
+    },
+    Modifiers {
+        mods_depressed: u32,
+        mods_latched: u32,
+        mods_locked: u32,
+        group: u32,
+    },
+}
+
+#[derive(PartialEq, Debug, Clone, Copy)]
+pub enum Event {
+    /// pointer event (motion / button / axis)
+    Pointer(PointerEvent),
+    /// keyboard events (key / modifiers)
+    Keyboard(KeyboardEvent),
+    /// enter event: request to enter a client.
+    /// The client must release the pointer if it is grabbed
+    /// and reply with a leave event, as soon as its ready to
+    /// receive events
+    Enter(),
+    /// leave event: this client is now ready to receive events and will
+    /// not send any events after until it sends an enter event
+    Leave(),
+    /// ping a client, to see if it is still alive. A client that does
+    /// not respond with a pong event will be assumed to be offline.
+    Ping(),
+    /// response to a ping event: this event signals that a client
+    /// is still alive but must otherwise be ignored
+    Pong(),
+    /// explicit disconnect request. The client will no longer
+    /// send events until the next Enter event. All of its keys should be released.
+    Disconnect(),
+}
+
+impl Display for PointerEvent {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            PointerEvent::Motion {
+                time: _,
+                relative_x,
+                relative_y,
+            } => write!(f, "motion({relative_x},{relative_y})"),
+            PointerEvent::Button {
+                time: _,
+                button,
+                state,
+            } => {
+                let str = match *button {
+                    BTN_LEFT => Some("left"),
+                    BTN_RIGHT => Some("right"),
+                    BTN_MIDDLE => Some("middle"),
+                    BTN_FORWARD => Some("forward"),
+                    BTN_BACK => Some("back"),
+                    _ => None,
+                };
+                if let Some(button) = str {
+                    write!(f, "button({button}, {state})")
+                } else {
+                    write!(f, "button({button}, {state}")
+                }
+            }
+            PointerEvent::Axis {
+                time: _,
+                axis,
+                value,
+            } => write!(f, "scroll({axis}, {value})"),
+            PointerEvent::AxisDiscrete120 { axis, value } => {
+                write!(f, "scroll-120 ({axis}, {value})")
+            }
+            PointerEvent::Frame {} => write!(f, "frame()"),
+        }
+    }
+}
+
+impl Display for KeyboardEvent {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            KeyboardEvent::Key {
+                time: _,
+                key,
+                state,
+            } => {
+                let scan = scancode::Linux::try_from(*key);
+                if let Ok(scan) = scan {
+                    write!(f, "key({scan:?}, {state})")
+                } else {
+                    write!(f, "key({key}, {state})")
+                }
+            }
+            KeyboardEvent::Modifiers {
+                mods_depressed,
+                mods_latched,
+                mods_locked,
+                group,
+            } => write!(
+                f,
+                "modifiers({mods_depressed},{mods_latched},{mods_locked},{group})"
+            ),
+        }
+    }
+}
+
+impl Display for Event {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Event::Pointer(p) => write!(f, "{}", p),
+            Event::Keyboard(k) => write!(f, "{}", k),
+            Event::Enter() => write!(f, "enter"),
+            Event::Leave() => write!(f, "leave"),
+            Event::Ping() => write!(f, "ping"),
+            Event::Pong() => write!(f, "pong"),
+            Event::Disconnect() => write!(f, "disconnect"),
+        }
+    }
+}
+
+impl Event {
+    fn event_type(&self) -> EventType {
+        match self {
+            Self::Pointer(_) => EventType::Pointer,
+            Self::Keyboard(_) => EventType::Keyboard,
+            Self::Enter() => EventType::Enter,
+            Self::Leave() => EventType::Leave,
+            Self::Ping() => EventType::Ping,
+            Self::Pong() => EventType::Pong,
+            Self::Disconnect() => EventType::Disconnect,
+        }
+    }
+}
+
+impl PointerEvent {
+    fn event_type(&self) -> PointerEventType {
+        match self {
+            Self::Motion { .. } => PointerEventType::Motion,
+            Self::Button { .. } => PointerEventType::Button,
+            Self::Axis { .. } => PointerEventType::Axis,
+            Self::AxisDiscrete120 { .. } => PointerEventType::AxisDiscrete120,
+            Self::Frame { .. } => PointerEventType::Frame,
+        }
+    }
+}
+
+impl KeyboardEvent {
+    fn event_type(&self) -> KeyboardEventType {
+        match self {
+            KeyboardEvent::Key { .. } => KeyboardEventType::Key,
+            KeyboardEvent::Modifiers { .. } => KeyboardEventType::Modifiers,
+        }
+    }
+}
+
+enum PointerEventType {
+    Motion,
+    Button,
+    Axis,
+    AxisDiscrete120,
+    Frame,
+}
+enum KeyboardEventType {
+    Key,
+    Modifiers,
+}
+enum EventType {
+    Pointer,
+    Keyboard,
+    Enter,
+    Leave,
+    Ping,
+    Pong,
+    Disconnect,
+}
+
+impl TryFrom<u8> for PointerEventType {
+    type Error = anyhow::Error;
+
+    fn try_from(value: u8) -> Result<Self> {
+        match value {
+            x if x == Self::Motion as u8 => Ok(Self::Motion),
+            x if x == Self::Button as u8 => Ok(Self::Button),
+            x if x == Self::Axis as u8 => Ok(Self::Axis),
+            x if x == Self::AxisDiscrete120 as u8 => Ok(Self::AxisDiscrete120),
+            x if x == Self::Frame as u8 => Ok(Self::Frame),
+            _ => Err(anyhow!(ProtocolError {
+                msg: format!("invalid pointer event type {}", value),
+            })),
+        }
+    }
+}
+
+impl TryFrom<u8> for KeyboardEventType {
+    type Error = anyhow::Error;
+
+    fn try_from(value: u8) -> Result<Self> {
+        match value {
+            x if x == Self::Key as u8 => Ok(Self::Key),
+            x if x == Self::Modifiers as u8 => Ok(Self::Modifiers),
+            _ => Err(anyhow!(ProtocolError {
+                msg: format!("invalid keyboard event type {}", value),
+            })),
+        }
+    }
+}
+
+impl From<&Event> for Vec<u8> {
+    fn from(event: &Event) -> Self {
+        let event_id = vec![event.event_type() as u8];
+        let event_data = match event {
+            Event::Pointer(p) => p.into(),
+            Event::Keyboard(k) => k.into(),
+            Event::Enter() => vec![],
+            Event::Leave() => vec![],
+            Event::Ping() => vec![],
+            Event::Pong() => vec![],
+            Event::Disconnect() => vec![],
+        };
+        [event_id, event_data].concat()
+    }
+}
+
+#[derive(Debug)]
+struct ProtocolError {
+    msg: String,
+}
+
+impl fmt::Display for ProtocolError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "Protocol violation: {}", self.msg)
+    }
+}
+impl Error for ProtocolError {}
+
+impl TryFrom<Vec<u8>> for Event {
+    type Error = anyhow::Error;
+
+    fn try_from(value: Vec<u8>) -> Result<Self> {
+        let event_id = u8::from_be_bytes(value[..1].try_into()?);
+        match event_id {
+            i if i == (EventType::Pointer as u8) => Ok(Event::Pointer(value.try_into()?)),
+            i if i == (EventType::Keyboard as u8) => Ok(Event::Keyboard(value.try_into()?)),
+            i if i == (EventType::Enter as u8) => Ok(Event::Enter()),
+            i if i == (EventType::Leave as u8) => Ok(Event::Leave()),
+            i if i == (EventType::Ping as u8) => Ok(Event::Ping()),
+            i if i == (EventType::Pong as u8) => Ok(Event::Pong()),
+            i if i == (EventType::Disconnect as u8) => Ok(Event::Disconnect()),
+            _ => Err(anyhow!(ProtocolError {
+                msg: format!("invalid event_id {}", event_id),
+            })),
+        }
+    }
+}
+
+impl From<&PointerEvent> for Vec<u8> {
+    fn from(event: &PointerEvent) -> Self {
+        let id = vec![event.event_type() as u8];
+        let data = match event {
+            PointerEvent::Motion {
+                time,
+                relative_x,
+                relative_y,
+            } => {
+                let time = time.to_be_bytes();
+                let relative_x = relative_x.to_be_bytes();
+                let relative_y = relative_y.to_be_bytes();
+                [&time[..], &relative_x[..], &relative_y[..]].concat()
+            }
+            PointerEvent::Button {
+                time,
+                button,
+                state,
+            } => {
+                let time = time.to_be_bytes();
+                let button = button.to_be_bytes();
+                let state = state.to_be_bytes();
+                [&time[..], &button[..], &state[..]].concat()
+            }
+            PointerEvent::Axis { time, axis, value } => {
+                let time = time.to_be_bytes();
+                let axis = axis.to_be_bytes();
+                let value = value.to_be_bytes();
+                [&time[..], &axis[..], &value[..]].concat()
+            }
+            PointerEvent::AxisDiscrete120 { axis, value } => {
+                let axis = axis.to_be_bytes();
+                let value = value.to_be_bytes();
+                [&axis[..], &value[..]].concat()
+            }
+            PointerEvent::Frame {} => {
+                vec![]
+            }
+        };
+        [id, data].concat()
+    }
+}
+
+impl TryFrom<Vec<u8>> for PointerEvent {
+    type Error = anyhow::Error;
+
+    fn try_from(data: Vec<u8>) -> Result<Self> {
+        match data.get(1) {
+            Some(id) => {
+                let event_type = match id.to_owned().try_into() {
+                    Ok(event_type) => event_type,
+                    Err(e) => return Err(e),
+                };
+                match event_type {
+                    PointerEventType::Motion => {
+                        let time = match data.get(2..6) {
+                            Some(d) => u32::from_be_bytes(d.try_into()?),
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 4 Bytes at index 2".into(),
+                                }))
+                            }
+                        };
+                        let relative_x = match data.get(6..14) {
+                            Some(d) => f64::from_be_bytes(d.try_into()?),
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 8 Bytes at index 6".into(),
+                                }))
+                            }
+                        };
+                        let relative_y = match data.get(14..22) {
+                            Some(d) => f64::from_be_bytes(d.try_into()?),
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 8 Bytes at index 14".into(),
+                                }))
+                            }
+                        };
+                        Ok(Self::Motion {
+                            time,
+                            relative_x,
+                            relative_y,
+                        })
+                    }
+                    PointerEventType::Button => {
+                        let time = match data.get(2..6) {
+                            Some(d) => u32::from_be_bytes(d.try_into()?),
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 4 Bytes at index 2".into(),
+                                }))
+                            }
+                        };
+                        let button = match data.get(6..10) {
+                            Some(d) => u32::from_be_bytes(d.try_into()?),
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 4 Bytes at index 10".into(),
+                                }))
+                            }
+                        };
+                        let state = match data.get(10..14) {
+                            Some(d) => u32::from_be_bytes(d.try_into()?),
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 4 Bytes at index 14".into(),
+                                }))
+                            }
+                        };
+                        Ok(Self::Button {
+                            time,
+                            button,
+                            state,
+                        })
+                    }
+                    PointerEventType::Axis => {
+                        let time = match data.get(2..6) {
+                            Some(d) => u32::from_be_bytes(d.try_into()?),
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 4 Bytes at index 2".into(),
+                                }))
+                            }
+                        };
+                        let axis = match data.get(6) {
+                            Some(d) => *d,
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 1 Byte at index 6".into(),
+                                }));
+                            }
+                        };
+                        let value = match data.get(7..15) {
+                            Some(d) => f64::from_be_bytes(d.try_into()?),
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 8 Bytes at index 7".into(),
+                                }));
+                            }
+                        };
+                        Ok(Self::Axis { time, axis, value })
+                    }
+                    PointerEventType::AxisDiscrete120 => {
+                        let axis = match data.get(2) {
+                            Some(d) => *d,
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 1 Byte at index 2".into(),
+                                }));
+                            }
+                        };
+                        let value = match data.get(3..7) {
+                            Some(d) => i32::from_be_bytes(d.try_into()?),
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 4 Bytes at index 3".into(),
+                                }));
+                            }
+                        };
+                        Ok(Self::AxisDiscrete120 { axis, value })
+                    }
+                    PointerEventType::Frame => Ok(Self::Frame {}),
+                }
+            }
+            None => Err(anyhow!(ProtocolError {
+                msg: "Expected an element at index 0".into(),
+            })),
+        }
+    }
+}
+
+impl From<&KeyboardEvent> for Vec<u8> {
+    fn from(event: &KeyboardEvent) -> Self {
+        let id = vec![event.event_type() as u8];
+        let data = match event {
+            KeyboardEvent::Key { time, key, state } => {
+                let time = time.to_be_bytes();
+                let key = key.to_be_bytes();
+                let state = state.to_be_bytes();
+                [&time[..], &key[..], &state[..]].concat()
+            }
+            KeyboardEvent::Modifiers {
+                mods_depressed,
+                mods_latched,
+                mods_locked,
+                group,
+            } => {
+                let mods_depressed = mods_depressed.to_be_bytes();
+                let mods_latched = mods_latched.to_be_bytes();
+                let mods_locked = mods_locked.to_be_bytes();
+                let group = group.to_be_bytes();
+                [
+                    &mods_depressed[..],
+                    &mods_latched[..],
+                    &mods_locked[..],
+                    &group[..],
+                ]
+                .concat()
+            }
+        };
+        [id, data].concat()
+    }
+}
+
+impl TryFrom<Vec<u8>> for KeyboardEvent {
+    type Error = anyhow::Error;
+
+    fn try_from(data: Vec<u8>) -> Result<Self> {
+        match data.get(1) {
+            Some(id) => {
+                let event_type = match id.to_owned().try_into() {
+                    Ok(event_type) => event_type,
+                    Err(e) => return Err(e),
+                };
+                match event_type {
+                    KeyboardEventType::Key => {
+                        let time = match data.get(2..6) {
+                            Some(d) => u32::from_be_bytes(d.try_into()?),
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 4 Bytes at index 6".into(),
+                                }))
+                            }
+                        };
+                        let key = match data.get(6..10) {
+                            Some(d) => u32::from_be_bytes(d.try_into()?),
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 4 Bytes at index 10".into(),
+                                }))
+                            }
+                        };
+                        let state = match data.get(10) {
+                            Some(d) => *d,
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 1 Bytes at index 14".into(),
+                                }))
+                            }
+                        };
+                        Ok(KeyboardEvent::Key { time, key, state })
+                    }
+                    KeyboardEventType::Modifiers => {
+                        let mods_depressed = match data.get(2..6) {
+                            Some(d) => u32::from_be_bytes(d.try_into()?),
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 4 Bytes at index 6".into(),
+                                }))
+                            }
+                        };
+                        let mods_latched = match data.get(6..10) {
+                            Some(d) => u32::from_be_bytes(d.try_into()?),
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 4 Bytes at index 10".into(),
+                                }))
+                            }
+                        };
+                        let mods_locked = match data.get(10..14) {
+                            Some(d) => u32::from_be_bytes(d.try_into()?),
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 4 Bytes at index 14".into(),
+                                }))
+                            }
+                        };
+                        let group = match data.get(14..18) {
+                            Some(d) => u32::from_be_bytes(d.try_into()?),
+                            None => {
+                                return Err(anyhow!(ProtocolError {
+                                    msg: "Expected 4 Bytes at index 18".into(),
+                                }))
+                            }
+                        };
+                        Ok(KeyboardEvent::Modifiers {
+                            mods_depressed,
+                            mods_latched,
+                            mods_locked,
+                            group,
+                        })
+                    }
+                }
+            }
+            None => Err(anyhow!(ProtocolError {
+                msg: "Expected an element at index 0".into(),
+            })),
+        }
+    }
+}

src/frontend.rs

@@ -97,6 +97,8 @@ pub enum FrontendRequest {
     Enumerate(),
     /// resolve dns
     ResolveDns(ClientHandle),
+    /// service shutdown
+    Terminate(),
     /// update hostname
     UpdateHostname(ClientHandle, Option<String>),
     /// update port
@@ -107,26 +109,6 @@ pub enum FrontendRequest {
     UpdateFixIps(ClientHandle, Vec<IpAddr>),
     /// request the state of the given client
     GetState(ClientHandle),
-    /// request reenabling input capture
-    EnableCapture,
-    /// request reenabling input emulation
-    EnableEmulation,
-}
-
-#[derive(Clone, Copy, Debug, Default, Serialize, Deserialize)]
-pub enum Status {
-    #[default]
-    Disabled,
-    Enabled,
-}
-
-impl From<Status> for bool {
-    fn from(status: Status) -> Self {
-        match status {
-            Status::Enabled => true,
-            Status::Disabled => false,
-        }
-    }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -145,10 +127,6 @@ pub enum FrontendEvent {
     Enumerate(Vec<(ClientHandle, ClientConfig, ClientState)>),
     /// an error occured
     Error(String),
-    /// capture status
-    CaptureStatus(Status),
-    /// emulation status
-    EmulationStatus(Status),
 }
 
 pub struct FrontendListener {
@@ -254,7 +232,7 @@ impl FrontendListener {
         Ok(rx)
     }
 
-    pub(crate) async fn broadcast(&mut self, notify: FrontendEvent) {
+    pub(crate) async fn broadcast_event(&mut self, notify: FrontendEvent) -> Result<()> {
         // encode event
         let json = serde_json::to_string(&notify).unwrap();
         let payload = json.as_bytes();
@@ -278,6 +256,7 @@ impl FrontendListener {
         // could not find a better solution because async
         let mut keep = keep.into_iter();
         self.tx_streams.retain(|_| keep.next().unwrap());
+        Ok(())
     }
 }
 

src/frontend/cli.rs

@@ -273,12 +273,6 @@ impl<'a> Cli<'a> {
             FrontendEvent::Error(e) => {
                 eprintln!("ERROR: {e}");
             }
-            FrontendEvent::CaptureStatus(s) => {
-                eprintln!("capture status: {s:?}")
-            }
-            FrontendEvent::EmulationStatus(s) => {
-                eprintln!("emulation status: {s:?}")
-            }
         }
     }
 

src/frontend/gtk.rs

@@ -8,7 +8,7 @@ use std::{
     process, str,
 };
 
-use crate::frontend::gtk::window::Window;
+use crate::frontend::{gtk::window::Window, FrontendRequest};
 
 use adw::Application;
 use endi::{Endian, ReadBytes};
@@ -113,55 +113,46 @@ fn build_ui(app: &Application) {
     });
 
     let window = Window::new(app, tx);
+    window.request(FrontendRequest::Enumerate());
 
-    glib::spawn_future_local(clone!(
-        #[weak]
-        window,
-        async move {
-            loop {
-                let notify = receiver.recv().await.unwrap_or_else(|_| process::exit(1));
-                match notify {
-                    FrontendEvent::Created(handle, client, state) => {
-                        window.new_client(handle, client, state);
-                    }
-                    FrontendEvent::Deleted(client) => {
-                        window.delete_client(client);
-                    }
-                    FrontendEvent::State(handle, config, state) => {
-                        window.update_client_config(handle, config);
-                        window.update_client_state(handle, state);
-                    }
-                    FrontendEvent::NoSuchClient(_) => {}
-                    FrontendEvent::Error(e) => {
-                        window.show_toast(e.as_str());
-                    }
-                    FrontendEvent::Enumerate(clients) => {
-                        for (handle, client, state) in clients {
-                            if window.client_idx(handle).is_some() {
-                                window.update_client_config(handle, client);
-                                window.update_client_state(handle, state);
-                            } else {
-                                window.new_client(handle, client, state);
-                            }
+    glib::spawn_future_local(clone!(@weak window => async move {
+        loop {
+            let notify = receiver.recv().await.unwrap_or_else(|_| process::exit(1));
+            match notify {
+                FrontendEvent::Created(handle, client, state) => {
+                    window.new_client(handle, client, state);
+                },
+                FrontendEvent::Deleted(client) => {
+                    window.delete_client(client);
+                }
+                FrontendEvent::State(handle, config, state) => {
+                    window.update_client_config(handle, config);
+                    window.update_client_state(handle, state);
+                }
+                FrontendEvent::NoSuchClient(_) => { }
+                FrontendEvent::Error(e) => {
+                    window.show_toast(e.as_str());
+                },
+                FrontendEvent::Enumerate(clients) => {
+                    for (handle, client, state) in clients {
+                        if window.client_idx(handle).is_some() {
+                            window.update_client_config(handle, client);
+                            window.update_client_state(handle, state);
+                        } else {
+                            window.new_client(handle, client, state);
                         }
                     }
-                    FrontendEvent::PortChanged(port, msg) => {
-                        match msg {
-                            None => window.show_toast(format!("port changed: {port}").as_str()),
-                            Some(msg) => window.show_toast(msg.as_str()),
-                        }
-                        window.imp().set_port(port);
-                    }
-                    FrontendEvent::CaptureStatus(s) => {
-                        window.set_capture(s.into());
-                    }
-                    FrontendEvent::EmulationStatus(s) => {
-                        window.set_emulation(s.into());
+                },
+                FrontendEvent::PortChanged(port, msg) => {
+                    match msg {
+                        None => window.show_toast(format!("port changed: {port}").as_str()),
+                        Some(msg) => window.show_toast(msg.as_str()),
                     }
+                    window.imp().set_port(port);
                 }
             }
         }
-    ));
+    }));
 
     window.present();
 }

src/frontend/gtk/client_row/imp.rs

@@ -52,13 +52,10 @@ impl ObjectSubclass for ClientRow {
 impl ObjectImpl for ClientRow {
     fn constructed(&self) {
         self.parent_constructed();
-        self.delete_button.connect_clicked(clone!(
-            #[weak(rename_to = row)]
-            self,
-            move |button| {
+        self.delete_button
+            .connect_clicked(clone!(@weak self as row => move |button| {
                 row.handle_client_delete(button);
-            }
-        ));
+            }));
     }
 
     fn signals() -> &'static [glib::subclass::Signal] {

src/frontend/gtk/window.rs

@@ -63,61 +63,31 @@ impl Window {
         let selection_model = NoSelection::new(Some(self.clients()));
         self.imp().client_list.bind_model(
             Some(&selection_model),
-            clone!(
-                #[weak(rename_to = window)]
-                self,
-                #[upgrade_or_panic]
-                move |obj| {
-                    let client_object = obj
-                        .downcast_ref()
-                        .expect("Expected object of type `ClientObject`.");
-                    let row = window.create_client_row(client_object);
-                    row.connect_closure(
-                        "request-update",
-                        false,
-                        closure_local!(
-                            #[strong]
-                            window,
-                            move |row: ClientRow, active: bool| {
-                                if let Some(client) = window.client_by_idx(row.index() as u32) {
-                                    window.request_client_activate(&client, active);
-                                    window.request_client_update(&client);
-                                    window.request_client_state(&client);
-                                }
-                            }
-                        ),
-                    );
-                    row.connect_closure(
-                        "request-delete",
-                        false,
-                        closure_local!(
-                            #[strong]
-                            window,
-                            move |row: ClientRow| {
-                                if let Some(client) = window.client_by_idx(row.index() as u32) {
-                                    window.request_client_delete(&client);
-                                }
-                            }
-                        ),
-                    );
-                    row.connect_closure(
-                        "request-dns",
-                        false,
-                        closure_local!(
-                            #[strong]
-                            window,
-                            move |row: ClientRow| {
-                                if let Some(client) = window.client_by_idx(row.index() as u32) {
-                                    window.request_client_update(&client);
-                                    window.request_dns(&client);
-                                    window.request_client_state(&client);
-                                }
-                            }
-                        ),
-                    );
-                    row.upcast()
-                }
-            ),
+            clone!(@weak self as window => @default-panic, move |obj| {
+                let client_object = obj.downcast_ref().expect("Expected object of type `ClientObject`.");
+                let row = window.create_client_row(client_object);
+                row.connect_closure("request-update", false, closure_local!(@strong window => move |row: ClientRow, active: bool| {
+                    if let Some(client) = window.client_by_idx(row.index() as u32) {
+                        window.request_client_activate(&client, active);
+                        window.request_client_update(&client);
+                        window.request_client_state(&client);
+                    }
+                }));
+                row.connect_closure("request-delete", false, closure_local!(@strong window => move |row: ClientRow| {
+                    if let Some(client) = window.client_by_idx(row.index() as u32) {
+                        window.request_client_delete(&client);
+                    }
+                }));
+                row.connect_closure("request-dns", false, closure_local!(@strong window => move
+                |row: ClientRow| {
+                    if let Some(client) = window.client_by_idx(row.index() as u32) {
+                        window.request_client_update(&client);
+                        window.request_dns(&client);
+                        window.request_client_state(&client);
+                    }
+                }));
+                row.upcast()
+            })
         );
     }
 
@@ -237,35 +207,29 @@ impl Window {
     }
 
     pub fn request_port_change(&self) {
-        let port = self
-            .imp()
-            .port_entry
-            .get()
-            .text()
-            .as_str()
-            .parse::<u16>()
-            .unwrap_or(DEFAULT_PORT);
-        self.request(FrontendRequest::ChangePort(port));
-    }
-
-    pub fn request_capture(&self) {
-        self.request(FrontendRequest::EnableCapture);
-    }
-
-    pub fn request_emulation(&self) {
-        self.request(FrontendRequest::EnableEmulation);
+        let port = self.imp().port_entry.get().text().to_string();
+        if let Ok(port) = port.as_str().parse::<u16>() {
+            self.request(FrontendRequest::ChangePort(port));
+        } else {
+            self.request(FrontendRequest::ChangePort(DEFAULT_PORT));
+        }
     }
 
     pub fn request_client_state(&self, client: &ClientObject) {
-        self.request(FrontendRequest::GetState(client.handle()));
+        let handle = client.handle();
+        let event = FrontendRequest::GetState(handle);
+        self.request(event);
     }
 
     pub fn request_client_create(&self) {
-        self.request(FrontendRequest::Create);
+        let event = FrontendRequest::Create;
+        self.request(event);
     }
 
     pub fn request_dns(&self, client: &ClientObject) {
-        self.request(FrontendRequest::ResolveDns(client.get_data().handle));
+        let data = client.get_data();
+        let event = FrontendRequest::ResolveDns(data.handle);
+        self.request(event);
     }
 
     pub fn request_client_update(&self, client: &ClientObject) {
@@ -285,11 +249,15 @@ impl Window {
     }
 
     pub fn request_client_activate(&self, client: &ClientObject, active: bool) {
-        self.request(FrontendRequest::Activate(client.handle(), active));
+        let handle = client.handle();
+        let event = FrontendRequest::Activate(handle, active);
+        self.request(event);
     }
 
     pub fn request_client_delete(&self, client: &ClientObject) {
-        self.request(FrontendRequest::Delete(client.handle()));
+        let handle = client.handle();
+        let event = FrontendRequest::Delete(handle);
+        self.request(event);
     }
 
     pub fn request(&self, event: FrontendRequest) {
@@ -311,24 +279,4 @@ impl Window {
         let toast_overlay = &self.imp().toast_overlay;
         toast_overlay.add_toast(toast);
     }
-
-    pub fn set_capture(&self, active: bool) {
-        self.imp().capture_active.replace(active);
-        self.update_capture_emulation_status();
-    }
-
-    pub fn set_emulation(&self, active: bool) {
-        self.imp().emulation_active.replace(active);
-        self.update_capture_emulation_status();
-    }
-
-    fn update_capture_emulation_status(&self) {
-        let capture = self.imp().capture_active.get();
-        let emulation = self.imp().emulation_active.get();
-        self.imp().capture_status_row.set_visible(!capture);
-        self.imp().emulation_status_row.set_visible(!emulation);
-        self.imp()
-            .capture_emulation_group
-            .set_visible(!capture || !emulation);
-    }
 }

src/frontend/gtk/window/imp.rs

@@ -6,7 +6,7 @@ use std::net::TcpStream;
 use std::os::unix::net::UnixStream;
 
 use adw::subclass::prelude::*;
-use adw::{prelude::*, ActionRow, PreferencesGroup, ToastOverlay};
+use adw::{prelude::*, ActionRow, ToastOverlay};
 use glib::subclass::InitializingObject;
 use gtk::glib::clone;
 use gtk::{gdk, gio, glib, Button, CompositeTemplate, Entry, Label, ListBox};
@@ -30,24 +30,12 @@ pub struct Window {
     pub hostname_label: TemplateChild<Label>,
     #[template_child]
     pub toast_overlay: TemplateChild<ToastOverlay>,
-    #[template_child]
-    pub capture_emulation_group: TemplateChild<PreferencesGroup>,
-    #[template_child]
-    pub capture_status_row: TemplateChild<ActionRow>,
-    #[template_child]
-    pub emulation_status_row: TemplateChild<ActionRow>,
-    #[template_child]
-    pub input_emulation_button: TemplateChild<Button>,
-    #[template_child]
-    pub input_capture_button: TemplateChild<Button>,
     pub clients: RefCell<Option<gio::ListStore>>,
     #[cfg(unix)]
     pub stream: RefCell<Option<UnixStream>>,
     #[cfg(windows)]
     pub stream: RefCell<Option<TcpStream>>,
     pub port: Cell<u16>,
-    pub capture_active: Cell<bool>,
-    pub emulation_active: Cell<bool>,
 }
 
 #[glib::object_subclass]
@@ -84,15 +72,11 @@ impl Window {
             clipboard.set_text(hostname.to_str().expect("hostname: invalid utf8"));
             button.set_icon_name("emblem-ok-symbolic");
             button.set_css_classes(&["success"]);
-            glib::spawn_future_local(clone!(
-                #[weak]
-                button,
-                async move {
-                    glib::timeout_future_seconds(1).await;
-                    button.set_icon_name("edit-copy-symbolic");
-                    button.set_css_classes(&[]);
-                }
-            ));
+            glib::spawn_future_local(clone!(@weak button => async move {
+                glib::timeout_future_seconds(1).await;
+                button.set_icon_name("edit-copy-symbolic");
+                button.set_css_classes(&[]);
+            }));
         }
     }
 
@@ -116,16 +100,6 @@ impl Window {
         self.port_edit_cancel.set_visible(false);
     }
 
-    #[template_callback]
-    fn handle_emulation(&self) {
-        self.obj().request_emulation();
-    }
-
-    #[template_callback]
-    fn handle_capture(&self) {
-        self.obj().request_capture();
-    }
-
     pub fn set_port(&self, port: u16) {
         self.port.set(port);
         if port == DEFAULT_PORT {

src/lib.rs

@@ -1,8 +1,13 @@
 pub mod client;
 pub mod config;
 pub mod dns;
+pub mod event;
 pub mod server;
 
+pub mod capture;
+pub mod emulate;
+
 pub mod capture_test;
 pub mod emulation_test;
 pub mod frontend;
+pub mod scancode;

src/main.rs

@@ -37,7 +37,7 @@ pub fn run() -> Result<()> {
         emulation_test::run()?;
     } else if config.daemon {
         // if daemon is specified we run the service
-        run_service(config)?;
+        run_service(&config)?;
     } else {
         //  otherwise start the service as a child process and
         //  run a frontend
@@ -58,7 +58,7 @@ pub fn run() -> Result<()> {
     anyhow::Ok(())
 }
 
-fn run_service(config: Config) -> Result<()> {
+fn run_service(config: &Config) -> Result<()> {
     // create single threaded tokio runtime
     let runtime = tokio::runtime::Builder::new_current_thread()
         .enable_io()
@@ -68,9 +68,9 @@ fn run_service(config: Config) -> Result<()> {
     // run async event loop
     runtime.block_on(LocalSet::new().run_until(async {
         // run main loop
-        log::info!("Press {:?} to release the mouse", config.release_bind);
+        log::info!("Press Ctrl+Alt+Shift+Super to release the mouse");
 
-        let mut server = Server::new(config);
+        let server = Server::new(config);
         server.run().await?;
 
         log::debug!("service exiting");

src/server.rs

@@ -1,41 +1,27 @@
-use capture_task::CaptureEvent;
-use emulation_task::EmulationEvent;
 use log;
 use std::{
     cell::{Cell, RefCell},
-    collections::{HashSet, VecDeque},
-    io::ErrorKind,
-    net::{IpAddr, SocketAddr},
+    collections::HashSet,
     rc::Rc,
 };
-use tokio::{
-    io::ReadHalf,
-    join, signal,
-    sync::{
-        mpsc::{channel, Sender},
-        Notify,
-    },
-    task::JoinHandle,
-};
-use tokio_util::sync::CancellationToken;
+use tokio::signal;
 
 use crate::{
-    client::{ClientConfig, ClientHandle, ClientManager, ClientState, Position},
+    client::{ClientConfig, ClientHandle, ClientManager, ClientState},
     config::Config,
-    dns::DnsResolver,
-    frontend::{self, FrontendEvent, FrontendListener, FrontendRequest, Status},
+    dns,
+    frontend::{FrontendListener, FrontendRequest},
+    server::capture_task::CaptureEvent,
 };
 
-#[cfg(unix)]
-use tokio::net::UnixStream;
-
-#[cfg(windows)]
-use tokio::net::TcpStream;
+use self::{emulation_task::EmulationEvent, resolver_task::DnsRequest};
 
 mod capture_task;
 mod emulation_task;
+mod frontend_task;
 mod network_task;
 mod ping_task;
+mod resolver_task;
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 enum State {
@@ -51,33 +37,16 @@ enum State {
 #[derive(Clone)]
 pub struct Server {
     active_client: Rc<Cell<Option<ClientHandle>>>,
-    pub(crate) client_manager: Rc<RefCell<ClientManager>>,
+    client_manager: Rc<RefCell<ClientManager>>,
     port: Rc<Cell<u16>>,
     state: Rc<Cell<State>>,
-    release_bind: Vec<input_event::scancode::Linux>,
-    notifies: Rc<Notifies>,
-    config: Rc<Config>,
-    pending_frontend_events: Rc<RefCell<VecDeque<FrontendEvent>>>,
-    pending_dns_requests: Rc<RefCell<VecDeque<ClientHandle>>>,
-    capture_status: Rc<Cell<Status>>,
-    emulation_status: Rc<Cell<Status>>,
-}
-
-#[derive(Default)]
-struct Notifies {
-    capture: Notify,
-    emulation: Notify,
-    ping: Notify,
-    port_changed: Notify,
-    frontend_event_pending: Notify,
-    dns_request_pending: Notify,
-    cancel: CancellationToken,
+    release_bind: Vec<crate::scancode::Linux>,
 }
 
 impl Server {
-    pub fn new(config: Config) -> Self {
+    pub fn new(config: &Config) -> Self {
         let active_client = Rc::new(Cell::new(None));
-        let client_manager = Rc::new(RefCell::new(ClientManager::default()));
+        let client_manager = Rc::new(RefCell::new(ClientManager::new()));
         let state = Rc::new(Cell::new(State::Receiving));
         let port = Rc::new(Cell::new(config.port));
         for config_client in config.get_clients() {
@@ -98,502 +67,147 @@ impl Server {
             let c = client_manager.get_mut(handle).expect("invalid handle");
             *c = (client, state);
         }
-
-        // task notification tokens
-        let notifies = Rc::new(Notifies::default());
         let release_bind = config.release_bind.clone();
-
-        let config = Rc::new(config);
-
         Self {
-            config,
             active_client,
             client_manager,
             port,
             state,
             release_bind,
-            notifies,
-            pending_frontend_events: Rc::new(RefCell::new(VecDeque::new())),
-            pending_dns_requests: Rc::new(RefCell::new(VecDeque::new())),
-            capture_status: Default::default(),
-            emulation_status: Default::default(),
         }
     }
 
-    pub async fn run(&mut self) -> anyhow::Result<()> {
-        // create frontend communication adapter, exit if already running
-        let mut frontend = match FrontendListener::new().await {
+    pub async fn run(&self) -> anyhow::Result<()> {
+        // create frontend communication adapter
+        let frontend = match FrontendListener::new().await {
             Some(f) => f?,
             None => {
+                // none means some other instance is already running
                 log::info!("service already running, exiting");
-                return Ok(());
+                return anyhow::Ok(());
             }
         };
 
-        let (capture_tx, capture_rx) = channel(1); /* requests for input capture */
-        let (emulation_tx, emulation_rx) = channel(1); /* emulation requests */
-        let (udp_recv_tx, udp_recv_rx) = channel(1); /* udp receiver */
-        let (udp_send_tx, udp_send_rx) = channel(1); /* udp sender */
-        let (request_tx, mut request_rx) = channel(1); /* frontend requests */
-        let (dns_tx, dns_rx) = channel(1); /* dns requests */
+        let (timer_tx, timer_rx) = tokio::sync::mpsc::channel(1);
+        let (frontend_notify_tx, frontend_notify_rx) = tokio::sync::mpsc::channel(1);
 
         // udp task
-        let network = network_task::new(self.clone(), udp_recv_tx.clone(), udp_send_rx).await?;
+        let (mut udp_task, sender_tx, receiver_rx, port_tx) =
+            network_task::new(self.clone(), frontend_notify_tx.clone()).await?;
 
         // input capture
-        let capture = capture_task::new(self.clone(), capture_rx, udp_send_tx.clone());
+        let (mut capture_task, capture_channel) = capture_task::new(
+            self.clone(),
+            sender_tx.clone(),
+            timer_tx.clone(),
+            self.release_bind.clone(),
+        );
 
         // input emulation
-        let emulation = emulation_task::new(
+        let (mut emulation_task, emulate_channel) = emulation_task::new(
             self.clone(),
-            emulation_rx,
-            udp_recv_rx,
-            udp_send_tx.clone(),
-            capture_tx.clone(),
+            receiver_rx,
+            sender_tx.clone(),
+            capture_channel.clone(),
+            timer_tx,
         );
 
         // create dns resolver
-        let resolver = DnsResolver::new(dns_rx)?;
-        let dns_task = tokio::task::spawn_local(resolver.run(self.clone()));
+        let resolver = dns::DnsResolver::new().await?;
+        let (mut resolver_task, resolve_tx) =
+            resolver_task::new(resolver, self.clone(), frontend_notify_tx);
 
-        // task that pings clients to see if they are responding
-        let ping = ping_task::new(
+        // frontend listener
+        let (mut frontend_task, frontend_tx) = frontend_task::new(
+            frontend,
+            frontend_notify_rx,
             self.clone(),
-            udp_send_tx.clone(),
-            emulation_tx.clone(),
-            capture_tx.clone(),
+            capture_channel.clone(),
+            emulate_channel.clone(),
+            resolve_tx.clone(),
+            port_tx,
         );
 
-        for handle in self.active_clients() {
-            self.request_dns(handle);
-        }
+        // task that pings clients to see if they are responding
+        let mut ping_task = ping_task::new(
+            self.clone(),
+            sender_tx.clone(),
+            emulate_channel.clone(),
+            capture_channel.clone(),
+            timer_rx,
+        );
 
+        let active = self
+            .client_manager
+            .borrow()
+            .get_client_states()
+            .filter_map(|(h, (c, s))| {
+                if s.active {
+                    Some((h, c.hostname.clone()))
+                } else {
+                    None
+                }
+            })
+            .collect::<Vec<_>>();
+        for (handle, hostname) in active {
+            frontend_tx
+                .send(FrontendRequest::Activate(handle, true))
+                .await?;
+            if let Some(hostname) = hostname {
+                let _ = resolve_tx.send(DnsRequest { hostname, handle }).await;
+            }
+        }
         log::info!("running service");
 
-        let mut join_handles = vec![];
+        tokio::select! {
+            _ = signal::ctrl_c() => {
+                log::info!("terminating service");
+            }
+            e = &mut capture_task => {
+                if let Ok(Err(e)) = e {
+                    log::error!("error in input capture task: {e}");
+                }
+            }
+            e = &mut emulation_task => {
+                if let Ok(Err(e)) = e {
+                    log::error!("error in input emulation task: {e}");
+                }
+            }
+            e = &mut frontend_task => {
+                if let Ok(Err(e)) = e {
+                    log::error!("error in frontend listener: {e}");
+                }
+            }
+            _ = &mut resolver_task => { }
+            _ = &mut udp_task => { }
+            _ = &mut ping_task => { }
+        }
 
-        loop {
-            tokio::select! {
-                stream = frontend.accept() => {
-                    match stream {
-                        Ok(s) => join_handles.push(handle_frontend_stream(self.notifies.cancel.clone(), s, request_tx.clone())),
-                        Err(e) => log::warn!("error accepting frontend connection: {e}"),
-                    };
-                    self.enumerate();
-                    self.notify_frontend(FrontendEvent::EmulationStatus(self.emulation_status.get()));
-                    self.notify_frontend(FrontendEvent::CaptureStatus(self.capture_status.get()));
-                    self.notify_frontend(FrontendEvent::PortChanged(self.port.get(), None));
-                }
-                request = request_rx.recv() => {
-                    let request = request.expect("channel closed");
-                    log::debug!("received frontend request: {request:?}");
-                    self.handle_request(&capture_tx.clone(), &emulation_tx.clone(), request).await;
-                    log::debug!("handled frontend request");
-                }
-                _ = self.notifies.frontend_event_pending.notified() => {
-                    while let Some(event) = {
-                        /* need to drop borrow before next iteration! */
-                        let event = self.pending_frontend_events.borrow_mut().pop_front();
-                        event
-                    } {
-                        frontend.broadcast(event).await;
-                    }
-                },
-                _ = self.notifies.dns_request_pending.notified() => {
-                    while let Some(request) = {
-                        /* need to drop borrow before next iteration! */
-                        let request = self.pending_dns_requests.borrow_mut().pop_front();
-                        request
-                    } {
-                        dns_tx.send(request).await.expect("channel closed");
-                    }
-                }
-                _ = self.cancelled() => break,
-                r = signal::ctrl_c() => {
-                    r.expect("failed to wait for CTRL+C");
-                    break;
-                }
+        let _ = emulate_channel.send(EmulationEvent::Terminate).await;
+        let _ = capture_channel.send(CaptureEvent::Terminate).await;
+        let _ = frontend_tx.send(FrontendRequest::Terminate()).await;
+
+        if !capture_task.is_finished() {
+            if let Err(e) = capture_task.await {
+                log::error!("error in input capture task: {e}");
+            }
+        }
+        if !emulation_task.is_finished() {
+            if let Err(e) = emulation_task.await {
+                log::error!("error in input emulation task: {e}");
             }
         }
 
-        log::info!("terminating service");
+        if !frontend_task.is_finished() {
+            if let Err(e) = frontend_task.await {
+                log::error!("error in frontend listener: {e}");
+            }
+        }
 
-        assert!(!capture_tx.is_closed());
-        assert!(!emulation_tx.is_closed());
-        assert!(!udp_recv_tx.is_closed());
-        assert!(!udp_send_tx.is_closed());
-        assert!(!request_tx.is_closed());
-        assert!(!dns_tx.is_closed());
-
-        self.cancel();
-        futures::future::join_all(join_handles).await;
-        let _ = join!(capture, dns_task, emulation, network, ping);
+        resolver_task.abort();
+        udp_task.abort();
+        ping_task.abort();
 
         Ok(())
     }
-
-    fn notify_frontend(&self, event: FrontendEvent) {
-        self.pending_frontend_events.borrow_mut().push_back(event);
-        self.notifies.frontend_event_pending.notify_one();
-    }
-
-    fn cancel(&self) {
-        self.notifies.cancel.cancel();
-    }
-
-    pub(crate) async fn cancelled(&self) {
-        self.notifies.cancel.cancelled().await
-    }
-
-    fn is_cancelled(&self) -> bool {
-        self.notifies.cancel.is_cancelled()
-    }
-
-    fn notify_capture(&self) {
-        self.notifies.capture.notify_waiters()
-    }
-
-    async fn capture_notified(&self) {
-        self.notifies.capture.notified().await
-    }
-
-    fn notify_emulation(&self) {
-        self.notifies.emulation.notify_waiters()
-    }
-
-    async fn emulation_notified(&self) {
-        self.notifies.emulation.notified().await
-    }
-
-    fn restart_ping_timer(&self) {
-        self.notifies.ping.notify_waiters()
-    }
-
-    async fn ping_timer_notified(&self) {
-        self.notifies.ping.notified().await
-    }
-
-    fn request_port_change(&self, port: u16) {
-        self.port.replace(port);
-        self.notifies.port_changed.notify_one();
-    }
-
-    fn notify_port_changed(&self, port: u16, msg: Option<String>) {
-        self.port.replace(port);
-        self.notify_frontend(FrontendEvent::PortChanged(port, msg));
-    }
-
-    pub(crate) fn client_updated(&self, handle: ClientHandle) {
-        let state = self.client_manager.borrow().get(handle).cloned();
-        if let Some((config, state)) = state {
-            self.notify_frontend(FrontendEvent::State(handle, config, state));
-        }
-    }
-
-    fn active_clients(&self) -> Vec<ClientHandle> {
-        self.client_manager
-            .borrow()
-            .get_client_states()
-            .filter(|(_, (_, s))| s.active)
-            .map(|(h, _)| h)
-            .collect()
-    }
-
-    fn request_dns(&self, handle: ClientHandle) {
-        self.pending_dns_requests.borrow_mut().push_back(handle);
-        self.notifies.dns_request_pending.notify_one();
-    }
-
-    async fn handle_request(
-        &self,
-        capture: &Sender<CaptureEvent>,
-        emulate: &Sender<EmulationEvent>,
-        event: FrontendRequest,
-    ) -> bool {
-        log::debug!("frontend: {event:?}");
-        match event {
-            FrontendRequest::EnableCapture => {
-                log::info!("received capture enable request");
-                self.notify_capture();
-            }
-            FrontendRequest::EnableEmulation => {
-                log::info!("received emulation enable request");
-                self.notify_emulation();
-            }
-            FrontendRequest::Create => {
-                let handle = self.add_client().await;
-                self.request_dns(handle);
-            }
-            FrontendRequest::Activate(handle, active) => {
-                if active {
-                    self.activate_client(capture, emulate, handle).await;
-                } else {
-                    self.deactivate_client(capture, emulate, handle).await;
-                }
-            }
-            FrontendRequest::ChangePort(port) => self.request_port_change(port),
-            FrontendRequest::Delete(handle) => {
-                self.remove_client(capture, emulate, handle).await;
-                self.notify_frontend(FrontendEvent::Deleted(handle));
-            }
-            FrontendRequest::Enumerate() => self.enumerate(),
-            FrontendRequest::GetState(handle) => self.broadcast_client(handle),
-            FrontendRequest::UpdateFixIps(handle, fix_ips) => {
-                self.update_fix_ips(handle, fix_ips);
-                self.request_dns(handle);
-            }
-            FrontendRequest::UpdateHostname(handle, host) => self.update_hostname(handle, host),
-            FrontendRequest::UpdatePort(handle, port) => self.update_port(handle, port),
-            FrontendRequest::UpdatePosition(handle, pos) => {
-                self.update_pos(handle, capture, emulate, pos).await;
-            }
-            FrontendRequest::ResolveDns(handle) => self.request_dns(handle),
-        };
-        false
-    }
-
-    fn enumerate(&self) {
-        let clients = self
-            .client_manager
-            .borrow()
-            .get_client_states()
-            .map(|(h, (c, s))| (h, c.clone(), s.clone()))
-            .collect();
-        self.notify_frontend(FrontendEvent::Enumerate(clients));
-    }
-
-    async fn add_client(&self) -> ClientHandle {
-        let handle = self.client_manager.borrow_mut().add_client();
-        log::info!("added client {handle}");
-        let (c, s) = self.client_manager.borrow().get(handle).unwrap().clone();
-        self.notify_frontend(FrontendEvent::Created(handle, c, s));
-        handle
-    }
-
-    async fn deactivate_client(
-        &self,
-        capture: &Sender<CaptureEvent>,
-        emulate: &Sender<EmulationEvent>,
-        handle: ClientHandle,
-    ) {
-        log::debug!("deactivating client {handle}");
-        match self.client_manager.borrow_mut().get_mut(handle) {
-            Some((_, s)) => s.active = false,
-            None => return,
-        };
-
-        let _ = capture.send(CaptureEvent::Destroy(handle)).await;
-        let _ = emulate.send(EmulationEvent::Destroy(handle)).await;
-        log::debug!("deactivating client {handle} done");
-    }
-
-    async fn activate_client(
-        &self,
-        capture: &Sender<CaptureEvent>,
-        emulate: &Sender<EmulationEvent>,
-        handle: ClientHandle,
-    ) {
-        log::debug!("activating client");
-        /* deactivate potential other client at this position */
-        let pos = match self.client_manager.borrow().get(handle) {
-            Some((client, _)) => client.pos,
-            None => return,
-        };
-
-        let other = self.client_manager.borrow_mut().find_client(pos);
-        if let Some(other) = other {
-            if other != handle {
-                self.deactivate_client(capture, emulate, other).await;
-            }
-        }
-
-        /* activate the client */
-        if let Some((_, s)) = self.client_manager.borrow_mut().get_mut(handle) {
-            s.active = true;
-        } else {
-            return;
-        };
-
-        /* notify emulation, capture and frontends */
-        let _ = capture.send(CaptureEvent::Create(handle, pos.into())).await;
-        let _ = emulate.send(EmulationEvent::Create(handle)).await;
-        log::debug!("activating client {handle} done");
-    }
-
-    async fn remove_client(
-        &self,
-        capture: &Sender<CaptureEvent>,
-        emulate: &Sender<EmulationEvent>,
-        handle: ClientHandle,
-    ) {
-        let Some(active) = self
-            .client_manager
-            .borrow_mut()
-            .remove_client(handle)
-            .map(|(_, s)| s.active)
-        else {
-            return;
-        };
-
-        if active {
-            let _ = capture.send(CaptureEvent::Destroy(handle)).await;
-            let _ = emulate.send(EmulationEvent::Destroy(handle)).await;
-        }
-    }
-
-    fn update_fix_ips(&self, handle: ClientHandle, fix_ips: Vec<IpAddr>) {
-        if let Some((c, _)) = self.client_manager.borrow_mut().get_mut(handle) {
-            c.fix_ips = fix_ips;
-        };
-        self.update_ips(handle);
-    }
-
-    pub(crate) fn update_dns_ips(&self, handle: ClientHandle, dns_ips: Vec<IpAddr>) {
-        if let Some((_, s)) = self.client_manager.borrow_mut().get_mut(handle) {
-            s.dns_ips = dns_ips;
-        };
-        self.update_ips(handle);
-    }
-
-    fn update_ips(&self, handle: ClientHandle) {
-        if let Some((c, s)) = self.client_manager.borrow_mut().get_mut(handle) {
-            s.ips = c
-                .fix_ips
-                .iter()
-                .cloned()
-                .chain(s.dns_ips.iter().cloned())
-                .collect::<HashSet<_>>();
-        }
-    }
-
-    fn update_hostname(&self, handle: ClientHandle, hostname: Option<String>) {
-        let mut client_manager = self.client_manager.borrow_mut();
-        let Some((c, s)) = client_manager.get_mut(handle) else {
-            return;
-        };
-
-        // hostname changed
-        if c.hostname != hostname {
-            c.hostname = hostname;
-            s.ips = HashSet::from_iter(c.fix_ips.iter().cloned());
-            s.active_addr = None;
-            self.request_dns(handle);
-        }
-    }
-
-    fn update_port(&self, handle: ClientHandle, port: u16) {
-        let mut client_manager = self.client_manager.borrow_mut();
-        let Some((c, s)) = client_manager.get_mut(handle) else {
-            return;
-        };
-
-        if c.port != port {
-            c.port = port;
-            s.active_addr = s.active_addr.map(|a| SocketAddr::new(a.ip(), port));
-        }
-    }
-
-    async fn update_pos(
-        &self,
-        handle: ClientHandle,
-        capture: &Sender<CaptureEvent>,
-        emulate: &Sender<EmulationEvent>,
-        pos: Position,
-    ) {
-        let (changed, active) = {
-            let mut client_manager = self.client_manager.borrow_mut();
-            let Some((c, s)) = client_manager.get_mut(handle) else {
-                return;
-            };
-
-            let changed = c.pos != pos;
-            c.pos = pos;
-            (changed, s.active)
-        };
-
-        // update state in event input emulator & input capture
-        if changed {
-            if active {
-                let _ = capture.send(CaptureEvent::Destroy(handle)).await;
-                let _ = emulate.send(EmulationEvent::Destroy(handle)).await;
-            }
-            let _ = capture.send(CaptureEvent::Create(handle, pos.into())).await;
-            let _ = emulate.send(EmulationEvent::Create(handle)).await;
-        }
-    }
-
-    fn broadcast_client(&self, handle: ClientHandle) {
-        let client = self.client_manager.borrow().get(handle).cloned();
-        let event = if let Some((config, state)) = client {
-            FrontendEvent::State(handle, config, state)
-        } else {
-            FrontendEvent::NoSuchClient(handle)
-        };
-        self.notify_frontend(event);
-    }
-
-    fn set_emulation_status(&self, status: Status) {
-        self.emulation_status.replace(status);
-        let status = FrontendEvent::EmulationStatus(status);
-        self.notify_frontend(status);
-    }
-
-    fn set_capture_status(&self, status: Status) {
-        self.capture_status.replace(status);
-        let status = FrontendEvent::CaptureStatus(status);
-        self.notify_frontend(status);
-    }
-
-    pub(crate) fn set_resolving(&self, handle: ClientHandle, status: bool) {
-        if let Some((_, s)) = self.client_manager.borrow_mut().get_mut(handle) {
-            s.resolving = status;
-        }
-        self.client_updated(handle);
-    }
-
-    pub(crate) fn get_hostname(&self, handle: u64) -> Option<String> {
-        self.client_manager
-            .borrow_mut()
-            .get_mut(handle)
-            .and_then(|(c, _)| c.hostname.clone())
-    }
-}
-
-async fn listen_frontend(
-    request_tx: Sender<FrontendRequest>,
-    #[cfg(unix)] mut stream: ReadHalf<UnixStream>,
-    #[cfg(windows)] mut stream: ReadHalf<TcpStream>,
-) {
-    use std::io;
-    loop {
-        let request = frontend::wait_for_request(&mut stream).await;
-        match request {
-            Ok(request) => {
-                let _ = request_tx.send(request).await;
-            }
-            Err(e) => {
-                if let Some(e) = e.downcast_ref::<io::Error>() {
-                    if e.kind() == ErrorKind::UnexpectedEof {
-                        return;
-                    }
-                }
-                log::error!("error reading frontend event: {e}");
-                return;
-            }
-        }
-    }
-}
-
-fn handle_frontend_stream(
-    cancel: CancellationToken,
-    #[cfg(unix)] stream: ReadHalf<UnixStream>,
-    #[cfg(windows)] stream: ReadHalf<TcpStream>,
-    request_tx: Sender<FrontendRequest>,
-) -> JoinHandle<()> {
-    tokio::task::spawn_local(async move {
-        tokio::select! {
-            _ = listen_frontend(request_tx, stream) => {},
-            _ = cancel.cancelled() => {},
-        }
-    })
 }

src/server/capture_task.rs

@@ -1,122 +1,68 @@
+use anyhow::{anyhow, Result};
 use futures::StreamExt;
 use std::{collections::HashSet, net::SocketAddr};
 
-use tokio::{
-    process::Command,
-    sync::mpsc::{Receiver, Sender},
-    task::JoinHandle,
+use tokio::{process::Command, sync::mpsc::Sender, task::JoinHandle};
+
+use crate::{
+    capture::{self, InputCapture},
+    client::{ClientEvent, ClientHandle},
+    event::{Event, KeyboardEvent},
+    scancode,
+    server::State,
 };
 
-use input_capture::{self, CaptureError, CaptureHandle, InputCapture, InputCaptureError, Position};
-
-use input_event::{scancode, Event, KeyboardEvent};
-
-use crate::{client::ClientHandle, frontend::Status, server::State};
-
 use super::Server;
 
 #[derive(Clone, Copy, Debug)]
-pub(crate) enum CaptureEvent {
+pub enum CaptureEvent {
     /// capture must release the mouse
     Release,
-    /// add a capture client
-    Create(CaptureHandle, Position),
-    /// destory a capture client
-    Destroy(CaptureHandle),
+    /// capture is notified of a change in client states
+    ClientEvent(ClientEvent),
+    /// termination signal
+    Terminate,
 }
 
-pub(crate) fn new(
+pub fn new(
     server: Server,
-    capture_rx: Receiver<CaptureEvent>,
-    udp_send: Sender<(Event, SocketAddr)>,
-) -> JoinHandle<()> {
-    let backend = server.config.capture_backend.map(|b| b.into());
-    tokio::task::spawn_local(capture_task(server, backend, udp_send, capture_rx))
-}
-
-async fn capture_task(
-    server: Server,
-    backend: Option<input_capture::Backend>,
     sender_tx: Sender<(Event, SocketAddr)>,
-    mut notify_rx: Receiver<CaptureEvent>,
-) {
-    loop {
-        if let Err(e) = do_capture(backend, &server, &sender_tx, &mut notify_rx).await {
-            log::warn!("input capture exited: {e}");
-        }
-        server.set_capture_status(Status::Disabled);
-        if server.is_cancelled() {
-            break;
-        }
-
-        // allow cancellation
+    timer_tx: Sender<()>,
+    release_bind: Vec<scancode::Linux>,
+) -> (JoinHandle<Result<()>>, Sender<CaptureEvent>) {
+    let (tx, mut rx) = tokio::sync::mpsc::channel(32);
+    let task = tokio::task::spawn_local(async move {
+        let mut capture = capture::create().await;
+        let mut pressed_keys = HashSet::new();
         loop {
             tokio::select! {
-                _ = notify_rx.recv() => continue, /* need to ignore requests here! */
-                _ = server.capture_notified() => break,
-                _ = server.cancelled() => return,
-            }
-        }
-    }
-}
+                event = capture.next() => {
+                    match event {
+                        Some(Ok(event)) => handle_capture_event(&server, &mut capture, &sender_tx, &timer_tx, event, &mut pressed_keys, &release_bind).await?,
+                        Some(Err(e)) => return Err(anyhow!("input capture: {e:?}")),
+                        None => return Err(anyhow!("input capture terminated")),
+                    }
+                }
+                e = rx.recv() => {
+                    log::debug!("input capture notify rx: {e:?}");
+                    match e {
+                        Some(e) => match e {
+                            CaptureEvent::Release => {
+                                capture.release()?;
+                                server.state.replace(State::Receiving);
 
-async fn do_capture(
-    backend: Option<input_capture::Backend>,
-    server: &Server,
-    sender_tx: &Sender<(Event, SocketAddr)>,
-    notify_rx: &mut Receiver<CaptureEvent>,
-) -> Result<(), InputCaptureError> {
-    /* allow cancelling capture request */
-    let mut capture = tokio::select! {
-        r = input_capture::create(backend) => {
-            r?
-        },
-        _ = server.cancelled() => return Ok(()),
-    };
-
-    server.set_capture_status(Status::Enabled);
-
-    // FIXME DUPLICATES
-    let clients = server
-        .client_manager
-        .borrow()
-        .get_client_states()
-        .map(|(h, s)| (h, s.clone()))
-        .collect::<Vec<_>>();
-    log::info!("{clients:?}");
-    for (handle, (config, _state)) in clients {
-        capture.create(handle, config.pos.into()).await?;
-    }
-
-    let mut pressed_keys = HashSet::new();
-    loop {
-        tokio::select! {
-            event = capture.next() => {
-                match event {
-                    Some(Ok(event)) => handle_capture_event(server, &mut capture, sender_tx, event, &mut pressed_keys).await?,
-                    Some(Err(e)) => return Err(e.into()),
-                    None => return Ok(()),
+                            }
+                            CaptureEvent::ClientEvent(e) => capture.notify(e)?,
+                            CaptureEvent::Terminate => break,
+                        },
+                        None => break,
+                    }
                 }
             }
-            e = notify_rx.recv() => {
-                log::debug!("input capture notify rx: {e:?}");
-                match e {
-                    Some(e) => match e {
-                        CaptureEvent::Release => {
-                            capture.release().await?;
-                            server.state.replace(State::Receiving);
-                        }
-                        CaptureEvent::Create(h, p) => capture.create(h, p).await?,
-                        CaptureEvent::Destroy(h) => capture.destroy(h).await?,
-                    },
-                    None => break,
-                }
-            }
-            _ = server.cancelled() => break,
         }
-    }
-    capture.terminate().await?;
-    Ok(())
+        anyhow::Ok(())
+    });
+    (task, tx)
 }
 
 fn update_pressed_keys(pressed_keys: &mut HashSet<scancode::Linux>, key: u32, state: u8) {
@@ -133,19 +79,21 @@ async fn handle_capture_event(
     server: &Server,
     capture: &mut Box<dyn InputCapture>,
     sender_tx: &Sender<(Event, SocketAddr)>,
-    event: (CaptureHandle, Event),
+    timer_tx: &Sender<()>,
+    event: (ClientHandle, Event),
     pressed_keys: &mut HashSet<scancode::Linux>,
-) -> Result<(), CaptureError> {
+    release_bind: &[scancode::Linux],
+) -> Result<()> {
     let (handle, mut e) = event;
     log::trace!("({handle}) {e:?}");
 
     if let Event::Keyboard(KeyboardEvent::Key { key, state, .. }) = e {
         update_pressed_keys(pressed_keys, key, state);
         log::debug!("{pressed_keys:?}");
-        if server.release_bind.iter().all(|k| pressed_keys.contains(k)) {
+        if release_bind.iter().all(|k| pressed_keys.contains(k)) {
             pressed_keys.clear();
             log::info!("releasing pointer");
-            capture.release().await?;
+            capture.release()?;
             server.state.replace(State::Receiving);
             log::trace!("STATE ===> Receiving");
             // send an event to release all the modifiers
@@ -153,49 +101,44 @@ async fn handle_capture_event(
         }
     }
 
-    let info = {
+    let (addr, enter, start_timer) = {
         let mut enter = false;
         let mut start_timer = false;
 
         // get client state for handle
         let mut client_manager = server.client_manager.borrow_mut();
-        let client_state = client_manager.get_mut(handle).map(|(_, s)| s);
-        if let Some(client_state) = client_state {
-            // if we just entered the client we want to send additional enter events until
-            // we get a leave event
-            if let Event::Enter() = e {
-                server.state.replace(State::AwaitingLeave);
-                server.active_client.replace(Some(handle));
-                log::trace!("Active client => {}", handle);
-                start_timer = true;
-                log::trace!("STATE ===> AwaitingLeave");
-                enter = true;
-            } else {
-                // ignore any potential events in receiving mode
-                if server.state.get() == State::Receiving && e != Event::Disconnect() {
-                    return Ok(());
-                }
+        let client_state = match client_manager.get_mut(handle) {
+            Some((_, s)) => s,
+            None => {
+                // should not happen
+                log::warn!("unknown client!");
+                capture.release()?;
+                server.state.replace(State::Receiving);
+                log::trace!("STATE ===> Receiving");
+                return Ok(());
             }
-            Some((client_state.active_addr, enter, start_timer))
+        };
+
+        // if we just entered the client we want to send additional enter events until
+        // we get a leave event
+        if let Event::Enter() = e {
+            server.state.replace(State::AwaitingLeave);
+            server.active_client.replace(Some(handle));
+            log::trace!("Active client => {}", handle);
+            start_timer = true;
+            log::trace!("STATE ===> AwaitingLeave");
+            enter = true;
         } else {
-            None
+            // ignore any potential events in receiving mode
+            if server.state.get() == State::Receiving && e != Event::Disconnect() {
+                return Ok(());
+            }
         }
-    };
 
-    let (addr, enter, start_timer) = match info {
-        Some(i) => i,
-        None => {
-            // should not happen
-            log::warn!("unknown client!");
-            capture.release().await?;
-            server.state.replace(State::Receiving);
-            log::trace!("STATE ===> Receiving");
-            return Ok(());
-        }
+        (client_state.active_addr, enter, start_timer)
     };
-
     if start_timer {
-        server.restart_ping_timer();
+        let _ = timer_tx.try_send(());
     }
     if enter {
         spawn_hook_command(server, handle);

src/server/emulation_task.rs

@@ -1,3 +1,4 @@
+use anyhow::{anyhow, Result};
 use std::net::SocketAddr;
 
 use tokio::{
@@ -6,129 +7,75 @@ use tokio::{
 };
 
 use crate::{
-    client::{ClientHandle, ClientManager},
-    frontend::Status,
+    client::{ClientEvent, ClientHandle},
+    emulate::{self, InputEmulation},
+    event::{Event, KeyboardEvent},
+    scancode,
     server::State,
 };
-use input_emulation::{self, EmulationError, EmulationHandle, InputEmulation, InputEmulationError};
-use input_event::{Event, KeyboardEvent};
 
-use super::{network_task::NetworkError, CaptureEvent, Server};
+use super::{CaptureEvent, Server};
 
 #[derive(Clone, Debug)]
-pub(crate) enum EmulationEvent {
-    /// create a new client
-    Create(EmulationHandle),
-    /// destroy a client
-    Destroy(EmulationHandle),
+pub enum EmulationEvent {
+    /// input emulation is notified of a change in client states
+    ClientEvent(ClientEvent),
     /// input emulation must release keys for client
     ReleaseKeys(ClientHandle),
+    /// termination signal
+    Terminate,
 }
 
-pub(crate) fn new(
+pub fn new(
     server: Server,
-    emulation_rx: Receiver<EmulationEvent>,
-    udp_rx: Receiver<Result<(Event, SocketAddr), NetworkError>>,
+    mut udp_rx: Receiver<Result<(Event, SocketAddr)>>,
     sender_tx: Sender<(Event, SocketAddr)>,
     capture_tx: Sender<CaptureEvent>,
-) -> JoinHandle<()> {
-    let emulation_task = emulation_task(server, emulation_rx, udp_rx, sender_tx, capture_tx);
-    tokio::task::spawn_local(emulation_task)
-}
+    timer_tx: Sender<()>,
+) -> (JoinHandle<Result<()>>, Sender<EmulationEvent>) {
+    let (tx, mut rx) = tokio::sync::mpsc::channel(32);
+    let emulate_task = tokio::task::spawn_local(async move {
+        let mut emulate = emulate::create().await;
+        let mut last_ignored = None;
 
-async fn emulation_task(
-    server: Server,
-    mut rx: Receiver<EmulationEvent>,
-    mut udp_rx: Receiver<Result<(Event, SocketAddr), NetworkError>>,
-    sender_tx: Sender<(Event, SocketAddr)>,
-    capture_tx: Sender<CaptureEvent>,
-) {
-    loop {
-        if let Err(e) = do_emulation(&server, &mut rx, &mut udp_rx, &sender_tx, &capture_tx).await {
-            log::warn!("input emulation exited: {e}");
-        }
-        server.set_emulation_status(Status::Disabled);
-        if server.is_cancelled() {
-            break;
-        }
-
-        // allow cancellation
         loop {
             tokio::select! {
-                _ = rx.recv() => continue, /* need to ignore requests here! */
-                _ = server.emulation_notified() => break,
-                _ = server.cancelled() => return,
-            }
-        }
-    }
-}
-
-async fn do_emulation(
-    server: &Server,
-    rx: &mut Receiver<EmulationEvent>,
-    udp_rx: &mut Receiver<Result<(Event, SocketAddr), NetworkError>>,
-    sender_tx: &Sender<(Event, SocketAddr)>,
-    capture_tx: &Sender<CaptureEvent>,
-) -> Result<(), InputEmulationError> {
-    let backend = server.config.emulation_backend.map(|b| b.into());
-    log::info!("creating input emulation...");
-    let mut emulation = tokio::select! {
-        r = input_emulation::create(backend) => {
-            r?
-        }
-        _ = server.cancelled() => return Ok(()),
-    };
-
-    server.set_emulation_status(Status::Enabled);
-
-    // add clients
-    for handle in server.active_clients() {
-        emulation.create(handle).await;
-    }
-
-    let res = do_emulation_session(server, &mut emulation, rx, udp_rx, sender_tx, capture_tx).await;
-
-    // release potentially still pressed keys
-    release_all_keys(server, &mut emulation).await?;
-
-    emulation.terminate().await;
-    res?;
-
-    Ok(())
-}
-
-async fn do_emulation_session(
-    server: &Server,
-    emulation: &mut Box<dyn InputEmulation>,
-    rx: &mut Receiver<EmulationEvent>,
-    udp_rx: &mut Receiver<Result<(Event, SocketAddr), NetworkError>>,
-    sender_tx: &Sender<(Event, SocketAddr)>,
-    capture_tx: &Sender<CaptureEvent>,
-) -> Result<(), InputEmulationError> {
-    let mut last_ignored = None;
-
-    loop {
-        tokio::select! {
-            udp_event = udp_rx.recv() => {
-                let udp_event = match udp_event.expect("channel closed") {
-                    Ok(e) => e,
-                    Err(e) => {
-                        log::warn!("network error: {e}");
-                        continue;
+                udp_event = udp_rx.recv() => {
+                    let udp_event = udp_event.ok_or(anyhow!("receiver closed"))??;
+                    handle_udp_rx(&server, &capture_tx, &mut emulate, &sender_tx, &mut last_ignored, udp_event, &timer_tx).await;
+                }
+                emulate_event = rx.recv() => {
+                    match emulate_event {
+                        Some(e) => match e {
+                            EmulationEvent::ClientEvent(e) => emulate.notify(e).await,
+                            EmulationEvent::ReleaseKeys(c) => release_keys(&server, &mut emulate, c).await,
+                            EmulationEvent::Terminate => break,
+                        },
+                        None => break,
                     }
-                };
-                handle_udp_rx(server, capture_tx, emulation, sender_tx, &mut last_ignored, udp_event).await?;
-            }
-            emulate_event = rx.recv() => {
-                match emulate_event.expect("channel closed") {
-                    EmulationEvent::Create(h) => emulation.create(h).await,
-                    EmulationEvent::Destroy(h) => emulation.destroy(h).await,
-                    EmulationEvent::ReleaseKeys(c) => release_keys(server, emulation, c).await?,
+                }
+                res = emulate.dispatch() => {
+                    res?;
                 }
             }
-            _ = server.notifies.cancel.cancelled() => break Ok(()),
         }
-    }
+
+        // release potentially still pressed keys
+        let clients = server
+            .client_manager
+            .borrow()
+            .get_client_states()
+            .map(|(h, _)| h)
+            .collect::<Vec<_>>();
+        for client in clients {
+            release_keys(&server, &mut emulate, client).await;
+        }
+
+        // destroy emulator
+        emulate.destroy().await;
+        anyhow::Ok(())
+    });
+    (emulate_task, tx)
 }
 
 async fn handle_udp_rx(
@@ -138,25 +85,49 @@ async fn handle_udp_rx(
     sender_tx: &Sender<(Event, SocketAddr)>,
     last_ignored: &mut Option<SocketAddr>,
     event: (Event, SocketAddr),
-) -> Result<(), EmulationError> {
+    timer_tx: &Sender<()>,
+) {
     let (event, addr) = event;
 
-    log::trace!("{:20} <-<-<-<------ {addr}", event.to_string());
-
-    // get client handle for addr
-    let Some(handle) =
-        activate_client_if_exists(&mut server.client_manager.borrow_mut(), addr, last_ignored)
-    else {
-        return Ok(());
+    // get handle for addr
+    let handle = match server.client_manager.borrow().get_client(addr) {
+        Some(a) => a,
+        None => {
+            if last_ignored.is_none() || last_ignored.is_some() && last_ignored.unwrap() != addr {
+                log::warn!("ignoring events from client {addr}");
+                last_ignored.replace(addr);
+            }
+            return;
+        }
     };
 
+    // next event can be logged as ignored again
+    last_ignored.take();
+
+    log::trace!("{:20} <-<-<-<------ {addr} ({handle})", event.to_string());
+    {
+        let mut client_manager = server.client_manager.borrow_mut();
+        let client_state = match client_manager.get_mut(handle) {
+            Some((_, s)) => s,
+            None => {
+                log::error!("unknown handle");
+                return;
+            }
+        };
+
+        // reset ttl for client and
+        client_state.alive = true;
+        // set addr as new default for this client
+        client_state.active_addr = Some(addr);
+    }
+
     match (event, addr) {
         (Event::Pong(), _) => { /* ignore pong events */ }
         (Event::Ping(), addr) => {
             let _ = sender_tx.send((Event::Pong(), addr)).await;
         }
         (Event::Disconnect(), _) => {
-            release_keys(server, emulate, handle).await?;
+            release_keys(server, emulate, handle).await;
         }
         (event, addr) => {
             // tell clients that we are ready to receive events
@@ -177,26 +148,34 @@ async fn handle_udp_rx(
                     }
                 }
                 State::Receiving => {
-                    let ignore_event =
-                        if let Event::Keyboard(KeyboardEvent::Key { key, state, .. }) = event {
-                            let (ignore_event, restart_timer) = update_client_keys(
-                                &mut server.client_manager.borrow_mut(),
-                                handle,
-                                key,
-                                state,
-                            );
-                            // restart timer if necessary
-                            if restart_timer {
-                                server.restart_ping_timer();
-                            }
-                            ignore_event
+                    let mut ignore_event = false;
+                    if let Event::Keyboard(KeyboardEvent::Key {
+                        time: _,
+                        key,
+                        state,
+                    }) = event
+                    {
+                        let mut client_manager = server.client_manager.borrow_mut();
+                        let client_state = if let Some((_, s)) = client_manager.get_mut(handle) {
+                            s
                         } else {
-                            false
+                            log::error!("unknown handle");
+                            return;
                         };
+                        if state == 0 {
+                            // ignore release event if key not pressed
+                            ignore_event = !client_state.pressed_keys.remove(&key);
+                        } else {
+                            // ignore press event if key not released
+                            ignore_event = !client_state.pressed_keys.insert(key);
+                            let _ = timer_tx.try_send(());
+                        }
+                    }
+                    // ignore double press / release events to
                     // workaround buggy rdp backend.
                     if !ignore_event {
                         // consume event
-                        emulate.consume(event, handle).await?;
+                        emulate.consume(event, handle).await;
                         log::trace!("{event} => emulate");
                     }
                 }
@@ -221,30 +200,13 @@ async fn handle_udp_rx(
             }
         }
     }
-    Ok(())
-}
-
-async fn release_all_keys(
-    server: &Server,
-    emulation: &mut Box<dyn InputEmulation>,
-) -> Result<(), EmulationError> {
-    let clients = server
-        .client_manager
-        .borrow()
-        .get_client_states()
-        .map(|(h, _)| h)
-        .collect::<Vec<_>>();
-    for client in clients {
-        release_keys(server, emulation, client).await?;
-    }
-    Ok(())
 }
 
 async fn release_keys(
     server: &Server,
     emulate: &mut Box<dyn InputEmulation>,
     client: ClientHandle,
-) -> Result<(), EmulationError> {
+) {
     let keys = server
         .client_manager
         .borrow_mut()
@@ -259,65 +221,19 @@ async fn release_keys(
             key,
             state: 0,
         });
-        emulate.consume(event, client).await?;
-        if let Ok(key) = input_event::scancode::Linux::try_from(key) {
+        emulate.consume(event, client).await;
+        if let Ok(key) = scancode::Linux::try_from(key) {
             log::warn!("releasing stuck key: {key:?}");
         }
     }
 
-    let event = Event::Keyboard(KeyboardEvent::Modifiers {
+    let modifiers_event = KeyboardEvent::Modifiers {
         mods_depressed: 0,
         mods_latched: 0,
         mods_locked: 0,
         group: 0,
-    });
-    emulate.consume(event, client).await?;
-    Ok(())
-}
-
-fn activate_client_if_exists(
-    client_manager: &mut ClientManager,
-    addr: SocketAddr,
-    last_ignored: &mut Option<SocketAddr>,
-) -> Option<ClientHandle> {
-    let Some(handle) = client_manager.get_client(addr) else {
-        // log ignored if it is the first event from the client in a series
-        if last_ignored.is_none() || last_ignored.is_some() && last_ignored.unwrap() != addr {
-            log::warn!("ignoring events from client {addr}");
-            last_ignored.replace(addr);
-        }
-        return None;
     };
-    // next event can be logged as ignored again
-    last_ignored.take();
-
-    let (_, client_state) = client_manager.get_mut(handle)?;
-
-    // reset ttl for client
-    client_state.alive = true;
-    // set addr as new default for this client
-    client_state.active_addr = Some(addr);
-    Some(handle)
-}
-
-fn update_client_keys(
-    client_manager: &mut ClientManager,
-    handle: ClientHandle,
-    key: u32,
-    state: u8,
-) -> (bool, bool) {
-    let Some(client_state) = client_manager.get_mut(handle).map(|(_, s)| s) else {
-        return (true, false);
-    };
-
-    // ignore double press / release events
-    let ignore_event = if state == 0 {
-        // ignore release event if key not pressed
-        !client_state.pressed_keys.remove(&key)
-    } else {
-        // ignore press event if key not released
-        !client_state.pressed_keys.insert(key)
-    };
-    let restart_timer = !client_state.pressed_keys.is_empty();
-    (ignore_event, restart_timer)
+    emulate
+        .consume(Event::Keyboard(modifiers_event), client)
+        .await;
 }

src/server/frontend_task.rs

@@ -0,0 +1,355 @@
+use std::{
+    collections::HashSet,
+    io::ErrorKind,
+    net::{IpAddr, SocketAddr},
+};
+#[cfg(unix)]
+use tokio::net::UnixStream;
+
+#[cfg(windows)]
+use tokio::net::TcpStream;
+
+use anyhow::{anyhow, Result};
+use tokio::{
+    io::ReadHalf,
+    sync::mpsc::{Receiver, Sender},
+    task::JoinHandle,
+};
+
+use crate::{
+    client::{ClientEvent, ClientHandle, Position},
+    frontend::{self, FrontendEvent, FrontendListener, FrontendRequest},
+};
+
+use super::{
+    capture_task::CaptureEvent, emulation_task::EmulationEvent, resolver_task::DnsRequest, Server,
+};
+
+pub(crate) fn new(
+    mut frontend: FrontendListener,
+    mut notify_rx: Receiver<FrontendEvent>,
+    server: Server,
+    capture: Sender<CaptureEvent>,
+    emulate: Sender<EmulationEvent>,
+    resolve_ch: Sender<DnsRequest>,
+    port_tx: Sender<u16>,
+) -> (JoinHandle<Result<()>>, Sender<FrontendRequest>) {
+    let (event_tx, mut event_rx) = tokio::sync::mpsc::channel(32);
+    let event_tx_clone = event_tx.clone();
+    let frontend_task = tokio::task::spawn_local(async move {
+        loop {
+            tokio::select! {
+                stream = frontend.accept() => {
+                    let stream = match stream {
+                        Ok(s) => s,
+                        Err(e) => {
+                            log::warn!("error accepting frontend connection: {e}");
+                            continue;
+                        }
+                    };
+                    handle_frontend_stream(&event_tx_clone, stream).await;
+                }
+                event = event_rx.recv() => {
+                    let frontend_event = event.ok_or(anyhow!("frontend channel closed"))?;
+                    if handle_frontend_event(&server, &capture, &emulate, &resolve_ch, &mut frontend, &port_tx, frontend_event).await {
+                        break;
+                    }
+                }
+                notify = notify_rx.recv() => {
+                    let notify = notify.ok_or(anyhow!("frontend notify closed"))?;
+                    let _ = frontend.broadcast_event(notify).await;
+                }
+            }
+        }
+        anyhow::Ok(())
+    });
+    (frontend_task, event_tx)
+}
+
+async fn handle_frontend_stream(
+    frontend_tx: &Sender<FrontendRequest>,
+    #[cfg(unix)] mut stream: ReadHalf<UnixStream>,
+    #[cfg(windows)] mut stream: ReadHalf<TcpStream>,
+) {
+    use std::io;
+
+    let tx = frontend_tx.clone();
+    tokio::task::spawn_local(async move {
+        loop {
+            let request = frontend::wait_for_request(&mut stream).await;
+            match request {
+                Ok(request) => {
+                    let _ = tx.send(request).await;
+                }
+                Err(e) => {
+                    if let Some(e) = e.downcast_ref::<io::Error>() {
+                        if e.kind() == ErrorKind::UnexpectedEof {
+                            return;
+                        }
+                    }
+                    log::error!("error reading frontend event: {e}");
+                    return;
+                }
+            }
+        }
+    });
+}
+
+async fn handle_frontend_event(
+    server: &Server,
+    capture: &Sender<CaptureEvent>,
+    emulate: &Sender<EmulationEvent>,
+    resolve_tx: &Sender<DnsRequest>,
+    frontend: &mut FrontendListener,
+    port_tx: &Sender<u16>,
+    event: FrontendRequest,
+) -> bool {
+    log::debug!("frontend: {event:?}");
+    match event {
+        FrontendRequest::Create => {
+            let handle = add_client(server, frontend).await;
+            resolve_dns(server, resolve_tx, handle).await;
+        }
+        FrontendRequest::Activate(handle, active) => {
+            if active {
+                activate_client(server, capture, emulate, handle).await;
+            } else {
+                deactivate_client(server, capture, emulate, handle).await;
+            }
+        }
+        FrontendRequest::ChangePort(port) => {
+            let _ = port_tx.send(port).await;
+        }
+        FrontendRequest::Delete(handle) => {
+            remove_client(server, capture, emulate, handle).await;
+            broadcast(frontend, FrontendEvent::Deleted(handle)).await;
+        }
+        FrontendRequest::Enumerate() => {
+            let clients = server
+                .client_manager
+                .borrow()
+                .get_client_states()
+                .map(|(h, (c, s))| (h, c.clone(), s.clone()))
+                .collect();
+            broadcast(frontend, FrontendEvent::Enumerate(clients)).await;
+        }
+        FrontendRequest::GetState(handle) => {
+            broadcast_client(server, frontend, handle).await;
+        }
+        FrontendRequest::Terminate() => {
+            log::info!("terminating gracefully...");
+            return true;
+        }
+        FrontendRequest::UpdateFixIps(handle, fix_ips) => {
+            update_fix_ips(server, handle, fix_ips).await;
+            resolve_dns(server, resolve_tx, handle).await;
+        }
+        FrontendRequest::UpdateHostname(handle, hostname) => {
+            update_hostname(server, resolve_tx, handle, hostname).await;
+            resolve_dns(server, resolve_tx, handle).await;
+        }
+        FrontendRequest::UpdatePort(handle, port) => {
+            update_port(server, handle, port).await;
+        }
+        FrontendRequest::UpdatePosition(handle, pos) => {
+            update_pos(server, handle, capture, emulate, pos).await;
+        }
+        FrontendRequest::ResolveDns(handle) => {
+            resolve_dns(server, resolve_tx, handle).await;
+        }
+    };
+    false
+}
+
+async fn resolve_dns(server: &Server, resolve_tx: &Sender<DnsRequest>, handle: ClientHandle) {
+    let hostname = server
+        .client_manager
+        .borrow()
+        .get(handle)
+        .and_then(|(c, _)| c.hostname.clone());
+    if let Some(hostname) = hostname {
+        let _ = resolve_tx
+            .send(DnsRequest {
+                hostname: hostname.clone(),
+                handle,
+            })
+            .await;
+    }
+}
+
+async fn broadcast(frontend: &mut FrontendListener, event: FrontendEvent) {
+    if let Err(e) = frontend.broadcast_event(event).await {
+        log::error!("error notifying frontend: {e}");
+    }
+}
+
+pub async fn add_client(server: &Server, frontend: &mut FrontendListener) -> ClientHandle {
+    let handle = server.client_manager.borrow_mut().add_client();
+    log::info!("added client {handle}");
+
+    let (c, s) = server.client_manager.borrow().get(handle).unwrap().clone();
+    broadcast(frontend, FrontendEvent::Created(handle, c, s)).await;
+    handle
+}
+
+pub async fn deactivate_client(
+    server: &Server,
+    capture: &Sender<CaptureEvent>,
+    emulate: &Sender<EmulationEvent>,
+    handle: ClientHandle,
+) {
+    match server.client_manager.borrow_mut().get_mut(handle) {
+        Some((_, s)) => {
+            s.active = false;
+        }
+        None => return,
+    };
+
+    let event = ClientEvent::Destroy(handle);
+    let _ = capture.send(CaptureEvent::ClientEvent(event)).await;
+    let _ = emulate.send(EmulationEvent::ClientEvent(event)).await;
+}
+
+pub async fn activate_client(
+    server: &Server,
+    capture: &Sender<CaptureEvent>,
+    emulate: &Sender<EmulationEvent>,
+    handle: ClientHandle,
+) {
+    /* deactivate potential other client at this position */
+    let pos = match server.client_manager.borrow().get(handle) {
+        Some((client, _)) => client.pos,
+        None => return,
+    };
+
+    let other = server.client_manager.borrow_mut().find_client(pos);
+    if let Some(other) = other {
+        if other != handle {
+            deactivate_client(server, capture, emulate, other).await;
+        }
+    }
+
+    /* activate the client */
+    if let Some((_, s)) = server.client_manager.borrow_mut().get_mut(handle) {
+        s.active = true;
+    } else {
+        return;
+    };
+
+    /* notify emulation, capture and frontends */
+    let event = ClientEvent::Create(handle, pos);
+    let _ = capture.send(CaptureEvent::ClientEvent(event)).await;
+    let _ = emulate.send(EmulationEvent::ClientEvent(event)).await;
+}
+
+pub async fn remove_client(
+    server: &Server,
+    capture: &Sender<CaptureEvent>,
+    emulate: &Sender<EmulationEvent>,
+    handle: ClientHandle,
+) {
+    let Some(active) = server
+        .client_manager
+        .borrow_mut()
+        .remove_client(handle)
+        .map(|(_, s)| s.active)
+    else {
+        return;
+    };
+
+    if active {
+        let destroy = ClientEvent::Destroy(handle);
+        let _ = capture.send(CaptureEvent::ClientEvent(destroy)).await;
+        let _ = emulate.send(EmulationEvent::ClientEvent(destroy)).await;
+    }
+}
+
+async fn update_fix_ips(server: &Server, handle: ClientHandle, fix_ips: Vec<IpAddr>) {
+    let mut client_manager = server.client_manager.borrow_mut();
+    let Some((c, _)) = client_manager.get_mut(handle) else {
+        return;
+    };
+
+    c.fix_ips = fix_ips;
+}
+
+async fn update_hostname(
+    server: &Server,
+    resolve_tx: &Sender<DnsRequest>,
+    handle: ClientHandle,
+    hostname: Option<String>,
+) {
+    let hostname = {
+        let mut client_manager = server.client_manager.borrow_mut();
+        let Some((c, s)) = client_manager.get_mut(handle) else {
+            return;
+        };
+
+        // update hostname
+        if c.hostname != hostname {
+            c.hostname = hostname;
+            s.ips = HashSet::from_iter(c.fix_ips.iter().cloned());
+            s.active_addr = None;
+            c.hostname.clone()
+        } else {
+            None
+        }
+    };
+
+    // resolve to update ips in state
+    if let Some(hostname) = hostname {
+        let _ = resolve_tx.send(DnsRequest { hostname, handle }).await;
+    }
+}
+
+async fn update_port(server: &Server, handle: ClientHandle, port: u16) {
+    let mut client_manager = server.client_manager.borrow_mut();
+    let Some((c, s)) = client_manager.get_mut(handle) else {
+        return;
+    };
+
+    if c.port != port {
+        c.port = port;
+        s.active_addr = s.active_addr.map(|a| SocketAddr::new(a.ip(), port));
+    }
+}
+
+async fn update_pos(
+    server: &Server,
+    handle: ClientHandle,
+    capture: &Sender<CaptureEvent>,
+    emulate: &Sender<EmulationEvent>,
+    pos: Position,
+) {
+    let (changed, active) = {
+        let mut client_manager = server.client_manager.borrow_mut();
+        let Some((c, s)) = client_manager.get_mut(handle) else {
+            return;
+        };
+
+        let changed = c.pos != pos;
+        c.pos = pos;
+        (changed, s.active)
+    };
+
+    // update state in event input emulator & input capture
+    if changed {
+        if active {
+            let destroy = ClientEvent::Destroy(handle);
+            let _ = capture.send(CaptureEvent::ClientEvent(destroy)).await;
+            let _ = emulate.send(EmulationEvent::ClientEvent(destroy)).await;
+        }
+        let create = ClientEvent::Create(handle, pos);
+        let _ = capture.send(CaptureEvent::ClientEvent(create)).await;
+        let _ = emulate.send(EmulationEvent::ClientEvent(create)).await;
+    }
+}
+
+async fn broadcast_client(server: &Server, frontend: &mut FrontendListener, handle: ClientHandle) {
+    let client = server.client_manager.borrow().get(handle).cloned();
+    if let Some((config, state)) = client {
+        broadcast(frontend, FrontendEvent::State(handle, config, state)).await;
+    } else {
+        broadcast(frontend, FrontendEvent::NoSuchClient(handle)).await;
+    }
+}

src/server/network_task.rs

@@ -1,99 +1,86 @@
-use std::{io, net::SocketAddr};
+use std::net::SocketAddr;
 
-use thiserror::Error;
+use anyhow::Result;
 use tokio::{
     net::UdpSocket,
     sync::mpsc::{Receiver, Sender},
     task::JoinHandle,
 };
 
-use input_event::{Event, ProtocolError};
+use crate::{event::Event, frontend::FrontendEvent};
 
 use super::Server;
 
-pub(crate) async fn new(
+pub async fn new(
     server: Server,
-    udp_recv_tx: Sender<Result<(Event, SocketAddr), NetworkError>>,
-    udp_send_rx: Receiver<(Event, SocketAddr)>,
-) -> io::Result<JoinHandle<()>> {
+    frontend_notify_tx: Sender<FrontendEvent>,
+) -> Result<(
+    JoinHandle<()>,
+    Sender<(Event, SocketAddr)>,
+    Receiver<Result<(Event, SocketAddr)>>,
+    Sender<u16>,
+)> {
     // bind the udp socket
     let listen_addr = SocketAddr::new("0.0.0.0".parse().unwrap(), server.port.get());
     let mut socket = UdpSocket::bind(listen_addr).await?;
+    let (receiver_tx, receiver_rx) = tokio::sync::mpsc::channel(32);
+    let (sender_tx, mut sender_rx) = tokio::sync::mpsc::channel(32);
+    let (port_tx, mut port_rx) = tokio::sync::mpsc::channel(32);
 
-    Ok(tokio::task::spawn_local(async move {
-        let mut sender_rx = udp_send_rx;
+    let udp_task = tokio::task::spawn_local(async move {
         loop {
-            let udp_receiver = udp_receiver(&socket, &udp_recv_tx);
-            let udp_sender = udp_sender(&socket, &mut sender_rx);
             tokio::select! {
-                _ = udp_receiver => break, /* channel closed */
-                _ = udp_sender => break, /* channel closed */
-                _ = server.notifies.port_changed.notified() => update_port(&server, &mut socket).await,
-                _ = server.cancelled() => break, /* cancellation requested */
+                event = receive_event(&socket) => {
+                    let _ = receiver_tx.send(event).await;
+                }
+                event = sender_rx.recv() => {
+                    let Some((event, addr)) = event else {
+                        break;
+                    };
+                    if let Err(e) = send_event(&socket, event, addr) {
+                        log::warn!("udp send failed: {e}");
+                    };
+                }
+                port = port_rx.recv() => {
+                    let Some(port) = port else {
+                        break;
+                    };
+
+                    if socket.local_addr().unwrap().port() == port {
+                        continue;
+                    }
+
+                    let listen_addr = SocketAddr::new("0.0.0.0".parse().unwrap(), port);
+                    match UdpSocket::bind(listen_addr).await {
+                        Ok(new_socket) => {
+                            socket = new_socket;
+                            server.port.replace(port);
+                            let _ = frontend_notify_tx.send(FrontendEvent::PortChanged(port, None)).await;
+                        }
+                        Err(e) => {
+                            log::warn!("could not change port: {e}");
+                            let port = socket.local_addr().unwrap().port();
+                            let _ = frontend_notify_tx.send(FrontendEvent::PortChanged(
+                                    port,
+                                    Some(format!("could not change port: {e}")),
+                                )).await;
+                        }
+                    }
+
+                }
             }
         }
-    }))
+    });
+    Ok((udp_task, sender_tx, receiver_rx, port_tx))
 }
 
-async fn update_port(server: &Server, socket: &mut UdpSocket) {
-    let new_port = server.port.get();
-    let current_port = socket.local_addr().expect("socket not bound").port();
-
-    // if port is the same, we dont need to change it
-    if current_port == new_port {
-        return;
-    }
-
-    // bind new socket
-    let listen_addr = SocketAddr::new("0.0.0.0".parse().unwrap(), new_port);
-    let new_socket = UdpSocket::bind(listen_addr).await;
-    let err = match new_socket {
-        Ok(new_socket) => {
-            *socket = new_socket;
-            None
-        }
-        Err(e) => Some(e.to_string()),
-    };
-
-    // notify frontend of the actual port
-    let port = socket.local_addr().expect("socket not bound").port();
-    server.notify_port_changed(port, err);
-}
-
-async fn udp_receiver(
-    socket: &UdpSocket,
-    receiver_tx: &Sender<Result<(Event, SocketAddr), NetworkError>>,
-) {
-    loop {
-        let event = receive_event(socket).await;
-        receiver_tx.send(event).await.expect("channel closed");
-    }
-}
-
-async fn udp_sender(socket: &UdpSocket, rx: &mut Receiver<(Event, SocketAddr)>) {
-    loop {
-        let (event, addr) = rx.recv().await.expect("channel closed");
-        if let Err(e) = send_event(socket, event, addr) {
-            log::warn!("udp send failed: {e}");
-        };
-    }
-}
-
-#[derive(Debug, Error)]
-pub(crate) enum NetworkError {
-    #[error(transparent)]
-    Protocol(#[from] ProtocolError),
-    #[error("network error: `{0}`")]
-    Io(#[from] io::Error),
-}
-
-async fn receive_event(socket: &UdpSocket) -> Result<(Event, SocketAddr), NetworkError> {
+async fn receive_event(socket: &UdpSocket) -> Result<(Event, SocketAddr)> {
     let mut buf = vec![0u8; 22];
     let (_amt, src) = socket.recv_from(&mut buf).await?;
     Ok((Event::try_from(buf)?, src))
 }
 
-fn send_event(sock: &UdpSocket, e: Event, addr: SocketAddr) -> Result<usize, NetworkError> {
+fn send_event(sock: &UdpSocket, e: Event, addr: SocketAddr) -> Result<usize> {
     log::trace!("{:20} ------>->->-> {addr}", e.to_string());
     let data: Vec<u8> = (&e).into();
     // When udp blocks, we dont want to block the event loop.

src/server/ping_task.rs

@@ -1,138 +1,129 @@
 use std::{net::SocketAddr, time::Duration};
 
-use tokio::{sync::mpsc::Sender, task::JoinHandle};
+use tokio::{
+    sync::mpsc::{Receiver, Sender},
+    task::JoinHandle,
+};
 
-use input_event::Event;
-
-use crate::client::ClientHandle;
+use crate::{client::ClientHandle, event::Event};
 
 use super::{capture_task::CaptureEvent, emulation_task::EmulationEvent, Server, State};
 
 const MAX_RESPONSE_TIME: Duration = Duration::from_millis(500);
 
-pub(crate) fn new(
+pub fn new(
     server: Server,
     sender_ch: Sender<(Event, SocketAddr)>,
     emulate_notify: Sender<EmulationEvent>,
     capture_notify: Sender<CaptureEvent>,
+    mut timer_rx: Receiver<()>,
 ) -> JoinHandle<()> {
     // timer task
-    tokio::task::spawn_local(async move {
-        tokio::select! {
-            _ = server.notifies.cancel.cancelled() => {}
-            _ = ping_task(&server, sender_ch, emulate_notify, capture_notify) => {}
-        }
-    })
-}
-
-async fn ping_task(
-    server: &Server,
-    sender_ch: Sender<(Event, SocketAddr)>,
-    emulate_notify: Sender<EmulationEvent>,
-    capture_notify: Sender<CaptureEvent>,
-) {
-    loop {
-        // wait for wake up signal
-        server.ping_timer_notified().await;
+    let ping_task = tokio::task::spawn_local(async move {
         loop {
-            let receiving = server.state.get() == State::Receiving;
-            let (ping_clients, ping_addrs) = {
-                let mut client_manager = server.client_manager.borrow_mut();
+            // wait for wake up signal
+            let Some(_): Option<()> = timer_rx.recv().await else {
+                break;
+            };
+            loop {
+                let receiving = server.state.get() == State::Receiving;
+                let (ping_clients, ping_addrs) = {
+                    let mut client_manager = server.client_manager.borrow_mut();
 
-                let ping_clients: Vec<ClientHandle> = if receiving {
-                    // if receiving we care about clients with pressed keys
-                    client_manager
-                        .get_client_states_mut()
-                        .filter(|(_, (_, s))| !s.pressed_keys.is_empty())
-                        .map(|(h, _)| h)
-                        .collect()
-                } else {
-                    // if sending we care about the active client
-                    server.active_client.get().iter().cloned().collect()
+                    let ping_clients: Vec<ClientHandle> = if receiving {
+                        // if receiving we care about clients with pressed keys
+                        client_manager
+                            .get_client_states_mut()
+                            .filter(|(_, (_, s))| !s.pressed_keys.is_empty())
+                            .map(|(h, _)| h)
+                            .collect()
+                    } else {
+                        // if sending we care about the active client
+                        server.active_client.get().iter().cloned().collect()
+                    };
+
+                    // get relevant socket addrs for clients
+                    let ping_addrs: Vec<SocketAddr> = {
+                        ping_clients
+                            .iter()
+                            .flat_map(|&h| client_manager.get(h))
+                            .flat_map(|(c, s)| {
+                                if s.alive && s.active_addr.is_some() {
+                                    vec![s.active_addr.unwrap()]
+                                } else {
+                                    s.ips
+                                        .iter()
+                                        .cloned()
+                                        .map(|ip| SocketAddr::new(ip, c.port))
+                                        .collect()
+                                }
+                            })
+                            .collect()
+                    };
+
+                    // reset alive
+                    for (_, (_, s)) in client_manager.get_client_states_mut() {
+                        s.alive = false;
+                    }
+
+                    (ping_clients, ping_addrs)
                 };
 
-                // get relevant socket addrs for clients
-                let ping_addrs: Vec<SocketAddr> = {
+                if receiving && ping_clients.is_empty() {
+                    // receiving and no client has pressed keys
+                    // -> no need to keep pinging
+                    break;
+                }
+
+                // ping clients
+                for addr in ping_addrs {
+                    if sender_ch.send((Event::Ping(), addr)).await.is_err() {
+                        break;
+                    }
+                }
+
+                // give clients time to resond
+                if receiving {
+                    log::trace!("waiting {MAX_RESPONSE_TIME:?} for response from client with pressed keys ...");
+                } else {
+                    log::trace!(
+                        "state: {:?} => waiting {MAX_RESPONSE_TIME:?} for client to respond ...",
+                        server.state.get()
+                    );
+                }
+
+                tokio::time::sleep(MAX_RESPONSE_TIME).await;
+
+                // when anything is received from a client,
+                // the alive flag gets set
+                let unresponsive_clients: Vec<_> = {
+                    let client_manager = server.client_manager.borrow();
                     ping_clients
                         .iter()
-                        .flat_map(|&h| client_manager.get(h))
-                        .flat_map(|(c, s)| {
-                            if s.alive && s.active_addr.is_some() {
-                                vec![s.active_addr.unwrap()]
-                            } else {
-                                s.ips
-                                    .iter()
-                                    .cloned()
-                                    .map(|ip| SocketAddr::new(ip, c.port))
-                                    .collect()
-                            }
+                        .filter_map(|&h| match client_manager.get(h) {
+                            Some((_, s)) if !s.alive => Some(h),
+                            _ => None,
                         })
                         .collect()
                 };
 
-                // reset alive
-                for (_, (_, s)) in client_manager.get_client_states_mut() {
-                    s.alive = false;
-                }
-
-                (ping_clients, ping_addrs)
-            };
-
-            if receiving && ping_clients.is_empty() {
-                // receiving and no client has pressed keys
-                // -> no need to keep pinging
-                break;
-            }
-
-            // ping clients
-            for addr in ping_addrs {
-                if sender_ch.send((Event::Ping(), addr)).await.is_err() {
-                    break;
-                }
-            }
-
-            // give clients time to resond
-            if receiving {
-                log::trace!(
-                    "waiting {MAX_RESPONSE_TIME:?} for response from client with pressed keys ..."
-                );
-            } else {
-                log::trace!(
-                    "state: {:?} => waiting {MAX_RESPONSE_TIME:?} for client to respond ...",
-                    server.state.get()
-                );
-            }
-
-            tokio::time::sleep(MAX_RESPONSE_TIME).await;
-
-            // when anything is received from a client,
-            // the alive flag gets set
-            let unresponsive_clients: Vec<_> = {
-                let client_manager = server.client_manager.borrow();
-                ping_clients
-                    .iter()
-                    .filter_map(|&h| match client_manager.get(h) {
-                        Some((_, s)) if !s.alive => Some(h),
-                        _ => None,
-                    })
-                    .collect()
-            };
-
-            // we may not be receiving anymore but we should respond
-            // to the original state and not the "new" one
-            if receiving {
-                for h in unresponsive_clients {
-                    log::warn!("device not responding, releasing keys!");
-                    let _ = emulate_notify.send(EmulationEvent::ReleaseKeys(h)).await;
-                }
-            } else {
-                // release pointer if the active client has not responded
-                if !unresponsive_clients.is_empty() {
-                    log::warn!("client not responding, releasing pointer!");
-                    server.state.replace(State::Receiving);
-                    let _ = capture_notify.send(CaptureEvent::Release).await;
+                // we may not be receiving anymore but we should respond
+                // to the original state and not the "new" one
+                if receiving {
+                    for h in unresponsive_clients {
+                        log::warn!("device not responding, releasing keys!");
+                        let _ = emulate_notify.send(EmulationEvent::ReleaseKeys(h)).await;
+                    }
+                } else {
+                    // release pointer if the active client has not responded
+                    if !unresponsive_clients.is_empty() {
+                        log::warn!("client not responding, releasing pointer!");
+                        server.state.replace(State::Receiving);
+                        let _ = capture_notify.send(CaptureEvent::Release).await;
+                    }
                 }
             }
         }
-    }
+    });
+    ping_task
 }

src/server/resolver_task.rs

@@ -0,0 +1,68 @@
+use std::collections::HashSet;
+
+use tokio::{sync::mpsc::Sender, task::JoinHandle};
+
+use crate::{client::ClientHandle, dns::DnsResolver, frontend::FrontendEvent};
+
+use super::Server;
+
+#[derive(Clone)]
+pub struct DnsRequest {
+    pub hostname: String,
+    pub handle: ClientHandle,
+}
+
+pub fn new(
+    resolver: DnsResolver,
+    mut server: Server,
+    mut frontend: Sender<FrontendEvent>,
+) -> (JoinHandle<()>, Sender<DnsRequest>) {
+    let (dns_tx, mut dns_rx) = tokio::sync::mpsc::channel::<DnsRequest>(32);
+    let resolver_task = tokio::task::spawn_local(async move {
+        loop {
+            let (host, handle) = match dns_rx.recv().await {
+                Some(r) => (r.hostname, r.handle),
+                None => break,
+            };
+
+            /* update resolving status */
+            if let Some((_, s)) = server.client_manager.borrow_mut().get_mut(handle) {
+                s.resolving = true;
+            }
+            notify_state_change(&mut frontend, &mut server, handle).await;
+
+            let ips = match resolver.resolve(&host).await {
+                Ok(ips) => ips,
+                Err(e) => {
+                    log::warn!("could not resolve host '{host}': {e}");
+                    vec![]
+                }
+            };
+
+            /* update ips and resolving state */
+            if let Some((c, s)) = server.client_manager.borrow_mut().get_mut(handle) {
+                let mut addrs = HashSet::from_iter(c.fix_ips.iter().cloned());
+                for ip in ips {
+                    addrs.insert(ip);
+                }
+                s.ips = addrs;
+                s.resolving = false;
+            }
+            notify_state_change(&mut frontend, &mut server, handle).await;
+        }
+    });
+    (resolver_task, dns_tx)
+}
+
+async fn notify_state_change(
+    frontend: &mut Sender<FrontendEvent>,
+    server: &mut Server,
+    handle: ClientHandle,
+) {
+    let state = server.client_manager.borrow_mut().get_mut(handle).cloned();
+    if let Some((config, state)) = state {
+        let _ = frontend
+            .send(FrontendEvent::State(handle, config, state))
+            .await;
+    }
+}