Fix: do not attempt to use keybinder in wayland

Author: mdgaziur

crates/findex-daemon/src/main.rs

@@ -1,3 +1,4 @@
+use std::ffi::OsStr;
 use daemonize::Daemonize;
 use inotify::{Inotify, WatchMask};
 use nix::libc::{pid_t, time_t};
@@ -73,7 +74,11 @@ fn findex_daemon(current_time: time_t) {
         let mut buf = [0; 1024];
         match inotify.read_events(&mut buf) {
             Ok(mut events) => {
-                if events.next().is_some() {
+                if let Some(event) = events.next() {
+                    if event.name == Some(OsStr::new("toggle_file")) && events.next().is_none() {
+                        continue;
+                    }
+
                     println!("[INFO] configs changed, restarting findex");
                     if findex_process.poll().is_none() {
                         findex_process.kill().unwrap();

crates/findex/src/gui/mod.rs

@@ -24,7 +24,7 @@ pub struct GUI {
     pub window: Window,
     search_box: Entry,
     result_list: ListBox,
-    keybinder: KeyBinder<KeypressHandlerPayload>,
+    keybinder: Option<KeyBinder<KeypressHandlerPayload>>,
 }
 
 impl GUI {
@@ -110,25 +110,31 @@ impl GUI {
             }
         });
 
-        let keybinder = match KeyBinder::new(true) {
-            Ok(instance) => instance,
-            Err(_e) => {
-                eprintln!("[ERROR] Keybinder is not supported");
-                std::process::exit(1);
-            }
-        };
+        let keybinder;
+        if std::env::var("WAYLAND_DISPLAY").is_err() {
+            keybinder = match KeyBinder::new(true) {
+                Ok(instance) => Some(instance),
+                Err(_e) => {
+                    eprintln!("[ERROR] Keybinder is not supported");
+                    std::process::exit(1);
+                }
+            };
+        } else {
+            keybinder = None;
+        }
+
         Self {
+            keybinder,
             window,
-            search_box,
             result_list,
-            keybinder,
+            search_box,
         }
     }
 
     pub fn wait_for_toggle(&mut self) {
         if std::env::var("WAYLAND_DISPLAY").is_err() {
             assert!(
-                self.keybinder.bind(
+                self.keybinder.as_mut().unwrap().bind(
                     &FINDEX_CONFIG.toggle_key,
                     |_, payload| {
                         Self::show_window(&payload.window, &payload.search_box, &payload.result_list);