Async (#30)

- manual eventloop now replaced by asycn-await using the tokio runtime
- dns no longer blocks the event loop
- simplifies logic
- makes xdg-desktop-portal easier to integrate

src/backend/producer/wayland.rs

@@ -1,9 +1,9 @@
 use crate::{client::{ClientHandle, Position, ClientEvent}, producer::EventProducer};
-use mio::{event::Source, unix::SourceFd};
 
-use std::{os::fd::RawFd, vec::Drain, io::ErrorKind, env};
+use std::{os::fd::RawFd, vec::Drain, io::{ErrorKind, self}, env};
 use memmap::MmapOptions;
 use anyhow::{anyhow, Result};
+use tokio::io::unix::AsyncFd;
 
 use std::{
     fs::File,
@@ -421,29 +421,12 @@ impl State {
     }
 }
 
-impl Source for WaylandEventProducer {
-    fn register(
-        &mut self,
-        registry: &mio::Registry,
-        token: mio::Token,
-        interests: mio::Interest,
-    ) -> std::io::Result<()> {
-        SourceFd(&self.state.wayland_fd).register(registry, token, interests)
-    }
-
-    fn reregister(
-        &mut self,
-        registry: &mio::Registry,
-        token: mio::Token,
-        interests: mio::Interest,
-    ) -> std::io::Result<()> {
-        SourceFd(&self.state.wayland_fd).reregister(registry, token, interests)
-    }
-
-    fn deregister(&mut self, registry: &mio::Registry) -> std::io::Result<()> {
-        SourceFd(&self.state.wayland_fd).deregister(registry)
+impl AsRawFd for WaylandEventProducer {
+    fn as_raw_fd(&self) -> RawFd {
+        self.state.wayland_fd
     }
 }
+
 impl WaylandEventProducer {
     fn read(&mut self) -> bool {
         match self.state.read_guard.take().unwrap().read() {
@@ -508,6 +491,10 @@ impl WaylandEventProducer {
 
 impl EventProducer for WaylandEventProducer {
 
+    fn get_async_fd(&self) -> io::Result<AsyncFd<RawFd>> {
+        AsyncFd::new(self.as_raw_fd())
+    }
+
     fn read_events(&mut self) -> Drain<(ClientHandle, Event)> {
         // read events
         while self.read() {

src/backend/producer/windows.rs

@@ -1,8 +1,4 @@
-use std::vec::Drain;
-
-use mio::{Token, Registry};
-use mio::event::Source;
-use std::io::Result;
+use tokio::sync::mpsc::{self, Receiver, Sender};
 
 use crate::{
     client::{ClientHandle, ClientEvent},
@@ -11,48 +7,24 @@ use crate::{
 };
 
 pub struct WindowsProducer {
-    pending_events: Vec<(ClientHandle, Event)>,
+    _tx: Sender<(ClientHandle, Event)>,
+    rx: Option<Receiver<(ClientHandle, Event)>>,
 }
 
-impl Source for WindowsProducer {
-    fn register(
-        &mut self,
-        _registry: &Registry,
-        _token: Token,
-        _interests: mio::Interest,
-    ) -> Result<()> {
-        Ok(())
-    }
-
-    fn reregister(
-        &mut self,
-        _registry: &Registry,
-        _token: Token,
-        _interests: mio::Interest,
-    ) -> Result<()> {
-        Ok(())
-    }
-
-    fn deregister(&mut self, _registry: &Registry) -> Result<()> {
-        Ok(())
-    }
-}
-
-
 impl EventProducer for WindowsProducer {
     fn notify(&mut self, _: ClientEvent) { }
 
-    fn read_events(&mut self) -> Drain<(ClientHandle, Event)> {
-        self.pending_events.drain(..)
-    }
-
     fn release(&mut self) { }
+    
+    fn get_wait_channel(&mut self) -> Option<mpsc::Receiver<(ClientHandle, Event)>> {
+        self.rx.take()
+    }
 }
 
 impl WindowsProducer {
     pub(crate) fn new() -> Self {
-        Self {
-            pending_events: vec![],
-        }
+        let (_tx, rx) = mpsc::channel(1);
+        let rx = Some(rx);
+        Self { _tx, rx }
     }
 }

src/backend/producer/x11.rs

@@ -1,12 +1,13 @@
+use std::io::Result;
+use std::os::fd::{AsRawFd, self};
 use std::vec::Drain;
 
-use mio::{Token, Registry};
-use mio::event::Source;
-use std::io::Result;
+use tokio::io::unix::AsyncFd;
 
+use crate::event::Event;
 use crate::producer::EventProducer;
 
-use crate::{client::{ClientHandle, ClientEvent}, event::Event};
+use crate::client::{ClientEvent, ClientHandle};
 
 pub struct X11Producer {
     pending_events: Vec<(ClientHandle, Event)>,
@@ -20,27 +21,9 @@ impl X11Producer {
     }
 }
 
-impl Source for X11Producer {
-    fn register(
-        &mut self,
-        _registry: &Registry,
-        _token: Token,
-        _interests: mio::Interest,
-    ) -> Result<()> {
-        Ok(())
-    }
-
-    fn reregister(
-        &mut self,
-        _registry: &Registry,
-        _token: Token,
-        _interests: mio::Interest,
-    ) -> Result<()> {
-        Ok(())
-    }
-
-    fn deregister(&mut self, _registry: &Registry) -> Result<()> {
-        Ok(())
+impl AsRawFd for X11Producer {
+    fn as_raw_fd(&self) -> fd::RawFd {
+        todo!()
     }
 }
 
@@ -52,4 +35,8 @@ impl EventProducer for X11Producer {
     }
 
     fn release(&mut self) {}
+
+    fn get_async_fd(&self) -> Result<AsyncFd<fd::RawFd>> {
+        todo!()
+    }
 }