ensure all keys are released when emulation ends

move capture/emulation errors into their creates
move channel creation out of dns
2026-04-24 05:23:19 +03:00 · 2024-07-16 20:39:38 +02:00 · 2024-07-15 21:10:30 +02:00 · 2024-07-15 20:32:57 +02:00 · 2024-07-15 12:56:36 +02:00 · 2024-07-15 12:44:56 +02:00
35 changed files with 669 additions and 873 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -98,9 +98,9 @@ dependencies = [

 [[package]]
 name = "ashpd"
-version = "0.9.1"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a"
+checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093"
 dependencies = [
 "enumflags2",
 "futures-channel",
@@ -200,9 +200,9 @@ dependencies = [

 [[package]]
 name = "async-signal"
-version = "0.2.9"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32"
+checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d"
 dependencies = [
 "async-io",
 "async-lock",
@@ -296,15 +296,15 @@ dependencies = [

 [[package]]
 name = "bytes"
-version = "1.6.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"

 [[package]]
 name = "cairo-rs"
-version = "0.20.0"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "797fd5a634dcb0ad0d7d583df794deb0a236d88e759cd34b7da20198c6c9d145"
+checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562"
 dependencies = [
 "bitflags 2.6.0",
 "cairo-sys-rs",
@@ -315,9 +315,9 @@ dependencies = [

 [[package]]
 name = "cairo-sys-rs"
-version = "0.20.0"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f"
+checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64"
 dependencies = [
 "glib-sys",
 "libc",
@@ -326,9 +326,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.1.6"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
+checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8"

 [[package]]
 name = "cfg-expr"
@@ -758,9 +758,9 @@ dependencies = [

 [[package]]
 name = "gdk-pixbuf"
-version = "0.20.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28bb53ecb56857c683c9ec859908e076dd3969c7d67598bd8b1ce095d211304a"
+checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699"
 dependencies = [
 "gdk-pixbuf-sys",
 "gio",
@@ -770,9 +770,9 @@ dependencies = [

 [[package]]
 name = "gdk-pixbuf-sys"
-version = "0.20.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f6681a0c1330d1d3968bec1529f7172d62819ef0bdbb0d18022320654158b03"
+checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379"
 dependencies = [
 "gio-sys",
 "glib-sys",
@@ -783,9 +783,9 @@ dependencies = [

 [[package]]
 name = "gdk4"
-version = "0.9.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea"
+checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07"
 dependencies = [
 "cairo-rs",
 "gdk-pixbuf",
@@ -798,9 +798,9 @@ dependencies = [

 [[package]]
 name = "gdk4-sys"
-version = "0.9.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878"
+checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd"
 dependencies = [
 "cairo-sys-rs",
 "gdk-pixbuf-sys",
@@ -842,9 +842,9 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"

 [[package]]
 name = "gio"
-version = "0.20.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "398e3da68749fdc32783cbf7521ec3f65c9cf946db8c7774f8460af49e52c6e2"
+checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -860,9 +860,9 @@ dependencies = [

 [[package]]
 name = "gio-sys"
-version = "0.20.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4feb96b31c32730ea3e1e89aecd2e4e37ecb1c473ad8f685e3430a159419f63"
+checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef"
 dependencies = [
 "glib-sys",
 "gobject-sys",
@@ -873,9 +873,9 @@ dependencies = [

 [[package]]
 name = "glib"
-version = "0.20.0"
+version = "0.19.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fee90a615ce05be7a32932cfb8adf2c4bbb4700e80d37713c981fb24c0c56238"
+checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44"
 dependencies = [
 "bitflags 2.6.0",
 "futures-channel",
@@ -895,18 +895,18 @@ dependencies = [

 [[package]]
 name = "glib-build-tools"
-version = "0.20.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7029c2651d9b5d5a3eea93ec8a1995665c6d3a69ce9bf6042ad9064d134736d8"
+checksum = "108f374fff60efd14b0d70d8916e7213aed18d7dd071ba3e9334ed2dac1dc86a"
 dependencies = [
 "gio",
 ]

 [[package]]
 name = "glib-macros"
-version = "0.20.0"
+version = "0.19.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4da558d8177c0c8c54368818b508a4244e1286fce2858cef4e547023f0cfa5ef"
+checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7"
 dependencies = [
 "heck 0.5.0",
 "proc-macro-crate",
@@ -917,9 +917,9 @@ dependencies = [

 [[package]]
 name = "glib-sys"
-version = "0.20.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4958c26e5a01c9af00dea669a97369eccbec29a8e6d125c24ea2d85ee7467b60"
+checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5"
 dependencies = [
 "libc",
 "system-deps",
@@ -927,9 +927,9 @@ dependencies = [

 [[package]]
 name = "gobject-sys"
-version = "0.20.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6908864f5ffff15b56df7e90346863904f49b949337ed0456b9287af61903b8"
+checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e"
 dependencies = [
 "glib-sys",
 "libc",
@@ -938,9 +938,9 @@ dependencies = [

 [[package]]
 name = "graphene-rs"
-version = "0.20.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630e940ad5824f90221d6579043a9cd1f8bec86b4a17faaf7827d58eb16e8c1f"
+checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf"
 dependencies = [
 "glib",
 "graphene-sys",
@@ -949,9 +949,9 @@ dependencies = [

 [[package]]
 name = "graphene-sys"
-version = "0.20.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8fade7b754982f47ebbed241fd2680816fdd4598321784da10b9e1168836a"
+checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05"
 dependencies = [
 "glib-sys",
 "libc",
@@ -961,9 +961,9 @@ dependencies = [

 [[package]]
 name = "gsk4"
-version = "0.9.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8"
+checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be"
 dependencies = [
 "cairo-rs",
 "gdk4",
@@ -976,9 +976,9 @@ dependencies = [

 [[package]]
 name = "gsk4-sys"
-version = "0.9.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde"
+checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc"
 dependencies = [
 "cairo-sys-rs",
 "gdk4-sys",
@@ -992,9 +992,9 @@ dependencies = [

 [[package]]
 name = "gtk4"
-version = "0.9.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaffc6c743c9160514cc9b67eace364e5dc5798369fa809cdb04e035c21c5c5d"
+checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab"
 dependencies = [
 "cairo-rs",
 "field-offset",
@@ -1013,9 +1013,9 @@ dependencies = [

 [[package]]
 name = "gtk4-macros"
-version = "0.9.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "188211f546ce5801f6d0245c37b6249143a2cb4fa040e54829ca1e76796e9f09"
+checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2",
@@ -1025,9 +1025,9 @@ dependencies = [

 [[package]]
 name = "gtk4-sys"
-version = "0.9.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666"
+checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5"
 dependencies = [
 "cairo-sys-rs",
 "gdk-pixbuf-sys",
@@ -1192,7 +1192,7 @@ dependencies = [

 [[package]]
 name = "input-capture"
-version = "0.2.0"
+version = "0.1.0"
 dependencies = [
 "ashpd",
 "async-trait",
@@ -1211,13 +1211,13 @@ dependencies = [
 "wayland-client",
 "wayland-protocols",
 "wayland-protocols-wlr",
- "windows 0.58.0",
+ "windows 0.57.0",
 "x11",
 ]

 [[package]]
 name = "input-emulation"
-version = "0.2.1"
+version = "0.1.0"
 dependencies = [
 "ashpd",
 "async-trait",
@@ -1234,13 +1234,13 @@ dependencies = [
 "wayland-protocols",
 "wayland-protocols-misc",
 "wayland-protocols-wlr",
- "windows 0.58.0",
+ "windows 0.57.0",
 "x11",
 ]

 [[package]]
 name = "input-event"
-version = "0.2.1"
+version = "0.1.0"
 dependencies = [
 "futures-core",
 "log",
@@ -1306,7 +1306,7 @@ dependencies = [

 [[package]]
 name = "lan-mouse"
-version = "0.9.1"
+version = "0.8.0"
 dependencies = [
 "anyhow",
 "async-channel",
@@ -1335,10 +1335,11 @@ dependencies = [

 [[package]]
 name = "libadwaita"
-version = "0.7.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878"
+checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9"
 dependencies = [
+ "gdk-pixbuf",
 "gdk4",
 "gio",
 "glib",
@@ -1350,9 +1351,9 @@ dependencies = [

 [[package]]
 name = "libadwaita-sys"
-version = "0.7.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6"
+checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8"
 dependencies = [
 "gdk4-sys",
 "gio-sys",
@@ -1545,9 +1546,9 @@ dependencies = [

 [[package]]
 name = "pango"
-version = "0.20.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54768854025df6903061d0084fd9702a253ddfd60db7d9b751d43b76689a7f0a"
+checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd"
 dependencies = [
 "gio",
 "glib",
@@ -1557,9 +1558,9 @@ dependencies = [

 [[package]]
 name = "pango-sys"
-version = "0.20.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07cc57d10cee4ec661f718a6902cee18c2f4cfae08e87e5a390525946913390"
+checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0"
 dependencies = [
 "glib-sys",
 "gobject-sys",
@@ -1726,9 +1727,9 @@ dependencies = [

 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
 "bitflags 2.6.0",
 ]
@@ -1945,9 +1946,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"

 [[package]]
 name = "syn"
-version = "2.0.71"
+version = "2.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
+checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1956,9 +1957,9 @@ dependencies = [

 [[package]]
 name = "system-deps"
-version = "7.0.1"
+version = "6.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c81f13d9a334a6c242465140bd262fae382b752ff2011c4f7419919a9c97922"
+checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
 dependencies = [
 "cfg-expr",
 "heck 0.5.0",
@@ -1987,18 +1988,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2022,9 +2023,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.38.1"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
 "backtrace",
 "bytes",
@@ -2065,14 +2066,14 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.8.15"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
 dependencies = [
 "serde",
 "serde_spanned",
 "toml_datetime",
- "toml_edit 0.22.16",
+ "toml_edit 0.22.15",
 ]

 [[package]]
@@ -2097,9 +2098,9 @@ dependencies = [

 [[package]]
 name = "toml_edit"
-version = "0.22.16"
+version = "0.22.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
+checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1"
 dependencies = [
 "indexmap",
 "serde",
@@ -2221,9 +2222,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

 [[package]]
 name = "wayland-backend"
-version = "0.3.6"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993"
+checksum = "269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198"
 dependencies = [
 "cc",
 "downcast-rs",
@@ -2235,9 +2236,9 @@ dependencies = [

 [[package]]
 name = "wayland-client"
-version = "0.31.5"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943"
+checksum = "08bd0f46c069d3382a36c8666c1b9ccef32b8b04f41667ca1fef06a1adcc2982"
 dependencies = [
 "bitflags 2.6.0",
 "rustix",
@@ -2247,9 +2248,9 @@ dependencies = [

 [[package]]
 name = "wayland-protocols"
-version = "0.32.3"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa"
+checksum = "1794d82d869f38439d15c24b26f06f6c8603d27d47b4f786d5197c99044de415"
 dependencies = [
 "bitflags 2.6.0",
 "wayland-backend",
@@ -2259,9 +2260,9 @@ dependencies = [

 [[package]]
 name = "wayland-protocols-misc"
-version = "0.3.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfe44d48a0e51909c89da297f6b43bb814b881c78b69e254a4558a5fa8752887"
+checksum = "28b497d7edd777ca365f2cce3837046b7832365b2a0b32f9c913b4e6f8d99839"
 dependencies = [
 "bitflags 2.6.0",
 "wayland-backend",
@@ -2272,9 +2273,9 @@ dependencies = [

 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953"
+checksum = "fa43c961473aed713d44c1f616f775186249dfca657f256d8841ca0690366aba"
 dependencies = [
 "bitflags 2.6.0",
 "wayland-backend",
@@ -2285,9 +2286,9 @@ dependencies = [

 [[package]]
 name = "wayland-scanner"
-version = "0.31.4"
+version = "0.31.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6"
+checksum = "edf466fc49a4feb65a511ca403fec3601494d0dee85dbf37fff6fa0dd4eec3b6"
 dependencies = [
 "proc-macro2",
 "quick-xml",
@@ -2296,9 +2297,9 @@ dependencies = [

 [[package]]
 name = "wayland-sys"
-version = "0.31.4"
+version = "0.31.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148"
+checksum = "4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7"
 dependencies = [
 "dlib",
 "log",
@@ -2345,11 +2346,11 @@ dependencies = [

 [[package]]
 name = "windows"
-version = "0.58.0"
+version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
+checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
 dependencies = [
- "windows-core 0.58.0",
+ "windows-core 0.57.0",
 "windows-targets 0.52.6",
 ]

@@ -2364,22 +2365,21 @@ dependencies = [

 [[package]]
 name = "windows-core"
-version = "0.58.0"
+version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
 dependencies = [
 "windows-implement",
 "windows-interface",
 "windows-result",
- "windows-strings",
 "windows-targets 0.52.6",
 ]

 [[package]]
 name = "windows-implement"
-version = "0.58.0"
+version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2388,9 +2388,9 @@ dependencies = [

 [[package]]
 name = "windows-interface"
-version = "0.58.0"
+version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2399,23 +2399,13 @@ dependencies = [

 [[package]]
 name = "windows-result"
-version = "0.2.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
 dependencies = [
 "windows-targets 0.52.6",
 ]

-[[package]]
-name = "windows-strings"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-dependencies = [
- "windows-result",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,19 +4,19 @@ members = ["input-capture", "input-emulation", "input-event"]
 [package]
 name = "lan-mouse"
 description = "Software KVM Switch / mouse & keyboard sharing software for Local Area Networks"
-version = "0.9.1"
+version = "0.8.0"
 edition = "2021"
 license = "GPL-3.0-or-later"
-repository = "https://github.com/feschber/lan-mouse"
+repository = "https://github.com/ferdinandschober/lan-mouse"

 [profile.release]
 strip = true
 lto = "fat"

 [dependencies]
-input-event = { path = "input-event", version = "0.2.1" }
-input-emulation = { path = "input-emulation", version = "0.2.1", default-features = false }
-input-capture = { path = "input-capture", version = "0.2.0", default-features = false }
+input-event = { path = "input-event", version = "0.1.0" }
+input-emulation = { path = "input-emulation", version = "0.1.0", default-features = false }
+input-capture = { path = "input-capture", version = "0.1.0", default-features = false }

 hickory-resolver = "0.24.1"
 toml = "0.8"
@@ -37,10 +37,10 @@ tokio = { version = "1.32.0", features = [
 ] }
 futures = "0.3.28"
 clap = { version = "4.4.11", features = ["derive"] }
-gtk = { package = "gtk4", version = "0.9.0", features = [
+gtk = { package = "gtk4", version = "0.8.1", features = [
    "v4_2",
 ], optional = true }
-adw = { package = "libadwaita", version = "0.7.0", features = [
+adw = { package = "libadwaita", version = "0.6.0", features = [
    "v1_1",
 ], optional = true }
 async-channel = { version = "2.1.1", optional = true }
@@ -54,7 +54,7 @@ tokio-util = "0.7.11"
 libc = "0.2.148"

 [build-dependencies]
-glib-build-tools = { version = "0.20.0", optional = true }
+glib-build-tools = { version = "0.19.0", optional = true }

 [features]
 default = ["wayland", "x11", "xdg_desktop_portal", "libei", "gtk"]
--- a/README.md
+++ b/README.md
@@ -57,10 +57,6 @@ input capture (to send events *to* other clients) on different operating systems
 > If you are using [Wayfire](https://github.com/WayfireWM/wayfire), make sure to use a recent version (must be newer than October 23rd) and **add `shortcuts-inhibit` to the list of plugins in your wayfire config!**
 > Otherwise input capture will not work.

-> [!Important]
-> The mouse cursor will be invisible when sending input to a Windows system if
-> there is no real mouse connected to the machine.
-
 ## Installation
 ### Install via cargo
 ```sh
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,6 @@
    inherit (nixpkgs) lib;
    genSystems = lib.genAttrs [
      "aarch64-darwin"
-      "aarch64-linux"
      "x86_64-darwin"
      "x86_64-linux"
    ];
@@ -51,7 +50,6 @@
          xorg.libX11
          gtk4
          libadwaita
-          librsvg
          xorg.libXtst
        ] ++ lib.optionals stdenv.isDarwin [
          darwin.apple_sdk_11_0.frameworks.CoreGraphics
--- a/input-capture/Cargo.toml
+++ b/input-capture/Cargo.toml
@@ -1,16 +1,16 @@
 [package]
 name = "input-capture"
 description = "cross-platform input-capture library used by lan-mouse"
-version = "0.2.0"
+version = "0.1.0"
 edition = "2021"
 license = "GPL-3.0-or-later"
-repository = "https://github.com/feschber/lan-mouse"
+repository = "https://github.com/ferdinandschober/lan-mouse"

 [dependencies]
 futures = "0.3.28"
 futures-core = "0.3.30"
 log = "0.4.22"
-input-event = { path = "../input-event", version = "0.2.1" }
+input-event = { path = "../input-event", version = "0.1.0" }
 memmap = "0.7"
 tempfile = "3.8"
 thiserror = "1.0.61"
@@ -40,7 +40,7 @@ wayland-protocols-wlr = { version = "0.3.1", features = [
    "client",
 ], optional = true }
 x11 = { version = "2.21.0", features = ["xlib", "xtest"], optional = true }
-ashpd = { version = "0.9", default-features = false, features = [
+ashpd = { version = "0.8", default-features = false, features = [
    "tokio",
 ], optional = true }
 reis = { version = "0.2", features = ["tokio"], optional = true }
@@ -49,7 +49,7 @@ reis = { version = "0.2", features = ["tokio"], optional = true }
 core-graphics = { version = "0.23", features = ["highsierra"] }

 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.58.0", features = [
+windows = { version = "0.57.0", features = [
    "Win32_System_LibraryLoader",
    "Win32_System_Threading",
    "Win32_Foundation",
--- a/input-capture/src/dummy.rs
+++ b/input-capture/src/dummy.rs
@@ -8,7 +8,7 @@ use input_event::Event;

 use crate::CaptureError;

-use super::{Capture, CaptureHandle, Position};
+use super::{CaptureHandle, InputCapture, Position};

 pub struct DummyInputCapture {}

@@ -25,7 +25,7 @@ impl Default for DummyInputCapture {
 }

 #[async_trait]
-impl Capture for DummyInputCapture {
+impl InputCapture for DummyInputCapture {
    async fn create(&mut self, _handle: CaptureHandle, _pos: Position) -> Result<(), CaptureError> {
        Ok(())
    }
--- a/input-capture/src/lib.rs
+++ b/input-capture/src/lib.rs
@@ -1,32 +1,31 @@
-use std::{collections::HashSet, fmt::Display, task::Poll};
+use std::fmt::Display;

 use async_trait::async_trait;
-use futures::StreamExt;
 use futures_core::Stream;

-use input_event::{scancode, Event, KeyboardEvent};
+use input_event::Event;

 pub use error::{CaptureCreationError, CaptureError, InputCaptureError};

 pub mod error;

 #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-mod libei;
+pub mod libei;

 #[cfg(target_os = "macos")]
-mod macos;
+pub mod macos;

 #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-mod wayland;
+pub mod wayland;

 #[cfg(windows)]
-mod windows;
+pub mod windows;

 #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-mod x11;
+pub mod x11;

 /// fallback input capture (does not produce events)
-mod dummy;
+pub mod dummy;

 pub type CaptureHandle = u64;

@@ -94,79 +93,10 @@ impl Display for Backend {
    }
 }

-pub struct InputCapture {
-    capture: Box<dyn Capture>,
-    pressed_keys: HashSet<scancode::Linux>,
-}
-
-impl InputCapture {
-    /// create a new client with the given id
-    pub async fn create(&mut self, id: CaptureHandle, pos: Position) -> Result<(), CaptureError> {
-        self.capture.create(id, pos).await
-    }
-
-    /// destroy the client with the given id, if it exists
-    pub async fn destroy(&mut self, id: CaptureHandle) -> Result<(), CaptureError> {
-        self.capture.destroy(id).await
-    }
-
-    /// release mouse
-    pub async fn release(&mut self) -> Result<(), CaptureError> {
-        self.pressed_keys.clear();
-        self.capture.release().await
-    }
-
-    /// destroy the input capture
-    pub async fn terminate(&mut self) -> Result<(), CaptureError> {
-        self.capture.terminate().await
-    }
-
-    /// creates a new [`InputCapture`]
-    pub async fn new(backend: Option<Backend>) -> Result<Self, CaptureCreationError> {
-        let capture = create(backend).await?;
-        Ok(Self {
-            capture,
-            pressed_keys: HashSet::new(),
-        })
-    }
-
-    /// check whether the given keys are pressed
-    pub fn keys_pressed(&self, keys: &[scancode::Linux]) -> bool {
-        keys.iter().all(|k| self.pressed_keys.contains(k))
-    }
-
-    fn update_pressed_keys(&mut self, key: u32, state: u8) {
-        if let Ok(scancode) = scancode::Linux::try_from(key) {
-            log::debug!("key: {key}, state: {state}, scancode: {scancode:?}");
-            match state {
-                1 => self.pressed_keys.insert(scancode),
-                _ => self.pressed_keys.remove(&scancode),
-            };
-        }
-    }
-}
-
-impl Stream for InputCapture {
-    type Item = Result<(CaptureHandle, Event), CaptureError>;
-
-    fn poll_next(
-        mut self: std::pin::Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
-        match self.capture.poll_next_unpin(cx) {
-            Poll::Ready(e) => {
-                if let Some(Ok((_, Event::Keyboard(KeyboardEvent::Key { key, state, .. })))) = e {
-                    self.update_pressed_keys(key, state);
-                }
-                Poll::Ready(e)
-            }
-            Poll::Pending => Poll::Pending,
-        }
-    }
-}
-
 #[async_trait]
-trait Capture: Stream<Item = Result<(CaptureHandle, Event), CaptureError>> + Unpin {
+pub trait InputCapture:
+    Stream<Item = Result<(CaptureHandle, Event), CaptureError>> + Unpin
+{
    /// create a new client with the given id
    async fn create(&mut self, id: CaptureHandle, pos: Position) -> Result<(), CaptureError>;

@@ -180,10 +110,10 @@ trait Capture: Stream<Item = Result<(CaptureHandle, Event), CaptureError>> + Unp
    async fn terminate(&mut self) -> Result<(), CaptureError>;
 }

-async fn create_backend(
+pub async fn create_backend(
    backend: Backend,
 ) -> Result<
-    Box<dyn Capture<Item = Result<(CaptureHandle, Event), CaptureError>>>,
+    Box<dyn InputCapture<Item = Result<(CaptureHandle, Event), CaptureError>>>,
    CaptureCreationError,
 > {
    match backend {
@@ -201,10 +131,10 @@ async fn create_backend(
    }
 }

-async fn create(
+pub async fn create(
    backend: Option<Backend>,
 ) -> Result<
-    Box<dyn Capture<Item = Result<(CaptureHandle, Event), CaptureError>>>,
+    Box<dyn InputCapture<Item = Result<(CaptureHandle, Event), CaptureError>>>,
    CaptureCreationError,
 > {
    if let Some(backend) = backend {
--- a/input-capture/src/libei.rs
+++ b/input-capture/src/libei.rs
@@ -38,7 +38,7 @@ use input_event::Event;

 use super::{
    error::{CaptureError, LibeiCaptureCreationError, ReisConvertEventStreamError},
-    Capture as LanMouseInputCapture, CaptureHandle, Position,
+    CaptureHandle, InputCapture as LanMouseInputCapture, Position,
 };

 /* there is a bug in xdg-remote-desktop-portal-gnome / mutter that
@@ -91,35 +91,13 @@ fn pos_to_barrier(r: &Region, pos: Position) -> (i32, i32, i32, i32) {
    }
 }

-/// Ashpd does not expose fields
-#[derive(Clone, Copy, Debug)]
-struct ICBarrier {
-    barrier_id: BarrierID,
-    position: (i32, i32, i32, i32),
-}
-
-impl ICBarrier {
-    fn new(barrier_id: BarrierID, position: (i32, i32, i32, i32)) -> Self {
-        Self {
-            barrier_id,
-            position,
-        }
-    }
-}
-
-impl From<ICBarrier> for Barrier {
-    fn from(barrier: ICBarrier) -> Self {
-        Barrier::new(barrier.barrier_id, barrier.position)
-    }
-}
-
 fn select_barriers(
    zones: &Zones,
-    clients: &[(CaptureHandle, Position)],
+    clients: &Vec<(CaptureHandle, Position)>,
    next_barrier_id: &mut u32,
-) -> (Vec<ICBarrier>, HashMap<BarrierID, CaptureHandle>) {
+) -> (Vec<Barrier>, HashMap<BarrierID, CaptureHandle>) {
    let mut client_for_barrier = HashMap::new();
-    let mut barriers: Vec<ICBarrier> = vec![];
+    let mut barriers: Vec<Barrier> = vec![];

    for (handle, pos) in clients {
        let mut client_barriers = zones
@@ -130,7 +108,7 @@ fn select_barriers(
                *next_barrier_id = id + 1;
                let position = pos_to_barrier(r, *pos);
                client_for_barrier.insert(id, *handle);
-                ICBarrier::new(id, position)
+                Barrier::new(id, position)
            })
            .collect();
        barriers.append(&mut client_barriers);
@@ -140,10 +118,10 @@ fn select_barriers(

 async fn update_barriers(
    input_capture: &InputCapture<'_>,
-    session: &Session<'_, InputCapture<'_>>,
-    active_clients: &[(CaptureHandle, Position)],
+    session: &Session<'_>,
+    active_clients: &Vec<(CaptureHandle, Position)>,
    next_barrier_id: &mut u32,
-) -> Result<(Vec<ICBarrier>, HashMap<BarrierID, CaptureHandle>), ashpd::Error> {
+) -> Result<HashMap<BarrierID, CaptureHandle>, ashpd::Error> {
    let zones = input_capture.zones(session).await?.response()?;
    log::debug!("zones: {zones:?}");

@@ -151,18 +129,17 @@ async fn update_barriers(
    log::debug!("barriers: {barriers:?}");
    log::debug!("client for barrier id: {id_map:?}");

-    let ashpd_barriers: Vec<Barrier> = barriers.iter().copied().map(|b| b.into()).collect();
    let response = input_capture
-        .set_pointer_barriers(session, &ashpd_barriers, zones.zone_set())
+        .set_pointer_barriers(session, &barriers, zones.zone_set())
        .await?;
    let response = response.response()?;
    log::debug!("{response:?}");
-    Ok((barriers, id_map))
+    Ok(id_map)
 }

 async fn create_session<'a>(
    input_capture: &'a InputCapture<'a>,
-) -> std::result::Result<(Session<'_, InputCapture<'_>>, BitFlags<Capabilities>), ashpd::Error> {
+) -> std::result::Result<(Session<'a>, BitFlags<Capabilities>), ashpd::Error> {
    log::debug!("creating input capture session");
    input_capture
        .create_session(
@@ -174,7 +151,7 @@ async fn create_session<'a>(

 async fn connect_to_eis(
    input_capture: &InputCapture<'_>,
-    session: &Session<'_, InputCapture<'_>>,
+    session: &Session<'_>,
 ) -> Result<(ei::Context, EiConvertEventStream), CaptureError> {
    log::debug!("connect_to_eis");
    let fd = input_capture.connect_to_eis(session).await?;
@@ -253,11 +230,11 @@ impl<'a> LibeiInputCapture<'a> {
    }
 }

-async fn do_capture(
-    input_capture: *const InputCapture<'static>,
+async fn do_capture<'a>(
+    input_capture: *const InputCapture<'a>,
    mut capture_event: Receiver<LibeiNotifyEvent>,
    notify_release: Arc<Notify>,
-    session: Option<(Session<'_, InputCapture<'_>>, BitFlags<Capabilities>)>,
+    session: Option<(Session<'a>, BitFlags<Capabilities>)>,
    event_tx: Sender<(CaptureHandle, Event)>,
    cancellation_token: CancellationToken,
 ) -> Result<(), CaptureError> {
@@ -312,7 +289,7 @@ async fn do_capture(
                input_capture,
                &mut session,
                &event_tx,
-                &active_clients,
+                &mut active_clients,
                &mut next_barrier_id,
                &notify_release,
                (cancel_session.clone(), cancel_update.clone()),
@@ -353,9 +330,9 @@ async fn do_capture(

 async fn do_capture_session(
    input_capture: &InputCapture<'_>,
-    session: &mut Session<'_, InputCapture<'_>>,
+    session: &mut Session<'_>,
    event_tx: &Sender<(CaptureHandle, Event)>,
-    active_clients: &[(CaptureHandle, Position)],
+    active_clients: &mut Vec<(CaptureHandle, Position)>,
    next_barrier_id: &mut u32,
    notify_release: &Notify,
    cancel: (CancellationToken, CancellationToken),
@@ -368,7 +345,7 @@ async fn do_capture_session(
    let (context, ei_event_stream) = connect_to_eis(input_capture, session).await?;

    // set barriers
-    let (barriers, client_for_barrier_id) =
+    let client_for_barrier_id =
        update_barriers(input_capture, session, active_clients, next_barrier_id).await?;

    log::debug!("enabling session");
@@ -411,15 +388,9 @@ async fn do_capture_session(
                    let activated = activated.ok_or(CaptureError::ActivationClosed)?;
                    log::debug!("activated: {activated:?}");

-                    // get barrier id from activation
-                    let barrier_id = match activated.barrier_id() {
-                        Some(bid) => bid,
-                        // workaround for KDE plasma not reporting barrier ids
-                        None => find_corresponding_client(&barriers, activated.cursor_position().expect("no cursor position reported by compositor")),
-                    };
-
-                    // find client corresponding to barrier
-                    let client = *client_for_barrier_id.get(&barrier_id).expect("invalid barrier id");
+                    let client = *client_for_barrier_id
+                        .get(&activated.barrier_id())
+                        .expect("invalid barrier id");
                    current_client.replace(Some(client));

                    // client entered => send event
@@ -478,20 +449,15 @@ async fn do_capture_session(
    Ok(())
 }

-async fn release_capture<'a>(
-    input_capture: &InputCapture<'a>,
-    session: &Session<'a, InputCapture<'a>>,
+async fn release_capture(
+    input_capture: &InputCapture<'_>,
+    session: &Session<'_>,
    activated: Activated,
    current_client: CaptureHandle,
    active_clients: &[(CaptureHandle, Position)],
 ) -> Result<(), CaptureError> {
-    if let Some(activation_id) = activated.activation_id() {
-        log::debug!("releasing input capture {activation_id}");
-    }
-    let (x, y) = activated
-        .cursor_position()
-        .expect("compositor did not report cursor position!");
-    log::debug!("client entered @ ({x}, {y})");
+    log::debug!("releasing input capture {}", activated.activation_id());
+    let (x, y) = activated.cursor_position();
    let pos = active_clients
        .iter()
        .filter(|(c, _)| *c == current_client)
@@ -508,39 +474,11 @@ async fn release_capture<'a>(
    // release 1px to the right of the entered zone
    let cursor_position = (x as f64 + dx, y as f64 + dy);
    input_capture
-        .release(session, activated.activation_id(), Some(cursor_position))
+        .release(session, activated.activation_id(), cursor_position)
        .await?;
    Ok(())
 }

-fn find_corresponding_client(barriers: &[ICBarrier], pos: (f32, f32)) -> BarrierID {
-    barriers
-        .iter()
-        .copied()
-        .min_by_key(|b| {
-            let (x1, y1, x2, y2) = b.position;
-            let (x1, y1, x2, y2) = (x1 as f32, y1 as f32, x2 as f32, y2 as f32);
-            distance_to_line(((x1, y1), (x2, y2)), pos) as i32
-        })
-        .expect("could not find barrier corresponding to client")
-        .barrier_id
-}
-
-fn distance_to_line(line: ((f32, f32), (f32, f32)), p: (f32, f32)) -> f32 {
-    let ((x1, y1), (x2, y2)) = line;
-    let (x0, y0) = p;
-    /*
-     * we use the fact that for the triangle spanned by the line and p,
-     * the height of the triangle is the desired distance and can be calculated by
-     * h = 2A / b with b being the line_length and
-     */
-    let double_triangle_area = ((y2 - y1) * x0 - (x2 - x1) * y0 + x2 * y1 - y2 * x1).abs();
-    let line_length = ((y2 - y1).powf(2.0) + (x2 - x1).powf(2.0)).sqrt();
-    let distance = double_triangle_area / line_length;
-    log::debug!("distance to line({line:?}, {p:?}) = {distance}");
-    distance
-}
-
 static ALL_CAPABILITIES: &[DeviceCapability] = &[
    DeviceCapability::Pointer,
    DeviceCapability::PointerAbsolute,
--- a/input-capture/src/macos.rs
+++ b/input-capture/src/macos.rs
@@ -1,5 +1,5 @@
 use crate::{
-    error::MacOSInputCaptureCreationError, Capture, CaptureError, CaptureHandle, Position,
+    error::MacOSInputCaptureCreationError, CaptureError, CaptureHandle, InputCapture, Position,
 };
 use async_trait::async_trait;
 use futures_core::Stream;
@@ -24,7 +24,7 @@ impl Stream for MacOSInputCapture {
 }

 #[async_trait]
-impl Capture for MacOSInputCapture {
+impl InputCapture for MacOSInputCapture {
    async fn create(&mut self, _id: CaptureHandle, _pos: Position) -> Result<(), CaptureError> {
        Ok(())
    }
--- a/input-capture/src/wayland.rs
+++ b/input-capture/src/wayland.rs
@@ -1,10 +1,11 @@
 use async_trait::async_trait;
 use futures_core::Stream;
+use memmap::MmapOptions;
 use std::{
    collections::VecDeque,
    env,
    io::{self, ErrorKind},
-    os::fd::{AsFd, RawFd},
+    os::fd::{AsFd, OwnedFd, RawFd},
    pin::Pin,
    task::{ready, Context, Poll},
 };
@@ -13,7 +14,7 @@ use tokio::io::unix::AsyncFd;
 use std::{
    fs::File,
    io::{BufWriter, Write},
-    os::unix::prelude::AsRawFd,
+    os::unix::prelude::{AsRawFd, FromRawFd},
    sync::Arc,
 };

@@ -58,13 +59,15 @@ use wayland_client::{
    Connection, Dispatch, DispatchError, EventQueue, QueueHandle, WEnum,
 };

+use tempfile;
+
 use input_event::{Event, KeyboardEvent, PointerEvent};

 use crate::CaptureError;

 use super::{
    error::{LayerShellCaptureCreationError, WaylandBindError},
-    Capture, CaptureHandle, Position,
+    CaptureHandle, InputCapture, Position,
 };

 struct Globals {
@@ -105,7 +108,7 @@ struct State {
    client_for_window: Vec<(Arc<Window>, CaptureHandle)>,
    focused: Option<(Arc<Window>, CaptureHandle)>,
    g: Globals,
-    wayland_fd: RawFd,
+    wayland_fd: OwnedFd,
    read_guard: Option<ReadEventsGuard>,
    qh: QueueHandle<Self>,
    pending_events: VecDeque<(CaptureHandle, Event)>,
@@ -120,7 +123,7 @@ struct Inner {

 impl AsRawFd for Inner {
    fn as_raw_fd(&self) -> RawFd {
-        self.state.wayland_fd
+        self.state.wayland_fd.as_raw_fd()
    }
 }

@@ -305,7 +308,10 @@ impl WaylandInputCapture {
        // flush outgoing events
        queue.flush()?;

-        let wayland_fd = queue.as_fd().as_raw_fd();
+        // prepare reading wayland events
+        let read_guard = queue.prepare_read().unwrap(); // there can not yet be events to dispatch
+        let wayland_fd = read_guard.connection_fd().try_clone_to_owned().unwrap();
+        std::mem::drop(read_guard);

        let mut state = State {
            pointer: None,
@@ -559,7 +565,7 @@ impl Inner {
 }

 #[async_trait]
-impl Capture for WaylandInputCapture {
+impl InputCapture for WaylandInputCapture {
    async fn create(&mut self, handle: CaptureHandle, pos: Position) -> Result<(), CaptureError> {
        self.add_client(handle, pos);
        let inner = self.0.get_mut();
@@ -814,6 +820,15 @@ impl Dispatch<WlKeyboard, ()> for State {
                    ));
                }
            }
+            wl_keyboard::Event::Keymap {
+                format: _,
+                fd,
+                size: _,
+            } => {
+                let fd = unsafe { &File::from_raw_fd(fd.as_raw_fd()) };
+                let _mmap = unsafe { MmapOptions::new().map_copy(fd).unwrap() };
+                // TODO keymap
+            }
            _ => (),
        }
    }
--- a/input-capture/src/windows.rs
+++ b/input-capture/src/windows.rs
@@ -37,7 +37,7 @@ use input_event::{
    Event, KeyboardEvent, PointerEvent, BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT,
 };

-use super::{Capture, CaptureError, CaptureHandle, Position};
+use super::{CaptureError, CaptureHandle, InputCapture, Position};

 enum Request {
    Create(CaptureHandle, Position),
@@ -64,7 +64,7 @@ unsafe fn signal_message_thread(event_type: EventType) {
 }

 #[async_trait]
-impl Capture for WindowsInputCapture {
+impl InputCapture for WindowsInputCapture {
    async fn create(&mut self, handle: CaptureHandle, pos: Position) -> Result<(), CaptureError> {
        unsafe {
            {
@@ -519,7 +519,7 @@ fn message_thread(ready_tx: mpsc::Sender<()>) {
        }

        /* window is used ro receive WM_DISPLAYCHANGE messages */
-        CreateWindowExW(
+        let ret = CreateWindowExW(
            Default::default(),
            w!("lan-mouse-message-window-class"),
            w!("lan-mouse-msg-window"),
@@ -532,8 +532,10 @@ fn message_thread(ready_tx: mpsc::Sender<()>) {
            HMENU::default(),
            instance,
            None,
-        )
-        .expect("CreateWindowExW");
+        );
+        if ret.0 == 0 {
+            panic!("CreateWindowExW");
+        }

        /* run message loop */
        loop {
@@ -541,7 +543,7 @@ fn message_thread(ready_tx: mpsc::Sender<()>) {
            let Some(msg) = get_msg() else {
                break;
            };
-            if msg.hwnd.0.is_null() {
+            if msg.hwnd.0 == 0 {
                /* messages sent via PostThreadMessage */
                match msg.wParam.0 {
                    x if x == EventType::Exit as usize => break,
--- a/input-capture/src/x11.rs
+++ b/input-capture/src/x11.rs
@@ -5,7 +5,7 @@ use futures_core::Stream;

 use crate::CaptureError;

-use super::Capture;
+use super::InputCapture;
 use input_event::Event;

 use super::error::X11InputCaptureCreationError;
@@ -20,7 +20,7 @@ impl X11InputCapture {
 }

 #[async_trait]
-impl Capture for X11InputCapture {
+impl InputCapture for X11InputCapture {
    async fn create(&mut self, _id: CaptureHandle, _pos: Position) -> Result<(), CaptureError> {
        Ok(())
    }
--- a/input-emulation/Cargo.toml
+++ b/input-emulation/Cargo.toml
@@ -1,46 +1,27 @@
 [package]
 name = "input-emulation"
 description = "cross-platform input emulation library used by lan-mouse"
-version = "0.2.1"
+version = "0.1.0"
 edition = "2021"
 license = "GPL-3.0-or-later"
-repository = "https://github.com/feschber/lan-mouse"
+repository = "https://github.com/ferdinandschober/lan-mouse"

 [dependencies]
 async-trait = "0.1.80"
 futures = "0.3.28"
 log = "0.4.22"
-input-event = { path = "../input-event", version = "0.2.1" }
+input-event = { path = "../input-event", version = "0.1.0" }
 thiserror = "1.0.61"
-tokio = { version = "1.32.0", features = [
-    "io-util",
-    "io-std",
-    "macros",
-    "net",
-    "process",
-    "rt",
-    "sync",
-    "signal",
-] }
+tokio = { version = "1.32.0", features = ["io-util", "io-std", "macros", "net", "process", "rt", "sync", "signal"] }
 once_cell = "1.19.0"

 [target.'cfg(all(unix, not(target_os="macos")))'.dependencies]
 wayland-client = { version="0.31.1", optional = true }
-wayland-protocols = { version = "0.32.1", features = [
-    "client",
-    "staging",
-    "unstable",
-], optional = true }
-wayland-protocols-wlr = { version = "0.3.1", features = [
-    "client",
-], optional = true }
-wayland-protocols-misc = { version = "0.3.1", features = [
-    "client",
-], optional = true }
+wayland-protocols = { version="0.32.1", features=["client", "staging", "unstable"], optional = true }
+wayland-protocols-wlr = { version="0.3.1", features=["client"], optional = true }
+wayland-protocols-misc = { version="0.3.1", features=["client"], optional = true }
 x11 = { version = "2.21.0", features = ["xlib", "xtest"], optional = true }
-ashpd = { version = "0.9", default-features = false, features = [
-    "tokio",
-], optional = true }
+ashpd = { version = "0.8", default-features = false, features = ["tokio"], optional = true }
 reis = { version = "0.2", features = [ "tokio" ], optional = true }

 [target.'cfg(target_os="macos")'.dependencies]
@@ -48,7 +29,7 @@ core-graphics = { version = "0.23", features = ["highsierra"] }
 keycode = "0.4.0"

 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.58.0", features = [
+windows = {  version = "0.57.0", features = [
    "Win32_System_LibraryLoader",
    "Win32_System_Threading",
    "Win32_Foundation",
@@ -60,12 +41,7 @@ windows = { version = "0.58.0", features = [

 [features]
 default = ["wayland", "x11", "xdg_desktop_portal", "libei"]
-wayland = [
-    "dep:wayland-client",
-    "dep:wayland-protocols",
-    "dep:wayland-protocols-wlr",
-    "dep:wayland-protocols-misc",
-]
+wayland = ["dep:wayland-client", "dep:wayland-protocols", "dep:wayland-protocols-wlr", "dep:wayland-protocols-misc" ]
 x11 = ["dep:x11"]
 xdg_desktop_portal = ["dep:ashpd"]
 libei = ["dep:reis", "dep:ashpd"]
--- a/input-emulation/src/dummy.rs
+++ b/input-emulation/src/dummy.rs
@@ -3,19 +3,19 @@ use input_event::Event;

 use crate::error::EmulationError;

-use super::{Emulation, EmulationHandle};
+use super::{EmulationHandle, InputEmulation};

 #[derive(Default)]
-pub(crate) struct DummyEmulation;
+pub struct DummyEmulation;

 impl DummyEmulation {
-    pub(crate) fn new() -> Self {
+    pub fn new() -> Self {
        Self {}
    }
 }

 #[async_trait]
-impl Emulation for DummyEmulation {
+impl InputEmulation for DummyEmulation {
    async fn consume(
        &mut self,
        event: Event,
--- a/input-emulation/src/error.rs
+++ b/input-emulation/src/error.rs
@@ -87,25 +87,19 @@ pub enum EmulationCreationError {

 impl EmulationCreationError {
    /// request was intentionally denied by the user
-    pub(crate) fn cancelled_by_user(&self) -> bool {
    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-        if matches!(
+    pub(crate) fn cancelled_by_user(&self) -> bool {
+        matches!(
            self,
            EmulationCreationError::Libei(LibeiEmulationCreationError::Ashpd(Response(
                ResponseError::Cancelled,
-            )))
-        ) {
-            return true;
-        }
-        #[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
-        if matches!(
-            self,
-            EmulationCreationError::Xdp(XdpEmulationCreationError::Ashpd(Response(
+            ))) | EmulationCreationError::Xdp(XdpEmulationCreationError::Ashpd(Response(
                ResponseError::Cancelled,
            )))
-        ) {
-            return true;
+        )
    }
+    #[cfg(not(all(unix, feature = "libei", not(target_os = "macos"))))]
+    pub(crate) fn cancelled_by_user(&self) -> bool {
        false
    }
 }
--- a/input-emulation/src/lib.rs
+++ b/input-emulation/src/lib.rs
@@ -1,34 +1,31 @@
 use async_trait::async_trait;
-use std::{
-    collections::{HashMap, HashSet},
-    fmt::Display,
-};
+use std::fmt::Display;

-use input_event::{Event, KeyboardEvent};
+use input_event::Event;

 pub use self::error::{EmulationCreationError, EmulationError, InputEmulationError};

 #[cfg(windows)]
-mod windows;
+pub mod windows;

 #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-mod x11;
+pub mod x11;

 #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-mod wlroots;
+pub mod wlroots;

 #[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
-mod xdg_desktop_portal;
+pub mod xdg_desktop_portal;

 #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-mod libei;
+pub mod libei;

 #[cfg(target_os = "macos")]
-mod macos;
+pub mod macos;

 /// fallback input emulation (logs events)
-mod dummy;
-mod error;
+pub mod dummy;
+pub mod error;

 pub type EmulationHandle = u64;

@@ -69,39 +66,45 @@ impl Display for Backend {
    }
 }

-pub struct InputEmulation {
-    emulation: Box<dyn Emulation>,
-    handles: HashSet<EmulationHandle>,
-    pressed_keys: HashMap<EmulationHandle, HashSet<u32>>,
+#[async_trait]
+pub trait InputEmulation: Send {
+    async fn consume(
+        &mut self,
+        event: Event,
+        handle: EmulationHandle,
+    ) -> Result<(), EmulationError>;
+    async fn create(&mut self, handle: EmulationHandle);
+    async fn destroy(&mut self, handle: EmulationHandle);
+    async fn terminate(&mut self);
 }

-impl InputEmulation {
-    async fn with_backend(backend: Backend) -> Result<InputEmulation, EmulationCreationError> {
-        let emulation: Box<dyn Emulation> = match backend {
+pub async fn create_backend(
+    backend: Backend,
+) -> Result<Box<dyn InputEmulation>, EmulationCreationError> {
+    match backend {
        #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-            Backend::Wlroots => Box::new(wlroots::WlrootsEmulation::new()?),
+        Backend::Wlroots => Ok(Box::new(wlroots::WlrootsEmulation::new()?)),
        #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-            Backend::Libei => Box::new(libei::LibeiEmulation::new().await?),
+        Backend::Libei => Ok(Box::new(libei::LibeiEmulation::new().await?)),
        #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-            Backend::X11 => Box::new(x11::X11Emulation::new()?),
+        Backend::X11 => Ok(Box::new(x11::X11Emulation::new()?)),
        #[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
-            Backend::Xdp => Box::new(xdg_desktop_portal::DesktopPortalEmulation::new().await?),
+        Backend::Xdp => Ok(Box::new(
+            xdg_desktop_portal::DesktopPortalEmulation::new().await?,
+        )),
        #[cfg(windows)]
-            Backend::Windows => Box::new(windows::WindowsEmulation::new()?),
+        Backend::Windows => Ok(Box::new(windows::WindowsEmulation::new()?)),
        #[cfg(target_os = "macos")]
-            Backend::MacOs => Box::new(macos::MacOSEmulation::new()?),
-            Backend::Dummy => Box::new(dummy::DummyEmulation::new()),
-        };
-        Ok(Self {
-            emulation,
-            handles: HashSet::new(),
-            pressed_keys: HashMap::new(),
-        })
+        Backend::MacOs => Ok(Box::new(macos::MacOSEmulation::new()?)),
+        Backend::Dummy => Ok(Box::new(dummy::DummyEmulation::new())),
+    }
 }

-    pub async fn new(backend: Option<Backend>) -> Result<InputEmulation, EmulationCreationError> {
+pub async fn create(
+    backend: Option<Backend>,
+) -> Result<Box<dyn InputEmulation>, EmulationCreationError> {
    if let Some(backend) = backend {
-            let b = Self::with_backend(backend).await;
+        let b = create_backend(backend).await;
        if b.is_ok() {
            log::info!("using emulation backend: {backend}");
        }
@@ -123,7 +126,7 @@ impl InputEmulation {
        Backend::MacOs,
        Backend::Dummy,
    ] {
-            match Self::with_backend(backend).await {
+        match create_backend(backend).await {
            Ok(b) => {
                log::info!("using emulation backend: {backend}");
                return Ok(b);
@@ -135,106 +138,3 @@ impl InputEmulation {

    Err(EmulationCreationError::NoAvailableBackend)
 }
-
-    pub async fn consume(
-        &mut self,
-        event: Event,
-        handle: EmulationHandle,
-    ) -> Result<(), EmulationError> {
-        match event {
-            Event::Keyboard(KeyboardEvent::Key { key, state, .. }) => {
-                // prevent double pressed / released keys
-                if self.update_pressed_keys(handle, key, state) {
-                    self.emulation.consume(event, handle).await?;
-                }
-                Ok(())
-            }
-            _ => self.emulation.consume(event, handle).await,
-        }
-    }
-
-    pub async fn create(&mut self, handle: EmulationHandle) -> bool {
-        if self.handles.insert(handle) {
-            self.pressed_keys.insert(handle, HashSet::new());
-            self.emulation.create(handle).await;
-            true
-        } else {
-            false
-        }
-    }
-
-    pub async fn destroy(&mut self, handle: EmulationHandle) {
-        let _ = self.release_keys(handle).await;
-        if self.handles.remove(&handle) {
-            self.pressed_keys.remove(&handle);
-            self.emulation.destroy(handle).await
-        }
-    }
-
-    pub async fn terminate(&mut self) {
-        for handle in self.handles.iter().cloned().collect::<Vec<_>>() {
-            self.destroy(handle).await
-        }
-        self.emulation.terminate().await
-    }
-
-    pub async fn release_keys(&mut self, handle: EmulationHandle) -> Result<(), EmulationError> {
-        if let Some(keys) = self.pressed_keys.get_mut(&handle) {
-            let keys = keys.drain().collect::<Vec<_>>();
-            for key in keys {
-                let event = Event::Keyboard(KeyboardEvent::Key {
-                    time: 0,
-                    key,
-                    state: 0,
-                });
-                self.emulation.consume(event, handle).await?;
-                if let Ok(key) = input_event::scancode::Linux::try_from(key) {
-                    log::warn!("releasing stuck key: {key:?}");
-                }
-            }
-        }
-
-        let event = Event::Keyboard(KeyboardEvent::Modifiers {
-            mods_depressed: 0,
-            mods_latched: 0,
-            mods_locked: 0,
-            group: 0,
-        });
-        self.emulation.consume(event, handle).await?;
-        Ok(())
-    }
-
-    pub fn has_pressed_keys(&self, handle: EmulationHandle) -> bool {
-        self.pressed_keys
-            .get(&handle)
-            .is_some_and(|p| !p.is_empty())
-    }
-
-    /// update the pressed_keys for the given handle
-    /// returns whether the event should be processed
-    fn update_pressed_keys(&mut self, handle: EmulationHandle, key: u32, state: u8) -> bool {
-        let Some(pressed_keys) = self.pressed_keys.get_mut(&handle) else {
-            return false;
-        };
-
-        if state == 0 {
-            // currently pressed => can release
-            pressed_keys.remove(&key)
-        } else {
-            // currently not pressed => can press
-            pressed_keys.insert(key)
-        }
-    }
-}
-
-#[async_trait]
-trait Emulation: Send {
-    async fn consume(
-        &mut self,
-        event: Event,
-        handle: EmulationHandle,
-    ) -> Result<(), EmulationError>;
-    async fn create(&mut self, handle: EmulationHandle);
-    async fn destroy(&mut self, handle: EmulationHandle);
-    async fn terminate(&mut self);
-}
--- a/input-emulation/src/libei.rs
+++ b/input-emulation/src/libei.rs
@@ -15,7 +15,7 @@ use tokio::task::JoinHandle;
 use ashpd::{
    desktop::{
        remote_desktop::{DeviceType, RemoteDesktop},
-        PersistMode, Session,
+        Session,
    },
    WindowIdentifier,
 };
@@ -34,7 +34,7 @@ use input_event::{Event, KeyboardEvent, PointerEvent};

 use crate::error::{EmulationError, ReisConvertStreamError};

-use super::{error::LibeiEmulationCreationError, Emulation, EmulationHandle};
+use super::{error::LibeiEmulationCreationError, EmulationHandle, InputEmulation};

 static INTERFACES: Lazy<HashMap<&'static str, u32>> = Lazy::new(|| {
    let mut m = HashMap::new();
@@ -60,7 +60,7 @@ struct Devices {
    keyboard: Arc<RwLock<Option<(ei::Device, ei::Keyboard)>>>,
 }

-pub(crate) struct LibeiEmulation<'a> {
+pub struct LibeiEmulation<'a> {
    context: ei::Context,
    devices: Devices,
    ei_task: JoinHandle<()>,
@@ -68,11 +68,10 @@ pub(crate) struct LibeiEmulation<'a> {
    libei_error: Arc<AtomicBool>,
    serial: AtomicU32,
    _remote_desktop: RemoteDesktop<'a>,
-    session: Session<'a, RemoteDesktop<'a>>,
+    session: Session<'a>,
 }

-async fn get_ei_fd<'a>(
-) -> Result<(RemoteDesktop<'a>, Session<'a, RemoteDesktop<'a>>, OwnedFd), ashpd::Error> {
+async fn get_ei_fd<'a>() -> Result<(RemoteDesktop<'a>, Session<'a>, OwnedFd), ashpd::Error> {
    let remote_desktop = RemoteDesktop::new().await?;

    log::debug!("creating session ...");
@@ -80,12 +79,7 @@ async fn get_ei_fd<'a>(

    log::debug!("selecting devices ...");
    remote_desktop
-        .select_devices(
-            &session,
-            DeviceType::Keyboard | DeviceType::Pointer,
-            None,
-            PersistMode::ExplicitlyRevoked,
-        )
+        .select_devices(&session, DeviceType::Keyboard | DeviceType::Pointer)
        .await?;

    log::info!("requesting permission for input emulation");
@@ -99,7 +93,7 @@ async fn get_ei_fd<'a>(
 }

 impl<'a> LibeiEmulation<'a> {
-    pub(crate) async fn new() -> Result<Self, LibeiEmulationCreationError> {
+    pub async fn new() -> Result<Self, LibeiEmulationCreationError> {
        let (_remote_desktop, session, eifd) = get_ei_fd().await?;
        let stream = UnixStream::from(eifd);
        stream.set_nonblocking(true)?;
@@ -147,7 +141,7 @@ impl<'a> Drop for LibeiEmulation<'a> {
 }

 #[async_trait]
-impl<'a> Emulation for LibeiEmulation<'a> {
+impl<'a> InputEmulation for LibeiEmulation<'a> {
    async fn consume(
        &mut self,
        event: Event,
--- a/input-emulation/src/macos.rs
+++ b/input-emulation/src/macos.rs
@@ -1,4 +1,4 @@
-use super::{error::EmulationError, Emulation, EmulationHandle};
+use super::{error::EmulationError, EmulationHandle, InputEmulation};
 use async_trait::async_trait;
 use core_graphics::display::{CGDisplayBounds, CGMainDisplayID, CGPoint};
 use core_graphics::event::{
@@ -16,8 +16,8 @@ use super::error::MacOSEmulationCreationError;
 const DEFAULT_REPEAT_DELAY: Duration = Duration::from_millis(500);
 const DEFAULT_REPEAT_INTERVAL: Duration = Duration::from_millis(32);

-pub(crate) struct MacOSEmulation {
-    event_source: CGEventSource,
+pub struct MacOSEmulation {
+    pub event_source: CGEventSource,
    repeat_task: Option<AbortHandle>,
    button_state: ButtonState,
 }
@@ -53,7 +53,7 @@ impl IndexMut<CGMouseButton> for ButtonState {
 unsafe impl Send for MacOSEmulation {}

 impl MacOSEmulation {
-    pub(crate) fn new() -> Result<Self, MacOSEmulationCreationError> {
+    pub fn new() -> Result<Self, MacOSEmulationCreationError> {
        let event_source = CGEventSource::new(CGEventSourceStateID::CombinedSessionState)
            .map_err(|_| MacOSEmulationCreationError::EventSourceCreation)?;
        let button_state = ButtonState {
@@ -106,7 +106,7 @@ fn key_event(event_source: CGEventSource, key: u16, state: u8) {
 }

 #[async_trait]
-impl Emulation for MacOSEmulation {
+impl InputEmulation for MacOSEmulation {
    async fn consume(
        &mut self,
        event: Event,
--- a/input-emulation/src/windows.rs
+++ b/input-emulation/src/windows.rs
@@ -19,23 +19,23 @@ use windows::Win32::UI::Input::KeyboardAndMouse::{
 };
 use windows::Win32::UI::WindowsAndMessaging::{XBUTTON1, XBUTTON2};

-use super::{Emulation, EmulationHandle};
+use super::{EmulationHandle, InputEmulation};

 const DEFAULT_REPEAT_DELAY: Duration = Duration::from_millis(500);
 const DEFAULT_REPEAT_INTERVAL: Duration = Duration::from_millis(32);

-pub(crate) struct WindowsEmulation {
+pub struct WindowsEmulation {
    repeat_task: Option<AbortHandle>,
 }

 impl WindowsEmulation {
-    pub(crate) fn new() -> Result<Self, WindowsEmulationCreationError> {
+    pub fn new() -> Result<Self, WindowsEmulationCreationError> {
        Ok(Self { repeat_task: None })
    }
 }

 #[async_trait]
-impl Emulation for WindowsEmulation {
+impl InputEmulation for WindowsEmulation {
    async fn consume(&mut self, event: Event, _: EmulationHandle) -> Result<(), EmulationError> {
        match event {
            Event::Pointer(pointer_event) => match pointer_event {
--- a/input-emulation/src/wlroots.rs
+++ b/input-emulation/src/wlroots.rs
@@ -1,6 +1,6 @@
 use crate::error::EmulationError;

-use super::{error::WlrootsEmulationCreationError, Emulation};
+use super::{error::WlrootsEmulationCreationError, InputEmulation};
 use async_trait::async_trait;
 use std::collections::HashMap;
 use std::io;
@@ -50,7 +50,7 @@ pub(crate) struct WlrootsEmulation {
 }

 impl WlrootsEmulation {
-    pub(crate) fn new() -> Result<Self, WlrootsEmulationCreationError> {
+    pub fn new() -> Result<Self, WlrootsEmulationCreationError> {
        let conn = Connection::connect_to_env()?;
        let (globals, queue) = registry_queue_init::<State>(&conn)?;
        let qh = queue.handle();
@@ -116,7 +116,7 @@ impl State {
 }

 #[async_trait]
-impl Emulation for WlrootsEmulation {
+impl InputEmulation for WlrootsEmulation {
    async fn consume(
        &mut self,
        event: Event,
--- a/input-emulation/src/x11.rs
+++ b/input-emulation/src/x11.rs
@@ -11,16 +11,16 @@ use input_event::{

 use crate::error::EmulationError;

-use super::{error::X11EmulationCreationError, Emulation, EmulationHandle};
+use super::{error::X11EmulationCreationError, EmulationHandle, InputEmulation};

-pub(crate) struct X11Emulation {
+pub struct X11Emulation {
    display: *mut xlib::Display,
 }

 unsafe impl Send for X11Emulation {}

 impl X11Emulation {
-    pub(crate) fn new() -> Result<Self, X11EmulationCreationError> {
+    pub fn new() -> Result<Self, X11EmulationCreationError> {
        let display = unsafe {
            match xlib::XOpenDisplay(ptr::null()) {
                d if d == ptr::null::<xlib::Display>() as *mut xlib::Display => {
@@ -99,7 +99,7 @@ impl Drop for X11Emulation {
 }

 #[async_trait]
-impl Emulation for X11Emulation {
+impl InputEmulation for X11Emulation {
    async fn consume(&mut self, event: Event, _: EmulationHandle) -> Result<(), EmulationError> {
        match event {
            Event::Pointer(pointer_event) => match pointer_event {
--- a/input-emulation/src/xdg_desktop_portal.rs
+++ b/input-emulation/src/xdg_desktop_portal.rs
@@ -1,7 +1,7 @@
 use ashpd::{
    desktop::{
        remote_desktop::{Axis, DeviceType, KeyState, RemoteDesktop},
-        PersistMode, Session,
+        Session,
    },
    zbus::AsyncDrop,
    WindowIdentifier,
@@ -16,15 +16,15 @@ use input_event::{

 use crate::error::EmulationError;

-use super::{error::XdpEmulationCreationError, Emulation, EmulationHandle};
+use super::{error::XdpEmulationCreationError, EmulationHandle, InputEmulation};

-pub(crate) struct DesktopPortalEmulation<'a> {
+pub struct DesktopPortalEmulation<'a> {
    proxy: RemoteDesktop<'a>,
-    session: Session<'a, RemoteDesktop<'a>>,
+    session: Session<'a>,
 }

 impl<'a> DesktopPortalEmulation<'a> {
-    pub(crate) async fn new() -> Result<DesktopPortalEmulation<'a>, XdpEmulationCreationError> {
+    pub async fn new() -> Result<DesktopPortalEmulation<'a>, XdpEmulationCreationError> {
        log::debug!("connecting to org.freedesktop.portal.RemoteDesktop portal ...");
        let proxy = RemoteDesktop::new().await?;

@@ -34,12 +34,7 @@ impl<'a> DesktopPortalEmulation<'a> {

        log::debug!("selecting devices ...");
        proxy
-            .select_devices(
-                &session,
-                DeviceType::Keyboard | DeviceType::Pointer,
-                None,
-                PersistMode::ExplicitlyRevoked,
-            )
+            .select_devices(&session, DeviceType::Keyboard | DeviceType::Pointer)
            .await?;

        log::info!("requesting permission for input emulation");
@@ -56,7 +51,7 @@ impl<'a> DesktopPortalEmulation<'a> {
 }

 #[async_trait]
-impl<'a> Emulation for DesktopPortalEmulation<'a> {
+impl<'a> InputEmulation for DesktopPortalEmulation<'a> {
    async fn consume(
        &mut self,
        event: input_event::Event,
@@ -88,7 +83,7 @@ impl<'a> Emulation for DesktopPortalEmulation<'a> {
                        _ => Axis::Horizontal,
                    };
                    self.proxy
-                        .notify_pointer_axis_discrete(&self.session, axis, value / 120)
+                        .notify_pointer_axis_discrete(&self.session, axis, value)
                        .await?;
                }
                PointerEvent::Axis {
--- a/input-event/Cargo.toml
+++ b/input-event/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "input-event"
 description = "cross-platform input-event types for input-capture / input-emulation"
-version = "0.2.1"
+version = "0.1.0"
 edition = "2021"
 license = "GPL-3.0-or-later"
-repository = "https://github.com/feschber/lan-mouse"
+repository = "https://github.com/ferdinandschober/lan-mouse"

 [dependencies]
 futures-core = "0.3.30"
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage {
  nativeBuildInputs = with pkgs; [
    pkg-config
    cmake
-    makeWrapper
    buildPackages.gtk4
  ];

@@ -37,12 +36,6 @@ rustPlatform.buildRustPackage {
  # Set Environment Variables
  RUST_BACKTRACE = "full";

-  # Needed to enable support for SVG icons in GTK
-  postInstall = ''
-    wrapProgram "$out/bin/lan-mouse" \
-      --set GDK_PIXBUF_MODULE_FILE ${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
-  '';
-
  meta = with lib; {
    description = "Lan Mouse is a mouse and keyboard sharing software";
    longDescription = ''
--- a/src/capture_test.rs
+++ b/src/capture_test.rs
@@ -20,7 +20,7 @@ async fn input_capture_test(config: Config) -> Result<(), InputCaptureError> {
    log::info!("creating input capture");
    let backend = config.capture_backend.map(|b| b.into());
    loop {
-        let mut input_capture = InputCapture::new(backend).await?;
+        let mut input_capture = input_capture::create(backend).await?;
        log::info!("creating clients");
        input_capture.create(0, Position::Left).await?;
        input_capture.create(1, Position::Right).await?;
@@ -33,7 +33,7 @@ async fn input_capture_test(config: Config) -> Result<(), InputCaptureError> {
    }
 }

-async fn do_capture(input_capture: &mut InputCapture) -> Result<(), CaptureError> {
+async fn do_capture(input_capture: &mut Box<dyn InputCapture>) -> Result<(), CaptureError> {
    loop {
        let (client, event) = input_capture
            .next()
--- a/src/client.rs
+++ b/src/client.rs
@@ -125,8 +125,8 @@ pub struct ClientState {
    /// e.g. Laptops usually have at least an ethernet and a wifi port
    /// which have different ip addresses
    pub ips: HashSet<IpAddr>,
-    /// client has pressed keys
-    pub has_pressed_keys: bool,
+    /// keys currently pressed by this client
+    pub pressed_keys: HashSet<u32>,
    /// dns resolving in progress
    pub resolving: bool,
 }
--- a/src/emulation_test.rs
+++ b/src/emulation_test.rs
@@ -1,6 +1,5 @@
 use crate::config::Config;
 use anyhow::Result;
-use input_emulation::InputEmulation;
 use input_event::{Event, PointerEvent};
 use std::f64::consts::PI;
 use std::time::{Duration, Instant};
@@ -23,7 +22,7 @@ const RADIUS: f64 = 100.0;

 async fn input_emulation_test(config: Config) -> Result<()> {
    let backend = config.emulation_backend.map(|b| b.into());
-    let mut emulation = InputEmulation::new(backend).await?;
+    let mut emulation = input_emulation::create(backend).await?;
    emulation.create(0).await;
    let start = Instant::now();
    let mut offset = (0, 0);
--- a/src/frontend/gtk.rs
+++ b/src/frontend/gtk.rs
@@ -114,16 +114,13 @@ fn build_ui(app: &Application) {

    let window = Window::new(app, tx);

-    glib::spawn_future_local(clone!(
-        #[weak]
-        window,
-        async move {
+    glib::spawn_future_local(clone!(@weak window => async move {
        loop {
            let notify = receiver.recv().await.unwrap_or_else(|_| process::exit(1));
            match notify {
                FrontendEvent::Created(handle, client, state) => {
                    window.new_client(handle, client, state);
-                    }
+                },
                FrontendEvent::Deleted(client) => {
                    window.delete_client(client);
                }
@@ -134,7 +131,7 @@ fn build_ui(app: &Application) {
                FrontendEvent::NoSuchClient(_) => { }
                FrontendEvent::Error(e) => {
                    window.show_toast(e.as_str());
-                    }
+                },
                FrontendEvent::Enumerate(clients) => {
                    for (handle, client, state) in clients {
                        if window.client_idx(handle).is_some() {
@@ -144,7 +141,7 @@ fn build_ui(app: &Application) {
                            window.new_client(handle, client, state);
                        }
                    }
-                    }
+                },
                FrontendEvent::PortChanged(port, msg) => {
                    match msg {
                        None => window.show_toast(format!("port changed: {port}").as_str()),
@@ -160,8 +157,7 @@ fn build_ui(app: &Application) {
                }
            }
        }
-        }
-    ));
+    }));

    window.present();
 }
--- a/src/frontend/gtk/client_row/imp.rs
+++ b/src/frontend/gtk/client_row/imp.rs
@@ -52,13 +52,10 @@ impl ObjectSubclass for ClientRow {
 impl ObjectImpl for ClientRow {
    fn constructed(&self) {
        self.parent_constructed();
-        self.delete_button.connect_clicked(clone!(
-            #[weak(rename_to = row)]
-            self,
-            move |button| {
+        self.delete_button
+            .connect_clicked(clone!(@weak self as row => move |button| {
                row.handle_client_delete(button);
-            }
-        ));
+            }));
    }

    fn signals() -> &'static [glib::subclass::Signal] {
--- a/src/frontend/gtk/window.rs
+++ b/src/frontend/gtk/window.rs
@@ -63,61 +63,31 @@ impl Window {
        let selection_model = NoSelection::new(Some(self.clients()));
        self.imp().client_list.bind_model(
            Some(&selection_model),
-            clone!(
-                #[weak(rename_to = window)]
-                self,
-                #[upgrade_or_panic]
-                move |obj| {
-                    let client_object = obj
-                        .downcast_ref()
-                        .expect("Expected object of type `ClientObject`.");
+            clone!(@weak self as window => @default-panic, move |obj| {
+                let client_object = obj.downcast_ref().expect("Expected object of type `ClientObject`.");
                let row = window.create_client_row(client_object);
-                    row.connect_closure(
-                        "request-update",
-                        false,
-                        closure_local!(
-                            #[strong]
-                            window,
-                            move |row: ClientRow, active: bool| {
+                row.connect_closure("request-update", false, closure_local!(@strong window => move |row: ClientRow, active: bool| {
                    if let Some(client) = window.client_by_idx(row.index() as u32) {
                        window.request_client_activate(&client, active);
                        window.request_client_update(&client);
                        window.request_client_state(&client);
                    }
-                            }
-                        ),
-                    );
-                    row.connect_closure(
-                        "request-delete",
-                        false,
-                        closure_local!(
-                            #[strong]
-                            window,
-                            move |row: ClientRow| {
+                }));
+                row.connect_closure("request-delete", false, closure_local!(@strong window => move |row: ClientRow| {
                    if let Some(client) = window.client_by_idx(row.index() as u32) {
                        window.request_client_delete(&client);
                    }
-                            }
-                        ),
-                    );
-                    row.connect_closure(
-                        "request-dns",
-                        false,
-                        closure_local!(
-                            #[strong]
-                            window,
-                            move |row: ClientRow| {
+                }));
+                row.connect_closure("request-dns", false, closure_local!(@strong window => move
+                |row: ClientRow| {
                    if let Some(client) = window.client_by_idx(row.index() as u32) {
                        window.request_client_update(&client);
                        window.request_dns(&client);
                        window.request_client_state(&client);
                    }
-                            }
-                        ),
-                    );
+                }));
                row.upcast()
-                }
-            ),
+            })
        );
    }

--- a/src/frontend/gtk/window/imp.rs
+++ b/src/frontend/gtk/window/imp.rs
@@ -84,15 +84,11 @@ impl Window {
            clipboard.set_text(hostname.to_str().expect("hostname: invalid utf8"));
            button.set_icon_name("emblem-ok-symbolic");
            button.set_css_classes(&["success"]);
-            glib::spawn_future_local(clone!(
-                #[weak]
-                button,
-                async move {
+            glib::spawn_future_local(clone!(@weak button => async move {
                glib::timeout_future_seconds(1).await;
                button.set_icon_name("edit-copy-symbolic");
                button.set_css_classes(&[]);
-                }
-            ));
+            }));
        }
    }

--- a/src/server.rs
+++ b/src/server.rs
@@ -1,5 +1,5 @@
-use capture_task::CaptureRequest;
-use emulation_task::EmulationRequest;
+use capture_task::CaptureEvent;
+use emulation_task::EmulationEvent;
 use log;
 use std::{
    cell::{Cell, RefCell},
@@ -253,7 +253,7 @@ impl Server {
        self.notifies.capture.notify_waiters()
    }

-    async fn capture_enabled(&self) {
+    async fn capture_notified(&self) {
        self.notifies.capture.notified().await
    }

@@ -306,8 +306,8 @@ impl Server {

    async fn handle_request(
        &self,
-        capture: &Sender<CaptureRequest>,
-        emulate: &Sender<EmulationRequest>,
+        capture: &Sender<CaptureEvent>,
+        emulate: &Sender<EmulationEvent>,
        event: FrontendRequest,
    ) -> bool {
        log::debug!("frontend: {event:?}");
@@ -372,8 +372,8 @@ impl Server {

    async fn deactivate_client(
        &self,
-        capture: &Sender<CaptureRequest>,
-        emulate: &Sender<EmulationRequest>,
+        capture: &Sender<CaptureEvent>,
+        emulate: &Sender<EmulationEvent>,
        handle: ClientHandle,
    ) {
        log::debug!("deactivating client {handle}");
@@ -382,15 +382,15 @@ impl Server {
            None => return,
        };

-        let _ = capture.send(CaptureRequest::Destroy(handle)).await;
-        let _ = emulate.send(EmulationRequest::Destroy(handle)).await;
+        let _ = capture.send(CaptureEvent::Destroy(handle)).await;
+        let _ = emulate.send(EmulationEvent::Destroy(handle)).await;
        log::debug!("deactivating client {handle} done");
    }

    async fn activate_client(
        &self,
-        capture: &Sender<CaptureRequest>,
-        emulate: &Sender<EmulationRequest>,
+        capture: &Sender<CaptureEvent>,
+        emulate: &Sender<EmulationEvent>,
        handle: ClientHandle,
    ) {
        log::debug!("activating client");
@@ -415,17 +415,15 @@ impl Server {
        };

        /* notify emulation, capture and frontends */
-        let _ = capture
-            .send(CaptureRequest::Create(handle, pos.into()))
-            .await;
-        let _ = emulate.send(EmulationRequest::Create(handle)).await;
+        let _ = capture.send(CaptureEvent::Create(handle, pos.into())).await;
+        let _ = emulate.send(EmulationEvent::Create(handle)).await;
        log::debug!("activating client {handle} done");
    }

    async fn remove_client(
        &self,
-        capture: &Sender<CaptureRequest>,
-        emulate: &Sender<EmulationRequest>,
+        capture: &Sender<CaptureEvent>,
+        emulate: &Sender<EmulationEvent>,
        handle: ClientHandle,
    ) {
        let Some(active) = self
@@ -438,14 +436,8 @@ impl Server {
        };

        if active {
-            let _ = capture.send(CaptureRequest::Destroy(handle)).await;
-            let _ = emulate.send(EmulationRequest::Destroy(handle)).await;
-        }
-    }
-
-    fn update_pressed_keys(&self, handle: ClientHandle, has_pressed_keys: bool) {
-        if let Some((_, s)) = self.client_manager.borrow_mut().get_mut(handle) {
-            s.has_pressed_keys = has_pressed_keys;
+            let _ = capture.send(CaptureEvent::Destroy(handle)).await;
+            let _ = emulate.send(EmulationEvent::Destroy(handle)).await;
        }
    }

@@ -504,8 +496,8 @@ impl Server {
    async fn update_pos(
        &self,
        handle: ClientHandle,
-        capture: &Sender<CaptureRequest>,
-        emulate: &Sender<EmulationRequest>,
+        capture: &Sender<CaptureEvent>,
+        emulate: &Sender<EmulationEvent>,
        pos: Position,
    ) {
        let (changed, active) = {
@@ -522,13 +514,11 @@ impl Server {
        // update state in event input emulator & input capture
        if changed {
            if active {
-                let _ = capture.send(CaptureRequest::Destroy(handle)).await;
-                let _ = emulate.send(EmulationRequest::Destroy(handle)).await;
+                let _ = capture.send(CaptureEvent::Destroy(handle)).await;
+                let _ = emulate.send(EmulationEvent::Destroy(handle)).await;
            }
-            let _ = capture
-                .send(CaptureRequest::Create(handle, pos.into()))
-                .await;
-            let _ = emulate.send(EmulationRequest::Create(handle)).await;
+            let _ = capture.send(CaptureEvent::Create(handle, pos.into())).await;
+            let _ = emulate.send(EmulationEvent::Create(handle)).await;
        }
    }

@@ -567,27 +557,6 @@ impl Server {
            .get_mut(handle)
            .and_then(|(c, _)| c.hostname.clone())
    }
-
-    fn get_state(&self) -> State {
-        self.state.get()
-    }
-
-    fn set_state(&self, state: State) {
-        log::debug!("state => {state:?}");
-        self.state.replace(state);
-    }
-
-    fn set_active(&self, handle: Option<u64>) {
-        log::debug!("active client => {handle:?}");
-        self.active_client.replace(handle);
-    }
-
-    fn active_addr(&self, handle: u64) -> Option<SocketAddr> {
-        self.client_manager
-            .borrow()
-            .get(handle)
-            .and_then(|(_, s)| s.active_addr)
-    }
 }

 async fn listen_frontend(
--- a/src/server/capture_task.rs
+++ b/src/server/capture_task.rs
@@ -1,5 +1,5 @@
 use futures::StreamExt;
-use std::net::SocketAddr;
+use std::{collections::HashSet, net::SocketAddr};

 use tokio::{
    process::Command,
@@ -9,14 +9,14 @@ use tokio::{

 use input_capture::{self, CaptureError, CaptureHandle, InputCapture, InputCaptureError, Position};

-use input_event::Event;
+use input_event::{scancode, Event, KeyboardEvent};

 use crate::{client::ClientHandle, frontend::Status, server::State};

 use super::Server;

 #[derive(Clone, Copy, Debug)]
-pub(crate) enum CaptureRequest {
+pub(crate) enum CaptureEvent {
    /// capture must release the mouse
    Release,
    /// add a capture client
@@ -27,7 +27,7 @@ pub(crate) enum CaptureRequest {

 pub(crate) fn new(
    server: Server,
-    capture_rx: Receiver<CaptureRequest>,
+    capture_rx: Receiver<CaptureEvent>,
    udp_send: Sender<(Event, SocketAddr)>,
 ) -> JoinHandle<()> {
    let backend = server.config.capture_backend.map(|b| b.into());
@@ -38,7 +38,7 @@ async fn capture_task(
    server: Server,
    backend: Option<input_capture::Backend>,
    sender_tx: Sender<(Event, SocketAddr)>,
-    mut notify_rx: Receiver<CaptureRequest>,
+    mut notify_rx: Receiver<CaptureEvent>,
 ) {
    loop {
        if let Err(e) = do_capture(backend, &server, &sender_tx, &mut notify_rx).await {
@@ -53,7 +53,7 @@ async fn capture_task(
        loop {
            tokio::select! {
                _ = notify_rx.recv() => continue, /* need to ignore requests here! */
-                _ = server.capture_enabled() => break,
+                _ = server.capture_notified() => break,
                _ = server.cancelled() => return,
            }
        }
@@ -64,48 +64,50 @@ async fn do_capture(
    backend: Option<input_capture::Backend>,
    server: &Server,
    sender_tx: &Sender<(Event, SocketAddr)>,
-    notify_rx: &mut Receiver<CaptureRequest>,
+    notify_rx: &mut Receiver<CaptureEvent>,
 ) -> Result<(), InputCaptureError> {
    /* allow cancelling capture request */
    let mut capture = tokio::select! {
-        r = InputCapture::new(backend) => r?,
+        r = input_capture::create(backend) => {
+            r?
+        },
        _ = server.cancelled() => return Ok(()),
    };

    server.set_capture_status(Status::Enabled);

-    let clients = server.active_clients();
-    let clients = clients.iter().copied().map(|handle| {
-        (
-            handle,
-            server
+    // FIXME DUPLICATES
+    let clients = server
        .client_manager
        .borrow()
-                .get(handle)
-                .map(|(c, _)| c.pos)
-                .expect("no such client"),
-        )
-    });
-    for (handle, pos) in clients {
-        capture.create(handle, pos.into()).await?;
+        .get_client_states()
+        .map(|(h, s)| (h, s.clone()))
+        .collect::<Vec<_>>();
+    log::info!("{clients:?}");
+    for (handle, (config, _state)) in clients {
+        capture.create(handle, config.pos.into()).await?;
    }

+    let mut pressed_keys = HashSet::new();
    loop {
        tokio::select! {
-            event = capture.next() => match event {
-                Some(event) => handle_capture_event(server, &mut capture, sender_tx, event?).await?,
+            event = capture.next() => {
+                match event {
+                    Some(Ok(event)) => handle_capture_event(server, &mut capture, sender_tx, event, &mut pressed_keys).await?,
+                    Some(Err(e)) => return Err(e.into()),
                    None => return Ok(()),
-            },
+                }
+            }
            e = notify_rx.recv() => {
                log::debug!("input capture notify rx: {e:?}");
                match e {
                    Some(e) => match e {
-                        CaptureRequest::Release => {
+                        CaptureEvent::Release => {
                            capture.release().await?;
                            server.state.replace(State::Receiving);
                        }
-                        CaptureRequest::Create(h, p) => capture.create(h, p).await?,
-                        CaptureRequest::Destroy(h) => capture.destroy(h).await?,
+                        CaptureEvent::Create(h, p) => capture.create(h, p).await?,
+                        CaptureEvent::Destroy(h) => capture.destroy(h).await?,
                    },
                    None => break,
                }
@@ -117,44 +119,92 @@ async fn do_capture(
    Ok(())
 }

+fn update_pressed_keys(pressed_keys: &mut HashSet<scancode::Linux>, key: u32, state: u8) {
+    if let Ok(scancode) = scancode::Linux::try_from(key) {
+        log::debug!("key: {key}, state: {state}, scancode: {scancode:?}");
+        match state {
+            1 => pressed_keys.insert(scancode),
+            _ => pressed_keys.remove(&scancode),
+        };
+    }
+}
+
 async fn handle_capture_event(
    server: &Server,
-    capture: &mut InputCapture,
+    capture: &mut Box<dyn InputCapture>,
    sender_tx: &Sender<(Event, SocketAddr)>,
    event: (CaptureHandle, Event),
+    pressed_keys: &mut HashSet<scancode::Linux>,
 ) -> Result<(), CaptureError> {
-    let (handle, event) = event;
-    log::trace!("({handle}) {event:?}");
+    let (handle, mut e) = event;
+    log::trace!("({handle}) {e:?}");

-    // capture started
-    if event == Event::Enter() {
-        server.set_state(State::AwaitingLeave);
-        server.set_active(Some(handle));
-        server.restart_ping_timer();
-        spawn_hook_command(server, handle);
+    if let Event::Keyboard(KeyboardEvent::Key { key, state, .. }) = e {
+        update_pressed_keys(pressed_keys, key, state);
+        log::debug!("{pressed_keys:?}");
+        if server.release_bind.iter().all(|k| pressed_keys.contains(k)) {
+            pressed_keys.clear();
+            log::info!("releasing pointer");
+            capture.release().await?;
+            server.state.replace(State::Receiving);
+            log::trace!("STATE ===> Receiving");
+            // send an event to release all the modifiers
+            e = Event::Disconnect();
+        }
    }

-    // release capture if emulation set state to Receiveing
-    if server.get_state() == State::Receiving {
-        capture.release().await?;
+    let info = {
+        let mut enter = false;
+        let mut start_timer = false;
+
+        // get client state for handle
+        let mut client_manager = server.client_manager.borrow_mut();
+        let client_state = client_manager.get_mut(handle).map(|(_, s)| s);
+        if let Some(client_state) = client_state {
+            // if we just entered the client we want to send additional enter events until
+            // we get a leave event
+            if let Event::Enter() = e {
+                server.state.replace(State::AwaitingLeave);
+                server.active_client.replace(Some(handle));
+                log::trace!("Active client => {}", handle);
+                start_timer = true;
+                log::trace!("STATE ===> AwaitingLeave");
+                enter = true;
+            } else {
+                // ignore any potential events in receiving mode
+                if server.state.get() == State::Receiving && e != Event::Disconnect() {
                    return Ok(());
                }
-
-    // check release bind
-    if capture.keys_pressed(&server.release_bind) {
-        capture.release().await?;
-        server.set_state(State::Receiving);
            }
-
-    if let Some(addr) = server.active_addr(handle) {
-        let event = match server.get_state() {
-            State::Sending => event,
-            /* send additional enter events until acknowleged */
-            State::AwaitingLeave => Event::Enter(),
-            /* released capture */
-            State::Receiving => Event::Disconnect(),
+            Some((client_state.active_addr, enter, start_timer))
+        } else {
+            None
+        }
    };
-        sender_tx.send((event, addr)).await.expect("sender closed");
+
+    let (addr, enter, start_timer) = match info {
+        Some(i) => i,
+        None => {
+            // should not happen
+            log::warn!("unknown client!");
+            capture.release().await?;
+            server.state.replace(State::Receiving);
+            log::trace!("STATE ===> Receiving");
+            return Ok(());
+        }
+    };
+
+    if start_timer {
+        server.restart_ping_timer();
+    }
+    if enter {
+        spawn_hook_command(server, handle);
+    }
+    if let Some(addr) = addr {
+        if enter {
+            let _ = sender_tx.send((Event::Enter(), addr)).await;
+        }
+        let _ = sender_tx.send((e, addr)).await;
    }
    Ok(())
 }
--- a/src/server/emulation_task.rs
+++ b/src/server/emulation_task.rs
@@ -11,12 +11,12 @@ use crate::{
    server::State,
 };
 use input_emulation::{self, EmulationError, EmulationHandle, InputEmulation, InputEmulationError};
-use input_event::Event;
+use input_event::{Event, KeyboardEvent};

-use super::{network_task::NetworkError, CaptureRequest, Server};
+use super::{network_task::NetworkError, CaptureEvent, Server};

 #[derive(Clone, Debug)]
-pub(crate) enum EmulationRequest {
+pub(crate) enum EmulationEvent {
    /// create a new client
    Create(EmulationHandle),
    /// destroy a client
@@ -27,10 +27,10 @@ pub(crate) enum EmulationRequest {

 pub(crate) fn new(
    server: Server,
-    emulation_rx: Receiver<EmulationRequest>,
+    emulation_rx: Receiver<EmulationEvent>,
    udp_rx: Receiver<Result<(Event, SocketAddr), NetworkError>>,
    sender_tx: Sender<(Event, SocketAddr)>,
-    capture_tx: Sender<CaptureRequest>,
+    capture_tx: Sender<CaptureEvent>,
 ) -> JoinHandle<()> {
    let emulation_task = emulation_task(server, emulation_rx, udp_rx, sender_tx, capture_tx);
    tokio::task::spawn_local(emulation_task)
@@ -38,10 +38,10 @@ pub(crate) fn new(

 async fn emulation_task(
    server: Server,
-    mut rx: Receiver<EmulationRequest>,
+    mut rx: Receiver<EmulationEvent>,
    mut udp_rx: Receiver<Result<(Event, SocketAddr), NetworkError>>,
    sender_tx: Sender<(Event, SocketAddr)>,
-    capture_tx: Sender<CaptureRequest>,
+    capture_tx: Sender<CaptureEvent>,
 ) {
    loop {
        if let Err(e) = do_emulation(&server, &mut rx, &mut udp_rx, &sender_tx, &capture_tx).await {
@@ -65,15 +65,17 @@ async fn emulation_task(

 async fn do_emulation(
    server: &Server,
-    rx: &mut Receiver<EmulationRequest>,
+    rx: &mut Receiver<EmulationEvent>,
    udp_rx: &mut Receiver<Result<(Event, SocketAddr), NetworkError>>,
    sender_tx: &Sender<(Event, SocketAddr)>,
-    capture_tx: &Sender<CaptureRequest>,
+    capture_tx: &Sender<CaptureEvent>,
 ) -> Result<(), InputEmulationError> {
    let backend = server.config.emulation_backend.map(|b| b.into());
    log::info!("creating input emulation...");
    let mut emulation = tokio::select! {
-        r = InputEmulation::new(backend) => r?,
+        r = input_emulation::create(backend) => {
+            r?
+        }
        _ = server.cancelled() => return Ok(()),
    };

@@ -85,17 +87,23 @@ async fn do_emulation(
    }

    let res = do_emulation_session(server, &mut emulation, rx, udp_rx, sender_tx, capture_tx).await;
-    emulation.terminate().await; // manual drop
-    res
+
+    // release potentially still pressed keys
+    release_all_keys(server, &mut emulation).await?;
+
+    emulation.terminate().await;
+    res?;
+
+    Ok(())
 }

 async fn do_emulation_session(
    server: &Server,
-    emulation: &mut InputEmulation,
-    rx: &mut Receiver<EmulationRequest>,
+    emulation: &mut Box<dyn InputEmulation>,
+    rx: &mut Receiver<EmulationEvent>,
    udp_rx: &mut Receiver<Result<(Event, SocketAddr), NetworkError>>,
    sender_tx: &Sender<(Event, SocketAddr)>,
-    capture_tx: &Sender<CaptureRequest>,
+    capture_tx: &Sender<CaptureEvent>,
 ) -> Result<(), InputEmulationError> {
    let mut last_ignored = None;

@@ -113,9 +121,9 @@ async fn do_emulation_session(
            }
            emulate_event = rx.recv() => {
                match emulate_event.expect("channel closed") {
-                    EmulationRequest::Create(h) => { let _ = emulation.create(h).await; },
-                    EmulationRequest::Destroy(h) => emulation.destroy(h).await,
-                    EmulationRequest::ReleaseKeys(c) => emulation.release_keys(c).await?,
+                    EmulationEvent::Create(h) => emulation.create(h).await,
+                    EmulationEvent::Destroy(h) => emulation.destroy(h).await,
+                    EmulationEvent::ReleaseKeys(c) => release_keys(server, emulation, c).await?,
                }
            }
            _ = server.notifies.cancel.cancelled() => break Ok(()),
@@ -125,8 +133,8 @@ async fn do_emulation_session(

 async fn handle_udp_rx(
    server: &Server,
-    capture_tx: &Sender<CaptureRequest>,
-    emulate: &mut InputEmulation,
+    capture_tx: &Sender<CaptureEvent>,
+    emulate: &mut Box<dyn InputEmulation>,
    sender_tx: &Sender<(Event, SocketAddr)>,
    last_ignored: &mut Option<SocketAddr>,
    event: (Event, SocketAddr),
@@ -147,7 +155,9 @@ async fn handle_udp_rx(
        (Event::Ping(), addr) => {
            let _ = sender_tx.send((Event::Pong(), addr)).await;
        }
-        (Event::Disconnect(), _) => emulate.release_keys(handle).await?,
+        (Event::Disconnect(), _) => {
+            release_keys(server, emulate, handle).await?;
+        }
        (event, addr) => {
            // tell clients that we are ready to receive events
            if let Event::Enter() = event {
@@ -162,18 +172,33 @@ async fn handle_udp_rx(
                    } else {
                        // upon receiving any event, we go back to receiving mode
                        server.state.replace(State::Receiving);
-                        let _ = capture_tx.send(CaptureRequest::Release).await;
+                        let _ = capture_tx.send(CaptureEvent::Release).await;
                        log::trace!("STATE ===> Receiving");
                    }
                }
                State::Receiving => {
-                    log::trace!("{event} => emulate");
-                    emulate.consume(event, handle).await?;
-                    let has_pressed_keys = emulate.has_pressed_keys(handle);
-                    server.update_pressed_keys(handle, has_pressed_keys);
-                    if has_pressed_keys {
+                    let ignore_event =
+                        if let Event::Keyboard(KeyboardEvent::Key { key, state, .. }) = event {
+                            let (ignore_event, restart_timer) = update_client_keys(
+                                &mut server.client_manager.borrow_mut(),
+                                handle,
+                                key,
+                                state,
+                            );
+                            // restart timer if necessary
+                            if restart_timer {
                                server.restart_ping_timer();
                            }
+                            ignore_event
+                        } else {
+                            false
+                        };
+                    // workaround buggy rdp backend.
+                    if !ignore_event {
+                        // consume event
+                        emulate.consume(event, handle).await?;
+                        log::trace!("{event} => emulate");
+                    }
                }
                State::AwaitingLeave => {
                    // we just entered the deadzone of a client, so
@@ -189,7 +214,7 @@ async fn handle_udp_rx(
                    // event should still be possible
                    if let Event::Enter() = event {
                        server.state.replace(State::Receiving);
-                        let _ = capture_tx.send(CaptureRequest::Release).await;
+                        let _ = capture_tx.send(CaptureEvent::Release).await;
                        log::trace!("STATE ===> Receiving");
                    }
                }
@@ -199,6 +224,57 @@ async fn handle_udp_rx(
    Ok(())
 }

+async fn release_all_keys(
+    server: &Server,
+    emulation: &mut Box<dyn InputEmulation>,
+) -> Result<(), EmulationError> {
+    let clients = server
+        .client_manager
+        .borrow()
+        .get_client_states()
+        .map(|(h, _)| h)
+        .collect::<Vec<_>>();
+    for client in clients {
+        release_keys(server, emulation, client).await?;
+    }
+    Ok(())
+}
+
+async fn release_keys(
+    server: &Server,
+    emulate: &mut Box<dyn InputEmulation>,
+    client: ClientHandle,
+) -> Result<(), EmulationError> {
+    let keys = server
+        .client_manager
+        .borrow_mut()
+        .get_mut(client)
+        .iter_mut()
+        .flat_map(|(_, s)| s.pressed_keys.drain())
+        .collect::<Vec<_>>();
+
+    for key in keys {
+        let event = Event::Keyboard(KeyboardEvent::Key {
+            time: 0,
+            key,
+            state: 0,
+        });
+        emulate.consume(event, client).await?;
+        if let Ok(key) = input_event::scancode::Linux::try_from(key) {
+            log::warn!("releasing stuck key: {key:?}");
+        }
+    }
+
+    let event = Event::Keyboard(KeyboardEvent::Modifiers {
+        mods_depressed: 0,
+        mods_latched: 0,
+        mods_locked: 0,
+        group: 0,
+    });
+    emulate.consume(event, client).await?;
+    Ok(())
+}
+
 fn activate_client_if_exists(
    client_manager: &mut ClientManager,
    addr: SocketAddr,
@@ -223,3 +299,25 @@ fn activate_client_if_exists(
    client_state.active_addr = Some(addr);
    Some(handle)
 }
+
+fn update_client_keys(
+    client_manager: &mut ClientManager,
+    handle: ClientHandle,
+    key: u32,
+    state: u8,
+) -> (bool, bool) {
+    let Some(client_state) = client_manager.get_mut(handle).map(|(_, s)| s) else {
+        return (true, false);
+    };
+
+    // ignore double press / release events
+    let ignore_event = if state == 0 {
+        // ignore release event if key not pressed
+        !client_state.pressed_keys.remove(&key)
+    } else {
+        // ignore press event if key not released
+        !client_state.pressed_keys.insert(key)
+    };
+    let restart_timer = !client_state.pressed_keys.is_empty();
+    (ignore_event, restart_timer)
+}
--- a/src/server/ping_task.rs
+++ b/src/server/ping_task.rs
@@ -6,15 +6,15 @@ use input_event::Event;

 use crate::client::ClientHandle;

-use super::{capture_task::CaptureRequest, emulation_task::EmulationRequest, Server, State};
+use super::{capture_task::CaptureEvent, emulation_task::EmulationEvent, Server, State};

 const MAX_RESPONSE_TIME: Duration = Duration::from_millis(500);

 pub(crate) fn new(
    server: Server,
    sender_ch: Sender<(Event, SocketAddr)>,
-    emulate_notify: Sender<EmulationRequest>,
-    capture_notify: Sender<CaptureRequest>,
+    emulate_notify: Sender<EmulationEvent>,
+    capture_notify: Sender<CaptureEvent>,
 ) -> JoinHandle<()> {
    // timer task
    tokio::task::spawn_local(async move {
@@ -28,8 +28,8 @@ pub(crate) fn new(
 async fn ping_task(
    server: &Server,
    sender_ch: Sender<(Event, SocketAddr)>,
-    emulate_notify: Sender<EmulationRequest>,
-    capture_notify: Sender<CaptureRequest>,
+    emulate_notify: Sender<EmulationEvent>,
+    capture_notify: Sender<CaptureEvent>,
 ) {
    loop {
        // wait for wake up signal
@@ -42,8 +42,8 @@ async fn ping_task(
                let ping_clients: Vec<ClientHandle> = if receiving {
                    // if receiving we care about clients with pressed keys
                    client_manager
-                        .get_client_states()
-                        .filter(|(_, (_, s))| s.has_pressed_keys)
+                        .get_client_states_mut()
+                        .filter(|(_, (_, s))| !s.pressed_keys.is_empty())
                        .map(|(h, _)| h)
                        .collect()
                } else {
@@ -123,14 +123,14 @@ async fn ping_task(
            if receiving {
                for h in unresponsive_clients {
                    log::warn!("device not responding, releasing keys!");
-                    let _ = emulate_notify.send(EmulationRequest::ReleaseKeys(h)).await;
+                    let _ = emulate_notify.send(EmulationEvent::ReleaseKeys(h)).await;
                }
            } else {
                // release pointer if the active client has not responded
                if !unresponsive_clients.is_empty() {
                    log::warn!("client not responding, releasing pointer!");
                    server.state.replace(State::Receiving);
-                    let _ = capture_notify.send(CaptureRequest::Release).await;
+                    let _ = capture_notify.send(CaptureEvent::Release).await;
                }
            }
        }
Author	SHA1	Message	Date
Ferdinand Schober	24948773fc	ensure all keys are released when emulation ends	2024-07-16 20:39:38 +02:00
Ferdinand Schober	f3de36bc26	move capture/emulation errors into their creates	2024-07-15 21:10:30 +02:00
Ferdinand Schober	3d7163bf1f	move channel creation out of dns	2024-07-15 20:32:57 +02:00
Ferdinand Schober	4a90d88420	add comment	2024-07-15 12:56:36 +02:00
Ferdinand Schober	824f5b52f5	panic if dropped without being terminated	2024-07-15 12:44:56 +02:00
Ferdinand Schober	102342ce36	fix input capture test	2024-07-15 12:37:34 +02:00
Ferdinand Schober	06c6b2ec2e	simplify dns	2024-07-15 08:15:27 +02:00
Ferdinand Schober	0ffeaf7e91	simplify	2024-07-14 17:56:54 +02:00
Ferdinand Schober	bd09787f72	cleanup imports	2024-07-14 17:51:16 +02:00
Ferdinand Schober	4bac6d4bae	simplify	2024-07-14 14:36:36 +02:00
Ferdinand Schober	a7e7941806	reduce visibility of some structs	2024-07-14 14:32:11 +02:00
Ferdinand Schober	8fa4ea530a	remove duplicate log	2024-07-14 14:18:57 +02:00
Ferdinand Schober	970575de8d	simplify	2024-07-14 14:03:36 +02:00
Ferdinand Schober	151ff34383	remove debug log	2024-07-14 12:04:39 +02:00
Ferdinand Schober	8e94a64570	ignore requests with capture / emulation disabled otherwise the server would hang when trying to enable clients	2024-07-14 12:02:14 +02:00
Ferdinand Schober	bba9400ab1	add FIXME	2024-07-12 21:01:49 +02:00
Ferdinand Schober	303a8294b9	fix unused import in windows	2024-07-12 18:30:24 +02:00
Ferdinand Schober	a60a1c7095	fix emulation client creation	2024-07-12 18:27:49 +02:00
Ferdinand Schober	f74b7f98fe	fix conditional compilation	2024-07-12 18:18:46 +02:00
Ferdinand Schober	7e77e0c3f5	sync port	2024-07-12 18:09:23 +02:00
Ferdinand Schober	aea4d0f3fb	fix edge case where cancellation is not possible	2024-07-12 18:07:28 +02:00
Ferdinand Schober	69afbe1674	simplify	2024-07-12 18:02:32 +02:00
Ferdinand Schober	d02d8d5ab9	move assert to correct location	2024-07-12 17:55:12 +02:00
Ferdinand Schober	54943d9057	fix possible panic because channels are dropped	2024-07-12 17:53:20 +02:00
Ferdinand Schober	9227bde6bf	sync capture + emulation status	2024-07-12 17:44:24 +02:00
Ferdinand Schober	f052efe086	add missing dns request notify	2024-07-12 17:18:18 +02:00
Ferdinand Schober	740272e9a5	fix clippy warnings	2024-07-12 17:13:10 +02:00
Ferdinand Schober	e063f4ffb4	restructure server	2024-07-12 17:09:45 +02:00
Ferdinand Schober	592cc01faf	unused import	2024-07-12 12:54:01 +02:00
Ferdinand Schober	d84c572a4e	allow deny capture / emulation	2024-07-12 12:46:57 +02:00
Ferdinand Schober	fa57b4ea34	allow cancelling session creation	2024-07-12 12:31:39 +02:00
Ferdinand Schober	8908c33603	move libei event conversion to event crate	2024-07-12 12:07:30 +02:00
Ferdinand Schober	7328958dde	fix session not actually closed	2024-07-12 11:41:32 +02:00
Ferdinand Schober	8de738e597	impl session close	2024-07-12 11:35:21 +02:00
Ferdinand Schober	621d9eac59	fix termination of libei emulation on error	2024-07-12 02:45:47 +02:00
Ferdinand Schober	b4afbbec45	fix duplicate barriers	2024-07-12 01:36:47 +02:00
Ferdinand Schober	d25c6d4ec2	fix remnants from testing stuff	2024-07-12 01:32:52 +02:00
Ferdinand Schober	73a57ee892	cleanup	2024-07-12 01:29:03 +02:00
Ferdinand Schober	39d6a3cace	clippy	2024-07-12 01:04:44 +02:00
Ferdinand Schober	335a1fc3e2	simplify	2024-07-12 01:01:09 +02:00
Ferdinand Schober	3014e404c3	asdf	2024-07-11 22:43:43 +02:00
Ferdinand Schober	d54e472498	fix emulation notify	2024-07-11 22:20:40 +02:00
Ferdinand Schober	b0407148bf	add some log messages	2024-07-11 19:27:40 +02:00
Ferdinand Schober	2a2cbce17d	cleanup	2024-07-11 17:18:31 +02:00
Ferdinand Schober	f1dc3a5708	clean	2024-07-11 17:07:29 +02:00
Ferdinand Schober	a4094b2ce7	remove termination request	2024-07-11 17:01:56 +02:00
Ferdinand Schober	69a5eec944	cleanup	2024-07-11 16:59:09 +02:00
Ferdinand Schober	4c30f032f4	cleanup	2024-07-11 16:47:36 +02:00
Ferdinand Schober	2d26bd6a0b	improve cancellation	2024-07-11 16:34:41 +02:00
Ferdinand Schober	f0c9290579	fix duplicate barriers + use Notify	2024-07-11 15:35:37 +02:00
Ferdinand Schober	d73ced7b16	wire frontend	2024-07-11 15:12:59 +02:00
Ferdinand Schober	9990e5b578	move to own preferences group	2024-07-11 12:37:39 +02:00
Ferdinand Schober	fcdf80de00	improve ui mockup	2024-07-11 10:20:33 +02:00
Ferdinand Schober	252547dfdb	solve clippy except tomanyargs	2024-07-11 01:14:35 +02:00
Ferdinand Schober	3f7dae65a2	fmt	2024-07-11 00:51:49 +02:00
Ferdinand Schober	c58f5dbdd5	fix missing Arc import	2024-07-11 00:44:17 +02:00
Ferdinand Schober	8ba178dce0	simplify cancellation of service	2024-07-11 00:42:32 +02:00
Ferdinand Schober	ae3ea2c497	fix windows/mac + rename async_drop to terminate	2024-07-10 22:33:37 +02:00
Ferdinand Schober	ebf7897caa	create capture session only if clients are active	2024-07-10 22:24:38 +02:00
Ferdinand Schober	9c0a40563e	prefer CancellationToken / Notify to channel	2024-07-10 22:03:56 +02:00
Ferdinand Schober	8ba92ede34	its getting cleaner	2024-07-10 20:31:02 +02:00
Ferdinand Schober	89ca9c3c0b	improve libei error handling	2024-07-10 09:32:21 +02:00
Ferdinand Schober	110b37e26e	improve capture error handling	2024-07-10 09:00:43 +02:00