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

fix windows + rename to dx/dy everywhere

Browse Source
This commit is contained in:
Ferdinand Schober
2024-07-09 18:58:01 +02:00
parent 306e0e6a60
commit eaa3d9d5b3
5 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
input-capture/src/windows.rs
View File

@@ -145,10 +145,11 @@ fn to_mouse_event(wparam: WPARAM, lparam: LPARAM) -> Option<PointerEvent> {
let (x, y) = (mouse_low_level.pt.x, mouse_low_level.pt.y); let (x, y) = (mouse_low_level.pt.x, mouse_low_level.pt.y);
let (ex, ey) = ENTRY_POINT; let (ex, ey) = ENTRY_POINT;
let (dx, dy) = (x - ex, y - ey); let (dx, dy) = (x - ex, y - ey);
let (dx, dy) = (dx as f64, dy as f64);
Some(PointerEvent::Motion { Some(PointerEvent::Motion {
time: 0, time: 0,
relative_x: dx as f64, dx: dx as f64,
relative_y: dy as f64, dy: dy as f64,
}) })
}, },
WPARAM(p) if p == WM_MOUSEWHEEL as usize => Some(PointerEvent::AxisDiscrete120 { WPARAM(p) if p == WM_MOUSEWHEEL as usize => Some(PointerEvent::AxisDiscrete120 {

6
input-emulation/src/wlroots.rs
View File

@@ -177,11 +177,7 @@ impl VirtualInput {
match event { match event {
Event::Pointer(e) => { Event::Pointer(e) => {
match e { match e {
PointerEvent::Motion { PointerEvent::Motion { time, dx, dy } => self.pointer.motion(time, dx, dy),
time,
dx: relative_x,
dy: relative_y,
} => self.pointer.motion(time, relative_x, relative_y),
PointerEvent::Button { PointerEvent::Button {
time, time,
button, button,

6
input-event/src/lib.rs
View File

@@ -67,11 +67,7 @@ pub enum Event {
impl Display for PointerEvent { impl Display for PointerEvent {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {
PointerEvent::Motion { PointerEvent::Motion { time: _, dx, dy } => write!(f, "motion({dx},{dy})"),
time: _,
dx: relative_x,
dy: relative_y,
} => write!(f, "motion({relative_x},{relative_y})"),
PointerEvent::Button { PointerEvent::Button {
time: _, time: _,
button, button,

12
input-event/src/proto.rs
View File

@@ -127,15 +127,11 @@ impl From<&PointerEvent> for Vec<u8> {
fn from(event: &PointerEvent) -> Self { fn from(event: &PointerEvent) -> Self {
let id = vec![event.event_type() as u8]; let id = vec![event.event_type() as u8];
let data = match event { let data = match event {
PointerEvent::Motion { PointerEvent::Motion { time, dx, dy } => {
time,
dx: relative_x,
dy: relative_y,
} => {
let time = time.to_be_bytes(); let time = time.to_be_bytes();
let relative_x = relative_x.to_be_bytes(); let dx = dx.to_be_bytes();
let relative_y = relative_y.to_be_bytes(); let dy = dy.to_be_bytes();
[&time[..], &relative_x[..], &relative_y[..]].concat() [&time[..], &dx[..], &dy[..]].concat()
} }
PointerEvent::Button { PointerEvent::Button {
time, time,

6
src/emulation_test.rs
View File

@@ -37,11 +37,11 @@ async fn input_emulation_test(config: Config) -> Result<()> {
if new_offset != offset { if new_offset != offset {
let relative_motion = (new_offset.0 - offset.0, new_offset.1 - offset.1); let relative_motion = (new_offset.0 - offset.0, new_offset.1 - offset.1);
offset = new_offset; offset = new_offset;
let (relative_x, relative_y) = (relative_motion.0 as f64, relative_motion.1 as f64); let (dx, dy) = (relative_motion.0 as f64, relative_motion.1 as f64);
let event = Event::Pointer(PointerEvent::Motion { let event = Event::Pointer(PointerEvent::Motion {
time: 0, time: 0,
dx: relative_x, dx: dx,
dy: relative_y, dy: dy,
}); });
emulation.consume(event, 0).await?; emulation.consume(event, 0).await?;
} }