TheLanc3/lan-mouse
1
0
Fork 0
mirror of https://github.com/feschber/lan-mouse.git synced 2026-04-13 01:41:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
Ferdinand Schober
2023-02-14 00:55:02 +01:00
parent 6aa525c960
commit 437a599504
8 changed files with 93 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/wayland/consumer.rs
View File

@@ -99,10 +99,14 @@ impl App {
let data = loop {
let result = request::request_data(client.addr, Request::KeyMap);
eprint!("\rconnecting to {} ", client.addr);
for _ in 0..attempts { eprint!("."); }
for _ in 0..attempts {
eprint!(".");
}
match result {
Ok(data) => break data,
Err(e) => { eprint!(" - {}", e); }
Err(e) => {
eprint!(" - {}", e);
}
}
io::stderr().flush().unwrap();
thread::sleep(Duration::from_millis(500));
@@ -110,7 +114,9 @@ impl App {
};
eprint!("\rconnecting to {} ", client.addr);
for _ in 0..attempts { eprint!("."); }
for _ in 0..attempts {
eprint!(".");
}
eprintln!(" done! ");
// TODO use shm_open
@@ -163,11 +169,7 @@ impl VirtualInput {
}
},
Event::Keyboard(e) => match e {
KeyboardEvent::Key {
time,
key,
state,
} => {
KeyboardEvent::Key { time, key, state } => {
self.keyboard.key(time, key, state as u32);
}
KeyboardEvent::Modifiers {

47
src/backend/windows/consumer.rs
View File

@@ -1,9 +1,15 @@
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::{KeyboardEvent, PointerEvent};
use winapi::{
self,
um::winuser::{INPUT, INPUT_MOUSE, LPINPUT, MOUSEEVENTF_MOVE, MOUSEINPUT},
};
use crate::{event::Event, client::{Client, ClientHandle}};
use crate::{
client::{Client, ClientHandle},
event::Event,
};
fn rel_mouse(dx: i32, dy: i32) {
let mi = MOUSEINPUT {
@@ -21,31 +27,34 @@ fn rel_mouse(dx: i32, dy: i32) {
u: std::mem::transmute(mi),
};
winapi::um::winuser::SendInput(1 as u32, &mut input as LPINPUT, std::mem::size_of::<INPUT>() as i32);
winapi::um::winuser::SendInput(
1 as u32,
&mut input as LPINPUT,
std::mem::size_of::<INPUT>() as i32,
);
}
}
pub fn run(event_rx: Receiver<(Event, ClientHandle)>, _clients: Vec<Client>) {
loop {
match event_rx.recv().expect("event receiver unavailable").0 {
Event::Pointer(pointer_event) => {
match pointer_event {
PointerEvent::Motion { time: _, relative_x, relative_y } => {
rel_mouse(relative_x as i32, relative_y as i32);
},
PointerEvent::Button { .. } => {},
PointerEvent::Axis { .. } => {},
PointerEvent::Frame { } => {},
Event::Pointer(pointer_event) => match pointer_event {
PointerEvent::Motion {
time: _,
relative_x,
relative_y,
} => {
rel_mouse(relative_x as i32, relative_y as i32);
}
PointerEvent::Button { .. } => {}
PointerEvent::Axis { .. } => {}
PointerEvent::Frame {} => {}
},
Event::Keyboard(keyboard_event) => {
match keyboard_event {
KeyboardEvent::Key {..} => {},
KeyboardEvent::Modifiers {..} => {},
}
Event::Keyboard(keyboard_event) => match keyboard_event {
KeyboardEvent::Key { .. } => {}
KeyboardEvent::Modifiers { .. } => {}
},
Event::Release() => { },
Event::Release() => {}
}
}
}

6
src/backend/windows/producer.rs
View File

@@ -1,6 +1,10 @@
use std::sync::mpsc::SyncSender;
use crate::{event::Event, client::{ClientHandle, Client}, request::Server};
use crate::{
client::{Client, ClientHandle},
event::Event,
request::Server,
};
pub fn run(_produce_tx: SyncSender<(Event, ClientHandle)>, _server: Server, _clients: Vec<Client>) {
todo!();

31
src/backend/x11/consumer.rs
View File

@@ -1,7 +1,10 @@
use std::{sync::mpsc::Receiver, ptr};
use x11::{xtest, xlib};
use std::{ptr, sync::mpsc::Receiver};
use x11::{xlib, xtest};
use crate::{client::{ClientHandle, Client}, event::Event};
use crate::{
client::{Client, ClientHandle},
event::Event,
};
fn open_display() -> Option<*mut xlib::Display> {
unsafe {
@@ -27,18 +30,20 @@ pub fn run(event_rx: Receiver<(Event, ClientHandle)>, _clients: Vec<Client>) {
loop {
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 } => {
relative_motion(display, relative_x as i32, relative_y as i32);
},
crate::event::PointerEvent::Button { .. } => {},
crate::event::PointerEvent::Axis { .. } => {},
crate::event::PointerEvent::Frame { } => {},
Event::Pointer(pointer_event) => match pointer_event {
crate::event::PointerEvent::Motion {
time: _,
relative_x,
relative_y,
} => {
relative_motion(display, relative_x as i32, relative_y as i32);
}
crate::event::PointerEvent::Button { .. } => {}
crate::event::PointerEvent::Axis { .. } => {}
crate::event::PointerEvent::Frame {} => {}
},
Event::Keyboard(_) => {},
Event::Release() => {},
Event::Keyboard(_) => {}
Event::Release() => {}
}
}
}

3
src/backend/x11/producer.rs
View File

@@ -1,9 +1,8 @@
use std::sync::mpsc::SyncSender;
use crate::client::Client;
use crate::event::Event;
use crate::request::Server;
use crate::client::Client;
pub fn run(_produce_tx: SyncSender<(Event, u32)>, _request_server: Server, _clients: Vec<Client>) {
todo!()