From 59e6a110793ae15cd5f81a2e17568e4c71f6af6c Mon Sep 17 00:00:00 2001 From: Nova Date: Mon, 20 Oct 2025 22:42:36 -0700 Subject: [PATCH] fix: mouse pointer target reliability issues --- Cargo.lock | 32 +++++++++--------------------- src/main.rs | 4 +--- src/objects/input/mouse_pointer.rs | 1 - 3 files changed, 10 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 572618d..4e80aea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2743,17 +2743,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "futures-macro" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - [[package]] name = "futures-sink" version = "0.3.31" @@ -2773,12 +2762,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-core", - "futures-macro", "futures-sink", "futures-task", "pin-project-lite", "pin-utils", - "slab", ] [[package]] @@ -3500,7 +3487,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", - "windows-targets 0.53.2", + "windows-targets 0.48.5", ] [[package]] @@ -4041,7 +4028,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.3.0", "proc-macro2", "quote", "syn 2.0.104", @@ -4779,7 +4766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.104", @@ -5113,7 +5100,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5461,7 +5448,7 @@ checksum = "6eae92052b72ef70dafa16eddbabffc77e5ca3574be2f7bc1127b36f0a7ad7f2" [[package]] name = "stardust-xr" version = "0.45.0" -source = "git+https://github.com/StardustXR/core.git?branch=dev#e859b31459debe81a13198459431ca98c6b278c0" +source = "git+https://github.com/StardustXR/core.git?branch=dev#f6cec16352034401114c1368bd8c21c3a6914f32" dependencies = [ "color-eyre", "dirs", @@ -5480,13 +5467,12 @@ dependencies = [ [[package]] name = "stardust-xr-schemas" version = "1.5.3" -source = "git+https://github.com/StardustXR/core.git?branch=dev#e859b31459debe81a13198459431ca98c6b278c0" +source = "git+https://github.com/StardustXR/core.git?branch=dev#f6cec16352034401114c1368bd8c21c3a6914f32" dependencies = [ "console-subscriber", "flatbuffers", "flexbuffers", "fnv", - "futures-util", "kdl", "manifest-dir-macros", "nanoid", @@ -5742,7 +5728,7 @@ dependencies = [ "getrandom 0.3.3", "once_cell", "rustix 1.1.2", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6189,7 +6175,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69fff37da548239c3bf9e64a12193d261e8b22b660991c6fd2df057c168f435f" dependencies = [ "cc", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -6790,7 +6776,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/src/main.rs b/src/main.rs index 7090ec1..4c19cb3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -209,9 +209,7 @@ async fn main() -> Result { .await .expect("Couldn't add the object manager"); - let object_registry = ObjectRegistry::new(&dbus_connection).await.expect( - "Couldn't make the object registry to find all objects with given interfaces in d-bus", - ); + let object_registry = ObjectRegistry::new(&dbus_connection).await; let _wayland = Wayland::new().expect("Couldn't create Wayland instance"); diff --git a/src/objects/input/mouse_pointer.rs b/src/objects/input/mouse_pointer.rs index 10524c8..2fc0634 100644 --- a/src/objects/input/mouse_pointer.rs +++ b/src/objects/input/mouse_pointer.rs @@ -483,7 +483,6 @@ impl MousePointer { // Get current focused handler let current_handler = focused_handler_rx.borrow().clone(); let Some(handler_info) = current_handler else { - warn!("Input delivery task: No focused handler, dropping input event"); continue; };