Epoll (#20)

major update:
- remove threading overhead by resorting to an event driven design with mio as a backend for epoll
- Clients can now have an arbitrary amount of ip adresses and lan-mouse will automatically choose the correct one
- -> seemless switching between ethernet and wifi
- cli frontend + frontend adapter for future frontends

src/consumer.rs

@@ -1,9 +1,8 @@
-use std::{thread::{JoinHandle, self}, sync::mpsc::Receiver, error::Error};
-
 #[cfg(unix)]
 use std::env;
 
-use crate::{backend::consumer, client::{Client, ClientHandle}, event::Event};
+use anyhow::Result;
+use crate::{backend::consumer, client::{ClientHandle, ClientEvent}, event::Event};
 
 #[cfg(unix)]
 #[derive(Debug)]
@@ -14,63 +13,87 @@ enum Backend {
     Libei,
 }
 
-pub fn start(consume_rx: Receiver<(Event, ClientHandle)>, clients: Vec<Client>, backend: Option<String>) -> Result<JoinHandle<()>, Box<dyn Error>> {
+pub trait EventConsumer {
+    /// Event corresponding to an abstract `client_handle`
+    fn consume(&self, event: Event, client_handle: ClientHandle);
+
+    /// Event corresponding to a configuration change
+    fn notify(&mut self, client_event: ClientEvent);
+}
+
+pub fn create() -> Result<Box<dyn EventConsumer>> {
     #[cfg(windows)]
-    let _backend = backend;
+    return Ok(Box::new(consumer::windows::WindowsConsumer::new()));
 
-    Ok(thread::Builder::new()
-        .name("event consumer".into())
-        .spawn(move || {
-            #[cfg(windows)]
-            consumer::windows::run(consume_rx, clients);
-
-            #[cfg(unix)]
-            let backend = match env::var("XDG_SESSION_TYPE") {
-                Ok(session_type) => match session_type.as_str() {
-                    "x11" => Backend::X11,
-                    "wayland" => {
-                        match backend {
-                            Some(backend) => match backend.as_str() {
-                                "wlroots" => Backend::Wlroots,
-                                "libei" => Backend::Libei,
-                                "xdg_desktop_portal" => Backend::RemoteDesktopPortal,
-                                backend => panic!("invalid backend: {}", backend)
-                            }
-                            // default to wlroots backend for now
-                            _ => Backend::Wlroots,
+    #[cfg(unix)]
+    let backend = match env::var("XDG_SESSION_TYPE") {
+        Ok(session_type) => match session_type.as_str() {
+            "x11" => {
+                log::info!("XDG_SESSION_TYPE = x11 -> using x11 event consumer");
+                Backend::X11
+            }
+            "wayland" => {
+                log::info!("XDG_SESSION_TYPE = wayland -> using wayland event consumer");
+                match env::var("XDG_CURRENT_DESKTOP") {
+                    Ok(current_desktop) => match current_desktop.as_str() {
+                        "gnome" => {
+                            log::info!("XDG_CURRENT_DESKTOP = gnome -> using libei backend");
+                            Backend::Libei
+                        }
+                        "KDE" => {
+                            log::info!("XDG_CURRENT_DESKTOP = KDE -> using xdg_desktop_portal backend");
+                            Backend::RemoteDesktopPortal
+                        }
+                        "sway" => {
+                            log::info!("XDG_CURRENT_DESKTOP = sway -> using wlroots backend");
+                            Backend::Wlroots
+                        }
+                        "Hyprland" => {
+                            log::info!("XDG_CURRENT_DESKTOP = Hyprland -> using wlroots backend");
+                            Backend::Wlroots
+                        }
+                        _ => {
+                            log::warn!("unknown XDG_CURRENT_DESKTOP -> defaulting to wlroots backend");
+                            Backend::Wlroots
                         }
                     }
-                    _ => panic!("unknown XDG_SESSION_TYPE"),
-                },
-                Err(_) => panic!("could not detect session type: XDG_SESSION_TYPE environment variable not set!"),
-            };
-
-            #[cfg(unix)]
-            match backend {
-                Backend::Libei => {
-                    #[cfg(not(feature = "libei"))]
-                    panic!("feature libei not enabled");
-                    #[cfg(feature = "libei")]
-                    consumer::libei::run(consume_rx, clients);
-                },
-                Backend::RemoteDesktopPortal => {
-                    #[cfg(not(feature = "xdg_desktop_portal"))]
-                    panic!("feature xdg_desktop_portal not enabled");
-                    #[cfg(feature = "xdg_desktop_portal")]
-                    consumer::xdg_desktop_portal::run(consume_rx, clients);
-                },
-                Backend::Wlroots => {
-                    #[cfg(not(feature = "wayland"))]
-                    panic!("feature wayland not enabled");
-                    #[cfg(feature = "wayland")]
-                    consumer::wlroots::run(consume_rx, clients);
-                },
-                Backend::X11 => {
-                    #[cfg(not(feature = "x11"))]
-                    panic!("feature x11 not enabled");
-                    #[cfg(feature = "x11")]
-                    consumer::x11::run(consume_rx, clients);
-                },
+                    // default to wlroots backend for now
+                    _ => {
+                        log::warn!("unknown XDG_CURRENT_DESKTOP -> defaulting to wlroots backend");
+                        Backend::Wlroots
+                    }
+                }
             }
-        })?)
+            _ => panic!("unknown XDG_SESSION_TYPE"),
+        },
+        Err(_) => panic!("could not detect session type: XDG_SESSION_TYPE environment variable not set!"),
+    };
+
+    #[cfg(unix)]
+    match backend {
+        Backend::Libei => {
+            #[cfg(not(feature = "libei"))]
+            panic!("feature libei not enabled");
+            #[cfg(feature = "libei")]
+            Ok(Box::new(consumer::libei::LibeiConsumer::new()))
+        },
+        Backend::RemoteDesktopPortal => {
+            #[cfg(not(feature = "xdg_desktop_portal"))]
+            panic!("feature xdg_desktop_portal not enabled");
+            #[cfg(feature = "xdg_desktop_portal")]
+            Ok(Box::new(consumer::xdg_desktop_portal::DesktopPortalConsumer::new()))
+        },
+        Backend::Wlroots => {
+            #[cfg(not(feature = "wayland"))]
+            panic!("feature wayland not enabled");
+            #[cfg(feature = "wayland")]
+            Ok(Box::new(consumer::wlroots::WlrootsConsumer::new()?))
+        },
+        Backend::X11 => {
+            #[cfg(not(feature = "x11"))]
+            panic!("feature x11 not enabled");
+            #[cfg(feature = "x11")]
+            Ok(Box::new(consumer::x11::X11Consumer::new()))
+        },
+    }
 }