chore: Release lan-mouse version 0.4.0

* macos: initial support

- adapted conditional compilation
- moved lan-mouse socket to ~/Library/Caches/lan-mouse-socket.sock instead of XDG_RUNTIME_DIR
- support for mouse input emulation
TODO: Keycode translation, input capture

.github/workflows/pre-release.yml

@@ -39,9 +39,23 @@ jobs:
         name: lan-mouse-windows
         path: target/release/lan-mouse.exe
 
+  macos-release-build:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: install dependencies
+      run: brew install gtk4 libadwaita
+    - name: Release Build
+      run: cargo build --release
+    - name: Upload build artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: lan-mouse-macos
+        path: target/release/lan-mouse
+
   pre-release:
     name: "Pre Release"
-    needs: [windows-release-build, linux-release-build]
+    needs: [windows-release-build, linux-release-build, macos-release-build]
     runs-on: "ubuntu-latest"
     steps:
     - name: Download build artifacts
@@ -56,3 +70,4 @@ jobs:
         files: |
           lan-mouse-linux/lan-mouse
           lan-mouse-windows/lan-mouse.exe
+          lan-mouse-macos/lan-mouse

.github/workflows/rust.yml

@@ -46,3 +46,19 @@ jobs:
       with:
         name: lan-mouse-windows
         path: target/debug/lan-mouse.exe
+
+  build-macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: install dependencies
+      run: brew install gtk4 libadwaita
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose
+    - name: Upload build artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: lan-mouse-macos
+        path: target/debug/lan-mouse

.github/workflows/tagged-release.yml

@@ -35,9 +35,23 @@ jobs:
         name: lan-mouse-windows
         path: target/release/lan-mouse.exe
 
+  macos-release-build:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: install dependencies
+      run: brew install gtk4 libadwaita
+    - name: Release Build
+      run: cargo build --release
+    - name: Upload build artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: lan-mouse-macos
+        path: target/release/lan-mouse
+
   tagged-release:
     name: "Tagged Release"
-    needs: [windows-release-build, linux-release-build]
+    needs: [windows-release-build, linux-release-build, macos-release-build]
     runs-on: "ubuntu-latest"
     steps:
     - name: Download build artifacts
@@ -50,3 +64,4 @@ jobs:
         files: |
           lan-mouse-linux/lan-mouse
           lan-mouse-windows/lan-mouse.exe
+          lan-mouse-macos/lan-mouse

.gitignore

@@ -1 +1,2 @@
 /target
+.gdbinit

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "lan-mouse"
 description = "Software KVM Switch / mouse & keyboard sharing software for Local Area Networks"
-version = "0.3.1"
+version = "0.4.0"
 edition = "2021"
 license = "GPL-3.0-or-later"
 repository = "https://github.com/ferdinandschober/lan-mouse"
@@ -21,21 +21,31 @@ serde = { version = "1.0", features = ["derive"] }
 anyhow = "1.0.71"
 log = "0.4.20"
 env_logger = "0.10.0"
-mio = { version = "0.8", features = ["os-ext"] }
 libc = "0.2.148"
 serde_json = "1.0.107"
+tokio = {version = "1.32.0", features = ["io-util", "macros", "net", "rt", "sync", "signal"] }
+async-trait = "0.1.73"
+futures-core = "0.3.28"
+futures = "0.3.28"
+clap = { version="4.4.11", features = ["derive"] }
 
-[target.'cfg(unix)'.dependencies]
+[target.'cfg(all(unix, not(target_os="macos")))'.dependencies]
 wayland-client = { version="0.30.2", optional = true }
 wayland-protocols = { version="0.30.0", features=["client", "staging", "unstable"], optional = true }
 wayland-protocols-wlr = { version="0.1.0", features=["client"], optional = true }
 wayland-protocols-misc = { version="0.1.0", features=["client"], optional = true }
 wayland-protocols-plasma = { version="0.1.0", features=["client"], optional = true }
-mio-signals = "0.2.0"
 x11 = { version = "2.21.0", features = ["xlib", "xtest"], optional = true }
+ashpd = { version = "0.6.2", default-features = false, features = ["tokio"], optional = true }
+reis = { git = "https://github.com/ids1024/reis", features = [ "tokio" ], optional = true }
+
+[target.'cfg(unix)'.dependencies]
 gtk = { package = "gtk4", version = "0.7.2", features = ["v4_6"], optional = true }
 adw = { package = "libadwaita", version = "0.5.2", features = ["v1_1"], optional = true }
 
+[target.'cfg(target_os="macos")'.dependencies]
+core-graphics = { version = "0.23", features = ["highsierra"] }
+
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3.9", features = ["winuser"] }
 
@@ -43,20 +53,9 @@ winapi = { version = "0.3.9", features = ["winuser"] }
 glib-build-tools = "0.18.0"
 
 [features]
-default = [
-	"wayland",
-	"x11",
-	"xdg_desktop_portal",
-	"libei",
-	"gtk",
-]
-wayland = [
-	"dep:wayland-client",
-	"dep:wayland-protocols",
-	"dep:wayland-protocols-wlr",
-	"dep:wayland-protocols-misc",
-	"dep:wayland-protocols-plasma" ]
-x11 = [ "dep:x11" ]
-xdg_desktop_portal = []
-libei = []
+default = ["wayland", "x11", "xdg_desktop_portal", "libei", "gtk"]
+wayland = ["dep:wayland-client", "dep:wayland-protocols", "dep:wayland-protocols-wlr", "dep:wayland-protocols-misc", "dep:wayland-protocols-plasma"]
+x11 = ["dep:x11"]
+xdg_desktop_portal = ["dep:ashpd"]
+libei = ["dep:reis", "dep:ashpd"]
 gtk = ["dep:gtk", "dep:adw"]

README.md

@@ -1,58 +1,38 @@
-# Lan Mouse Share
+# Lan Mouse
+- _Now with a gtk frontend_
 
