lock usage of rdev's grab behind new grab feature

justDeeevin · Aug 24, 2024 · d1b5dda · d1b5dda
1 parent ef7083c
commit d1b5dda
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,6 +47,9 @@ display-info = "0.5.1"
 geo = "0.28.0"
 zip = "2.2.0"
 
+[features]
+grab = ["rdev/unstable_grab"]
+
 [target.'cfg(windows)'.dependencies]
 mslnk = "0.1.8"
 

diff --git a/src/logic/listener.rs b/src/logic/listener.rs
@@ -2,7 +2,9 @@ use iced::{
     futures::{channel::mpsc, StreamExt},
     subscription, Subscription,
 };
-use rdev::{grab, listen};
+#[cfg(feature = "grab")]
+use rdev::grab;
+use rdev::listen;
 
 enum State {
     Starting,
@@ -27,6 +29,7 @@ pub fn bind() -> Subscription<Event> {
                 State::Starting => {
                     let (tx, rx) = mpsc::unbounded();
                     std::thread::spawn(move || {
+                        #[cfg(feature = "grab")]
                         if cfg!(target_os = "linux")
                             && std::env::var("XDG_SESSION_TYPE").unwrap() == "wayland"
                         {
@@ -50,6 +53,15 @@ pub fn bind() -> Subscription<Event> {
                             })
                             .unwrap();
                         }
+                        #[cfg(not(feature = "grab"))]
+                        listen(move |event| {
+                            if let Err(e) = tx.unbounded_send(event.clone()) {
+                                if !e.is_disconnected() {
+                                    panic!("{}", e);
+                                }
+                            }
+                        })
+                        .unwrap();
                     });
                     (Event::Ready, State::Ready(rx))
                 }