From b01f7c27937e5feb8977d3caa5bce2088d72e2ae Mon Sep 17 00:00:00 2001 From: Ferdinand Schober Date: Sun, 3 Dec 2023 22:37:41 +0100 Subject: [PATCH] move server to src/ --- src/event.rs | 2 -- src/lib.rs | 1 + src/main.rs | 2 +- src/{event => }/server.rs | 3 +-- 4 files changed, 3 insertions(+), 5 deletions(-) rename src/{event => }/server.rs (99%) diff --git a/src/event.rs b/src/event.rs index eb4575f..7b516f4 100644 --- a/src/event.rs +++ b/src/event.rs @@ -1,7 +1,5 @@ use std::{error::Error, fmt::{self, Display}}; -pub mod server; - #[derive(Debug, Clone, Copy)] pub enum PointerEvent { Motion { diff --git a/src/lib.rs b/src/lib.rs index 4262c86..3115236 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,6 +2,7 @@ pub mod client; pub mod config; pub mod dns; pub mod event; +pub mod server; pub mod consumer; pub mod producer; diff --git a/src/main.rs b/src/main.rs index 33900d3..9277cdd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,7 +3,7 @@ use std::{process, error::Error}; use env_logger::Env; use lan_mouse::{ consumer, producer, - config::{Config, Frontend::{Cli, Gtk}}, event::server::Server, + config::{Config, Frontend::{Cli, Gtk}}, server::Server, frontend::{FrontendListener, cli}, }; diff --git a/src/event/server.rs b/src/server.rs similarity index 99% rename from src/event/server.rs rename to src/server.rs index e17bf66..ee323d3 100644 --- a/src/event/server.rs +++ b/src/server.rs @@ -12,8 +12,7 @@ use tokio::net::TcpStream; use std::{net::SocketAddr, io::ErrorKind}; use crate::{client::{ClientEvent, ClientManager, Position, ClientHandle}, consumer::EventConsumer, producer::EventProducer, frontend::{FrontendEvent, FrontendListener, FrontendNotify, self}, dns::{self, DnsResolver}}; -// use crate::event::PointerEvent; -use super::Event; +use crate::event::Event; /// keeps track of state to prevent a feedback loop /// of continuously sending and receiving the same event.