-![image](https://github.com/ferdinandschober/lan-mouse/assets/40996949/ccb33815-4357-4c8d-a5d2-8897ab626a08)
+Lan Mouse is a mouse and keyboard sharing software similar to universal-control on Apple devices.
+It allows for using multiple pcs with a single set of mouse and keyboard.
+
+The primary target is Wayland on Linux but Windows and MacOS have partial support as well (see below for more details).
+
+![Screenshot from 2023-12-09 01-48-12](https://github.com/feschber/lan-mouse/assets/40996949/016a06a9-76db-4951-9dcc-127d012c59df#gh-dark-mode-only)
+![Screenshot from 2023-12-09 01-48-19](https://github.com/feschber/lan-mouse/assets/40996949/d6318340-f811-4e16-9d6e-d1b79883c709#gh-light-mode-only)
 
 
 Goal of this project is to be an open-source replacement for proprietary tools like [Synergy](https://symless.com/synergy), [Share Mouse](https://www.sharemouse.com/de/).
 
 Focus lies on performance and a clean, manageable implementation that can easily be expanded to support additional backends like e.g. Android, iOS, ... .
 
-Of course ***blazingly fast™*** and stable, because it's written in rust.
+***blazingly fast™*** because it's written in rust.
 
 For an alternative (with slightly different goals) you may check out [Input Leap](https://github.com/input-leap).
 
-_Now with a gtk frontend_
+## OS Support
 
-## Configuration
-Configuration is done through the file `config.toml`,
-which must be located in the current working directory when
-executing lan-mouse.
+The following table shows support for input emulation (to emulate events received from other clients) and
+input capture (to send events *to* other clients) on different operating systems:
 
-### Example config
-A minimal config file could look like this:
-
-```toml
-# example configuration
-
-# optional port (defaults to 4242)
-port = 4242
-# # optional frontend -> defaults to gtk if available
-# # possible values are "cli" and "gtk" 
-# frontend = "gtk"
-
-# define a client on the right side with host name "iridium"
-[right]
-# hostname
-host_name = "iridium"
-# optional list of (known) ip addresses
-ips = ["192.168.178.156"]
-
-# define a client on the left side with IP address 192.168.178.189
-[left]
-# The hostname is optional: When no hostname is specified,
-# at least one ip address needs to be specified.
-host_name = "thorium"
-# ips for ethernet and wifi
-ips = ["192.168.178.189"]
-# optional port
-port = 4242
-```
-
-Where `left` can be either `left`, `right`, `top` or `bottom`.
-
-> :warning: Note that clients from the config
-> file are currently ignored when using the gtk frontend!
+| Backend                   | input emulation          | input capture                        |
+|---------------------------|--------------------------|--------------------------------------|
+| Wayland (wlroots)         | :heavy_check_mark:       | :heavy_check_mark:                   |
+| Wayland (KDE)             | :heavy_check_mark:       | :heavy_check_mark:                   |
+| Wayland (Gnome)           | :heavy_check_mark:       | WIP                                  |
+| X11                       | (WIP)                    | WIP                                  |
+| Windows                   | ( :heavy_check_mark: )   | WIP                                  |
+| MacOS                     | ( :heavy_check_mark: )   | WIP                                  |
 
+Keycode translation is not yet implemented so on MacOS only mouse emulation works as of right now.
 
 ## Build and Run
 Build in release mode:
@@ -84,79 +64,77 @@ an executable with just support for wayland:
 cargo build --no-default-features --features wayland
 ```
 
-## OS Support
+## Usage
+### Gtk Frontend
+By default the gtk frontend will open when running `lan-mouse`.
 
-The following table shows support for Event receiving and event Emitting
-on different operating systems:
+To add a new connection, simply click the `Add` button on *both* devices,
+enter the corresponding hostname and activate it.
 
-| Backend                   | Event Receiving          | Event Emitting                       |
-|---------------------------|--------------------------|--------------------------------------|
-| Wayland (wlroots)         | :heavy_check_mark:       | :heavy_check_mark:                   |
-| Wayland (KDE)             | WIP                      | :heavy_check_mark:                   |
-| Wayland (Gnome)           | TODO (libei support)     | TODO (wlr-layer-shell not supported) |
-| X11                       | WIP                      | TODO                                 |
-| Windows                   | needs improvements       | TODO                                 |
-| MacOS                     | TODO (I dont own a Mac)  | TODO (I dont own a Mac)              |
+If the mouse can not be moved onto a device, make sure you have port `4242` (or the one selected)
+opened up in your firewall.
 
-## Wayland compositor support
-### Input Emulation (for receiving events)
-On wayland input-emulation is in an early/unstable state as of writing this.
+### Command Line Interface
+The cli interface can be enabled using `--frontend cli` as commandline arguments.
+Type `help` to list the available commands.
 
-Different compositors have different ways of enabling input emulation:
+E.g.:
+```sh
+$ cargo run --release -- --frontend cli
+(...)
+> connect <host> left|right|top|bottom
+(...)
+> list
+(...)
+> activate 0
+```
 
-Most wlroots-based compositors like Hyprland and Sway support the following
-unstable wayland protocols for keyboard and mouse emulation:
-- [virtual-keyboard-unstable-v1](https://wayland.app/protocols/virtual-keyboard-unstable-v1)
-- [wlr-virtual-pointer-unstable-v1](https://wayland.app/protocols/wlr-virtual-pointer-unstable-v1) are used to emulate input on wlroots compositors
+### Daemon
+Lan Mouse can be launched in daemon mode to keep it running in the background.
+To do so, add `--daemon` to the commandline args:
 
-KDE also has a protocol for input emulation ([kde-fake-input](https://wayland.app/protocols/kde-fake-input)), it is however not exposed to
-third party apps, so the recommended way of enabling input emulation in KDE is the
-[freedesktop remote-desktop-portal](https://flatpak.github.io/xdg-desktop-portal/#gdbus-org.freedesktop.portal.RemoteDesktop).
+```sh
+$ cargo run --release -- --daemon
+```
 
-Gnome uses [libei](https://gitlab.freedesktop.org/libinput/libei) for input emulation,
-which has the goal to become the general approach for emulating Input on wayland.
+## Configuration
+To automatically load clients on startup, the file `$XDG_CONFIG_HOME/lan-mouse/config.toml` is parsed.
+`$XDG_CONFIG_HOME` defaults to `~/.config/`.
 
-|  Required Protocols  (Event Receiving) | Sway               | Kwin                 | Gnome                |
-|----------------------------------------|--------------------|----------------------|----------------------|
-| wlr-virtual-pointer-unstable-v1        | :heavy_check_mark: | :x:                  | :x:                  |
-| virtual-keyboard-unstable-v1           | :heavy_check_mark: | :x:                  | :x:                  |
-| ~fake-input~                           | :x:                | ~:heavy_check_mark:~ | :x:                  |
+To create this file you can copy the following example config:
 
-### Input capture
+### Example config
 
-To capture mouse and keyboard input, a few things are necessary:
-- Displaying an immovable surface at screen edges
-- Locking the mouse in place
-- (optionally but highly recommended) reading unaccelerated mouse input
+```toml
+# example configuration
 
-|  Required Protocols  (Event Emitting)  | Sway               | Kwin                 | Gnome                |
-|----------------------------------------|--------------------|----------------------|----------------------|
-| pointer-constraints-unstable-v1        | :heavy_check_mark: | :heavy_check_mark:   | :heavy_check_mark:   |
-| relative-pointer-unstable-v1           | :heavy_check_mark: | :heavy_check_mark:   | :heavy_check_mark:   |
-| keyboard-shortcuts-inhibit-unstable-v1 | :heavy_check_mark: | :heavy_check_mark:   | :heavy_check_mark:   |
-| wlr-layer-shell-unstable-v1            | :heavy_check_mark: | :heavy_check_mark:   | :x:                  |
+# optional port (defaults to 4242)
+port = 4242
+# # optional frontend -> defaults to gtk if available
+# # possible values are "cli" and "gtk" 
+# frontend = "gtk"
 
-The [zwlr\_virtual\_pointer\_manager\_v1](wlr-virtual-pointer-unstable-v1) is required
-to display surfaces on screen edges and used to display the immovable window on
-both wlroots based compositors and KDE.
+# define a client on the right side with host name "iridium"
+[right]
+# hostname
+host_name = "iridium"
+# optional list of (known) ip addresses
+ips = ["192.168.178.156"]
 
-Gnome unfortunately does not support this protocol
-and [likely won't ever support it](https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/1141).
+# define a client on the left side with IP address 192.168.178.189
+[left]
+# The hostname is optional: When no hostname is specified,
+# at least one ip address needs to be specified.
+host_name = "thorium"
+# ips for ethernet and wifi
+ips = ["192.168.178.189", "192.168.178.172"]
+# optional port
+port = 4242
+```
 
-So there is currently no way of doing this in Wayland, aside from a custom Gnome-Shell
-extension, which is not a very elegant solution.
+Where `left` can be either `left`, `right`, `top` or `bottom`.
 
-This is to be looked into in the future.
-
-~In order for layershell surfaces to be able to lock the pointer using the pointer\_constraints protocol [this patch](https://github.com/swaywm/sway/pull/7178) needs to be applied to sway.~
-(this works natively on sway versions >= 1.8)
-
-## Windows support
-Currently windows can receive mouse and keyboard events,
-event producing on windows is WIP.
-
-
-## TODOS
+## Roadmap
 - [x] Capture the actual mouse events on the server side via a wayland client and send them to the client
 - [x] Mouse grabbing
 - [x] Window with absolute position -> wlr\_layer\_shell
@@ -171,9 +149,8 @@ event producing on windows is WIP.
 - [x] Liveness tracking (automatically ungrab mouse when client unreachable)
 - [ ] Clipboard support
 - [x] Graphical frontend (gtk?)
-- [ ] *Encrytion*
-- [ ] Gnome Shell Extension (layer shell is not supported)
-- [ ] respect xdg-config-home for config file location.
+- [ ] *Encryption*
+- [x] respect xdg-config-home for config file location.
 
 ## Protocol
 Currently *all* mouse and keyboard events are sent via **UDP** for performance reasons.
@@ -222,3 +199,55 @@ would be a better choice for the future and could also help for WIFI connections
 Sending key and mouse event data over the local network might not be the biggest security concern but in any public network or business environment it's *QUITE* a problem to basically broadcast your keystrokes.
 - There should be an encryption layer below the application to enable a secure link.
 - The encryption keys could be generated by the graphical frontend.
+
+
+## Wayland support
+### Input Emulation (for receiving events)
+On wayland input-emulation is in an early/unstable state as of writing this.
+
+For this reason a suitable backend is chosen based on the active desktop environment / compositor.
+
+Different compositors have different ways of enabling input emulation:
+
+#### Wlroots
+Most wlroots-based compositors like Hyprland and Sway support the following
+unstable wayland protocols for keyboard and mouse emulation:
+- [virtual-keyboard-unstable-v1](https://wayland.app/protocols/virtual-keyboard-unstable-v1)
+- [wlr-virtual-pointer-unstable-v1](https://wayland.app/protocols/wlr-virtual-pointer-unstable-v1)
+
+#### KDE
+KDE also has a protocol for input emulation ([kde-fake-input](https://wayland.app/protocols/kde-fake-input)),
+it is however not exposed to third party applications.
+
+The recommended way to emulate input on KDE is the
+[freedesktop remote-desktop-portal](https://flatpak.github.io/xdg-desktop-portal/#gdbus-org.freedesktop.portal.RemoteDesktop).
+
+#### Gnome (TODO)
+Gnome uses [libei](https://gitlab.freedesktop.org/libinput/libei) for input emulation,
+which has the goal to become the general approach for emulating Input on wayland.
+
+
+### Input capture
+
+To capture mouse and keyboard input, a few things are necessary:
+- Displaying an immovable surface at screen edges
+- Locking the mouse in place
+- (optionally but highly recommended) reading unaccelerated mouse input
+
+|  Required Protocols  (Event Emitting)  | Sway               | Kwin                 | Gnome                |
+|----------------------------------------|--------------------|----------------------|----------------------|
+| pointer-constraints-unstable-v1        | :heavy_check_mark: | :heavy_check_mark:   | :heavy_check_mark:   |
+| relative-pointer-unstable-v1           | :heavy_check_mark: | :heavy_check_mark:   | :heavy_check_mark:   |
+| keyboard-shortcuts-inhibit-unstable-v1 | :heavy_check_mark: | :heavy_check_mark:   | :heavy_check_mark:   |
+| wlr-layer-shell-unstable-v1            | :heavy_check_mark: | :heavy_check_mark:   | :x:                  |
+
+The [zwlr\_virtual\_pointer\_manager\_v1](wlr-virtual-pointer-unstable-v1) is required
+to display surfaces on screen edges and used to display the immovable window on
+both wlroots based compositors and KDE.
+
+Gnome unfortunately does not support this protocol
+and [likely won't ever support it](https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/1141).
+
+~In order for layershell surfaces to be able to lock the pointer using the pointer\_constraints protocol [this patch](https://github.com/swaywm/sway/pull/7178) needs to be applied to sway.~
+(this works natively on sway versions >= 1.8)
+

de.feschber.LanMouse.yml

@@ -0,0 +1,14 @@
+app-id: de.feschber.LanMouse
+runtime: org.freedesktop.Platform
+runtime-version: '22.08'
+sdk: org.freedesktop.Sdk
+command: target/release/lan-mouse
+modules:
+  - name: hello
+    buildsystem: simple
+    build-commands:
+      - cargo build --release
+      - install -D lan-mouse /app/bin/lan-mouse
+    sources:
+      - type: file
+        path: target/release/lan-mouse

resources/style-dark.css

@@ -1,3 +1,11 @@
 #delete-button {
   color: @red_1;
 }
+
+#port-edit-cancel {
+  color: @red_1;
+}
+
+#port-edit-apply {
+  color: @green_1;
+}

resources/style.css

@@ -1,3 +1,11 @@
 #delete-button {
   color: @red_3;
 }
+
+#port-edit-cancel {
+  color: @red_3;
+}
+
+#port-edit-apply {
+  color: @green_3;
+}

resources/window.ui

@@ -8,114 +8,138 @@
 			<attribute name="action">window.close</attribute>
 		</item>
 	</menu>
-	<template class="LanMouseWindow" parent="GtkApplicationWindow">
-		<property name="width-request">800</property>
+	<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>
-		<child type="titlebar">
-			<object class="GtkHeaderBar">
-				<child type ="end">
-					<object class="GtkMenuButton">
-						<property name="icon-name">open-menu-symbolic</property>
-						<property name="menu-model">main-menu</property>
+		<property name="content">
+			<object class="AdwToolbarView">
+				<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>
-				<style>
-					<class name="flat"/>
-				</style>
-			</object>
-		</child>
-		<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">mouse-icon</property>
-				<property name="child">
-				  <object class="AdwClamp">
-					<property name="maximum-size">600</property>
-					<property name="tightening-threshold">300</property>
-					<property name="child">
-					  <object class="GtkBox">
-						<property name="orientation">vertical</property>
-						<property name="spacing">12</property>
+				<property name="content">
+					<object class="AdwToastOverlay" id="toast_overlay">
 						<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>
+							<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">mouse-icon</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="GtkEntry">
-												<!-- <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 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>
+															</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>
+															</object>
+														</child>
+													</object>
+												</child>
 											</object>
 										</child>
-									</object>
-								</child>
-							</object>
-						</child>
-						<child>
-							<object class="AdwPreferencesGroup">
-								<property name="title" translatable="yes">Connections</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 below</property>
+										<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>
-										<style>
-											<class name="boxed-list" />
-										</style>
+									  </object>
+									</property>
 								  </object>
-								</child>
+							  </property>
 							</object>
 						</child>
-						<child>
-							<object class="AdwPreferencesGroup">
-								<child>
-									<object class="GtkButton" id="add_client_button">
-										<property name="halign">center</property>
-										<property name="valign">center</property>
-										<property name="tooltip-text">connect a new computer</property>
-										<property name="child">
-											<object class="AdwButtonContent">
-												<property name="icon-name">list-add-symbolic</property>
-												<property name="label" translatable="yes">Add</property>
-												<property name="use-underline">True</property>
-											</object>
-										</property>
-										<!-- <signal name="clicked" handler="handle_add_client" swapped="true"/> -->
-										<style>
-											<class name="pill"/>
-										</style>
-									</object>
-								</child>
-							</object>
-						</child>
-					  </object>
-					</property>
-				  </object>
-			  </property>
+					</object>
+				</property>
 			</object>
-		</child>
+		</property>
 	</template>
 </interface>

src/backend/consumer.rs

@@ -1,14 +1,17 @@
 #[cfg(windows)]
 pub mod windows;
 
-#[cfg(all(unix, feature="x11"))]
+#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
 pub mod x11;
 
-#[cfg(all(unix, feature = "wayland"))]
+#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
 pub mod wlroots;
 
-#[cfg(all(unix, feature = "xdg_desktop_portal"))]
+#[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
 pub mod xdg_desktop_portal;
 
-#[cfg(all(unix, feature = "libei"))]
+#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
 pub mod libei;
+
+#[cfg(target_os = "macos")]
+pub mod macos;

src/backend/consumer/libei.rs

@@ -1,18 +1,381 @@
-use crate::consumer::EventConsumer;
+use std::{
+    collections::HashMap,
+    io,
+    os::{
+        fd::{FromRawFd, RawFd},
+        unix::net::UnixStream,
+    },
+    time::{SystemTime, UNIX_EPOCH},
+};
 
-pub struct LibeiConsumer {}
+use anyhow::{anyhow, Result};
+use ashpd::desktop::remote_desktop::{DeviceType, RemoteDesktop};
+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},
+    consumer::EventConsumer,
+    event::Event,
+};
+
+pub struct LibeiConsumer {
+    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<RawFd, ashpd::Error> {
+    let proxy = RemoteDesktop::new().await?;
+    let session = proxy.create_session().await?;
+
+    // I HATE EVERYTHING, THIS TOOK 8 HOURS OF DEBUGGING
+    proxy
+        .select_devices(
+            &session,
+            DeviceType::Pointer | DeviceType::Keyboard | DeviceType::Touchscreen,
+        )
+        .await?;
+
+    proxy
+        .start(&session, &ashpd::WindowIdentifier::default())
+        .await?
+        .response()?;
+    proxy.connect_to_eis(&session).await
+}
 
 impl LibeiConsumer {
-    pub fn new() -> Self { Self {  } }
+    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 eifd = unsafe {
+            let ret = libc::dup(eifd);
+            if ret < 0 {
+                Err(io::Error::last_os_error())
+            } else {
+                Ok(ret)
+            }
+        }?;
+        let stream = unsafe { UnixStream::from_raw_fd(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())?;
+        return 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 EventConsumer for LibeiConsumer {
-    fn consume(&self, _: crate::event::Event, _: crate::client::ClientHandle) {
-        log::error!("libei backend not yet implemented!");
-        todo!()
+    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::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();
     }
 
-    fn notify(&mut self, _: crate::client::ClientEvent) {
-        todo!()
+    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::ProtocolError(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/backend/consumer/macos.rs

@@ -0,0 +1,221 @@
+use crate::client::{ClientEvent, ClientHandle};
+use crate::consumer::EventConsumer;
+use crate::event::{Event, KeyboardEvent, PointerEvent};
+use anyhow::{anyhow, Result};
+use async_trait::async_trait;
+use core_graphics::display::CGPoint;
+use core_graphics::event::{
+    CGEvent, CGEventTapLocation, CGEventType, CGMouseButton, ScrollEventUnit,
+};
+use core_graphics::event_source::{CGEventSource, CGEventSourceStateID};
+use std::ops::{Index, IndexMut};
+
+pub struct MacOSConsumer {
+    pub event_source: CGEventSource,
+    button_state: ButtonState,
+}
+
+struct ButtonState {
+    left: bool,
+    right: bool,
+    center: bool,
+}
+
+impl Index<CGMouseButton> for ButtonState {
+    type Output = bool;
+
+    fn index(&self, index: CGMouseButton) -> &Self::Output {
+        match index {
+            CGMouseButton::Left => &self.left,
+            CGMouseButton::Right => &self.right,
+            CGMouseButton::Center => &self.center,
+        }
+    }
+}
+
+impl IndexMut<CGMouseButton> for ButtonState {
+    fn index_mut(&mut self, index: CGMouseButton) -> &mut Self::Output {
+        match index {
+            CGMouseButton::Left => &mut self.left,
+            CGMouseButton::Right => &mut self.right,
+            CGMouseButton::Center => &mut self.center,
+        }
+    }
+}
+
+unsafe impl Send for MacOSConsumer {}
+
+impl MacOSConsumer {
+    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,
+            center: false,
+        };
+        Ok(Self {
+            event_source,
+            button_state,
+        })
+    }
+
+    fn get_mouse_location(&self) -> Option<CGPoint> {
+        let event: CGEvent = CGEvent::new(self.event_source.clone()).ok()?;
+        Some(event.location())
+    }
+}
+
+#[async_trait]
+impl EventConsumer for MacOSConsumer {
+    async fn consume(&mut self, event: Event, _client_handle: ClientHandle) {
+        match event {
+            Event::Pointer(pointer_event) => match pointer_event {
+                PointerEvent::Motion {
+                    time: _,
+                    relative_x,
+                    relative_y,
+                } => {
+                    let mut mouse_location = match self.get_mouse_location() {
+                        Some(l) => l,
+                        None => {
+                            log::warn!("could not get mouse location!");
+                            return;
+                        }
+                    };
+                    mouse_location.x += relative_x;
+                    mouse_location.y += relative_y;
+
+                    let mut event_type = CGEventType::MouseMoved;
+                    if self.button_state.left {
+                        event_type = CGEventType::LeftMouseDragged
+                    } else if self.button_state.right {
+                        event_type = CGEventType::RightMouseDragged
+                    } else if self.button_state.center {
+                        event_type = CGEventType::OtherMouseDragged
+                    };
+                    let event = match CGEvent::new_mouse_event(
+                        self.event_source.clone(),
+                        event_type,
+                        mouse_location,
+                        CGMouseButton::Left,
+                    ) {
+                        Ok(e) => e,
+                        Err(_) => {
+                            log::warn!("mouse event creation failed!");
+                            return;
+                        }
+                    };
+                    event.post(CGEventTapLocation::HID);
+                }
+                PointerEvent::Button {
+                    time: _,
+                    button,
+                    state,
+                } => {
+                    let (event_type, mouse_button) = match (button, state) {
+                        (b, 1) if b == crate::event::BTN_LEFT => {
+                            (CGEventType::LeftMouseDown, CGMouseButton::Left)
+                        }
+                        (b, 0) if b == crate::event::BTN_LEFT => {
+                            (CGEventType::LeftMouseUp, CGMouseButton::Left)
+                        }
+                        (b, 1) if b == crate::event::BTN_RIGHT => {
+                            (CGEventType::RightMouseDown, CGMouseButton::Right)
+                        }
+                        (b, 0) if b == crate::event::BTN_RIGHT => {
+                            (CGEventType::RightMouseUp, CGMouseButton::Right)
+                        }
+                        (b, 1) if b == crate::event::BTN_MIDDLE => {
+                            (CGEventType::OtherMouseDown, CGMouseButton::Center)
+                        }
+                        (b, 0) if b == crate::event::BTN_MIDDLE => {
+                            (CGEventType::OtherMouseUp, CGMouseButton::Center)
+                        }
+                        _ => {
+                            log::warn!("invalid button event: {button},{state}");
+                            return;
+                        }
+                    };
+                    // store button state
+                    self.button_state[mouse_button] = if state == 1 { true } else { false };
+
+                    let location = self.get_mouse_location().unwrap();
+                    let event = match CGEvent::new_mouse_event(
+                        self.event_source.clone(),
+                        event_type,
+                        location,
+                        mouse_button,
+                    ) {
+                        Ok(e) => e,
+                        Err(()) => {
+                            log::warn!("mouse event creation failed!");
+                            return;
+                        }
+                    };
+                    event.post(CGEventTapLocation::HID);
+                }
+                PointerEvent::Axis {
+                    time: _,
+                    axis,
+                    value,
+                } => {
+                    let value = value as i32 / 10; // FIXME: high precision scroll events
+                    let (count, wheel1, wheel2, wheel3) = match axis {
+                        0 => (1, value, 0, 0), // 0 = vertical => 1 scroll wheel device (y axis)
+                        1 => (2, 0, value, 0), // 1 = horizontal => 2 scroll wheel devices (y, x) -> (0, x)
+                        _ => {
+                            log::warn!("invalid scroll event: {axis}, {value}");
+                            return;
+                        }
+                    };
+                    let event = match CGEvent::new_scroll_event(
+                        self.event_source.clone(),
+                        ScrollEventUnit::LINE,
+                        count,
+                        wheel1,
+                        wheel2,
+                        wheel3,
+                    ) {
+                        Ok(e) => e,
+                        Err(()) => {
+                            log::warn!("scroll event creation failed!");
+                            return;
+                        }
+                    };
+                    event.post(CGEventTapLocation::HID);
+                }
+                PointerEvent::Frame { .. } => {}
+            },
+            Event::Keyboard(keyboard_event) => match keyboard_event {
+                KeyboardEvent::Key { .. } => {
+                    /*
+                    let code = CGKeyCode::from_le(key as u16);
+                    let event = match CGEvent::new_keyboard_event(
+                        self.event_source.clone(),
+                        code,
+                        match state { 1 => true, _ => false }
+                    ) {
+                        Ok(e) => e,
+                        Err(_) => {
+                            log::warn!("unable to create key event");
+                            return
+                        }
+                    };
+                    event.post(CGEventTapLocation::HID);
+                    */
+                }
+                KeyboardEvent::Modifiers { .. } => {}
+            },
+            Event::Release() => {}
+            Event::Ping() => {}
+            Event::Pong() => {}
+        }
+    }
+
+    async fn notify(&mut self, _client_event: ClientEvent) {}
+
+    async fn destroy(&mut self) {}
+}

src/backend/consumer/windows.rs

@@ -1,15 +1,15 @@
-use crate::{event::{KeyboardEvent, PointerEvent}, consumer::EventConsumer};
+use crate::{
+    consumer::EventConsumer,
+    event::{KeyboardEvent, PointerEvent},
+};
+use async_trait::async_trait;
 use winapi::{
     self,
-    um::winuser::{INPUT, INPUT_MOUSE, LPINPUT, MOUSEEVENTF_MOVE, MOUSEINPUT,
-        MOUSEEVENTF_LEFTDOWN,
-        MOUSEEVENTF_RIGHTDOWN,
-        MOUSEEVENTF_MIDDLEDOWN,
-        MOUSEEVENTF_LEFTUP,
-        MOUSEEVENTF_RIGHTUP,
-        MOUSEEVENTF_MIDDLEUP,
-        MOUSEEVENTF_WHEEL,
-        MOUSEEVENTF_HWHEEL, INPUT_KEYBOARD, KEYBDINPUT, KEYEVENTF_SCANCODE, KEYEVENTF_KEYUP,
+    um::winuser::{
+        INPUT, INPUT_KEYBOARD, INPUT_MOUSE, KEYBDINPUT, KEYEVENTF_KEYUP, KEYEVENTF_SCANCODE,
+        LPINPUT, MOUSEEVENTF_HWHEEL, MOUSEEVENTF_LEFTDOWN, MOUSEEVENTF_LEFTUP,
+        MOUSEEVENTF_MIDDLEDOWN, MOUSEEVENTF_MIDDLEUP, MOUSEEVENTF_MOVE, MOUSEEVENTF_RIGHTDOWN,
+        MOUSEEVENTF_RIGHTUP, MOUSEEVENTF_WHEEL, MOUSEINPUT,
     },
 };
 
@@ -18,15 +18,17 @@ use crate::{
     event::Event,
 };
 
-
 pub struct WindowsConsumer {}
 
 impl WindowsConsumer {
-    pub fn new() -> Self { Self {  } }
+    pub fn new() -> Self {
+        Self {}
+    }
 }
 
+#[async_trait]
 impl EventConsumer for WindowsConsumer {
-    fn consume(&self, event: Event, _: ClientHandle) {
+    async fn consume(&mut self, event: Event, _: ClientHandle) {
         match event {
             Event::Pointer(pointer_event) => match pointer_event {
                 PointerEvent::Motion {
@@ -36,21 +38,35 @@ impl EventConsumer for WindowsConsumer {
                 } => {
                     rel_mouse(relative_x as i32, relative_y as i32);
                 }
-                PointerEvent::Button { time:_, button, state } => { mouse_button(button, state)}
-                PointerEvent::Axis { time:_, axis, value } => { scroll(axis, value) }
+                PointerEvent::Button {
+                    time: _,
+                    button,
+                    state,
+                } => mouse_button(button, state),
+                PointerEvent::Axis {
+                    time: _,
+                    axis,
+                    value,
+                } => scroll(axis, value),
                 PointerEvent::Frame {} => {}
             },
             Event::Keyboard(keyboard_event) => match keyboard_event {
-                KeyboardEvent::Key { time:_, key, state } => { key_event(key, state) }
+                KeyboardEvent::Key {
+                    time: _,
+                    key,
+                    state,
+                } => key_event(key, state),
                 KeyboardEvent::Modifiers { .. } => {}
             },
             _ => {}
         }
     }
 
-    fn notify(&mut self, _: ClientEvent) {
+    async fn notify(&mut self, _: ClientEvent) {
         // nothing to do
     }
+
+    async fn destroy(&mut self) {}
 }
 
 fn send_mouse_input(mi: MOUSEINPUT) {
@@ -86,18 +102,19 @@ fn mouse_button(button: u32, state: u32) {
             0x110 => MOUSEEVENTF_LEFTUP,
             0x111 => MOUSEEVENTF_RIGHTUP,
             0x112 => MOUSEEVENTF_MIDDLEUP,
-            _ => return
-        }
+            _ => return,
+        },
         1 => match button {
             0x110 => MOUSEEVENTF_LEFTDOWN,
             0x111 => MOUSEEVENTF_RIGHTDOWN,
             0x112 => MOUSEEVENTF_MIDDLEDOWN,
-            _ => return
-        }
-        _ => return
+            _ => return,
+        },
+        _ => return,
     };
     let mi = MOUSEINPUT {
-        dx: 0, dy: 0, // no movement
+        dx: 0,
+        dy: 0, // no movement
         mouseData: 0,
         dwFlags: dw_flags,
         time: 0,
@@ -110,10 +127,11 @@ fn scroll(axis: u8, value: f64) {
     let event_type = match axis {
         0 => MOUSEEVENTF_WHEEL,
         1 => MOUSEEVENTF_HWHEEL,
-        _ => return
+        _ => return,
     };
     let mi = MOUSEINPUT {
-        dx: 0, dy: 0,
+        dx: 0,
+        dy: 0,
         mouseData: (-value * 15.0) as i32 as u32,
         dwFlags: event_type,
         time: 0,
@@ -126,11 +144,12 @@ fn key_event(key: u32, state: u8) {
     let ki = KEYBDINPUT {
         wVk: 0,
         wScan: key as u16,
-        dwFlags: KEYEVENTF_SCANCODE | match state {
-            0 => KEYEVENTF_KEYUP,
-            1 => 0u32,
-            _ => return
-        },
+        dwFlags: KEYEVENTF_SCANCODE
+            | match state {
+                0 => KEYEVENTF_KEYUP,
+                1 => 0u32,
+                _ => return,
+            },
         time: 0,
         dwExtraInfo: 0,
     };

src/backend/consumer/wlroots.rs

@@ -1,14 +1,17 @@
-use wayland_client::WEnum;
-use crate::client::{ClientHandle, ClientEvent};
+use crate::client::{ClientEvent, ClientHandle};
 use crate::consumer::EventConsumer;
+use async_trait::async_trait;
 use std::collections::HashMap;
+use std::io;
 use std::os::fd::OwnedFd;
 use std::os::unix::prelude::AsRawFd;
+use wayland_client::backend::WaylandError;
+use wayland_client::WEnum;
 
-use anyhow::{Result, anyhow};
+use anyhow::{anyhow, Result};
 use wayland_client::globals::BindError;
-use wayland_client::protocol::wl_pointer::{Axis, ButtonState};
 use wayland_client::protocol::wl_keyboard::{self, WlKeyboard};
+use wayland_client::protocol::wl_pointer::{Axis, ButtonState};
 use wayland_client::protocol::wl_seat::WlSeat;
 use wayland_protocols_wlr::virtual_pointer::v1::client::{
     zwlr_virtual_pointer_manager_v1::ZwlrVirtualPointerManagerV1 as VpManager,
@@ -46,6 +49,7 @@ struct State {
 
 // App State, implements Dispatch event handlers
 pub(crate) struct WlrootsConsumer {
+    last_flush_failed: bool,
     state: State,
     queue: EventQueue<State>,
 }
@@ -89,6 +93,7 @@ impl WlrootsConsumer {
         let input_for_client: HashMap<ClientHandle, VirtualInput> = HashMap::new();
 
         let mut consumer = WlrootsConsumer {
+            last_flush_failed: false,
             state: State {
                 keymap: None,
                 input_for_client,
@@ -99,7 +104,10 @@ impl WlrootsConsumer {
             queue,
         };
         while consumer.state.keymap.is_none() {
-            consumer.queue.blocking_dispatch(&mut consumer.state).unwrap();
+            consumer
+                .queue
+                .blocking_dispatch(&mut consumer.state)
+                .unwrap();
         }
         // let fd = unsafe { &File::from_raw_fd(consumer.state.keymap.unwrap().1.as_raw_fd()) };
         // let mmap = unsafe { MmapOptions::new().map_copy(fd).unwrap() };
@@ -136,17 +144,45 @@ impl State {
     }
 }
 
+#[async_trait]
 impl EventConsumer for WlrootsConsumer {
-    fn consume(&self, event: Event, client_handle: ClientHandle) {
+    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 {
+                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: ({client_handle}) - {event:?}"
+                        );
+                        return;
+                    }
+                }
+            }
             virtual_input.consume_event(event).unwrap();
-            if let Err(e) = self.queue.flush() {
-                log::error!("{}", e);
+            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, retrying ...");
+                }
+                Err(WaylandError::Io(e)) => {
+                    log::error!("{e}")
+                }
+                Err(WaylandError::Protocol(e)) => {
+                    panic!("wayland protocol violation: {e}")
+                }
+                Ok(()) => {
+                    self.last_flush_failed = false;
+                }
             }
         }
     }
 
-    fn notify(&mut self, client_event: ClientEvent) {
+    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() {
@@ -154,8 +190,9 @@ impl EventConsumer for WlrootsConsumer {
             }
         }
     }
-}
 
+    async fn destroy(&mut self) {}
+}
 
 enum VirtualInput {
     Wlroots { pointer: Vp, keyboard: Vk },
@@ -163,67 +200,76 @@ enum VirtualInput {
 }
 
 impl VirtualInput {
-    fn consume_event(&self, event: Event) -> Result<(),()> {
+    fn consume_event(&self, event: Event) -> Result<(), ()> {
         match event {
-            Event::Pointer(e) => match e {
-                PointerEvent::Motion {
-                    time,
-                    relative_x,
-                    relative_y,
-                } => match self {
-                    VirtualInput::Wlroots {
-                        pointer,
-                        keyboard: _,
-                    } => {
-                        pointer.motion(time, relative_x, relative_y);
-                    }
-                    VirtualInput::Kde { fake_input } => {
-                        fake_input.pointer_motion(relative_y, relative_y);
-                    }
-                },
-                PointerEvent::Button {
-                    time,
-                    button,
-                    state,
-                } => {
-                    let state: ButtonState = state.try_into()?;
-                    match self {
+            Event::Pointer(e) => {
+                match e {
+                    PointerEvent::Motion {
+                        time,
+                        relative_x,
+                        relative_y,
+                    } => match self {
                         VirtualInput::Wlroots {
                             pointer,
                             keyboard: _,
                         } => {
-                            pointer.button(time, button, state);
+                            pointer.motion(time, relative_x, relative_y);
                         }
                         VirtualInput::Kde { fake_input } => {
-                            fake_input.button(button, state as u32);
+                            fake_input.pointer_motion(relative_y, relative_y);
+                        }
+                    },
+                    PointerEvent::Button {
+                        time,
+                        button,
+                        state,
+                    } => {
+                        let state: ButtonState = state.try_into()?;
+                        match self {
+                            VirtualInput::Wlroots {
+                                pointer,
+                                keyboard: _,
+                            } => {
+                                pointer.button(time, button, state);
+                            }
+                            VirtualInput::Kde { fake_input } => {
+                                fake_input.button(button, state as u32);
+                            }
                         }
                     }
-                }
-                PointerEvent::Axis { time, axis, value } => {
-                    let axis: Axis = (axis as u32).try_into()?;
-                    match self {
+                    PointerEvent::Axis { time, axis, value } => {
+                        let axis: Axis = (axis as u32).try_into()?;
+                        match self {
+                            VirtualInput::Wlroots {
+                                pointer,
+                                keyboard: _,
+                            } => {
+                                pointer.axis(time, axis, value);
+                                pointer.frame();
+                            }
+                            VirtualInput::Kde { fake_input } => {
+                                fake_input.axis(axis as u32, value);
+                            }
+                        }
+                    }
+                    PointerEvent::Frame {} => match self {
                         VirtualInput::Wlroots {
                             pointer,
                             keyboard: _,
                         } => {
-                            pointer.axis(time, axis, value);
                             pointer.frame();
                         }
-                        VirtualInput::Kde { fake_input } => {
-                            fake_input.axis(axis as u32, value);
-                        }
-                    }
+                        VirtualInput::Kde { fake_input: _ } => {}
+                    },
                 }
-                PointerEvent::Frame {} => match self {
-                    VirtualInput::Wlroots {
-                        pointer,
-                        keyboard: _,
-                    } => {
+                match self {
+                    VirtualInput::Wlroots { pointer, .. } => {
+                        // insert a frame event after each mouse event
                         pointer.frame();
                     }
-                    VirtualInput::Kde { fake_input: _ } => {}
-                },
-            },
+                    _ => {}
+                }
+            }
             Event::Keyboard(e) => match e {
                 KeyboardEvent::Key { time, key, state } => match self {
                     VirtualInput::Wlroots {
@@ -251,7 +297,7 @@ impl VirtualInput {
                     VirtualInput::Kde { fake_input: _ } => {}
                 },
             },
-            _ => {},
+            _ => {}
         }
         Ok(())
     }
@@ -288,7 +334,7 @@ impl Dispatch<WlKeyboard, ()> for State {
             wl_keyboard::Event::Keymap { format, fd, size } => {
                 state.keymap = Some((u32::from(format), fd, size));
             }
-            _ => {},
+            _ => {}
         }
     }
 }

src/backend/consumer/x11.rs

@@ -1,15 +1,15 @@
+use async_trait::async_trait;
 use std::ptr;
 use x11::{xlib, xtest};
 
-use crate::{
-    client::ClientHandle,
-    event::Event, consumer::EventConsumer,
-};
+use crate::{client::ClientHandle, consumer::EventConsumer, event::Event};
 
 pub struct X11Consumer {
     display: *mut xlib::Display,
 }
 
+unsafe impl Send for X11Consumer {}
+
 impl X11Consumer {
     pub fn new() -> Self {
         let display = unsafe {
@@ -30,8 +30,9 @@ impl X11Consumer {
     }
 }
 
+#[async_trait]
 impl EventConsumer for X11Consumer {
-    fn consume(&self, event: Event, _: ClientHandle) {
+    async fn consume(&mut self, event: Event, _: ClientHandle) {
         match event {
             Event::Pointer(pointer_event) => match pointer_event {
                 crate::event::PointerEvent::Motion {
@@ -50,8 +51,9 @@ impl EventConsumer for X11Consumer {
         }
     }
 
-    fn notify(&mut self, _: crate::client::ClientEvent) {
+    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) {}
+}

src/backend/consumer/xdg_desktop_portal.rs

@@ -1,15 +1,128 @@
+use anyhow::Result;
+use ashpd::{
+    desktop::{
+        remote_desktop::{Axis, DeviceType, KeyState, RemoteDesktop},
+        Session,
+    },
+    WindowIdentifier,
+};
+use async_trait::async_trait;
+
 use crate::consumer::EventConsumer;
 
-pub struct DesktopPortalConsumer {}
-
-impl DesktopPortalConsumer {
-    pub fn new() -> Self { Self {  } }
+pub struct DesktopPortalConsumer<'a> {
+    proxy: RemoteDesktop<'a>,
+    session: Session<'a>,
 }
 
-impl EventConsumer for DesktopPortalConsumer {
-    fn consume(&self, _: crate::event::Event, _: crate::client::ClientHandle) {
-        log::error!("xdg_desktop_portal backend not yet implemented!");
+impl<'a> DesktopPortalConsumer<'a> {
+    pub async fn new() -> Result<DesktopPortalConsumer<'a>> {
+        let proxy = RemoteDesktop::new().await?;
+        let session = proxy.create_session().await?;
+        proxy
+            .select_devices(&session, DeviceType::Keyboard | DeviceType::Pointer)
+            .await?;
+
+        let _ = proxy
+            .start(&session, &WindowIdentifier::default())
+            .await?
+            .response()?;
+
+        Ok(Self { proxy, session })
+    }
+}
+
+#[async_trait]
+impl<'a> EventConsumer for DesktopPortalConsumer<'a> {
+    async fn consume(&mut self, event: crate::event::Event, _client: crate::client::ClientHandle) {
+        match event {
+            crate::event::Event::Pointer(p) => {
+                match p {
+                    crate::event::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}");
+                        }
+                    }
+                    crate::event::PointerEvent::Button {
+                        time: _,
+                        button,
+                        state,
+                    } => {
+                        let state = match state {
+                            0 => KeyState::Released,
+                            _ => KeyState::Pressed,
+                        };
+                        if let Err(e) = self
+                            .proxy
+                            .notify_pointer_button(&self.session, button as i32, state)
+                            .await
+                        {
+                            log::warn!("{e}");
+                        }
+                    }
+                    crate::event::PointerEvent::Axis {
+                        time: _,
+                        axis,
+                        value,
+                    } => {
+                        let axis = match axis {
+                            0 => Axis::Vertical,
+                            _ => Axis::Horizontal,
+                        };
+                        // TODO smooth scrolling
+                        if let Err(e) = self
+                            .proxy
+                            .notify_pointer_axis_discrete(&self.session, axis, value as i32)
+                            .await
+                        {
+                            log::warn!("{e}");
+                        }
+                    }
+                    crate::event::PointerEvent::Frame {} => {}
+                }
+            }
+            crate::event::Event::Keyboard(k) => {
+                match k {
+                    crate::event::KeyboardEvent::Key {
+                        time: _,
+                        key,
+                        state,
+                    } => {
+                        let state = match state {
+                            0 => KeyState::Released,
+                            _ => KeyState::Pressed,
+                        };
+                        if let Err(e) = self
+                            .proxy
+                            .notify_keyboard_keycode(&self.session, key as i32, state)
+                            .await
+                        {
+                            log::warn!("{e}");
+                        }
+                    }
+                    crate::event::KeyboardEvent::Modifiers { .. } => {
+                        // ignore
+                    }
+                }
+            }
+            _ => {}
+        }
     }
 
-    fn notify(&mut self, _: crate::client::ClientEvent) {}
+    async fn notify(&mut self, _client: crate::client::ClientEvent) {}
+
+    async fn destroy(&mut self) {
+        log::debug!("closing remote desktop session");
+        if let Err(e) = self.session.close().await {
+            log::error!("failed to close remote desktop session: {e}");
+        }
+    }
 }

src/backend/producer.rs

@@ -1,6 +1,10 @@
-#[cfg(all(unix, feature = "wayland"))]
+#[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"))]
+#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
 pub mod x11;

src/backend/producer/libei.rs

@@ -0,0 +1,31 @@
+use anyhow::Result;
+use std::{io, task::Poll};
+
+use futures_core::Stream;
+
+use crate::{client::ClientHandle, event::Event, producer::EventProducer};
+
+pub struct LibeiProducer {}
+
+impl LibeiProducer {
+    pub fn new() -> Result<Self> {
+        Ok(Self {})
+    }
+}
+
+impl EventProducer for LibeiProducer {
+    fn notify(&mut self, _event: crate::client::ClientEvent) {}
+
+    fn release(&mut self) {}
+}
+
+impl Stream for LibeiProducer {
+    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/backend/producer/macos.rs

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

src/backend/producer/wayland.rs

@@ -1,9 +1,20 @@
-use crate::{client::{ClientHandle, Position, ClientEvent}, producer::EventProducer};
-use mio::{event::Source, unix::SourceFd};
+use crate::{
+    client::{ClientEvent, ClientHandle, Position},
+    producer::EventProducer,
+};
 
-use std::{os::fd::RawFd, vec::Drain, io::ErrorKind};
-use memmap::MmapOptions;
 use anyhow::{anyhow, Result};
+use futures_core::Stream;
+use memmap::MmapOptions;
+use std::{
+    collections::VecDeque,
+    env,
+    io::{self, ErrorKind},
+    os::fd::{OwnedFd, RawFd},
+    pin::Pin,
+    task::{ready, Context, Poll},
+};
+use tokio::io::unix::AsyncFd;
 
 use std::{
     fs::File,
@@ -12,20 +23,26 @@ use std::{
     rc::Rc,
 };
 
-use wayland_protocols::{wp::{
-    keyboard_shortcuts_inhibit::zv1::client::{
-        zwp_keyboard_shortcuts_inhibit_manager_v1::ZwpKeyboardShortcutsInhibitManagerV1,
-        zwp_keyboard_shortcuts_inhibitor_v1::ZwpKeyboardShortcutsInhibitorV1,
+use wayland_protocols::{
+    wp::{
+        keyboard_shortcuts_inhibit::zv1::client::{
+            zwp_keyboard_shortcuts_inhibit_manager_v1::ZwpKeyboardShortcutsInhibitManagerV1,
+            zwp_keyboard_shortcuts_inhibitor_v1::ZwpKeyboardShortcutsInhibitorV1,
+        },
+        pointer_constraints::zv1::client::{
+            zwp_locked_pointer_v1::ZwpLockedPointerV1,
+            zwp_pointer_constraints_v1::{Lifetime, ZwpPointerConstraintsV1},
+        },
+        relative_pointer::zv1::client::{
+            zwp_relative_pointer_manager_v1::ZwpRelativePointerManagerV1,
+            zwp_relative_pointer_v1::{self, ZwpRelativePointerV1},
+        },
     },
-    pointer_constraints::zv1::client::{
-        zwp_locked_pointer_v1::ZwpLockedPointerV1,
-        zwp_pointer_constraints_v1::{Lifetime, ZwpPointerConstraintsV1},
+    xdg::xdg_output::zv1::client::{
+        zxdg_output_manager_v1::ZxdgOutputManagerV1,
+        zxdg_output_v1::{self, ZxdgOutputV1},
     },
-    relative_pointer::zv1::client::{
-        zwp_relative_pointer_manager_v1::ZwpRelativePointerManagerV1,
-        zwp_relative_pointer_v1::{self, ZwpRelativePointerV1},
-    },
-}, xdg::xdg_output::zv1::client::{zxdg_output_manager_v1::ZxdgOutputManagerV1, zxdg_output_v1::{self, ZxdgOutputV1}}};
+};
 
 use wayland_protocols_wlr::layer_shell::v1::client::{
     zwlr_layer_shell_v1::{Layer, ZwlrLayerShellV1},
@@ -33,14 +50,15 @@ use wayland_protocols_wlr::layer_shell::v1::client::{
 };
 
 use wayland_client::{
-    backend::{WaylandError, ReadEventsGuard},
+    backend::{ReadEventsGuard, WaylandError},
     delegate_noop,
     globals::{registry_queue_init, GlobalListContents},
     protocol::{
-        wl_buffer, wl_compositor, wl_keyboard, wl_pointer, wl_region, wl_registry, wl_seat, wl_shm,
-        wl_shm_pool, wl_surface, wl_output::{self, WlOutput},
+        wl_buffer, wl_compositor, wl_keyboard,
+        wl_output::{self, WlOutput},
+        wl_pointer, wl_region, wl_registry, wl_seat, wl_shm, wl_shm_pool, wl_surface,
     },
-    Connection, Dispatch, DispatchError, QueueHandle, WEnum, EventQueue,
+    Connection, Dispatch, DispatchError, EventQueue, QueueHandle, WEnum,
 };
 
 use tempfile;
@@ -70,8 +88,8 @@ impl OutputInfo {
     fn new() -> Self {
         Self {
             name: "".to_string(),
-            position: (0,0),
-            size: (0,0),
+            position: (0, 0),
+            size: (0, 0),
         }
     }
 }
@@ -83,18 +101,26 @@ struct State {
     client_for_window: Vec<(Rc<Window>, ClientHandle)>,
     focused: Option<(Rc<Window>, ClientHandle)>,
     g: Globals,
-    wayland_fd: RawFd,
+    wayland_fd: OwnedFd,
     read_guard: Option<ReadEventsGuard>,
     qh: QueueHandle<Self>,
-    pending_events: Vec<(ClientHandle, Event)>,
+    pending_events: VecDeque<(ClientHandle, Event)>,
     output_info: Vec<(WlOutput, OutputInfo)>,
 }
 
-pub struct WaylandEventProducer {
+struct Inner {
     state: State,
     queue: EventQueue<State>,
 }
 
+impl AsRawFd for Inner {
+    fn as_raw_fd(&self) -> RawFd {
+        self.state.wayland_fd.as_raw_fd()
+    }
+}
+
+pub struct WaylandEventProducer(AsyncFd<Inner>);
+
 struct Window {
     buffer: wl_buffer::WlBuffer,
     surface: wl_surface::WlSurface,
@@ -102,7 +128,13 @@ struct Window {
 }
 
 impl Window {
-    fn new(state: &State, qh: &QueueHandle<State>, output: &WlOutput, pos: Position, size: (i32, i32)) -> Window {
+    fn new(
+        state: &State,
+        qh: &QueueHandle<State>,
+        output: &WlOutput,
+        pos: Position,
+        size: (i32, i32),
+    ) -> Window {
         let g = &state.g;
 
         let (width, height) = match pos {
@@ -128,7 +160,7 @@ impl Window {
         let layer_surface = g.layer_shell.get_layer_surface(
             &surface,
             Some(&output),
-            Layer::Top,
+            Layer::Overlay,
             "LAN Mouse Sharing".into(),
             qh,
             (),
@@ -142,7 +174,7 @@ impl Window {
 
         layer_surface.set_anchor(anchor);
         layer_surface.set_size(width, height);
-        layer_surface.set_exclusive_zone(0);
+        layer_surface.set_exclusive_zone(-1);
         layer_surface.set_margin(0, 0, 0, 0);
         surface.set_input_region(None);
         surface.commit();
@@ -164,15 +196,20 @@ impl Drop for Window {
 }
 
 fn get_edges(outputs: &[(WlOutput, OutputInfo)], pos: Position) -> Vec<(WlOutput, i32)> {
-    outputs.iter().map(|(o, i)| {
-        (o.clone(),
-        match pos {
-            Position::Left => i.position.0,
-            Position::Right => i.position.0 + i.size.0,
-            Position::Top => i.position.1,
-            Position::Bottom => i.position.1 + i.size.1,
+    outputs
+        .iter()
+        .map(|(o, i)| {
+            (
+                o.clone(),
+                match pos {
+                    Position::Left => i.position.0,
+                    Position::Right => i.position.0 + i.size.0,
+                    Position::Top => i.position.1,
+                    Position::Bottom => i.position.1 + i.size.1,
+                },
+            )
         })
-    }).collect()
+        .collect()
 }
 
 fn get_output_configuration(state: &State, pos: Position) -> Vec<(WlOutput, OutputInfo)> {
@@ -182,12 +219,21 @@ fn get_output_configuration(state: &State, pos: Position) -> Vec<(WlOutput, Outp
 
     // remove those edges that are at the same position
     // as an opposite edge of a different output
-    let outputs: Vec<WlOutput> = edges.iter().filter(|(_,edge)| {
-        opposite_edges.iter().map(|(_,e)| *e).find(|e| e == edge).is_none()
-    }).map(|(o,_)| o.clone()).collect();
-    state.output_info
+    let outputs: Vec<WlOutput> = edges
         .iter()
-        .filter(|(o,_)| outputs.contains(o))
+        .filter(|(_, edge)| {
+            opposite_edges
+                .iter()
+                .map(|(_, e)| *e)
+                .find(|e| e == edge)
+                .is_none()
+        })
+        .map(|(o, _)| o.clone())
+        .collect();
+    state
+        .output_info
+        .iter()
+        .filter(|(o, _)| outputs.contains(o))
         .map(|(o, i)| (o.clone(), i.clone()))
         .collect()
 }
@@ -196,7 +242,13 @@ fn draw(f: &mut File, (width, height): (u32, u32)) {
     let mut buf = BufWriter::new(f);
     for _ in 0..height {
         for _ in 0..width {
-            buf.write_all(&0x44FbF1C7u32.to_ne_bytes()).unwrap();
+            if env::var("LM_DEBUG_LAYER_SHELL").ok().is_some() {
+                // AARRGGBB
+                buf.write_all(&0xFF11d116u32.to_ne_bytes()).unwrap();
+            } else {
+                // AARRGGBB
+                buf.write_all(&0x00000000u32.to_ne_bytes()).unwrap();
+            }
         }
     }
 }
@@ -250,10 +302,15 @@ impl WaylandEventProducer {
             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 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 outputs = vec![];
 
@@ -274,7 +331,7 @@ impl WaylandEventProducer {
 
         // prepare reading wayland events
         let read_guard = queue.prepare_read()?;
-        let wayland_fd = read_guard.connection_fd().as_raw_fd();
+        let wayland_fd = read_guard.connection_fd().try_clone_to_owned().unwrap();
         std::mem::drop(read_guard);
 
         let mut state = State {
@@ -287,7 +344,7 @@ impl WaylandEventProducer {
             qh,
             wayland_fd,
             read_guard: None,
-            pending_events: vec![],
+            pending_events: VecDeque::new(),
             output_info: vec![],
         };
 
@@ -301,7 +358,10 @@ impl WaylandEventProducer {
 
         // read outputs
         for output in state.g.outputs.iter() {
-            state.g.xdg_output_manager.get_xdg_output(output, &state.qh, output.clone());
+            state
+                .g
+                .xdg_output_manager
+                .get_xdg_output(output, &state.qh, output.clone());
         }
 
         // roundtrip to read xdg_output events
@@ -315,7 +375,9 @@ impl WaylandEventProducer {
         let read_guard = queue.prepare_read()?;
         state.read_guard = Some(read_guard);
 
-        Ok(WaylandEventProducer { queue, state })
+        let inner = AsyncFd::new(Inner { queue, state })?;
+
+        Ok(WaylandEventProducer(inner))
     }
 }
 
@@ -403,7 +465,6 @@ impl State {
     }
 
     fn add_client(&mut self, client: ClientHandle, pos: Position) {
-
         let outputs = get_output_configuration(self, pos);
 
         outputs.iter().for_each(|(o, i)| {
@@ -411,34 +472,10 @@ impl State {
             let window = Rc::new(window);
             self.client_for_window.push((window, client));
         });
-
     }
 }
 
-impl Source for WaylandEventProducer {
-    fn register(
-        &mut self,
-        registry: &mio::Registry,
-        token: mio::Token,
-        interests: mio::Interest,
-    ) -> std::io::Result<()> {
-        SourceFd(&self.state.wayland_fd).register(registry, token, interests)
-    }
-
-    fn reregister(
-        &mut self,
-        registry: &mio::Registry,
-        token: mio::Token,
-        interests: mio::Interest,
-    ) -> std::io::Result<()> {
-        SourceFd(&self.state.wayland_fd).reregister(registry, token, interests)
-    }
-
-    fn deregister(&mut self, registry: &mio::Registry) -> std::io::Result<()> {
-        SourceFd(&self.state.wayland_fd).deregister(registry)
-    }
-}
-impl WaylandEventProducer {
+impl Inner {
     fn read(&mut self) -> bool {
         match self.state.read_guard.take().unwrap().read() {
             Ok(_) => true,
@@ -491,57 +528,91 @@ impl WaylandEventProducer {
             Err(e) => match e {
                 WaylandError::Io(e) => {
                     log::error!("error writing to wayland socket: {e}")
-                },
+                }
                 WaylandError::Protocol(e) => {
                     panic!("wayland protocol violation: {e}")
-                },
+                }
             },
         }
     }
 }
 
 impl EventProducer for WaylandEventProducer {
-
-    fn read_events(&mut self) -> Drain<(ClientHandle, Event)> {
-        // read events
-        while self.read() {
-            // prepare next read
-            self.prepare_read();
-        }
-        // dispatch the events
-        self.dispatch_events();
-
-        // flush outgoing events
-        self.flush_events();
-
-        // prepare for the next read
-        self.prepare_read();
-
-        // return the events
-        self.state.pending_events.drain(..)
-    }
-
     fn notify(&mut self, client_event: ClientEvent) {
-        if let ClientEvent::Create(handle, pos) = client_event {
-            self.state.add_client(handle, pos);
-        }
-        if let ClientEvent::Destroy(handle) = client_event {
-            loop {
-                // remove all windows corresponding to this client
-                if let Some(i) = self.state.client_for_window.iter().position(|(_,c)| *c == handle) {
-                    self.state.client_for_window.remove(i);
-                    self.state.focused = None;
-                } else {
-                    break
+        match client_event {
+            ClientEvent::Create(handle, pos) => {
+                self.0.get_mut().state.add_client(handle, pos);
+            }
+            ClientEvent::Destroy(handle) => {
+                let inner = self.0.get_mut();
+                loop {
+                    // remove all windows corresponding to this client
+                    if let Some(i) = inner
+                        .state
+                        .client_for_window
+                        .iter()
+                        .position(|(_, c)| *c == handle)
+                    {
+                        inner.state.client_for_window.remove(i);
+                        inner.state.focused = None;
+                    } else {
+                        break;
+                    }
                 }
             }
         }
-        self.flush_events();
+        let inner = self.0.get_mut();
+        inner.flush_events();
     }
 
     fn release(&mut self) {
-        self.state.ungrab();
-        self.flush_events();
+        let inner = self.0.get_mut();
+        inner.state.ungrab();
+        inner.flush_events();
+    }
+}
+
+impl Stream for WaylandEventProducer {
+    type Item = io::Result<(ClientHandle, Event)>;
+
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        log::trace!("producer.next()");
+        if let Some(event) = self.0.get_mut().state.pending_events.pop_front() {
+            return Poll::Ready(Some(Ok(event)));
+        }
+
+        loop {
+            let mut guard = ready!(self.0.poll_read_ready_mut(cx))?;
+
+            {
+                let inner = guard.get_inner_mut();
+
+                // read events
+                while inner.read() {
+                    // prepare next read
+                    inner.prepare_read();
+                }
+
+                // dispatch the events
+                inner.dispatch_events();
+
+                // flush outgoing events
+                inner.flush_events();
+
+                // prepare for the next read
+                inner.prepare_read();
+            }
+
+            // clear read readiness for tokio read guard
+            // guard.clear_ready_matching(Ready::READABLE);
+            guard.clear_ready();
+
+            // if an event has been queued during dispatch_events() we return it
+            match guard.get_inner_mut().state.pending_events.pop_front() {
+                Some(event) => return Poll::Ready(Some(Ok(event))),
+                None => continue,
+            }
+        }
     }
 }
 
@@ -577,7 +648,6 @@ impl Dispatch<wl_pointer::WlPointer, ()> for State {
         _: &Connection,
         qh: &QueueHandle<Self>,
     ) {
-
         match event {
             wl_pointer::Event::Enter {
                 serial,
@@ -586,12 +656,12 @@ impl Dispatch<wl_pointer::WlPointer, ()> for State {
                 surface_y: _,
             } => {
                 // get client corresponding to the focused surface
-                log::trace!("produce: enter()");
                 {
                     if let Some((window, client)) = app
                         .client_for_window
                         .iter()
-                        .find(|(w, _c)| w.surface == surface) {
+                        .find(|(w, _c)| w.surface == surface)
+                    {
                         app.focused = Some((window.clone(), *client));
                         app.grab(&surface, pointer, serial.clone(), qh);
                     } else {
@@ -603,10 +673,9 @@ impl Dispatch<wl_pointer::WlPointer, ()> for State {
                     .iter()
                     .find(|(w, _c)| w.surface == surface)
                     .unwrap();
-                app.pending_events.push((*client, Event::Release()));
+                app.pending_events.push_back((*client, Event::Release()));
             }
             wl_pointer::Event::Leave { .. } => {
-                log::trace!("produce: leave()");
                 app.ungrab();
             }
             wl_pointer::Event::Button {
@@ -615,9 +684,8 @@ impl Dispatch<wl_pointer::WlPointer, ()> for State {
                 button,
                 state,
             } => {
-                log::trace!("produce: button()");
                 let (_, client) = app.focused.as_ref().unwrap();
-                app.pending_events.push((
+                app.pending_events.push_back((
                     *client,
                     Event::Pointer(PointerEvent::Button {
                         time,
@@ -627,9 +695,8 @@ impl Dispatch<wl_pointer::WlPointer, ()> for State {
                 ));
             }
             wl_pointer::Event::Axis { time, axis, value } => {
-                log::trace!("produce: scroll()");
                 let (_, client) = app.focused.as_ref().unwrap();
-                app.pending_events.push((
+                app.pending_events.push_back((
                     *client,
                     Event::Pointer(PointerEvent::Axis {
                         time,
@@ -639,12 +706,9 @@ impl Dispatch<wl_pointer::WlPointer, ()> for State {
                 ));
             }
             wl_pointer::Event::Frame {} => {
-                log::trace!("produce: frame()");
-                let (_, client) = app.focused.as_ref().unwrap();
-                app.pending_events.push((
-                    *client,
-                    Event::Pointer(PointerEvent::Frame {}),
-                ));
+                // TODO properly handle frame events
+                // we simply insert a frame event on the client side
+                // after each event for now
             }
             _ => {}
         }
@@ -672,7 +736,7 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for State {
                 state,
             } => {
                 if let Some(client) = client {
-                    app.pending_events.push((
+                    app.pending_events.push_back((
                         *client,
                         Event::Keyboard(KeyboardEvent::Key {
                             time,
@@ -690,7 +754,7 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for State {
                 group,
             } => {
                 if let Some(client) = client {
-                    app.pending_events.push((
+                    app.pending_events.push_back((
                         *client,
                         Event::Keyboard(KeyboardEvent::Modifiers {
                             mods_depressed,
@@ -737,10 +801,9 @@ impl Dispatch<ZwpRelativePointerV1, ()> for State {
             dy_unaccel: surface_y,
         } = event
         {
-            log::trace!("produce: motion()");
             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((
+                app.pending_events.push_back((
                     *client,
                     Event::Pointer(PointerEvent::Motion {
                         time,
@@ -766,7 +829,8 @@ impl Dispatch<ZwlrLayerSurfaceV1, ()> for State {
             if let Some((window, _client)) = app
                 .client_for_window
                 .iter()
-                .find(|(w, _c)| &w.layer_surface == layer_surface) {
+                .find(|(w, _c)| &w.layer_surface == layer_surface)
+            {
                 // client corresponding to the layer_surface
                 let surface = &window.surface;
                 let buffer = &window.buffer;
@@ -801,17 +865,22 @@ impl Dispatch<wl_registry::WlRegistry, ()> for State {
         qh: &QueueHandle<Self>,
     ) {
         match event {
-            wl_registry::Event::Global { name, interface, version: _ } => {
-                match interface.as_str() {
-                    "wl_output" => {
-                        log::debug!("wl_output global");
-                        state.g.outputs.push(registry.bind::<wl_output::WlOutput, _, _>(name, 4, qh, ()))
-                    }
-                    _ => {}
+            wl_registry::Event::Global {
+                name,
+                interface,
+                version: _,
+            } => match interface.as_str() {
+                "wl_output" => {
+                    log::debug!("wl_output global");
+                    state
+                        .g
+                        .outputs
+                        .push(registry.bind::<wl_output::WlOutput, _, _>(name, 4, qh, ()))
                 }
+                _ => {}
             },
-            wl_registry::Event::GlobalRemove { .. } => {},
-            _ => {},
+            wl_registry::Event::GlobalRemove { .. } => {}
+            _ => {}
         }
     }
 }
@@ -826,11 +895,8 @@ impl Dispatch<ZxdgOutputV1, WlOutput> for State {
         _: &QueueHandle<Self>,
     ) {
         log::debug!("xdg-output - {event:?}");
-        let output_info = match state
-            .output_info
-            .iter_mut()
-            .find(|(o, _)| o == wl_output) {
-            Some((_,c)) => c,
+        let output_info = match state.output_info.iter_mut().find(|(o, _)| o == wl_output) {
+            Some((_, c)) => c,
             None => {
                 let output_info = OutputInfo::new();
                 state.output_info.push((wl_output.clone(), output_info));
@@ -841,16 +907,16 @@ impl Dispatch<ZxdgOutputV1, WlOutput> for State {
         match event {
             zxdg_output_v1::Event::LogicalPosition { x, y } => {
                 output_info.position = (x, y);
-            },
+            }
             zxdg_output_v1::Event::LogicalSize { width, height } => {
                 output_info.size = (width, height);
-            },
-            zxdg_output_v1::Event::Done => {},
+            }
+            zxdg_output_v1::Event::Done => {}
             zxdg_output_v1::Event::Name { name } => {
                 output_info.name = name;
-            },
-            zxdg_output_v1::Event::Description { .. } => {},
-            _ => {},
+            }
+            zxdg_output_v1::Event::Description { .. } => {}
+            _ => {}
         }
     }
 }

src/backend/producer/windows.rs

@@ -1,58 +1,31 @@
-use std::vec::Drain;
-
-use mio::{Token, Registry};
-use mio::event::Source;
+use core::task::{Context, Poll};
+use futures::Stream;
 use std::io::Result;
+use std::pin::Pin;
 
 use crate::{
-    client::{ClientHandle, ClientEvent},
+    client::{ClientEvent, ClientHandle},
     event::Event,
     producer::EventProducer,
 };
 
-pub struct WindowsProducer {
-    pending_events: Vec<(ClientHandle, Event)>,
-}
-
-impl Source for WindowsProducer {
-    fn register(
-        &mut self,
-        _registry: &Registry,
-        _token: Token,
-        _interests: mio::Interest,
-    ) -> Result<()> {
-        Ok(())
-    }
-
-    fn reregister(
-        &mut self,
-        _registry: &Registry,
-        _token: Token,
-        _interests: mio::Interest,
-    ) -> Result<()> {
-        Ok(())
-    }
-
-    fn deregister(&mut self, _registry: &Registry) -> Result<()> {
-        Ok(())
-    }
-}
-
+pub struct WindowsProducer {}
 
 impl EventProducer for WindowsProducer {
-    fn notify(&mut self, _: ClientEvent) { }
+    fn notify(&mut self, _: ClientEvent) {}
 
-    fn read_events(&mut self) -> Drain<(ClientHandle, Event)> {
-        self.pending_events.drain(..)
-    }
-
-    fn release(&mut self) { }
+    fn release(&mut self) {}
 }
 
 impl WindowsProducer {
     pub(crate) fn new() -> Self {
-        Self {
-            pending_events: vec![],
-        }
+        Self {}
+    }
+}
+
+impl Stream for WindowsProducer {
+    type Item = Result<(ClientHandle, Event)>;
+    fn poll_next(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        Poll::Pending
     }
 }

src/backend/producer/x11.rs

@@ -1,55 +1,34 @@
-use std::vec::Drain;
+use std::io;
+use std::task::Poll;
 
-use mio::{Token, Registry};
-use mio::event::Source;
-use std::io::Result;
+use futures_core::Stream;
 
+use crate::event::Event;
 use crate::producer::EventProducer;
 
-use crate::{client::{ClientHandle, ClientEvent}, event::Event};
+use crate::client::{ClientEvent, ClientHandle};
 
-pub struct X11Producer {
-    pending_events: Vec<(ClientHandle, Event)>,
-}
+pub struct X11Producer {}
 
 impl X11Producer {
     pub fn new() -> Self {
-        Self {
-            pending_events: vec![],
-        }
-    }
-}
-
-impl Source for X11Producer {
-    fn register(
-        &mut self,
-        _registry: &Registry,
-        _token: Token,
-        _interests: mio::Interest,
-    ) -> Result<()> {
-        Ok(())
-    }
-
-    fn reregister(
-        &mut self,
-        _registry: &Registry,
-        _token: Token,
-        _interests: mio::Interest,
-    ) -> Result<()> {
-        Ok(())
-    }
-
-    fn deregister(&mut self, _registry: &Registry) -> Result<()> {
-        Ok(())
+        Self {}
     }
 }
 
 impl EventProducer for X11Producer {
-    fn notify(&mut self, _: ClientEvent) { }
-
-    fn read_events(&mut self) -> Drain<(ClientHandle, Event)> {
-        self.pending_events.drain(..)
-    }
+    fn notify(&mut self, _: ClientEvent) {}
 
     fn release(&mut self) {}
 }
+
+impl Stream for X11Producer {
+    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/client.rs

@@ -1,6 +1,11 @@
-use std::{net::SocketAddr, collections::{HashSet, hash_set::Iter}, fmt::Display, time::{Instant, Duration}, iter::Cloned};
+use std::{
+    collections::HashSet,
+    fmt::Display,
+    net::{IpAddr, SocketAddr},
+    time::Instant,
+};
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Eq, Hash, PartialEq, Clone, Copy, Serialize, Deserialize)]
 pub enum Position {
@@ -10,6 +15,12 @@ pub enum Position {
     Bottom,
 }
 
+impl Default for Position {
+    fn default() -> Self {
+        Self::Left
+    }
+}
+
 impl Position {
     pub fn opposite(&self) -> Self {
         match self {
@@ -23,18 +34,24 @@ impl Position {
 
 impl Display for Position {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", match self {
-            Position::Left => "left",
-            Position::Right => "right",
-            Position::Top => "top",
-            Position::Bottom => "bottom",
-        })
+        write!(
+            f,
+            "{}",
+            match self {
+                Position::Left => "left",
+                Position::Right => "right",
+                Position::Top => "top",
+                Position::Bottom => "bottom",
+            }
+        )
     }
 }
 
 #[derive(Debug, Eq, PartialEq, Clone, Serialize, Deserialize)]
 pub struct Client {
-    /// handle to refer to the client.
+    /// hostname of this client
+    pub hostname: Option<String>,
+    /// unique handle to refer to the client.
     /// This way any event consumer / producer backend does not
     /// need to know anything about a client other than its handle.
     pub handle: ClientHandle,
@@ -46,6 +63,8 @@ pub struct Client {
     /// e.g. Laptops usually have at least an ethernet and a wifi port
     /// which have different ip addresses
     pub addrs: HashSet<SocketAddr>,
+    /// both active_addr and addrs can be None / empty so port needs to be stored seperately
+    pub port: u16,
     /// position of a client on screen
     pub pos: Position,
 }
@@ -53,159 +72,122 @@ pub struct Client {
 pub enum ClientEvent {
     Create(ClientHandle, Position),
     Destroy(ClientHandle),
-    UpdatePos(ClientHandle, Position),
-    AddAddr(ClientHandle, SocketAddr),
-    RemoveAddr(ClientHandle, SocketAddr),
 }
 
 pub type ClientHandle = u32;
 
+#[derive(Debug, Clone)]
+pub struct ClientState {
+    pub client: Client,
+    pub active: bool,
+    pub last_ping: Option<Instant>,
+    pub last_seen: Option<Instant>,
+    pub last_replied: Option<Instant>,
+}
+
 pub struct ClientManager {
-    /// probably not beneficial to use a hashmap here
-    clients: Vec<Client>,
-    last_ping: Vec<(ClientHandle, Option<Instant>)>,
-    last_seen: Vec<(ClientHandle, Option<Instant>)>,
-    last_replied:  Vec<(ClientHandle, Option<Instant>)>,
-    next_client_id: u32,
+    clients: Vec<Option<ClientState>>, // HashMap likely not beneficial
 }
 
 impl ClientManager {
     pub fn new() -> Self {
-        Self {
-            clients: vec![],
-            next_client_id: 0,
-            last_ping: vec![],
-            last_seen: vec![],
-            last_replied: vec![],
-        }
+        Self { clients: vec![] }
     }
 
     /// add a new client to this manager
-    pub fn add_client(&mut self, addrs: HashSet<SocketAddr>, pos: Position) -> ClientHandle {
-        let handle = self.next_id();
+    pub fn add_client(
+        &mut self,
+        hostname: Option<String>,
+        addrs: HashSet<IpAddr>,
+        port: u16,
+        pos: Position,
+    ) -> ClientHandle {
+        // get a new client_handle
+        let handle = self.free_id();
+
         // we dont know, which IP is initially active
         let active_addr = None;
 
+        // map ip addresses to socket addresses
+        let addrs = HashSet::from_iter(addrs.into_iter().map(|ip| SocketAddr::new(ip, port)));
+
         // store the client
-        let client = Client { handle, active_addr, addrs, pos };
-        self.clients.push(client);
-        self.last_ping.push((handle, None));
-        self.last_seen.push((handle, None));
-        self.last_replied.push((handle, None));
+        let client = Client {
+            hostname,
+            handle,
+            active_addr,
+            addrs,
+            port,
+            pos,
+        };
+
+        // client was never seen, nor pinged
+        let client_state = ClientState {
+            client,
+            last_ping: None,
+            last_seen: None,
+            last_replied: None,
+            active: false,
+        };
+
+        if handle as usize >= self.clients.len() {
+            assert_eq!(handle as usize, self.clients.len());
+            self.clients.push(Some(client_state));
+        } else {
+            self.clients[handle as usize] = Some(client_state);
+        }
         handle
     }
 
-    /// add a socket address to the given client
-    pub fn add_addr(&mut self, client: ClientHandle, addr: SocketAddr) {
-        if let Some(client) = self.get_mut(client) {
-            client.addrs.insert(addr);
-        }
-    }
-
-    /// remove socket address from the given client
-    pub fn remove_addr(&mut self, client: ClientHandle, addr: SocketAddr) {
-        if let Some(client) = self.get_mut(client) {
-            client.addrs.remove(&addr);
-        }
-    }
-
-    pub fn set_default_addr(&mut self, client: ClientHandle, addr: SocketAddr) {
-        if let Some(client) = self.get_mut(client) {
-            client.active_addr = Some(addr)
-        }
-    }
-
-    /// update the position of a client
-    pub fn update_pos(&mut self, client: ClientHandle, pos: Position) {
-        if let Some(client) = self.get_mut(client) {
-            client.pos = pos;
-        }
-    }
-
-    pub fn get_active_addr(&self, client: ClientHandle) -> Option<SocketAddr> {
-        self.get(client)?.active_addr
-    }
-
-    pub fn get_addrs(&self, client: ClientHandle) -> Option<Cloned<Iter<'_, SocketAddr>>> {
-        Some(self.get(client)?.addrs.iter().cloned())
-    }
-
-    pub fn last_ping(&self, client: ClientHandle) -> Option<Duration> {
-        let last_ping = self.last_ping
-            .iter()
-            .find(|(c,_)| *c == client)?.1;
-        last_ping.map(|p| p.elapsed())
-    }
-
-    pub fn last_seen(&self, client: ClientHandle) -> Option<Duration> {
-        let last_seen = self.last_seen
-            .iter()
-            .find(|(c, _)| *c == client)?.1;
-        last_seen.map(|t| t.elapsed())
-    }
-
-    pub fn last_replied(&self, client: ClientHandle) -> Option<Duration> {
-        let last_replied = self.last_replied
-            .iter()
-            .find(|(c, _)| *c == client)?.1;
-        last_replied.map(|t| t.elapsed())
-    }
-
-    pub fn reset_last_ping(&mut self, client: ClientHandle) {
-        if let Some(c) = self.last_ping
-            .iter_mut()
-            .find(|(c, _)| *c == client) {
-                c.1 = Some(Instant::now());
-            }
-    }
-
-    pub fn reset_last_seen(&mut self, client: ClientHandle) {
-        if let Some(c) = self.last_seen
-            .iter_mut()
-            .find(|(c, _)| *c == client) {
-                c.1 = Some(Instant::now());
-            }
-    }
-
-    pub fn reset_last_replied(&mut self, client: ClientHandle) {
-        if let Some(c) = self.last_replied
-            .iter_mut()
-            .find(|(c, _)| *c == client) {
-                c.1 = Some(Instant::now());
-            }
-    }
-
+    /// find a client by its address
     pub fn get_client(&self, addr: SocketAddr) -> Option<ClientHandle> {
+        // since there shouldn't be more than a handful of clients at any given
+        // time this is likely faster than using a HashMap
         self.clients
             .iter()
-            .find(|c| c.addrs.contains(&addr))
-            .map(|c| c.handle)
+            .position(|c| {
+                if let Some(c) = c {
+                    c.active && c.client.addrs.contains(&addr)
+                } else {
+                    false
+                }
+            })
+            .map(|p| p as ClientHandle)
     }
 
-    pub fn remove_client(&mut self, client: ClientHandle) {
-        if let Some(i) = self.clients.iter().position(|c| c.handle == client) {
-            self.clients.remove(i);
-            self.last_ping.remove(i);
-            self.last_seen.remove(i);
-            self.last_replied.remove(i);
+    /// remove a client from the list
+    pub fn remove_client(&mut self, client: ClientHandle) -> Option<ClientState> {
+        // remove id from occupied ids
+        self.clients.get_mut(client as usize)?.take()
+    }
+
+    /// get a free slot in the client list
+    fn free_id(&mut self) -> ClientHandle {
+        for i in 0..u32::MAX {
+            if self.clients.get(i as usize).is_none()
+                || self.clients.get(i as usize).unwrap().is_none()
+            {
+                return i;
+            }
         }
+        panic!("Out of client ids");
     }
 
-    fn next_id(&mut self) -> ClientHandle {
-        let handle = self.next_client_id;
-        self.next_client_id += 1;
-        handle
+    // returns an immutable reference to the client state corresponding to `client`
+    pub fn get<'a>(&'a self, client: ClientHandle) -> Option<&'a ClientState> {
+        self.clients.get(client as usize)?.as_ref()
     }
 
-    fn get<'a>(&'a self, client: ClientHandle) -> Option<&'a Client> {
+    /// returns a mutable reference to the client state corresponding to `client`
+    pub fn get_mut<'a>(&'a mut self, client: ClientHandle) -> Option<&'a mut ClientState> {
+        self.clients.get_mut(client as usize)?.as_mut()
+    }
+
+    pub fn enumerate(&self) -> Vec<(Client, bool)> {
         self.clients
             .iter()
-            .find(|c| c.handle == client)
-    }
-
-    fn get_mut<'a>(&'a mut self, client: ClientHandle) -> Option<&'a mut Client> {
-        self.clients
-            .iter_mut()
-            .find(|c| c.handle == client)
+            .filter_map(|s| s.as_ref())
+            .map(|s| (s.client.clone(), s.active))
+            .collect()
     }
 }

src/config.rs

@@ -1,14 +1,13 @@
+use anyhow::Result;
+use clap::Parser;
 use serde::{Deserialize, Serialize};
-use core::fmt;
 use std::collections::HashSet;
-use std::net::{IpAddr, SocketAddr};
-use std::{error::Error, fs};
-
 use std::env;
+use std::net::IpAddr;
+use std::{error::Error, fs};
 use toml;
 
 use crate::client::Position;
-use crate::dns;
 
 pub const DEFAULT_PORT: u16 = 4242;
 
@@ -29,66 +28,79 @@ pub struct Client {
     pub port: Option<u16>,
 }
 
-#[derive(Debug, Clone)]
-struct MissingParameter {
-    arg: &'static str,
-}
-
-impl fmt::Display for MissingParameter {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Missing a parameter for argument: {}", self.arg)
-    }
-}
-
-impl Error for MissingParameter {}
-
 impl ConfigToml {
     pub fn new(path: &str) -> Result<ConfigToml, Box<dyn Error>> {
         let config = fs::read_to_string(path)?;
+        log::info!("using config: \"{path}\"");
         Ok(toml::from_str::<_>(&config)?)
     }
 }
 
-fn find_arg(key: &'static str) -> Result<Option<String>, MissingParameter> {
-    let args: Vec<String> = env::args().collect();
+#[derive(Parser, Debug)]
+#[command(author, version, about, long_about = None)]
+struct CliArgs {
+    /// the listen port for lan-mouse
+    #[arg(short, long)]
+    port: Option<u16>,
 
-    for (i, arg) in args.iter().enumerate() {
-        if arg != key {
-            continue;
-        }
-        match args.get(i+1) {
-            None => return Err(MissingParameter { arg: key }),
-            Some(arg) => return Ok(Some(arg.clone())),
-        };
-    }
-    Ok(None)
+    /// the frontend to use [cli | gtk]
+    #[arg(short, long)]
+    frontend: Option<String>,
+
+    /// non-default config file location
+    #[arg(short, long)]
+    config: Option<String>,
+
+    /// run only the service as a daemon without the frontend
+    #[arg(short, long)]
+    daemon: bool,
 }
 
-#[derive(PartialEq, Eq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum Frontend {
     Gtk,
     Cli,
 }
 
+#[derive(Debug)]
 pub struct Config {
     pub frontend: Frontend,
     pub port: u16,
     pub clients: Vec<(Client, Position)>,
+    pub daemon: bool,
 }
 
 impl Config {
-    pub fn new() -> Result<Self, Box<dyn Error>> {
-        let config_path = "config.toml";
-        let config_toml = match ConfigToml::new(config_path) {
+    pub fn new() -> Result<Self> {
+        let args = CliArgs::parse();
+        let config_file = "config.toml";
+        #[cfg(unix)]
+        let config_path = {
+            let xdg_config_home =
+                env::var("XDG_CONFIG_HOME").unwrap_or(format!("{}/.config", env::var("HOME")?));
+            format!("{xdg_config_home}/lan-mouse/{config_file}")
+        };
+
+        #[cfg(not(unix))]
+        let config_path = {
+            let app_data =
+                env::var("LOCALAPPDATA").unwrap_or(format!("{}/.config", env::var("USERPROFILE")?));
+            format!("{app_data}\\lan-mouse\\{config_file}")
+        };
+
+        // --config <file> overrules default location
+        let config_path = args.config.unwrap_or(config_path);
+
+        let config_toml = match ConfigToml::new(config_path.as_str()) {
             Err(e) => {
-                log::error!("config.toml: {e}");
+                log::error!("{config_path}: {e}");
                 log::warn!("Continuing without config file ...");
                 None
-            },
+            }
             Ok(c) => Some(c),
         };
 
-        let frontend = match find_arg("--frontend")? {
+        let frontend = match args.frontend {
             None => match &config_toml {
                 Some(c) => c.frontend.clone(),
                 None => None,
@@ -104,16 +116,16 @@ impl Config {
             Some(s) => match s.as_str() {
                 "cli" => Frontend::Cli,
                 "gtk" => Frontend::Gtk,
-                    _ => Frontend::Cli,
-            }
+                _ => Frontend::Cli,
+            },
         };
 
-        let port = match find_arg("--port")? {
-            Some(port) => port.parse::<u16>()?,
+        let port = match args.port {
+            Some(port) => port,
             None => match &config_toml {
                 Some(c) => c.port.unwrap_or(DEFAULT_PORT),
                 None => DEFAULT_PORT,
-            }
+            },
         };
 
         let mut clients: Vec<(Client, Position)> = vec![];
@@ -133,43 +145,29 @@ impl Config {
             }
         }
 
-        Ok(Config { frontend, clients, port })
+        let daemon = args.daemon;
+
+        Ok(Config {
+            daemon,
+            frontend,
+            clients,
+            port,
+        })
     }
 
-    pub fn get_clients(&self) -> Vec<(HashSet<SocketAddr>, Option<String>,  Position)> {
-        self.clients.iter().map(|(c,p)| {
-            let port = c.port.unwrap_or(DEFAULT_PORT);
-            // add ips from config
-            let config_ips: Vec<IpAddr> = if let Some(ips) = c.ips.as_ref() {
-                ips.iter().cloned().collect()
-            } else {
-                vec![]
-            };
-            let host_name = c.host_name.clone();
-            // add ips from dns lookup
-            let dns_ips = match host_name.as_ref() {
-                None => vec![],
-                Some(host_name) => match dns::resolve(host_name) {
-                    Err(e) => {
-                        log::warn!("{host_name}: could not resolve host: {e}");
-                        vec![]
-                    }
-                    Ok(l) if l.is_empty() => {
-                        log::warn!("{host_name}: could not resolve host");
-                        vec![]
-                    }
-                    Ok(l) => l,
-                }
-            };
-            if config_ips.is_empty() && dns_ips.is_empty() {
-                log::error!("no ips found for client {p:?}, ignoring!");
-                log::error!("You can manually specify ip addresses via the `ips` config option");
-            }
-            let ips = config_ips.into_iter().chain(dns_ips.into_iter());
-
-            // map ip addresses to socket addresses
-            let addrs: HashSet<SocketAddr> = ips.map(|ip| SocketAddr::new(ip, port)).collect();
-            (addrs, host_name, *p)
-        }).filter(|(a, _, _)| !a.is_empty()).collect()
+    pub fn get_clients(&self) -> Vec<(HashSet<IpAddr>, Option<String>, u16, Position)> {
+        self.clients
+            .iter()
+            .map(|(c, p)| {
+                let port = c.port.unwrap_or(DEFAULT_PORT);
+                let ips: HashSet<IpAddr> = if let Some(ips) = c.ips.as_ref() {
+                    HashSet::from_iter(ips.iter().cloned())
+                } else {
+                    HashSet::new()
+                };
+                let host_name = c.host_name.clone();
+                (ips, host_name, port, *p)
+            })
+            .collect()
     }
 }

src/consumer.rs

@@ -1,10 +1,17 @@
-#[cfg(unix)]
+use async_trait::async_trait;
+use std::future;
+
+#[cfg(all(unix, not(target_os = "macos")))]
 use std::env;
 
+use crate::{
+    backend::consumer,
+    client::{ClientEvent, ClientHandle},
+    event::Event,
+};
 use anyhow::Result;
-use crate::{backend::consumer, client::{ClientHandle, ClientEvent}, event::Event};
 
-#[cfg(unix)]
+#[cfg(all(unix, not(target_os = "macos")))]
 #[derive(Debug)]
 enum Backend {
     Wlroots,
@@ -13,19 +20,27 @@ enum Backend {
     Libei,
 }
 
-pub trait EventConsumer {
-    /// Event corresponding to an abstract `client_handle`
-    fn consume(&self, event: Event, client_handle: ClientHandle);
+#[async_trait]
+pub trait EventConsumer: 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(())
+    }
 
-    /// Event corresponding to a configuration change
-    fn notify(&mut self, client_event: ClientEvent);
+    async fn destroy(&mut self);
 }
 
-pub fn create() -> Result<Box<dyn EventConsumer>> {
+pub async fn create() -> Result<Box<dyn EventConsumer>> {
     #[cfg(windows)]
     return Ok(Box::new(consumer::windows::WindowsConsumer::new()));
 
-    #[cfg(unix)]
+    #[cfg(target_os = "macos")]
+    return Ok(Box::new(consumer::macos::MacOSConsumer::new()?));
+
+    #[cfg(all(unix, not(target_os = "macos")))]
     let backend = match env::var("XDG_SESSION_TYPE") {
         Ok(session_type) => match session_type.as_str() {
             "x11" => {
@@ -36,12 +51,14 @@ pub fn create() -> Result<Box<dyn EventConsumer>> {
                 log::info!("XDG_SESSION_TYPE = wayland -> using wayland event consumer");
                 match env::var("XDG_CURRENT_DESKTOP") {
                     Ok(current_desktop) => match current_desktop.as_str() {
-                        "gnome" => {
-                            log::info!("XDG_CURRENT_DESKTOP = gnome -> using libei backend");
+                        "GNOME" => {
+                            log::info!("XDG_CURRENT_DESKTOP = GNOME -> using libei backend");
                             Backend::Libei
                         }
                         "KDE" => {
-                            log::info!("XDG_CURRENT_DESKTOP = KDE -> using xdg_desktop_portal backend");
+                            log::info!(
+                                "XDG_CURRENT_DESKTOP = KDE -> using xdg_desktop_portal backend"
+                            );
                             Backend::RemoteDesktopPortal
                         }
                         "sway" => {
@@ -53,10 +70,12 @@ pub fn create() -> Result<Box<dyn EventConsumer>> {
                             Backend::Wlroots
                         }
                         _ => {
-                            log::warn!("unknown XDG_CURRENT_DESKTOP -> defaulting to wlroots backend");
+                            log::warn!(
+                                "unknown XDG_CURRENT_DESKTOP -> defaulting to wlroots backend"
+                            );
                             Backend::Wlroots
                         }
-                    }
+                    },
                     // default to wlroots backend for now
                     _ => {
                         log::warn!("unknown XDG_CURRENT_DESKTOP -> defaulting to wlroots backend");
@@ -66,34 +85,38 @@ pub fn create() -> Result<Box<dyn EventConsumer>> {
             }
             _ => panic!("unknown XDG_SESSION_TYPE"),
         },
-        Err(_) => panic!("could not detect session type: XDG_SESSION_TYPE environment variable not set!"),
+        Err(_) => {
+            panic!("could not detect session type: XDG_SESSION_TYPE environment variable not set!")
+        }
     };
 
-    #[cfg(unix)]
+    #[cfg(all(unix, not(target_os = "macos")))]
     match backend {
         Backend::Libei => {
             #[cfg(not(feature = "libei"))]
             panic!("feature libei not enabled");
             #[cfg(feature = "libei")]
-            Ok(Box::new(consumer::libei::LibeiConsumer::new()))
-        },
+            Ok(Box::new(consumer::libei::LibeiConsumer::new().await?))
+        }
         Backend::RemoteDesktopPortal => {
             #[cfg(not(feature = "xdg_desktop_portal"))]
             panic!("feature xdg_desktop_portal not enabled");
             #[cfg(feature = "xdg_desktop_portal")]
-            Ok(Box::new(consumer::xdg_desktop_portal::DesktopPortalConsumer::new()))
-        },
+            Ok(Box::new(
+                consumer::xdg_desktop_portal::DesktopPortalConsumer::new().await?,
+            ))
+        }
         Backend::Wlroots => {
             #[cfg(not(feature = "wayland"))]
             panic!("feature wayland not enabled");
             #[cfg(feature = "wayland")]
             Ok(Box::new(consumer::wlroots::WlrootsConsumer::new()?))
-        },
+        }
         Backend::X11 => {
             #[cfg(not(feature = "x11"))]
             panic!("feature x11 not enabled");
             #[cfg(feature = "x11")]
             Ok(Box::new(consumer::x11::X11Consumer::new()))
-        },
+        }
     }
 }

src/dns.rs

@@ -1,9 +1,23 @@
+use anyhow::Result;
 use std::{error::Error, net::IpAddr};
 
-use trust_dns_resolver::Resolver;
+use trust_dns_resolver::TokioAsyncResolver;
 
-pub fn resolve(host: &str) -> Result<Vec<IpAddr>, Box<dyn Error>> {
-    log::info!("resolving {host} ...");
-    let response = Resolver::from_system_conf()?.lookup_ip(host)?;
-    Ok(response.iter().collect())
+pub(crate) struct DnsResolver {
+    resolver: TokioAsyncResolver,
+}
+impl DnsResolver {
+    pub(crate) async fn new() -> Result<Self> {
+        let resolver = TokioAsyncResolver::tokio_from_system_conf()?;
+        Ok(Self { resolver })
+    }
+
+    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())
+    }
 }

src/event.rs

@@ -1,6 +1,12 @@
-use std::{error::Error, fmt::{self, Display}};
+use std::{
+    error::Error,
+    fmt::{self, Display},
+};
 
-pub mod server;
+// FIXME
+pub(crate) const BTN_LEFT: u32 = 0x110;
+pub(crate) const BTN_RIGHT: u32 = 0x111;
+pub(crate) const BTN_MIDDLE: u32 = 0x112;
 
 #[derive(Debug, Clone, Copy)]
 pub enum PointerEvent {
@@ -49,10 +55,22 @@ pub enum Event {
 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 } => write!(f, "button({button}, {state})"),
-            PointerEvent::Axis { time: _, axis, value } => write!(f, "scroll({axis}, {value})"),
-            PointerEvent::Frame { } => write!(f, "frame()"),
+            PointerEvent::Motion {
+                time: _,
+                relative_x,
+                relative_y,
+            } => write!(f, "motion({relative_x},{relative_y})"),
+            PointerEvent::Button {
+                time: _,
+                button,
+                state,
+            } => write!(f, "button({button}, {state})"),
+            PointerEvent::Axis {
+                time: _,
+                axis,
+                value,
+            } => write!(f, "scroll({axis}, {value})"),
+            PointerEvent::Frame {} => write!(f, "frame()"),
         }
     }
 }
@@ -60,8 +78,20 @@ impl Display for PointerEvent {
 impl Display for KeyboardEvent {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            KeyboardEvent::Key { time: _, key, state } => write!(f, "key({key}, {state})"),
-            KeyboardEvent::Modifiers { mods_depressed, mods_latched, mods_locked, group } => write!(f, "modifiers({mods_depressed},{mods_latched},{mods_locked},{group})"),
+            KeyboardEvent::Key {
+                time: _,
+                key,
+                state,
+            } => write!(f, "key({key}, {state})"),
+            KeyboardEvent::Modifiers {
+                mods_depressed,
+                mods_latched,
+                mods_locked,
+                group,
+            } => write!(
+                f,
+                "modifiers({mods_depressed},{mods_latched},{mods_locked},{group})"
+            ),
         }
     }
 }

src/event/server.rs

@@ -1,322 +0,0 @@
-use std::{error::Error, io::Result, collections::HashSet, time::Duration};
-use log;
-use mio::{Events, Poll, Interest, Token, net::UdpSocket};
-#[cfg(not(windows))]
-use mio_signals::{Signals, Signal, SignalSet};
-
-use std::{net::SocketAddr, io::ErrorKind};
-
-use crate::{client::{ClientEvent, ClientManager, Position}, consumer::EventConsumer, producer::EventProducer, frontend::{FrontendEvent, FrontendAdapter}, dns};
-use super::Event;
-
-/// keeps track of state to prevent a feedback loop
-/// of continuously sending and receiving the same event.
-#[derive(Eq, PartialEq)]
-enum State {
-    Sending,
-    Receiving,
-}
-
-pub struct Server {
-    poll: Poll,
-    socket: UdpSocket,
-    producer: Box<dyn EventProducer>,
-    consumer: Box<dyn EventConsumer>,
-    #[cfg(not(windows))]
-    signals: Signals,
-    frontend: FrontendAdapter,
-    client_manager: ClientManager,
-    state: State,
-}
-
-const UDP_RX: Token = Token(0);
-const FRONTEND_RX: Token = Token(1);
-const PRODUCER_RX: Token = Token(2);
-#[cfg(not(windows))]
-const SIGNAL: Token = Token(3);
-
-impl Server {
-    pub fn new(
-        port: u16,
-        mut producer: Box<dyn EventProducer>,
-        consumer: Box<dyn EventConsumer>,
-        mut frontend: FrontendAdapter,
-    ) -> Result<Self> {
-        // bind the udp socket
-        let listen_addr = SocketAddr::new("0.0.0.0".parse().unwrap(), port);
-        let mut socket = UdpSocket::bind(listen_addr)?;
-
-        // register event sources
-        let poll = Poll::new()?;
-
-        // hand signal handling over to the event loop
-        #[cfg(not(windows))]
-        let mut signals = Signals::new(SignalSet::all())?;
-
-        #[cfg(not(windows))]
-        poll.registry().register(&mut signals, SIGNAL, Interest::READABLE)?;
-        poll.registry().register(&mut socket, UDP_RX, Interest::READABLE | Interest::WRITABLE)?;
-        poll.registry().register(&mut producer, PRODUCER_RX, Interest::READABLE)?;
-        poll.registry().register(&mut frontend, FRONTEND_RX, Interest::READABLE)?;
-
-        // create client manager
-        let client_manager = ClientManager::new();
-        Ok(Server {
-            poll, socket, consumer, producer,
-            #[cfg(not(windows))]
-            signals, frontend,
-            client_manager,
-            state: State::Receiving,
-        })
-    }
-
-    pub fn run(&mut self) -> Result<()> {
-        let mut events = Events::with_capacity(10);
-        loop {
-            match self.poll.poll(&mut events, None) {
-                Ok(()) => (),
-                Err(e) if e.kind() == ErrorKind::Interrupted => continue,
-                Err(e) => return Err(e),
-            }
-            for event in &events {
-                if !event.is_readable() { continue }
-                match event.token() {
-                    UDP_RX => self.handle_udp_rx(),
-                    PRODUCER_RX => self.handle_producer_rx(),
-                    FRONTEND_RX => if self.handle_frontend_rx() { return Ok(()) },
-                    #[cfg(not(windows))]
-                    SIGNAL => if self.handle_signal() { return Ok(()) },
-                    _ => panic!("what happened here?")
-                }
-            }
-        }
-    }
-
-    pub fn add_client(&mut self, addr: HashSet<SocketAddr>, pos: Position) {
-        let client = self.client_manager.add_client(addr, pos);
-        log::debug!("add_client {client}");
-        self.producer.notify(ClientEvent::Create(client, pos));
-        self.consumer.notify(ClientEvent::Create(client, pos));
-    }
-
-    pub fn remove_client(&mut self, host: String, port: u16) {
-        if let Ok(ips) = dns::resolve(host.as_str()) {
-            if let Some(ip) = ips.iter().next() {
-                let addr = SocketAddr::new(*ip, port);
-                if let Some(handle) = self.client_manager.get_client(addr) {
-                    log::debug!("remove_client {handle}");
-                    self.client_manager.remove_client(handle);
-                    self.producer.notify(ClientEvent::Destroy(handle));
-                    self.consumer.notify(ClientEvent::Destroy(handle));
-                }
-            }
-        }
-    }
-
-    fn handle_udp_rx(&mut self) {
-        loop {
-            let (event, addr) = match self.receive_event() {
-                Ok(e) => e,
-                Err(e) => {
-                    if e.is::<std::io::Error>() {
-                        if let ErrorKind::WouldBlock = e.downcast_ref::<std::io::Error>()
-                            .unwrap()
-                            .kind() {
-                            return
-                        }
-                    }
-                    log::error!("{}", e);
-                    continue
-                }
-            };
-            log::trace!("{:20} <-<-<-<------ {addr}", event.to_string());
-
-            // get handle for addr
-            let handle = match self.client_manager.get_client(addr) {
-                Some(a) => a,
-                None => {
-                    log::warn!("ignoring event from client {addr:?}");
-                    continue
-                }
-            };
-
-            // reset ttl for client and set addr as new default for this client
-            self.client_manager.reset_last_seen(handle);
-            self.client_manager.set_default_addr(handle, addr);
-            match (event, addr) {
-                (Event::Pong(), _) => {},
-                (Event::Ping(), addr) => {
-                    if let Err(e) = Self::send_event(&self.socket, Event::Pong(), addr) {
-                        log::error!("udp send: {}", e);
-                    }
-                    // we release the mouse here,
-                    // since its very likely, that we wont get a release event
-                    self.producer.release();
-                }
-                (event, addr) => {
-                    match self.state {
-                        State::Sending => {
-                            // in sending state, we dont want to process
-                            // any events to avoid feedback loops,
-                            // therefore we tell the event producer
-                            // to release the pointer and move on
-                            // first event -> release pointer
-                            if let Event::Release() = event {
-                                log::debug!("releasing pointer ...");
-                                self.producer.release();
-                                self.state = State::Receiving;
-                            }
-                        }
-                        State::Receiving => {
-                            // consume event
-                            self.consumer.consume(event, handle);
-
-                            // let the server know we are still alive once every second
-                            let last_replied = self.client_manager.last_replied(handle);
-                            if  last_replied.is_none() 
-                            || last_replied.is_some() && last_replied.unwrap() > Duration::from_secs(1) {
-                                self.client_manager.reset_last_replied(handle);
-                                if let Err(e) = Self::send_event(&self.socket, Event::Pong(), addr) {
-                                    log::error!("udp send: {}", e);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    fn handle_producer_rx(&mut self) {
-        let events = self.producer.read_events();
-        let mut should_release = false;
-        for (c, e) in events.into_iter() {
-            // in receiving state, only release events
-            // must be transmitted
-            if let Event::Release() = e {
-                self.state = State::Sending;
-            }
-            // otherwise we should have an address to send to
-            // transmit events to the corrensponding client
-            if let Some(addr) = self.client_manager.get_active_addr(c) {
-                log::trace!("{:20} ------>->->-> {addr}", e.to_string());
-                if let Err(e) = Self::send_event(&self.socket, e, addr) {
-                    log::error!("udp send: {}", e);
-                }
-            }
-
-            // if client last responded > 2 seconds ago
-            // and we have not sent a ping since 500 milliseconds,
-            // send a ping
-            let last_seen = self.client_manager.last_seen(c);
-            let last_ping = self.client_manager.last_ping(c);
-            if last_seen.is_some() && last_seen.unwrap() < Duration::from_secs(2) {
-                continue
-            }
-
-            // client last seen > 500ms ago
-            if last_ping.is_some() && last_ping.unwrap() < Duration::from_millis(500) {
-                continue
-            }
-
-            // release mouse if client didnt respond to the first ping
-            if last_ping.is_some() && last_ping.unwrap() < Duration::from_secs(1) {
-                should_release = true;
-            }
-
-            // last ping > 500ms ago -> ping all interfaces
-            self.client_manager.reset_last_ping(c);
-            if let Some(iter) = self.client_manager.get_addrs(c) {
-                for addr in iter {
-                    log::debug!("pinging {addr}");
-                    if let Err(e) = Self::send_event(&self.socket, Event::Ping(), addr) {
-                        if e.kind() != ErrorKind::WouldBlock {
-                            log::error!("udp send: {}", e);
-                        }
-                    }
-                    // send additional release event, in case client is still in sending mode
-                    if let Err(e) = Self::send_event(&self.socket, Event::Release(), addr) {
-                        if e.kind() != ErrorKind::WouldBlock {
-                            log::error!("udp send: {}", e);
-                        }
-                    }
-                }
-            } else {
-                // TODO should repeat dns lookup
-            }
-        }
-
-        if should_release && self.state != State::Receiving {
-            log::info!("client not responding - releasing pointer");
-            self.producer.release();
-            self.state = State::Receiving;
-        }
-
-    }
-
-    fn handle_frontend_rx(&mut self) -> bool {
-        loop {
-            match self.frontend.read_event() {
-                Ok(event) => match event {
-                    FrontendEvent::AddClient(host, port, pos) => {
-                        if let Ok(ips) = dns::resolve(host.as_str()) {
-                            let addrs = ips.iter().map(|i| SocketAddr::new(*i, port));
-                            self.add_client(HashSet::from_iter(addrs), pos);
-                        }
-                    }
-                    FrontendEvent::DelClient(host, port) => self.remove_client(host, port),
-                    FrontendEvent::Shutdown() => {
-                        log::info!("terminating gracefully...");
-                        return true;
-                    },
-                    FrontendEvent::ChangePort(_) => todo!(),
-                    FrontendEvent::AddIp(_, _) => todo!(),
-                }
-                Err(e) if e.kind() == ErrorKind::WouldBlock => return false,
-                Err(e) => {
-                    log::error!("frontend: {e}");
-                }
-            }
-        }
-    }
-
-    #[cfg(not(windows))]
-    fn handle_signal(&mut self) -> bool {
-        #[cfg(windows)]
-        return false;
-        #[cfg(not(windows))]
-        loop {
-            match self.signals.receive() {
-                Err(e) if e.kind() == ErrorKind::WouldBlock => return false,
-                Err(e) => {
-                    log::error!("error reading signal: {e}");
-                    return false;
-                }
-                Ok(Some(Signal::Interrupt) | Some(Signal::Terminate)) => {
-                    // terminate on SIG_INT or SIG_TERM
-                    log::info!("terminating gracefully...");
-                    return true;
-                },
-                Ok(Some(signal)) => {
-                    log::info!("ignoring signal {signal:?}");
-                },
-                Ok(None) => return false,
-            }
-        }
-    }
-
-    fn send_event(sock: &UdpSocket, e: Event, addr: SocketAddr) -> Result<usize> {
-        let data: Vec<u8> = (&e).into();
-        // We are currently abusing a blocking send to get the lowest possible latency.
-        // It may be better to set the socket to non-blocking and only send when ready.
-        sock.send_to(&data[..], addr)
-    }
-
-    fn receive_event(&self) -> std::result::Result<(Event, SocketAddr), Box<dyn Error>> {
-        let mut buf = vec![0u8; 22];
-        match self.socket.recv_from(&mut buf) {
-            Ok((_amt, src)) => Ok((Event::try_from(buf)?, src)),
-            Err(e) => Err(Box::new(e)),
-        }
-    }
-}

src/frontend.rs

@@ -1,20 +1,31 @@
-use std::io::{Read, Result};
-use std::net::IpAddr;
-use std::str;
+use anyhow::{anyhow, Result};
+use std::{cmp::min, io::ErrorKind, str, time::Duration};
 
 #[cfg(unix)]
-use std::{env, path::{Path, PathBuf}};
+use std::{
+    env,
+    path::{Path, PathBuf},
+};
 
-use mio::{Registry, Token, event::Source};
+use tokio::io::ReadHalf;
+use tokio::io::{AsyncReadExt, AsyncWriteExt, WriteHalf};
 
 #[cfg(unix)]
-use mio::net::UnixListener;
+use tokio::net::UnixListener;
+#[cfg(unix)]
+use tokio::net::UnixStream;
+
 #[cfg(windows)]
-use mio::net::TcpListener;
+use tokio::net::TcpListener;
+#[cfg(windows)]
+use tokio::net::TcpStream;
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
-use crate::client::{Client, Position};
+use crate::{
+    client::{Client, ClientHandle, Position},
+    config::{Config, Frontend},
+};
 
 /// cli frontend
 pub mod cli;
@@ -23,99 +34,240 @@ pub mod cli;
 #[cfg(all(unix, feature = "gtk"))]
 pub mod gtk;
 
+pub fn run_frontend(config: &Config) -> Result<()> {
+    match config.frontend {
+        #[cfg(all(unix, feature = "gtk"))]
+        Frontend::Gtk => {
+            gtk::run();
+        }
+        #[cfg(any(not(feature = "gtk"), not(unix)))]
+        Frontend::Gtk => panic!("gtk frontend requested but feature not enabled!"),
+        Frontend::Cli => {
+            cli::run()?;
+        }
+    };
+    Ok(())
+}
+
+fn exponential_back_off(duration: &mut Duration) -> &Duration {
+    let new = duration.saturating_mul(2);
+    *duration = min(new, Duration::from_secs(1));
+    duration
+}
+
+/// wait for the lan-mouse socket to come online
+#[cfg(unix)]
+pub fn wait_for_service() -> Result<std::os::unix::net::UnixStream> {
+    let socket_path = FrontendListener::socket_path()?;
+    let mut duration = Duration::from_millis(1);
+    loop {
+        use std::os::unix::net::UnixStream;
+        if let Ok(stream) = UnixStream::connect(&socket_path) {
+            break Ok(stream);
+        }
+        // a signaling mechanism or inotify could be used to
+        // improve this
+        std::thread::sleep(*exponential_back_off(&mut duration));
+    }
+}
+
+#[cfg(windows)]
+pub fn wait_for_service() -> Result<std::net::TcpStream> {
+    let mut duration = Duration::from_millis(1);
+    loop {
+        use std::net::TcpStream;
+        if let Ok(stream) = TcpStream::connect("127.0.0.1:5252") {
+            break Ok(stream);
+        }
+        std::thread::sleep(*exponential_back_off(&mut duration));
+    }
+}
+
 #[derive(Debug, Eq, PartialEq, Clone, Serialize, Deserialize)]
 pub enum FrontendEvent {
+    /// add a new client
+    AddClient(Option<String>, u16, Position),
+    /// activate/deactivate client
+    ActivateClient(ClientHandle, bool),
+    /// change the listen port (recreate udp listener)
     ChangePort(u16),
-    AddClient(String, u16, Position),
-    DelClient(String, u16),
-    AddIp(String, Option<IpAddr>),
+    /// remove a client
+    DelClient(ClientHandle),
+    /// request an enumertaion of all clients
+    Enumerate(),
+    /// service shutdown
     Shutdown(),
+    /// update a client (hostname, port, position)
+    UpdateClient(ClientHandle, Option<String>, u16, Position),
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum FrontendNotify {
-    NotifyClientCreate(Client),
+    NotifyClientCreate(ClientHandle, Option<String>, u16, Position),
+    NotifyClientUpdate(ClientHandle, Option<String>, u16, Position),
+    NotifyClientDelete(ClientHandle),
+    /// new port, reason of failure (if failed)
+    NotifyPortChange(u16, Option<String>),
+    Enumerate(Vec<(Client, bool)>),
     NotifyError(String),
 }
 
-pub struct FrontendAdapter {
+pub struct FrontendListener {
     #[cfg(windows)]
     listener: TcpListener,
     #[cfg(unix)]
     listener: UnixListener,
     #[cfg(unix)]
     socket_path: PathBuf,
+    #[cfg(unix)]
+    tx_streams: Vec<WriteHalf<UnixStream>>,
+    #[cfg(windows)]
+    tx_streams: Vec<WriteHalf<TcpStream>>,
 }
 
-impl FrontendAdapter {
-    pub fn new() -> std::result::Result<Self, Box<dyn std::error::Error>> {
+impl FrontendListener {
+    #[cfg(all(unix, not(target_os = "macos")))]
+    pub fn socket_path() -> Result<PathBuf> {
+        let xdg_runtime_dir = match env::var("XDG_RUNTIME_DIR") {
+            Ok(d) => d,
+            Err(e) => return Err(anyhow!("could not find XDG_RUNTIME_DIR: {e}")),
+        };
+        let xdg_runtime_dir = Path::new(xdg_runtime_dir.as_str());
+        Ok(xdg_runtime_dir.join("lan-mouse-socket.sock"))
+    }
+
+    #[cfg(all(unix, target_os = "macos"))]
+    pub fn socket_path() -> Result<PathBuf> {
+        let home = match env::var("HOME") {
+            Ok(d) => d,
+            Err(e) => return Err(anyhow!("could not find HOME: {e}")),
+        };
+        let home = Path::new(home.as_str());
+        let path = home
+            .join("Library")
+            .join("Caches")
+            .join("lan-mouse-socket.sock");
+        Ok(path)
+    }
+
+    pub async fn new() -> Option<Result<Self>> {
         #[cfg(unix)]
-        let socket_path = Path::new(env::var("XDG_RUNTIME_DIR")?.as_str()).join("lan-mouse-socket.sock");
-        #[cfg(unix)]
-        log::debug!("remove socket: {:?}", socket_path);
-        #[cfg(unix)]
-        if socket_path.exists() {
-            std::fs::remove_file(&socket_path).unwrap();
-        }
-        #[cfg(unix)]
-        let listener = UnixListener::bind(&socket_path)?;
+        let (socket_path, listener) = {
+            let socket_path = match Self::socket_path() {
+                Ok(path) => path,
+                Err(e) => return Some(Err(e)),
+            };
+
+            log::debug!("remove socket: {:?}", socket_path);
+            if socket_path.exists() {
+                // try to connect to see if some other instance
+                // of lan-mouse is already running
+                match UnixStream::connect(&socket_path).await {
+                    // connected -> lan-mouse is already running
+                    Ok(_) => return None,
+                    // lan-mouse is not running but a socket was left behind
+                    Err(e) => {
+                        log::debug!("{socket_path:?}: {e} - removing left behind socket");
+                        let _ = std::fs::remove_file(&socket_path);
+                    }
+                }
+            }
+            let listener = match UnixListener::bind(&socket_path) {
+                Ok(ls) => ls,
+                // some other lan-mouse instance has bound the socket in the meantime
+                Err(e) if e.kind() == ErrorKind::AddrInUse => return None,
+                Err(e) => return Some(Err(anyhow!("failed to bind lan-mouse-socket: {e}"))),
+            };
+            (socket_path, listener)
+        };
 
         #[cfg(windows)]
-        let listener = TcpListener::bind("127.0.0.1:5252".parse().unwrap())?; // abuse tcp
+        let listener = match TcpListener::bind("127.0.0.1:5252").await {
+            Ok(ls) => ls,
+            // some other lan-mouse instance has bound the socket in the meantime
+            Err(e) if e.kind() == ErrorKind::AddrInUse => return None,
+            Err(e) => return Some(Err(anyhow!("failed to bind lan-mouse-socket: {e}"))),
+        };
 
         let adapter = Self {
             listener,
             #[cfg(unix)]
             socket_path,
+            tx_streams: vec![],
         };
 
-        Ok(adapter)
+        Some(Ok(adapter))
     }
 
-    pub fn read_event(&mut self) -> Result<FrontendEvent>{
-        let (mut stream, _) = self.listener.accept()?;
-        let mut buf = [0u8; 128]; // FIXME
-        stream.read(&mut buf)?;
-        let json = str::from_utf8(&buf)
-            .unwrap()
-            .trim_end_matches(char::from(0)); // remove trailing 0-bytes
-        log::debug!("{json}");
-        let event = serde_json::from_str(json).unwrap();
-        log::debug!("{:?}", event);
-        Ok(event)
+    #[cfg(unix)]
+    pub async fn accept(&mut self) -> Result<ReadHalf<UnixStream>> {
+        log::trace!("frontend.accept()");
+
+        let stream = self.listener.accept().await?.0;
+        let (rx, tx) = tokio::io::split(stream);
+        self.tx_streams.push(tx);
+        Ok(rx)
     }
 
-    pub fn notify(&self, _event: FrontendNotify) { }
-}
-
-impl Source for FrontendAdapter {
-    fn register(
-        &mut self,
-        registry: &Registry,
-        token: Token,
-        interests: mio::Interest,
-    ) -> Result<()> {
-        self.listener.register(registry, token, interests)
+    #[cfg(windows)]
+    pub async fn accept(&mut self) -> Result<ReadHalf<TcpStream>> {
+        let stream = self.listener.accept().await?.0;
+        let (rx, tx) = tokio::io::split(stream);
+        self.tx_streams.push(tx);
+        Ok(rx)
     }
 
-    fn reregister(
-        &mut self,
-        registry: &Registry,
-        token: Token,
-        interests: mio::Interest,
-    ) -> Result<()> {
-        self.listener.reregister(registry, token, interests)
-    }
+    pub(crate) async fn notify_all(&mut self, notify: FrontendNotify) -> Result<()> {
+        // encode event
+        let json = serde_json::to_string(&notify).unwrap();
+        let payload = json.as_bytes();
+        let len = payload.len().to_be_bytes();
+        log::debug!("json: {json}, len: {}", payload.len());
 
-    fn deregister(&mut self, registry: &Registry) -> Result<()> {
-        self.listener.deregister(registry)
+        let mut keep = vec![];
+
+        // TODO do simultaneously
+        for tx in self.tx_streams.iter_mut() {
+            // write len + payload
+            if let Err(_) = tx.write(&len).await {
+                keep.push(false);
+                continue;
+            }
+            if let Err(_) = tx.write(payload).await {
+                keep.push(false);
+                continue;
+            }
+            keep.push(true);
+        }
+
+        // could not find a better solution because async
+        let mut keep = keep.into_iter();
+        self.tx_streams.retain(|_| keep.next().unwrap());
+        Ok(())
     }
 }
 
 #[cfg(unix)]
-impl Drop for FrontendAdapter {
+impl Drop for FrontendListener {
     fn drop(&mut self) {
         log::debug!("remove socket: {:?}", self.socket_path);
-        std::fs::remove_file(&self.socket_path).unwrap();
+        let _ = std::fs::remove_file(&self.socket_path);
     }
 }
+
+#[cfg(unix)]
+pub async fn read_event(stream: &mut ReadHalf<UnixStream>) -> Result<FrontendEvent> {
+    let len = stream.read_u64().await?;
+    assert!(len <= 256);
+    let mut buf = [0u8; 256];
+    stream.read_exact(&mut buf[..len as usize]).await?;
+    Ok(serde_json::from_slice(&buf[..len as usize])?)
+}
+
+#[cfg(windows)]
+pub async fn read_event(stream: &mut ReadHalf<TcpStream>) -> Result<FrontendEvent> {
+    let len = stream.read_u64().await?;
+    let mut buf = [0u8; 256];
+    stream.read_exact(&mut buf[..len as usize]).await?;
+    Ok(serde_json::from_slice(&buf[..len as usize])?)
+}

src/frontend/cli.rs

@@ -1,99 +1,257 @@
-use anyhow::Result;
-use std::{thread::{self, JoinHandle}, io::Write};
+use anyhow::{anyhow, Context, Result};
 #[cfg(windows)]
 use std::net::SocketAddrV4;
+use std::{
+    io::{ErrorKind, Read, Write},
+    str::SplitWhitespace,
+    thread,
+};
 
-#[cfg(unix)]
-use std::{os::unix::net::UnixStream, path::Path, env};
 #[cfg(windows)]
 use std::net::TcpStream;
+#[cfg(unix)]
+use std::os::unix::net::UnixStream;
 
 use crate::{client::Position, config::DEFAULT_PORT};
 
-use super::FrontendEvent;
+use super::{FrontendEvent, FrontendNotify};
 
-pub fn start() -> Result<JoinHandle<()>> {
+pub fn run() -> Result<()> {
     #[cfg(unix)]
-    let socket_path = Path::new(env::var("XDG_RUNTIME_DIR")?.as_str()).join("lan-mouse-socket.sock");
-    Ok(thread::Builder::new()
+    let socket_path = super::FrontendListener::socket_path()?;
+
+    #[cfg(unix)]
+    let Ok(mut tx) = UnixStream::connect(&socket_path) else {
+        return Err(anyhow!("Could not connect to lan-mouse-socket"));
+    };
+
+    #[cfg(windows)]
+    let Ok(mut tx) = TcpStream::connect("127.0.0.1:5252".parse::<SocketAddrV4>().unwrap()) else {
+        return Err(anyhow!("Could not connect to lan-mouse-socket"));
+    };
+
+    let mut rx = tx.try_clone()?;
+
+    let reader = thread::Builder::new()
         .name("cli-frontend".to_string())
         .spawn(move || {
-        loop {
-            eprint!("lan-mouse > ");
-            std::io::stderr().flush().unwrap();
-            let mut buf = String::new();
-            match std::io::stdin().read_line(&mut buf) {
-                Ok(len) => {
-                    if let Some(event) = parse_cmd(buf, len) {
-                        #[cfg(unix)]
-                        let Ok(mut stream) = UnixStream::connect(&socket_path) else {
-                            log::error!("Could not connect to lan-mouse-socket");
-                            continue;
-                        };
-                        #[cfg(windows)]
-                        let Ok(mut stream) = TcpStream::connect("127.0.0.1:5252".parse::<SocketAddrV4>().unwrap()) else {
-                            log::error!("Could not connect to lan-mouse-server");
-                            continue;
-                        };
-                        let json = serde_json::to_string(&event).unwrap();
-                        if let Err(e) = stream.write(json.as_bytes()) {
-                            log::error!("error sending message: {e}");
-                        };
-                        if event == FrontendEvent::Shutdown() {
-                            break;
+            // all further prompts
+            prompt();
+            loop {
+                let mut buf = String::new();
+                match std::io::stdin().read_line(&mut buf) {
+                    Ok(0) => break,
+                    Ok(len) => {
+                        if let Some(events) = parse_cmd(buf, len) {
+                            for event in events.iter() {
+                                let json = serde_json::to_string(&event).unwrap();
+                                let bytes = json.as_bytes();
+                                let len = bytes.len().to_be_bytes();
+                                if let Err(e) = tx.write(&len) {
+                                    log::error!("error sending message: {e}");
+                                };
+                                if let Err(e) = tx.write(bytes) {
+                                    log::error!("error sending message: {e}");
+                                };
+                                if *event == FrontendEvent::Shutdown() {
+                                    return;
+                                }
+                            }
+                            // prompt is printed after the server response is received
+                        } else {
+                            prompt();
                         }
                     }
-                }
-                Err(e) => {
-                    log::error!("{e:?}");
-                    break
+                    Err(e) => {
+                        log::error!("error reading from stdin: {e}");
+                        break;
+                    }
                 }
             }
+        })?;
+
+    let writer = thread::Builder::new()
+        .name("cli-frontend-notify".to_string())
+        .spawn(move || {
+            loop {
+                // read len
+                let mut len = [0u8; 8];
+                match rx.read_exact(&mut len) {
+                    Ok(()) => (),
+                    Err(e) if e.kind() == ErrorKind::UnexpectedEof => break,
+                    Err(e) => break log::error!("{e}"),
+                };
+                let len = usize::from_be_bytes(len);
+
+                // read payload
+                let mut buf: Vec<u8> = vec![0u8; len];
+                match rx.read_exact(&mut buf[..len]) {
+                    Ok(()) => (),
+                    Err(e) if e.kind() == ErrorKind::UnexpectedEof => break,
+                    Err(e) => break log::error!("{e}"),
+                };
+
+                let notify: FrontendNotify = match serde_json::from_slice(&buf) {
+                    Ok(n) => n,
+                    Err(e) => break log::error!("{e}"),
+                };
+                match notify {
+                    FrontendNotify::NotifyClientCreate(client, host, port, pos) => {
+                        log::info!(
+                            "new client ({client}): {}:{port} - {pos}",
+                            host.as_deref().unwrap_or("")
+                        );
+                    }
+                    FrontendNotify::NotifyClientUpdate(client, host, port, pos) => {
+                        log::info!(
+                            "client ({client}) updated: {}:{port} - {pos}",
+                            host.as_deref().unwrap_or("")
+                        );
+                    }
+                    FrontendNotify::NotifyClientDelete(client) => {
+                        log::info!("client ({client}) deleted.");
+                    }
+                    FrontendNotify::NotifyError(e) => {
+                        log::warn!("{e}");
+                    }
+                    FrontendNotify::Enumerate(clients) => {
+                        for (client, active) in clients.into_iter() {
+                            log::info!(
+                                "client ({}) [{}]: active: {}, associated addresses: [{}]",
+                                client.handle,
+                                client.hostname.as_deref().unwrap_or(""),
+                                if active { "yes" } else { "no" },
+                                client
+                                    .addrs
+                                    .into_iter()
+                                    .map(|a| a.to_string())
+                                    .collect::<Vec<String>>()
+                                    .join(", ")
+                            );
+                        }
+                    }
+                    FrontendNotify::NotifyPortChange(port, msg) => match msg {
+                        Some(msg) => log::info!("could not change port: {msg}"),
+                        None => log::info!("port changed: {port}"),
+                    },
+                }
+                prompt();
+            }
+        })?;
+    match reader.join() {
+        Ok(_) => (),
+        Err(e) => {
+            let msg = match (e.downcast_ref::<&str>(), e.downcast_ref::<String>()) {
+                (Some(&s), _) => s,
+                (_, Some(s)) => s,
+                _ => "no panic info",
+            };
+            log::error!("reader thread paniced: {msg}");
         }
-    })?)
+    }
+    match writer.join() {
+        Ok(_) => (),
+        Err(e) => {
+            let msg = match (e.downcast_ref::<&str>(), e.downcast_ref::<String>()) {
+                (Some(&s), _) => s,
+                (_, Some(s)) => s,
+                _ => "no panic info",
+            };
+            log::error!("writer thread paniced: {msg}");
+        }
+    }
+    Ok(())
 }
 
-fn parse_cmd(s: String, len: usize) -> Option<FrontendEvent> {
+fn prompt() {
+    eprint!("lan-mouse > ");
+    std::io::stderr().flush().unwrap();
+}
+
+fn parse_cmd(s: String, len: usize) -> Option<Vec<FrontendEvent>> {
     if len == 0 {
-        return Some(FrontendEvent::Shutdown())
+        return Some(vec![FrontendEvent::Shutdown()]);
     }
     let mut l = s.split_whitespace();
     let cmd = l.next()?;
-    match cmd {
-        "connect" => {
-            let host = l.next()?.to_owned();
-            let pos = match l.next()? {
-                "right" => Position::Right,
-                "top" => Position::Top,
-                "bottom" => Position::Bottom,
-                _ => Position::Left,
-            };
-            let port = match l.next() {
-                Some(p) => match p.parse() {
-                    Ok(p) => p,
-                    Err(e) => {
-                        log::error!("{e}");
-                        return None;
-                    }
-                }
-                None => DEFAULT_PORT,
-            };
-            Some(FrontendEvent::AddClient(host, port, pos))
-        }
-        "disconnect" => {
-            let host = l.next()?.to_owned();
-            let port = match l.next()?.parse() {
-                Ok(p) => p,
-                Err(e) => {
-                    log::error!("{e}");
-                    return None;
-                }
-            };
-            Some(FrontendEvent::DelClient(host, port))
+    let res = match cmd {
+        "help" => {
+            log::info!("list                                                 list clients");
+            log::info!("connect <host> left|right|top|bottom [port]          add a new client");
+            log::info!("disconnect <client>                                  remove a client");
+            log::info!("activate <client>                                    activate a client");
+            log::info!("deactivate <client>                                  deactivate a client");
+            log::info!("exit                                                 exit lan-mouse");
+            log::info!("setport <port>                                       change port");
+            None
         }
+        "exit" => return Some(vec![FrontendEvent::Shutdown()]),
+        "list" => return Some(vec![FrontendEvent::Enumerate()]),
+        "connect" => Some(parse_connect(l)),
+        "disconnect" => Some(parse_disconnect(l)),
+        "activate" => Some(parse_activate(l)),
+        "deactivate" => Some(parse_deactivate(l)),
+        "setport" => Some(parse_port(l)),
         _ => {
             log::error!("unknown command: {s}");
             None
         }
+    };
+    match res {
+        Some(Ok(e)) => Some(e),
+        Some(Err(e)) => {
+            log::warn!("{e}");
+            None
+        }
+        _ => None,
     }
 }
+
+fn parse_connect(mut l: SplitWhitespace) -> Result<Vec<FrontendEvent>> {
+    let usage = "usage: connect <host> left|right|top|bottom [port]";
+    let host = l.next().context(usage)?.to_owned();
+    let pos = match l.next().context(usage)? {
+        "right" => Position::Right,
+        "top" => Position::Top,
+        "bottom" => Position::Bottom,
+        _ => Position::Left,
+    };
+    let port = if let Some(p) = l.next() {
+        p.parse()?
+    } else {
+        DEFAULT_PORT
+    };
+    Ok(vec![
+        FrontendEvent::AddClient(Some(host), port, pos),
+        FrontendEvent::Enumerate(),
+    ])
+}
+
+fn parse_disconnect(mut l: SplitWhitespace) -> Result<Vec<FrontendEvent>> {
+    let client = l.next().context("usage: disconnect <client_id>")?.parse()?;
+    Ok(vec![
+        FrontendEvent::DelClient(client),
+        FrontendEvent::Enumerate(),
+    ])
+}
+
+fn parse_activate(mut l: SplitWhitespace) -> Result<Vec<FrontendEvent>> {
+    let client = l.next().context("usage: activate <client_id>")?.parse()?;
+    Ok(vec![
+        FrontendEvent::ActivateClient(client, true),
+        FrontendEvent::Enumerate(),
+    ])
+}
+
+fn parse_deactivate(mut l: SplitWhitespace) -> Result<Vec<FrontendEvent>> {
+    let client = l.next().context("usage: deactivate <client_id>")?.parse()?;
+    Ok(vec![
+        FrontendEvent::ActivateClient(client, false),
+        FrontendEvent::Enumerate(),
+    ])
+}
+
+fn parse_port(mut l: SplitWhitespace) -> Result<Vec<FrontendEvent>> {
+    let port = l.next().context("usage: setport <port>")?.parse()?;
+    Ok(vec![FrontendEvent::ChangePort(port)])
+}

src/frontend/gtk.rs

@@ -1,26 +1,39 @@
-mod window;
 mod client_object;
 mod client_row;
+mod window;
 
-use std::{io::Result, thread::{self, JoinHandle}};
+use std::{
+    env,
+    io::{ErrorKind, Read},
+    process, str,
+};
 
-use crate::frontend::gtk::window::Window;
+use crate::{config::DEFAULT_PORT, frontend::gtk::window::Window};
 
-use gtk::{prelude::*, IconTheme, gdk::Display, gio::{SimpleAction, SimpleActionGroup}, glib::clone, CssProvider};
 use adw::Application;
+use gtk::{
+    gdk::Display,
+    gio::{SimpleAction, SimpleActionGroup},
+    glib::{clone, MainContext, Priority},
+    prelude::*,
+    subclass::prelude::ObjectSubclassIsExt,
+    CssProvider, IconTheme,
+};
 use gtk::{gio, glib, prelude::ApplicationExt};
 
 use self::client_object::ClientObject;
 
-pub fn start() -> Result<JoinHandle<glib::ExitCode>> {
-    thread::Builder::new()
-        .name("gtk-thread".into())
-        .spawn(gtk_main)
+use super::FrontendNotify;
+
+pub fn run() -> glib::ExitCode {
+    log::debug!("running gtk frontend");
+    let ret = gtk_main();
+    log::debug!("frontend exited");
+    ret
 }
 
 fn gtk_main() -> glib::ExitCode {
-    gio::resources_register_include!("lan-mouse.gresource")
-        .expect("Failed to register resources.");
+    gio::resources_register_include!("lan-mouse.gresource").expect("Failed to register resources.");
 
     let app = Application::builder()
         .application_id("de.feschber.lan-mouse")
@@ -30,64 +43,156 @@ fn gtk_main() -> glib::ExitCode {
     app.connect_startup(|_| load_css());
     app.connect_activate(build_ui);
 
-    app.run()
+    let args: Vec<&'static str> = vec![];
+    app.run_with_args(&args)
 }
 
 fn load_css() {
     let provider = CssProvider::new();
     provider.load_from_resource("de/feschber/LanMouse/style.css");
     gtk::style_context_add_provider_for_display(
-    &Display::default().expect("Could not connect to a display."),
+        &Display::default().expect("Could not connect to a display."),
         &provider,
         gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
     );
 }
 
 fn load_icons() {
-    let icon_theme = IconTheme::for_display(&Display::default().expect("Could not connect to a display."));
+    let icon_theme =
+        IconTheme::for_display(&Display::default().expect("Could not connect to a display."));
     icon_theme.add_resource_path("/de/feschber/LanMouse/icons");
 }
 
 fn build_ui(app: &Application) {
+    log::debug!("connecting to lan-mouse-socket");
+    let mut rx = match super::wait_for_service() {
+        Ok(stream) => stream,
+        Err(e) => {
+            log::error!("could not connect to lan-mouse-socket: {e}");
+            process::exit(1);
+        }
+    };
+    let tx = match rx.try_clone() {
+        Ok(sock) => sock,
+        Err(e) => {
+            log::error!("{e}");
+            process::exit(1);
+        }
+    };
+    log::debug!("connected to lan-mouse-socket");
+
+    let (sender, receiver) = MainContext::channel::<FrontendNotify>(Priority::default());
+
+    gio::spawn_blocking(move || {
+        match loop {
+            // read length
+            let mut len = [0u8; 8];
+            match rx.read_exact(&mut len) {
+                Ok(_) => (),
+                Err(e) if e.kind() == ErrorKind::UnexpectedEof => break Ok(()),
+                Err(e) => break Err(e),
+            };
+            let len = usize::from_be_bytes(len);
+
+            // read payload
+            let mut buf = vec![0u8; len];
+            match rx.read_exact(&mut buf) {
+                Ok(_) => (),
+                Err(e) if e.kind() == ErrorKind::UnexpectedEof => break Ok(()),
+                Err(e) => break Err(e),
+            };
+
+            // parse json
+            let json = str::from_utf8(&buf).unwrap();
+            match serde_json::from_str(json) {
+                Ok(notify) => sender.send(notify).unwrap(),
+                Err(e) => log::error!("{e}"),
+            }
+        } {
+            Ok(()) => {}
+            Err(e) => log::error!("{e}"),
+        }
+    });
+
     let window = Window::new(app);
-    let action_client_activate = SimpleAction::new(
-        "activate-client",
-        Some(&i32::static_variant_type()),
-    );
-    let action_client_delete = SimpleAction::new(
-        "delete-client",
-        Some(&i32::static_variant_type()),
-    );
-    action_client_activate.connect_activate(clone!(@weak window => move |_action, param| {
-        log::debug!("activate-client");
+    window.imp().stream.borrow_mut().replace(tx);
+    receiver.attach(None, clone!(@weak window => @default-return glib::ControlFlow::Break,
+        move |notify| {
+            match notify {
+                FrontendNotify::NotifyClientCreate(client, hostname, port, position) => {
+                    window.new_client(client, hostname, port, position, false);
+                },
+                FrontendNotify::NotifyClientUpdate(client, hostname, port, position) => {
+                    log::info!("client updated: {client}, {}:{port}, {position}", hostname.unwrap_or("".to_string()));
+                }
+                FrontendNotify::NotifyError(e) => {
+                    // TODO
+                    log::error!("{e}");
+                },
+                FrontendNotify::NotifyClientDelete(client) => {
+                    window.delete_client(client);
+                }
+                FrontendNotify::Enumerate(clients) => {
+                    for (client, active) in clients {
+                        if window.client_idx(client.handle).is_some() {
+                            continue
+                        }
+                        window.new_client(
+                            client.handle,
+                            client.hostname,
+                            client.addrs
+                                .iter()
+                                .next()
+                                .map(|s| s.port())
+                                .unwrap_or(DEFAULT_PORT),
+                            client.pos,
+                            active,
+                        );
+                    }
+                },
+                FrontendNotify::NotifyPortChange(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);
+                }
+            }
+            glib::ControlFlow::Continue
+        }
+    ));
+
+    let action_request_client_update =
+        SimpleAction::new("request-client-update", Some(&u32::static_variant_type()));
+
+    // remove client
+    let action_client_delete =
+        SimpleAction::new("request-client-delete", Some(&u32::static_variant_type()));
+
+    // update client state
+    action_request_client_update.connect_activate(clone!(@weak window => move |_action, param| {
+        log::debug!("request-client-update");
         let index = param.unwrap()
-            .get::<i32>()
+            .get::<u32>()
             .unwrap();
         let Some(client) = window.clients().item(index as u32) else {
             return;
         };
         let client = client.downcast_ref::<ClientObject>().unwrap();
-        window.update_client(client);
+        window.request_client_update(client);
     }));
+
     action_client_delete.connect_activate(clone!(@weak window => move |_action, param| {
         log::debug!("delete-client");
-        let index = param.unwrap()
-            .get::<i32>()
+        let idx = param.unwrap()
+            .get::<u32>()
             .unwrap();
-        let Some(client) = window.clients().item(index as u32) else {
-            return;
-        };
-        let client = client.downcast_ref::<ClientObject>().unwrap();
-        window.update_client(client);
-        window.clients().remove(index as u32);
-        if window.clients().n_items() == 0 {
-            window.set_placeholder_visible(true);
-        }
+        window.request_client_delete(idx);
     }));
 
     let actions = SimpleActionGroup::new();
     window.insert_action_group("win", Some(&actions));
-    actions.add_action(&action_client_activate);
+    actions.add_action(&action_request_client_update);
     actions.add_action(&action_client_delete);
     window.present();
 }

src/frontend/gtk/client_object.rs

@@ -1,15 +1,24 @@
 mod imp;
 
-use gtk::glib::{self, Object};
 use adw::subclass::prelude::*;
+use gtk::glib::{self, Object};
+
+use crate::client::ClientHandle;
 
 glib::wrapper! {
     pub struct ClientObject(ObjectSubclass<imp::ClientObject>);
 }
 
 impl ClientObject {
-    pub fn new(hostname: String, port: u32, active: bool, position: String) -> Self {
+    pub fn new(
+        handle: ClientHandle,
+        hostname: Option<String>,
+        port: u32,
+        position: String,
+        active: bool,
+    ) -> Self {
         Object::builder()
+            .property("handle", handle)
             .property("hostname", hostname)
             .property("port", port)
             .property("active", active)
@@ -24,7 +33,8 @@ impl ClientObject {
 
 #[derive(Default, Clone)]
 pub struct ClientData {
-    pub hostname: String,
+    pub handle: ClientHandle,
+    pub hostname: Option<String>,
     pub port: u32,
     pub active: bool,
     pub position: String,

src/frontend/gtk/client_object/imp.rs

@@ -5,11 +5,14 @@ use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 
+use crate::client::ClientHandle;
+
 use super::ClientData;
 
 #[derive(Properties, Default)]
 #[properties(wrapper_type = super::ClientObject)]
 pub struct ClientObject {
+    #[property(name = "handle", get, set, type = ClientHandle, member = handle)]
     #[property(name = "hostname", get, set, type = String, member = hostname)]
     #[property(name = "port", get, set, type = u32, member = port, maximum = u16::MAX as u32)]
     #[property(name = "active", get, set, type = bool, member = active)]

src/frontend/gtk/client_row.rs

@@ -16,8 +16,7 @@ glib::wrapper! {
 
 impl ClientRow {
     pub fn new(_client_object: &ClientObject) -> Self {
-        Object::builder()
-            .build()
+        Object::builder().build()
     }
 
     pub fn bind(&self, client_object: &ClientObject) {
@@ -31,8 +30,19 @@ impl ClientRow {
 
         let hostname_binding = client_object
             .bind_property("hostname", &self.imp().hostname.get(), "text")
+            .transform_to(|_, v: Option<String>| {
+                if let Some(hostname) = v {
+                    Some(hostname)
+                } else {
+                    Some("".to_string())
+                }
+            })
             .transform_from(|_, v: String| {
-                if v == "" { Some("hostname".into()) } else { Some(v) }
+                if v.as_str().trim() == "" {
+                    Some(None)
+                } else {
+                    Some(Some(v))
+                }
             })
             .bidirectional()
             .sync_create()
@@ -40,18 +50,34 @@ impl ClientRow {
 
         let title_binding = client_object
             .bind_property("hostname", self, "title")
+            .transform_to(|_, v: Option<String>| {
+                if let Some(hostname) = v {
+                    Some(hostname)
+                } else {
+                    Some("<span font_style=\"italic\" font_weight=\"light\" foreground=\"darkgrey\">no hostname!</span>".to_string())
+                }
+            })
+            .sync_create()
             .build();
 
         let port_binding = client_object
             .bind_property("port", &self.imp().port.get(), "text")
             .transform_from(|_, v: String| {
                 if v == "" {
-                    Some(4242)
+                    Some(DEFAULT_PORT as u32)
                 } else {
                     Some(v.parse::<u16>().unwrap_or(DEFAULT_PORT) as u32)
                 }
             })
+            .transform_to(|_, v: u32| {
+                if v == 4242 {
+                    Some("".to_string())
+                } else {
+                    Some(v.to_string())
+                }
+            })
             .bidirectional()
+            .sync_create()
             .build();
 
         let subtitle_binding = client_object
@@ -59,24 +85,19 @@ impl ClientRow {
             .sync_create()
             .build();
 
-
         let position_binding = client_object
             .bind_property("position", &self.imp().position.get(), "selected")
-            .transform_from(|_, v: u32| {
-                match v {
-                    1 => Some("right"),
-                    2 => Some("top"),
-                    3 => Some("bottom"),
-                    _ => Some("left"),
-                }
+            .transform_from(|_, v: u32| match v {
+                1 => Some("right"),
+                2 => Some("top"),
+                3 => Some("bottom"),
+                _ => Some("left"),
             })
-            .transform_to(|_, v: String| {
-                match v.as_str() {
-                    "right" => Some(1),
-                    "top" => Some(2u32),
-                    "bottom" => Some(3u32),
-                    _ => Some(0u32),
-                }
+            .transform_to(|_, v: String| match v.as_str() {
+                "right" => Some(1),
+                "top" => Some(2u32),
+                "bottom" => Some(3u32),
+                _ => Some(0u32),
             })
             .bidirectional()
             .sync_create()

src/frontend/gtk/client_row/imp.rs

@@ -1,10 +1,10 @@
 use std::cell::RefCell;
 
-use glib::{Binding, subclass::InitializingObject};
-use adw::{prelude::*, ComboRow, ActionRow};
 use adw::subclass::prelude::*;
+use adw::{prelude::*, ActionRow, ComboRow};
+use glib::{subclass::InitializingObject, Binding};
 use gtk::glib::clone;
-use gtk::{glib, CompositeTemplate, Switch, Button};
+use gtk::{glib, Button, CompositeTemplate, Switch};
 
 #[derive(CompositeTemplate, Default)]
 #[template(resource = "/de/feschber/LanMouse/client_row.ui")]
@@ -44,9 +44,10 @@ impl ObjectSubclass for ClientRow {
 impl ObjectImpl for ClientRow {
     fn constructed(&self) {
         self.parent_constructed();
-        self.delete_button.connect_clicked(clone!(@weak self as row => move |button| {
-            row.handle_client_delete(button);
-        }));
+        self.delete_button
+            .connect_clicked(clone!(@weak self as row => move |button| {
+                row.handle_client_delete(button);
+            }));
     }
 }
 
@@ -54,8 +55,10 @@ impl ObjectImpl for ClientRow {
 impl ClientRow {
     #[template_callback]
     fn handle_client_set_state(&self, state: bool, switch: &Switch) -> bool {
-        let idx = self.obj().index();
-        switch.activate_action("win.activate-client", Some(&idx.to_variant())).unwrap();
+        let idx = self.obj().index() as u32;
+        switch
+            .activate_action("win.request-client-update", Some(&idx.to_variant()))
+            .unwrap();
         switch.set_state(state);
 
         true // dont run default handler
@@ -64,8 +67,10 @@ impl ClientRow {
     #[template_callback]
     fn handle_client_delete(&self, button: &Button) {
         log::debug!("delete button pressed");
-        let idx = self.obj().index();
-        button.activate_action("win.delete-client", Some(&idx.to_variant())).unwrap();
+        let idx = self.obj().index() as u32;
+        button
+            .activate_action("win.request-client-delete", Some(&idx.to_variant()))
+            .unwrap();
     }
 }
 

src/frontend/gtk/window.rs

@@ -1,13 +1,17 @@
 mod imp;
 
-use std::{path::{Path, PathBuf}, env, process, os::unix::net::UnixStream, io::Write};
+use std::io::Write;
 
 use adw::prelude::*;
 use adw::subclass::prelude::*;
-use gtk::{glib, gio, NoSelection};
 use glib::{clone, Object};
+use gtk::{gio, glib, NoSelection};
 
-use crate::{frontend::{gtk::client_object::ClientObject, FrontendEvent}, config::DEFAULT_PORT, client::Position};
+use crate::{
+    client::{ClientHandle, Position},
+    config::DEFAULT_PORT,
+    frontend::{gtk::client_object::ClientObject, FrontendEvent},
+};
 
 use super::client_row::ClientRow;
 
@@ -67,16 +71,61 @@ impl Window {
         row
     }
 
-    fn new_client(&self) {
-        let client = ClientObject::new(String::from(""), DEFAULT_PORT as u32, false, "left".into());
+    pub fn new_client(
+        &self,
+        handle: ClientHandle,
+        hostname: Option<String>,
+        port: u16,
+        position: Position,
+        active: bool,
+    ) {
+        let client = ClientObject::new(handle, hostname, port as u32, position.to_string(), active);
         self.clients().append(&client);
+        self.set_placeholder_visible(false);
     }
 
-    pub fn update_client(&self, client: &ClientObject) {
+    pub fn client_idx(&self, handle: ClientHandle) -> Option<usize> {
+        self.clients()
+            .iter::<ClientObject>()
+            .position(|c| {
+                if let Ok(c) = c {
+                    c.handle() == handle
+                } else {
+                    false
+                }
+            })
+            .map(|p| p as usize)
+    }
+
+    pub fn delete_client(&self, handle: ClientHandle) {
+        let Some(idx) = self.client_idx(handle) else {
+            log::warn!("could not find client with handle {handle}");
+            return;
+        };
+
+        self.clients().remove(idx as u32);
+        if self.clients().n_items() == 0 {
+            self.set_placeholder_visible(true);
+        }
+    }
+
+    pub fn request_client_create(&self) {
+        let event = FrontendEvent::AddClient(None, DEFAULT_PORT, Position::default());
+        self.imp().set_port(DEFAULT_PORT);
+        self.request(event);
+    }
+
+    pub fn request_port_change(&self) {
+        let port = self.imp().port_entry.get().text().to_string();
+        if let Ok(port) = u16::from_str_radix(port.as_str(), 10) {
+            self.request(FrontendEvent::ChangePort(port));
+        } else {
+            self.request(FrontendEvent::ChangePort(DEFAULT_PORT));
+        }
+    }
+
+    pub fn request_client_update(&self, client: &ClientObject) {
         let data = client.get_data();
-        let socket_path = self.imp().socket_path.borrow();
-        let socket_path = socket_path.as_ref().unwrap().as_path();
-        let host_name = data.hostname;
         let position = match data.position.as_str() {
             "left" => Position::Left,
             "right" => Position::Right,
@@ -84,44 +133,47 @@ impl Window {
             "bottom" => Position::Bottom,
             _ => {
                 log::error!("invalid position: {}", data.position);
-                return
+                return;
             }
         };
-        let port = data.port;
-        let event = if client.active() {
-            FrontendEvent::DelClient(host_name, port as u16)
-        } else {
-            FrontendEvent::AddClient(host_name, port as u16, position)
-        };
+        let hostname = data.hostname;
+        let port = data.port as u16;
+        let event = FrontendEvent::UpdateClient(client.handle(), hostname, port, position);
+        self.request(event);
+
+        let event = FrontendEvent::ActivateClient(client.handle(), !client.active());
+        self.request(event);
+    }
+
+    pub fn request_client_delete(&self, idx: u32) {
+        if let Some(obj) = self.clients().item(idx) {
+            let client_object: &ClientObject = obj
+                .downcast_ref()
+                .expect("Expected object of type `ClientObject`.");
+            let handle = client_object.handle();
+            let event = FrontendEvent::DelClient(handle);
+            self.request(event);
+        }
+    }
+
+    fn request(&self, event: FrontendEvent) {
         let json = serde_json::to_string(&event).unwrap();
-        let Ok(mut stream) = UnixStream::connect(socket_path) else {
-            log::error!("Could not connect to lan-mouse-socket @ {socket_path:?}");
-            return;
+        log::debug!("requesting {json}");
+        let mut stream = self.imp().stream.borrow_mut();
+        let stream = stream.as_mut().unwrap();
+        let bytes = json.as_bytes();
+        let len = bytes.len().to_be_bytes();
+        if let Err(e) = stream.write(&len) {
+            log::error!("error sending message: {e}");
         };
-        if let Err(e) = stream.write(json.as_bytes()) {
+        if let Err(e) = stream.write(bytes) {
             log::error!("error sending message: {e}");
         };
     }
 
-    fn setup_callbacks(&self) {
-        self.imp()
-            .add_client_button
-            .connect_clicked(clone!(@weak self as window => move |_| {
-                window.new_client();
-                window.set_placeholder_visible(false);
-            }));
-    }
-
-    fn connect_stream(&self) {
-        let xdg_runtime_dir = match env::var("XDG_RUNTIME_DIR") {
-            Ok(v) => v,
-            Err(e) => {
-                log::error!("{e}");
-                process::exit(1);
-            }
-        };
-        let socket_path = Path::new(xdg_runtime_dir.as_str())
-            .join("lan-mouse-socket.sock");
-        self.imp().socket_path.borrow_mut().replace(PathBuf::from(socket_path));
+    pub fn show_toast(&self, msg: &str) {
+        let toast = adw::Toast::new(msg);
+        let toast_overlay = &self.imp().toast_overlay;
+        toast_overlay.add_toast(toast);
     }
 }

src/frontend/gtk/window/imp.rs

@@ -1,22 +1,36 @@
-use std::{cell::{Cell, RefCell}, path::PathBuf};
+use std::{
+    cell::{Cell, RefCell},
+    os::unix::net::UnixStream,
+};
 
-use glib::subclass::InitializingObject;
-use adw::{prelude::*, ActionRow};
 use adw::subclass::prelude::*;
-use gtk::{glib, Button, CompositeTemplate, ListBox, gio};
+use adw::{
+    prelude::{EditableExt, WidgetExt},
+    ActionRow, ToastOverlay,
+};
+use glib::subclass::InitializingObject;
+use gtk::{gio, glib, Button, CompositeTemplate, Entry, ListBox};
+
+use crate::config::DEFAULT_PORT;
 
 #[derive(CompositeTemplate, Default)]
 #[template(resource = "/de/feschber/LanMouse/window.ui")]
 pub struct Window {
-    pub number: Cell<i32>,
     #[template_child]
-    pub add_client_button: TemplateChild<Button>,
+    pub port_edit_apply: TemplateChild<Button>,
+    #[template_child]
+    pub port_edit_cancel: TemplateChild<Button>,
     #[template_child]
     pub client_list: TemplateChild<ListBox>,
     #[template_child]
     pub client_placeholder: TemplateChild<ActionRow>,
+    #[template_child]
+    pub port_entry: TemplateChild<Entry>,
+    #[template_child]
+    pub toast_overlay: TemplateChild<ToastOverlay>,
     pub clients: RefCell<Option<gio::ListStore>>,
-    pub socket_path: RefCell<Option<PathBuf>>,
+    pub stream: RefCell<Option<UnixStream>>,
+    pub port: Cell<u16>,
 }
 
 #[glib::object_subclass]
@@ -24,7 +38,7 @@ impl ObjectSubclass for Window {
     // `NAME` needs to match `class` attribute of template
     const NAME: &'static str = "LanMouseWindow";
     type Type = super::Window;
-    type ParentType = gtk::ApplicationWindow;
+    type ParentType = adw::ApplicationWindow;
 
     fn class_init(klass: &mut Self::Class) {
         klass.bind_template();
@@ -39,25 +53,53 @@ impl ObjectSubclass for Window {
 #[gtk::template_callbacks]
 impl Window {
     #[template_callback]
-    fn handle_button_clicked(&self, button: &Button) {
-        let number_increased = self.number.get() + 1;
-        self.number.set(number_increased);
-        button.set_label(&number_increased.to_string())
+    fn handle_add_client_pressed(&self, _button: &Button) {
+        self.obj().request_client_create();
+    }
+
+    #[template_callback]
+    fn handle_port_changed(&self, _entry: &Entry) {
+        self.port_edit_apply.set_visible(true);
+        self.port_edit_cancel.set_visible(true);
+    }
+
+    #[template_callback]
+    fn handle_port_edit_apply(&self) {
+        self.obj().request_port_change();
+    }
+
+    #[template_callback]
+    fn handle_port_edit_cancel(&self) {
+        log::debug!("cancel port edit");
+        self.port_entry
+            .set_text(self.port.get().to_string().as_str());
+        self.port_edit_apply.set_visible(false);
+        self.port_edit_cancel.set_visible(false);
+    }
+
+    pub fn set_port(&self, port: u16) {
+        self.port.set(port);
+        if port == DEFAULT_PORT {
+            self.port_entry.set_text("");
+        } else {
+            self.port_entry.set_text(format!("{port}").as_str());
+        }
+        self.port_edit_apply.set_visible(false);
+        self.port_edit_cancel.set_visible(false);
     }
 }
 
-
 impl ObjectImpl for Window {
     fn constructed(&self) {
         self.parent_constructed();
+        self.set_port(DEFAULT_PORT);
         let obj = self.obj();
         obj.setup_icon();
         obj.setup_clients();
-        obj.setup_callbacks();
-        obj.connect_stream();
     }
 }
 
 impl WidgetImpl for Window {}
 impl WindowImpl for Window {}
 impl ApplicationWindowImpl for Window {}
+impl AdwApplicationWindowImpl for Window {}

src/ioutils.rs

@@ -2,9 +2,8 @@ use std::io::{self, Write};
 
 use crate::client::Position;
 
-
 pub fn ask_confirmation(default: bool) -> Result<bool, io::Error> {
-    eprint!("{}", if default {" [Y,n] "} else { " [y,N] "});
+    eprint!("{}", if default { " [Y,n] " } else { " [y,N] " });
     io::stderr().flush()?;
     let answer = loop {
         let mut buffer = String::new();
@@ -18,7 +17,7 @@ pub fn ask_confirmation(default: bool) -> Result<bool, io::Error> {
             _ => {
                 eprint!("Enter y for Yes or n for No: ");
                 io::stderr().flush()?;
-                continue
+                continue;
             }
         }
     };
@@ -41,7 +40,7 @@ pub fn ask_position() -> Result<Position, io::Error> {
             _ => {
                 eprint!("Invalid position: {answer} - enter top (t) | bottom (b) | left(l) | right(r): ");
                 io::stderr().flush()?;
-                continue
+                continue;
             }
         };
     };

src/lib.rs

@@ -2,6 +2,7 @@ pub mod client;
 pub mod config;
 pub mod dns;
 pub mod event;
+pub mod server;
 
 pub mod consumer;
 pub mod producer;

src/main.rs

@@ -1,17 +1,18 @@
-use std::{process, error::Error};
+use anyhow::Result;
+use std::process::{self, Child, Command};
 
 use env_logger::Env;
 use lan_mouse::{
-    consumer, producer,
-    config::{Config, Frontend::{Cli, Gtk}}, event::server::Server,
-    frontend::{FrontendAdapter, cli},
+    config::Config,
+    consumer,
+    frontend::{self, FrontendListener},
+    producer,
+    server::Server,
 };
 
-#[cfg(all(unix, feature = "gtk"))]
-use lan_mouse::frontend::gtk;
+use tokio::{join, task::LocalSet};
 
 pub fn main() {
-
     // init logging
     let env = Env::default().filter_or("LAN_MOUSE_LOG_LEVEL", "info");
     env_logger::init_from_env(env);
@@ -22,51 +23,64 @@ pub fn main() {
     }
 }
 
-pub fn run() -> Result<(), Box<dyn Error>> {
-    // parse config file
+pub fn start_service() -> Result<Child> {
+    let child = Command::new(std::env::current_exe()?)
+        .args(std::env::args().skip(1))
+        .arg("--daemon")
+        .spawn()?;
+    Ok(child)
+}
+
+pub fn run() -> Result<()> {
+    // parse config file + cli args
     let config = Config::new()?;
+    log::debug!("{config:?}");
 
-    // start producing and consuming events
-    let producer = producer::create()?;
-    let consumer = consumer::create()?;
-
-    // create frontend communication adapter
-    let frontend_adapter = FrontendAdapter::new()?;
-
-    // start sending and receiving events
-    let mut event_server = Server::new(config.port, producer, consumer, frontend_adapter)?;
-
-    // any threads need to be started after event_server sets up signal handling
-    match config.frontend {
-        #[cfg(all(unix, feature = "gtk"))]
-        Gtk => { gtk::start()?; }
-        #[cfg(any(not(feature = "gtk"), not(unix)))]
-        Gtk => panic!("gtk frontend requested but feature not enabled!"),
-        Cli => { cli::start()?; }
-    };
-
-    // this currently causes issues, because the clients from
-    // the config arent communicated to gtk yet.
-    if config.frontend == Gtk {
-        log::warn!("clients defined in config currently have no effect with the gtk frontend");
+    if config.daemon {
+        // if daemon is specified we run the service
+        run_service(&config)?;
     } else {
-        // add clients from config
-        config.get_clients().into_iter().for_each(|(c, h, p)| {
-            let host_name = match h {
-                Some(h) => format!(" '{}'", h),
-                None => "".to_owned(),
-            };
-            if c.len() == 0 {
-                log::warn!("ignoring client{} with 0 assigned ips!", host_name);
-            }
-            log::info!("adding client [{}]{} @ {:?}", p, host_name, c);
-            event_server.add_client(c, p);
-        });
+        //  otherwise start the service as a child process and
+        //  run a frontend
+        start_service()?;
+        frontend::run_frontend(&config)?;
     }
 
-    log::info!("Press Ctrl+Alt+Shift+Super to release the mouse");
-    // run event loop
-    event_server.run()?;
+    anyhow::Ok(())
+}
 
+fn run_service(config: &Config) -> Result<()> {
+    // create single threaded tokio runtime
+    let runtime = tokio::runtime::Builder::new_current_thread()
+        .enable_io()
+        .enable_time()
+        .build()?;
+
+    // run async event loop
+    runtime.block_on(LocalSet::new().run_until(async {
+        // create frontend communication adapter
+        let frontend_adapter = match FrontendListener::new().await {
+            Some(Err(e)) => return Err(e),
+            Some(Ok(f)) => f,
+            None => {
+                // none means some other instance is already running
+                log::info!("service already running, exiting");
+                return anyhow::Ok(());
+            }
+        };
+
+        // create event producer and consumer
+        let (producer, consumer) = join!(producer::create(), consumer::create(),);
+        let (producer, consumer) = (producer?, consumer?);
+
+        // create server
+        let mut event_server = Server::new(config, frontend_adapter, consumer, producer).await?;
+        log::info!("Press Ctrl+Alt+Shift+Super to release the mouse");
+
+        // run event loop
+        event_server.run().await?;
+        log::debug!("service exiting");
+        anyhow::Ok(())
+    }))?;
     Ok(())
 }

src/producer.rs

@@ -1,38 +1,65 @@
-use mio::event::Source;
-use std::{error::Error, vec::Drain};
-use crate::{client::{ClientHandle, ClientEvent}, event::Event};
-use crate::backend::producer;
+use anyhow::Result;
+use std::io;
 
-#[cfg(unix)]
+use futures_core::Stream;
+
+use crate::backend::producer;
+use crate::{
+    client::{ClientEvent, ClientHandle},
+    event::Event,
+};
+
+#[cfg(all(unix, not(target_os = "macos")))]
 use std::env;
 
-#[cfg(unix)]
+#[cfg(all(unix, not(target_os = "macos")))]
 enum Backend {
-    Wayland,
+    LayerShell,
+    Libei,
     X11,
 }
 
-pub fn create() -> Result<Box<dyn EventProducer>, Box<dyn Error>> {
+pub async fn create() -> Result<Box<dyn EventProducer>> {
+    #[cfg(target_os = "macos")]
+    return Ok(Box::new(producer::macos::MacOSProducer::new()));
+
     #[cfg(windows)]
     return Ok(Box::new(producer::windows::WindowsProducer::new()));
 
-    #[cfg(unix)]
+    #[cfg(all(unix, not(target_os = "macos")))]
     let backend = match env::var("XDG_SESSION_TYPE") {
         Ok(session_type) => match session_type.as_str() {
             "x11" => {
                 log::info!("XDG_SESSION_TYPE = x11 -> using X11 event producer");
                 Backend::X11
-            },
+            }
             "wayland" => {
                 log::info!("XDG_SESSION_TYPE = wayland -> using wayland event producer");
-                Backend::Wayland
+                match env::var("XDG_CURRENT_DESKTOP") {
+                    Ok(desktop) => match desktop.as_str() {
+                        "GNOME" => {
+                            log::info!("XDG_CURRENT_DESKTOP = GNOME -> using libei backend");
+                            Backend::Libei
+                        }
+                        d => {
+                            log::info!("XDG_CURRENT_DESKTOP = {d} -> using layer_shell backend");
+                            Backend::LayerShell
+                        }
+                    },
+                    Err(_) => {
+                        log::warn!("XDG_CURRENT_DESKTOP not set! Assuming layer_shell support -> using layer_shell backend");
+                        Backend::LayerShell
+                    }
+                }
             }
             _ => panic!("unknown XDG_SESSION_TYPE"),
         },
-        Err(_) => panic!("could not detect session type: XDG_SESSION_TYPE environment variable not set!"),
+        Err(_) => {
+            panic!("could not detect session type: XDG_SESSION_TYPE environment variable not set!")
+        }
     };
 
-    #[cfg(unix)]
+    #[cfg(all(unix, not(target_os = "macos")))]
     match backend {
         Backend::X11 => {
             #[cfg(not(feature = "x11"))]
@@ -40,24 +67,25 @@ pub fn create() -> Result<Box<dyn EventProducer>, Box<dyn Error>> {
             #[cfg(feature = "x11")]
             Ok(Box::new(producer::x11::X11Producer::new()))
         }
-        Backend::Wayland => {
+        Backend::LayerShell => {
             #[cfg(not(feature = "wayland"))]
             panic!("feature wayland not enabled");
             #[cfg(feature = "wayland")]
             Ok(Box::new(producer::wayland::WaylandEventProducer::new()?))
         }
+        Backend::Libei => {
+            #[cfg(not(feature = "libei"))]
+            panic!("feature libei not enabled");
+            #[cfg(feature = "libei")]
+            Ok(Box::new(producer::libei::LibeiProducer::new()?))
+        }
     }
 }
 
-pub trait EventProducer: Source {
+pub trait EventProducer: Stream<Item = io::Result<(ClientHandle, Event)>> + Unpin {
     /// notify event producer of configuration changes
     fn notify(&mut self, event: ClientEvent);
 
-    /// read an event
-    /// this function must be invoked to retrieve an Event after
-    /// the eventfd indicates a pending Event
-    fn read_events(&mut self) -> Drain<(ClientHandle, Event)>;
-
     /// release mouse
     fn release(&mut self);
 }

src/server.rs

@@ -0,0 +1,553 @@
+use futures::stream::StreamExt;
+use log;
+use std::{
+    collections::HashSet,
+    error::Error,
+    io::Result,
+    net::IpAddr,
+    time::{Duration, Instant},
+};
+use tokio::{
+    io::ReadHalf,
+    net::UdpSocket,
+    signal,
+    sync::mpsc::{Receiver, Sender},
+};
+
+#[cfg(unix)]
+use tokio::net::UnixStream;
+
+#[cfg(windows)]
+use tokio::net::TcpStream;
+
+use std::{io::ErrorKind, net::SocketAddr};
+
+use crate::event::Event;
+use crate::{
+    client::{ClientEvent, ClientHandle, ClientManager, Position},
+    config::Config,
+    consumer::EventConsumer,
+    dns::{self, DnsResolver},
+    frontend::{self, FrontendEvent, FrontendListener, FrontendNotify},
+    producer::EventProducer,
+};
+
+/// keeps track of state to prevent a feedback loop
+/// of continuously sending and receiving the same event.
+#[derive(Eq, PartialEq)]
+enum State {
+    Sending,
+    Receiving,
+}
+
+pub struct Server {
+    resolver: DnsResolver,
+    client_manager: ClientManager,
+    state: State,
+    frontend: FrontendListener,
+    consumer: Box<dyn EventConsumer>,
+    producer: Box<dyn EventProducer>,
+    socket: UdpSocket,
+    frontend_rx: Receiver<FrontendEvent>,
+    frontend_tx: Sender<FrontendEvent>,
+}
+
+impl Server {
+    pub async fn new(
+        config: &Config,
+        frontend: FrontendListener,
+        consumer: Box<dyn EventConsumer>,
+        producer: Box<dyn EventProducer>,
+    ) -> anyhow::Result<Self> {
+        // create dns resolver
+        let resolver = dns::DnsResolver::new().await?;
+
+        // bind the udp socket
+        let listen_addr = SocketAddr::new("0.0.0.0".parse().unwrap(), config.port);
+        let socket = UdpSocket::bind(listen_addr).await?;
+        let (frontend_tx, frontend_rx) = tokio::sync::mpsc::channel(1);
+
+        // create client manager
+        let client_manager = ClientManager::new();
+        let mut server = Server {
+            frontend,
+            consumer,
+            producer,
+            resolver,
+            socket,
+            client_manager,
+            state: State::Receiving,
+            frontend_rx,
+            frontend_tx,
+        };
+
+        // add clients from config
+        for (c, h, port, p) in config.get_clients().into_iter() {
+            server.add_client(h, c, port, p).await;
+        }
+
+        Ok(server)
+    }
+
+    pub async fn run(&mut self) -> anyhow::Result<()> {
+        loop {
+            log::trace!("polling ...");
+            tokio::select! {
+                // safety: cancellation safe
+                udp_event = receive_event(&self.socket) => {
+                    log::trace!("-> receive_event");
+                    match udp_event {
+                        Ok(e) => self.handle_udp_rx(e).await,
+                        Err(e) => log::error!("error reading event: {e}"),
+                    }
+                }
+                // safety: cancellation safe
+                res = self.producer.next() => {
+                    log::trace!("-> producer.next()");
+                    match res {
+                        Some(Ok((client, event))) => {
+                            self.handle_producer_event(client,event).await;
+                        },
+                        Some(Err(e)) => log::error!("error reading from event producer: {e}"),
+                        _ => break,
+                    }
+                }
+                // safety: cancellation safe
+                stream = self.frontend.accept() => {
+                    log::trace!("-> frontend.accept()");
+                    match stream {
+                        Ok(s) => self.handle_frontend_stream(s).await,
+                        Err(e) => log::error!("error connecting to frontend: {e}"),
+                    }
+                }
+                // safety: cancellation safe
+                frontend_event = self.frontend_rx.recv() => {
+                    log::trace!("-> frontend.recv()");
+                    if let Some(event) = frontend_event {
+                        if self.handle_frontend_event(event).await {
+                            break;
+                        }
+                    }
+                }
+                // safety: cancellation safe
+                e = self.consumer.dispatch() => {
+                    log::trace!("-> consumer.dispatch()");
+                    if let Err(e) = e {
+                        return Err(e);
+                    }
+                }
+                // safety: cancellation safe
+                _ = signal::ctrl_c() => {
+                    log::info!("terminating gracefully ...");
+                    break;
+                }
+            }
+        }
+
+        // destroy consumer
+        self.consumer.destroy().await;
+
+        Ok(())
+    }
+
+    pub async fn add_client(
+        &mut self,
+        hostname: Option<String>,
+        mut addr: HashSet<IpAddr>,
+        port: u16,
+        pos: Position,
+    ) -> ClientHandle {
+        let ips = if let Some(hostname) = hostname.as_ref() {
+            match self.resolver.resolve(hostname.as_str()).await {
+                Ok(ips) => HashSet::from_iter(ips.iter().cloned()),
+                Err(e) => {
+                    log::warn!("could not resolve host: {e}");
+                    HashSet::new()
+                }
+            }
+        } else {
+            HashSet::new()
+        };
+        addr.extend(ips.iter());
+        log::info!(
+            "adding client [{}]{} @ {:?}",
+            pos,
+            hostname.as_deref().unwrap_or(""),
+            &ips
+        );
+        let client = self
+            .client_manager
+            .add_client(hostname.clone(), addr, port, pos);
+        log::debug!("add_client {client}");
+        let notify = FrontendNotify::NotifyClientCreate(client, hostname, port, pos);
+        if let Err(e) = self.frontend.notify_all(notify).await {
+            log::error!("error notifying frontend: {e}");
+        };
+        client
+    }
+
+    pub async fn activate_client(&mut self, client: ClientHandle, active: bool) {
+        if let Some(state) = self.client_manager.get_mut(client) {
+            state.active = active;
+            if state.active {
+                self.producer
+                    .notify(ClientEvent::Create(client, state.client.pos));
+                self.consumer
+                    .notify(ClientEvent::Create(client, state.client.pos))
+                    .await;
+            } else {
+                self.producer.notify(ClientEvent::Destroy(client));
+                self.consumer.notify(ClientEvent::Destroy(client)).await;
+            }
+        }
+    }
+
+    pub async fn remove_client(&mut self, client: ClientHandle) -> Option<ClientHandle> {
+        self.producer.notify(ClientEvent::Destroy(client));
+        self.consumer.notify(ClientEvent::Destroy(client)).await;
+        if let Some(client) = self
+            .client_manager
+            .remove_client(client)
+            .map(|s| s.client.handle)
+        {
+            let notify = FrontendNotify::NotifyClientDelete(client);
+            log::debug!("{notify:?}");
+            if let Err(e) = self.frontend.notify_all(notify).await {
+                log::error!("error notifying frontend: {e}");
+            }
+            Some(client)
+        } else {
+            None
+        }
+    }
+
+    pub async fn update_client(
+        &mut self,
+        client: ClientHandle,
+        hostname: Option<String>,
+        port: u16,
+        pos: Position,
+    ) {
+        // retrieve state
+        let Some(state) = self.client_manager.get_mut(client) else {
+            return;
+        };
+
+        // update pos
+        state.client.pos = pos;
+        if state.active {
+            self.producer.notify(ClientEvent::Destroy(client));
+            self.consumer.notify(ClientEvent::Destroy(client)).await;
+            self.producer.notify(ClientEvent::Create(client, pos));
+            self.consumer.notify(ClientEvent::Create(client, pos)).await;
+        }
+
+        // update port
+        if state.client.port != port {
+            state.client.port = port;
+            state.client.addrs = state
+                .client
+                .addrs
+                .iter()
+                .cloned()
+                .map(|mut a| {
+                    a.set_port(port);
+                    a
+                })
+                .collect();
+            state
+                .client
+                .active_addr
+                .map(|a| SocketAddr::new(a.ip(), port));
+        }
+
+        // update hostname
+        if state.client.hostname != hostname {
+            state.client.addrs = HashSet::new();
+            state.client.active_addr = None;
+            state.client.hostname = hostname;
+            if let Some(hostname) = state.client.hostname.as_ref() {
+                match self.resolver.resolve(hostname.as_str()).await {
+                    Ok(ips) => {
+                        let addrs = ips.iter().map(|i| SocketAddr::new(*i, port));
+                        state.client.addrs = HashSet::from_iter(addrs);
+                    }
+                    Err(e) => {
+                        log::warn!("could not resolve host: {e}");
+                    }
+                }
+            }
+        }
+        log::debug!("client updated: {:?}", state);
+    }
+
+    async fn handle_udp_rx(&mut self, event: (Event, SocketAddr)) {
+        let (event, addr) = event;
+
+        // get handle for addr
+        let handle = match self.client_manager.get_client(addr) {
+            Some(a) => a,
+            None => {
+                log::warn!("ignoring event from client {addr:?}");
+                return;
+            }
+        };
+
+        log::trace!("{:20} <-<-<-<------ {addr} ({handle})", event.to_string());
+        let state = match self.client_manager.get_mut(handle) {
+            Some(s) => s,
+            None => {
+                log::error!("unknown handle");
+                return;
+            }
+        };
+
+        // reset ttl for client and
+        state.last_seen = Some(Instant::now());
+        // set addr as new default for this client
+        state.client.active_addr = Some(addr);
+        match (event, addr) {
+            (Event::Pong(), _) => {}
+            (Event::Ping(), addr) => {
+                if let Err(e) = send_event(&self.socket, Event::Pong(), addr).await {
+                    log::error!("udp send: {}", e);
+                }
+                // we release the mouse here,
+                // since its very likely, that we wont get a release event
+                self.producer.release();
+            }
+            (event, addr) => match self.state {
+                State::Sending => {
+                    // in sending state, we dont want to process
+                    // any events to avoid feedback loops,
+                    // therefore we tell the event producer
+                    // to release the pointer and move on
+                    // first event -> release pointer
+                    if let Event::Release() = event {
+                        log::debug!("releasing pointer ...");
+                        self.producer.release();
+                        self.state = State::Receiving;
+                    }
+                }
+                State::Receiving => {
+                    // consume event
+                    self.consumer.consume(event, handle).await;
+
+                    // let the server know we are still alive once every second
+                    let last_replied = state.last_replied;
+                    if last_replied.is_none()
+                        || last_replied.is_some()
+                            && last_replied.unwrap().elapsed() > Duration::from_secs(1)
+                    {
+                        state.last_replied = Some(Instant::now());
+                        if let Err(e) = send_event(&self.socket, Event::Pong(), addr).await {
+                            log::error!("udp send: {}", e);
+                        }
+                    }
+                }
+            },
+        }
+    }
+
+    async fn handle_producer_event(&mut self, c: ClientHandle, e: Event) {
+        let mut should_release = false;
+        // in receiving state, only release events
+        // must be transmitted
+        if let Event::Release() = e {
+            self.state = State::Sending;
+        }
+
+        log::trace!("producer: ({c}) {e:?}");
+        let state = match self.client_manager.get_mut(c) {
+            Some(state) => state,
+            None => {
+                log::warn!("unknown client!");
+                return;
+            }
+        };
+        // otherwise we should have an address to send to
+        // transmit events to the corrensponding client
+        if let Some(addr) = state.client.active_addr {
+            if let Err(e) = send_event(&self.socket, e, addr).await {
+                log::error!("udp send: {}", e);
+            }
+        }
+
+        // if client last responded > 2 seconds ago
+        // and we have not sent a ping since 500 milliseconds,
+        // send a ping
+        if state.last_seen.is_some() && state.last_seen.unwrap().elapsed() < Duration::from_secs(2)
+        {
+            return;
+        }
+
+        // client last seen > 500ms ago
+        if state.last_ping.is_some()
+            && state.last_ping.unwrap().elapsed() < Duration::from_millis(500)
+        {
+            return;
+        }
+
+        // release mouse if client didnt respond to the first ping
+        if state.last_ping.is_some() && state.last_ping.unwrap().elapsed() < Duration::from_secs(1)
+        {
+            should_release = true;
+        }
+
+        // last ping > 500ms ago -> ping all interfaces
+        state.last_ping = Some(Instant::now());
+        for addr in state.client.addrs.iter() {
+            log::debug!("pinging {addr}");
+            if let Err(e) = send_event(&self.socket, Event::Ping(), *addr).await {
+                if e.kind() != ErrorKind::WouldBlock {
+                    log::error!("udp send: {}", e);
+                }
+            }
+            // send additional release event, in case client is still in sending mode
+            if let Err(e) = send_event(&self.socket, Event::Release(), *addr).await {
+                if e.kind() != ErrorKind::WouldBlock {
+                    log::error!("udp send: {}", e);
+                }
+            }
+        }
+
+        if should_release && self.state != State::Receiving {
+            log::info!("client not responding - releasing pointer");
+            self.producer.release();
+            self.state = State::Receiving;
+        }
+    }
+
+    #[cfg(unix)]
+    async fn handle_frontend_stream(&mut self, mut stream: ReadHalf<UnixStream>) {
+        use std::io;
+
+        let tx = self.frontend_tx.clone();
+        tokio::task::spawn_local(async move {
+            loop {
+                let event = frontend::read_event(&mut stream).await;
+                match event {
+                    Ok(event) => tx.send(event).await.unwrap(),
+                    Err(e) => {
+                        if let Some(e) = e.downcast_ref::<io::Error>() {
+                            if e.kind() == ErrorKind::UnexpectedEof {
+                                return;
+                            }
+                        }
+                        log::error!("error reading frontend event: {e}");
+                    }
+                }
+            }
+        });
+        self.enumerate().await;
+    }
+
+    #[cfg(windows)]
+    async fn handle_frontend_stream(&mut self, mut stream: ReadHalf<TcpStream>) {
+        let tx = self.frontend_tx.clone();
+        tokio::task::spawn_local(async move {
+            loop {
+                let event = frontend::read_event(&mut stream).await;
+                match event {
+                    Ok(event) => tx.send(event).await.unwrap(),
+                    Err(e) => log::error!("error reading frontend event: {e}"),
+                }
+            }
+        });
+        self.enumerate().await;
+    }
+
+    async fn handle_frontend_event(&mut self, event: FrontendEvent) -> bool {
+        log::debug!("frontend: {event:?}");
+        match event {
+            FrontendEvent::AddClient(hostname, port, pos) => {
+                self.add_client(hostname, HashSet::new(), port, pos).await;
+            }
+            FrontendEvent::ActivateClient(client, active) => {
+                self.activate_client(client, active).await
+            }
+            FrontendEvent::ChangePort(port) => {
+                let current_port = self.socket.local_addr().unwrap().port();
+                if current_port == port {
+                    if let Err(e) = self
+                        .frontend
+                        .notify_all(FrontendNotify::NotifyPortChange(port, None))
+                        .await
+                    {
+                        log::warn!("error notifying frontend: {e}");
+                    }
+                    return false;
+                }
+                let listen_addr = SocketAddr::new("0.0.0.0".parse().unwrap(), port);
+                match UdpSocket::bind(listen_addr).await {
+                    Ok(socket) => {
+                        self.socket = socket;
+                        if let Err(e) = self
+                            .frontend
+                            .notify_all(FrontendNotify::NotifyPortChange(port, None))
+                            .await
+                        {
+                            log::warn!("error notifying frontend: {e}");
+                        }
+                    }
+                    Err(e) => {
+                        log::warn!("could not change port: {e}");
+                        let port = self.socket.local_addr().unwrap().port();
+                        if let Err(e) = self
+                            .frontend
+                            .notify_all(FrontendNotify::NotifyPortChange(
+                                port,
+                                Some(format!("could not change port: {e}")),
+                            ))
+                            .await
+                        {
+                            log::error!("error notifying frontend: {e}");
+                        }
+                    }
+                }
+            }
+            FrontendEvent::DelClient(client) => {
+                self.remove_client(client).await;
+            }
+            FrontendEvent::Enumerate() => self.enumerate().await,
+            FrontendEvent::Shutdown() => {
+                log::info!("terminating gracefully...");
+                return true;
+            }
+            FrontendEvent::UpdateClient(client, hostname, port, pos) => {
+                self.update_client(client, hostname, port, pos).await
+            }
+        }
+        false
+    }
+
+    async fn enumerate(&mut self) {
+        let clients = self.client_manager.enumerate();
+        if let Err(e) = self
+            .frontend
+            .notify_all(FrontendNotify::Enumerate(clients))
+            .await
+        {
+            log::error!("error notifying frontend: {e}");
+        }
+    }
+}
+
+async fn receive_event(
+    socket: &UdpSocket,
+) -> std::result::Result<(Event, SocketAddr), Box<dyn Error>> {
+    log::trace!("receive_event");
+    let mut buf = vec![0u8; 22];
+    match socket.recv_from(&mut buf).await {
+        Ok((_amt, src)) => Ok((Event::try_from(buf)?, src)),
+        Err(e) => Err(Box::new(e)),
+    }
+}
+
+async fn send_event(sock: &UdpSocket, e: Event, addr: SocketAddr) -> Result<usize> {
+    log::trace!("{:20} ------>->->-> {addr}", e.to_string());
+    let data: Vec<u8> = (&e).into();
+    // We are currently abusing a blocking send to get the lowest possible latency.
+    // It may be better to set the socket to non-blocking and only send when ready.
+    sock.send_to(&data[..], addr).await
+}