From 00f52923b8cba0cef92eb5a4e8310ccdc0545e00 Mon Sep 17 00:00:00 2001 From: Ferdinand Schober Date: Mon, 13 Feb 2023 16:50:11 +0100 Subject: [PATCH] fix windows build --- src/backend/windows/consumer.rs | 18 ++++++++++++------ src/main.rs | 15 +++++++++++---- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/backend/windows/consumer.rs b/src/backend/windows/consumer.rs index 000f538..864e149 100644 --- a/src/backend/windows/consumer.rs +++ b/src/backend/windows/consumer.rs @@ -2,6 +2,7 @@ use std::sync::mpsc::Receiver; use winapi::{self, um::winuser::{INPUT, LPINPUT, INPUT_MOUSE, MOUSEINPUT, MOUSEEVENTF_MOVE}}; +use crate::event::{PointerEvent, KeyboardEvent}; use crate::{event::Event, client::{Client, ClientHandle}}; @@ -31,16 +32,21 @@ pub fn run(event_rx: Receiver<(Event, ClientHandle)>, _clients: Vec) { match event_rx.recv().expect("event receiver unavailable").0 { Event::Pointer(pointer_event) => { match pointer_event { - crate::event::PointerEvent::Motion { time: _, relative_x, relative_y } => { + PointerEvent::Motion { time: _, relative_x, relative_y } => { rel_mouse(relative_x as i32, relative_y as i32); }, - crate::event::PointerEvent::Button { .. } => {}, - crate::event::PointerEvent::Axis { .. } => {}, - crate::event::PointerEvent::Frame { } => {}, + PointerEvent::Button { .. } => {}, + PointerEvent::Axis { .. } => {}, + PointerEvent::Frame { } => {}, } }, - Event::Keyboard(_) => {}, - Event::Release() => {}, + Event::Keyboard(keyboard_event) => { + match keyboard_event { + KeyboardEvent::Key {..} => {}, + KeyboardEvent::Modifiers {..} => {}, + } + }, + Event::Release() => { }, } } } diff --git a/src/main.rs b/src/main.rs index 678891b..bb281bc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,16 +1,18 @@ -use std::{net::SocketAddr, sync::mpsc, thread, env}; +use std::{net::SocketAddr, sync::mpsc, thread}; + +#[cfg(unix)] +use std::env; use lan_mouse::{ client::{ClientManager, Position}, - config, dns, event, request, backend::Backend, + config, dns, event, request, }; #[cfg(windows)] use lan_mouse::backend::windows; #[cfg(unix)] -use lan_mouse::backend::wayland; -use lan_mouse::backend::x11; +use lan_mouse::backend::{Backend,wayland,x11}; fn add_client(client_manager: &mut ClientManager, client: &config::Client, pos: Position) { let ip = match client.ip { @@ -75,6 +77,11 @@ pub fn main() { } Err(_) => panic!("could not detect session type"), }; + + #[cfg(windows)] + println!("using backend: windows"); + + #[cfg(unix)] println!("using backend: {}", match backend { Backend::X11 => "x11", Backend::WAYLAND => "wayland",