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/producer.rs

@@ -1,10 +1,10 @@
+use mio::event::Source;
+use std::{error::Error, vec::Drain};
+use crate::{client::{ClientHandle, ClientEvent}, event::Event};
+use crate::backend::producer;
+
 #[cfg(unix)]
 use std::env;
-use std::{thread::{JoinHandle, self}, sync::mpsc::SyncSender, error::Error};
-
-use crate::{client::{Client, ClientHandle}, event::Event, request::Server};
-
-use crate::backend::producer;
 
 #[cfg(unix)]
 enum Backend {
@@ -12,41 +12,52 @@ enum Backend {
     X11,
 }
 
-pub fn start(
-    produce_tx: SyncSender<(Event, ClientHandle)>,
-    clients: Vec<Client>,
-    request_server: Server,
-) -> Result<JoinHandle<()>, Box<dyn Error>> {
-    Ok(thread::Builder::new()
-        .name("event producer".into())
-        .spawn(move || {
-            #[cfg(windows)]
-            producer::windows::run(produce_tx, request_server, clients);
+pub fn create() -> Result<Box<dyn EventProducer>, Box<dyn Error>> {
+    #[cfg(windows)]
+    return Ok(Box::new(producer::windows::WindowsProducer::new()));
 
-            #[cfg(unix)]
-            let backend = match env::var("XDG_SESSION_TYPE") {
-                Ok(session_type) => match session_type.as_str() {
-                    "x11" => Backend::X11,
-                    "wayland" => Backend::Wayland,
-                    _ => panic!("unknown XDG_SESSION_TYPE"),
-                },
-                Err(_) => panic!("could not detect session type: XDG_SESSION_TYPE environment variable not set!"),
-            };
-
-            #[cfg(unix)]
-            match backend {
-                Backend::X11 => {
-                    #[cfg(not(feature = "x11"))]
-                    panic!("feature x11 not enabled");
-                    #[cfg(feature = "x11")]
-                    producer::x11::run(produce_tx, request_server, clients);
-                }
-                Backend::Wayland => {
-                    #[cfg(not(feature = "wayland"))]
-                    panic!("feature wayland not enabled");
-                    #[cfg(feature = "wayland")]
-                    producer::wayland::run(produce_tx, request_server, clients);
-                }
+    #[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 producer");
+                Backend::X11
+            },
+            "wayland" => {
+                log::info!("XDG_SESSION_TYPE = wayland -> using wayland event producer");
+                Backend::Wayland
             }
-        })?)
+            _ => panic!("unknown XDG_SESSION_TYPE"),
+        },
+        Err(_) => panic!("could not detect session type: XDG_SESSION_TYPE environment variable not set!"),
+    };
+
+    #[cfg(unix)]
+    match backend {
+        Backend::X11 => {
+            #[cfg(not(feature = "x11"))]
+            panic!("feature x11 not enabled");
+            #[cfg(feature = "x11")]
+            Ok(Box::new(producer::x11::X11Producer::new()))
+        }
+        Backend::Wayland => {
+            #[cfg(not(feature = "wayland"))]
+            panic!("feature wayland not enabled");
+            #[cfg(feature = "wayland")]
+            Ok(Box::new(producer::wayland::WaylandEventProducer::new()?))
+        }
+    }
+}
+
+pub trait EventProducer: Source {
+    /// notify event producer of configuration changes
+    fn notify(&mut self, event: ClientEvent);
+
+    /// read an event
+    /// this function must be invoked to retrieve an Event after
+    /// the eventfd indicates a pending Event
+    fn read_events(&mut self) -> Drain<(ClientHandle, Event)>;
+
+    /// release mouse
+    fn release(&mut self);
 }