refactor producer and consumer (#97)

src/backend.rs

@@ -1,2 +0,0 @@
-pub mod consumer;
-pub mod producer;

src/backend/consumer.rs

@@ -1,20 +0,0 @@
-#[cfg(windows)]
-pub mod windows;
-
-#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-pub mod x11;
-
-#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-pub mod wlroots;
-
-#[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
-pub mod xdg_desktop_portal;
-
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-pub mod libei;
-
-#[cfg(target_os = "macos")]
-pub mod macos;
-
-/// fallback consumer
-pub mod dummy;

src/backend/producer.rs

@@ -1,17 +0,0 @@
-#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-pub mod libei;
-
-#[cfg(target_os = "macos")]
-pub mod macos;
-
-#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-pub mod wayland;
-
-#[cfg(windows)]
-pub mod windows;
-
-#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-pub mod x11;
-
-/// fallback event producer
-pub mod dummy;

src/consumer.rs

@@ -2,12 +2,32 @@ use async_trait::async_trait;
 use std::future;
 
 use crate::{
-    backend::consumer,
     client::{ClientEvent, ClientHandle},
     event::Event,
 };
 use anyhow::Result;
 
+#[cfg(windows)]
+pub mod windows;
+
+#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
+pub mod x11;
+
+#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
+pub mod wlroots;
+
+#[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
+pub mod xdg_desktop_portal;
+
+#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
+pub mod libei;
+
+#[cfg(target_os = "macos")]
+pub mod macos;
+
+/// fallback consumer
+pub mod dummy;
+
 #[async_trait]
 pub trait EventConsumer: Send {
     async fn consume(&mut self, event: Event, client_handle: ClientHandle);
@@ -23,13 +43,13 @@ pub trait EventConsumer: Send {
 
 pub async fn create() -> Box<dyn EventConsumer> {
     #[cfg(windows)]
-    match consumer::windows::WindowsConsumer::new() {
+    match windows::WindowsConsumer::new() {
         Ok(c) => return Box::new(c),
         Err(e) => log::warn!("windows event consumer unavailable: {e}"),
     }
 
     #[cfg(target_os = "macos")]
-    match consumer::macos::MacOSConsumer::new() {
+    match macos::MacOSConsumer::new() {
         Ok(c) => {
             log::info!("using macos event consumer");
             return Box::new(c);
@@ -38,7 +58,7 @@ pub async fn create() -> Box<dyn EventConsumer> {
     }
 
     #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-    match consumer::wlroots::WlrootsConsumer::new() {
+    match wlroots::WlrootsConsumer::new() {
         Ok(c) => {
             log::info!("using wlroots event consumer");
             return Box::new(c);
@@ -47,7 +67,7 @@ pub async fn create() -> Box<dyn EventConsumer> {
     }
 
     #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-    match consumer::libei::LibeiConsumer::new().await {
+    match libei::LibeiConsumer::new().await {
         Ok(c) => {
             log::info!("using libei event consumer");
             return Box::new(c);
@@ -56,7 +76,7 @@ pub async fn create() -> Box<dyn EventConsumer> {
     }
 
     #[cfg(all(unix, feature = "xdg_desktop_portal", not(target_os = "macos")))]
-    match consumer::xdg_desktop_portal::DesktopPortalConsumer::new().await {
+    match xdg_desktop_portal::DesktopPortalConsumer::new().await {
         Ok(c) => {
             log::info!("using xdg-remote-desktop-portal event consumer");
             return Box::new(c);
@@ -65,7 +85,7 @@ pub async fn create() -> Box<dyn EventConsumer> {
     }
 
     #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-    match consumer::x11::X11Consumer::new() {
+    match x11::X11Consumer::new() {
         Ok(c) => {
             log::info!("using x11 event consumer");
             return Box::new(c);
@@ -74,5 +94,5 @@ pub async fn create() -> Box<dyn EventConsumer> {
     }
 
     log::error!("falling back to dummy event consumer");
-    Box::new(consumer::dummy::DummyConsumer::new())
+    Box::new(dummy::DummyConsumer::new())
 }

src/lib.rs

@@ -7,6 +7,5 @@ pub mod server;
 pub mod consumer;
 pub mod producer;
 
-pub mod backend;
 pub mod frontend;
 pub mod scancode;

src/producer.rs

@@ -2,27 +2,44 @@ use std::io;
 
 use futures_core::Stream;
 
-use crate::backend::producer;
 use crate::{
     client::{ClientEvent, ClientHandle},
     event::Event,
 };
 
+#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
+pub mod libei;
+
+#[cfg(target_os = "macos")]
+pub mod macos;
+
+#[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
+pub mod wayland;
+
+#[cfg(windows)]
+pub mod windows;
+
+#[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
+pub mod x11;
+
+/// fallback event producer
+pub mod dummy;
+
 pub async fn create() -> Box<dyn EventProducer> {
     #[cfg(target_os = "macos")]
-    match producer::macos::MacOSProducer::new() {
+    match macos::MacOSProducer::new() {
         Ok(p) => return Box::new(p),
         Err(e) => log::info!("macos event producer not available: {e}"),
     }
 
     #[cfg(windows)]
-    match producer::windows::WindowsProducer::new() {
+    match windows::WindowsProducer::new() {
         Ok(p) => return Box::new(p),
         Err(e) => log::info!("windows event producer not available: {e}"),
     }
 
     #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
-    match producer::libei::LibeiProducer::new().await {
+    match libei::LibeiProducer::new().await {
         Ok(p) => {
             log::info!("using libei event producer");
             return Box::new(p);
@@ -31,7 +48,7 @@ pub async fn create() -> Box<dyn EventProducer> {
     }
 
     #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
-    match producer::wayland::WaylandEventProducer::new() {
+    match wayland::WaylandEventProducer::new() {
         Ok(p) => {
             log::info!("using layer-shell event producer");
             return Box::new(p);
@@ -40,7 +57,7 @@ pub async fn create() -> Box<dyn EventProducer> {
     }
 
     #[cfg(all(unix, feature = "x11", not(target_os = "macos")))]
-    match producer::x11::X11Producer::new() {
+    match x11::X11Producer::new() {
         Ok(p) => {
             log::info!("using x11 event producer");
             return Box::new(p);
@@ -49,7 +66,7 @@ pub async fn create() -> Box<dyn EventProducer> {
     }
 
     log::error!("falling back to dummy event producer");
-    Box::new(producer::dummy::DummyProducer::new())
+    Box::new(dummy::DummyProducer::new())
 }
 
 pub trait EventProducer: Stream<Item = io::Result<(ClientHandle, Event)>> + Unpin {