weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix, win mouse, touchpad scroll

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2023-06-07 20:01:01 +08:00
parent c69d59596b
commit c4f9650d7f
5 changed files with 96 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libs/enigo/examples/mouse.rs
View File

@@ -1,4 +1,5 @@
use enigo::{Enigo, MouseButton, MouseControllable};
use winapi::um::winuser::WHEEL_DELTA;
use std::thread;
use std::time::Duration;
@@ -11,30 +12,22 @@ fn main() {
enigo.mouse_move_to(500, 200);
thread::sleep(wait_time);
enigo.mouse_down(MouseButton::Left).ok();
thread::sleep(wait_time);
enigo.mouse_move_relative(100, 100);
thread::sleep(wait_time);
enigo.mouse_up(MouseButton::Left);
thread::sleep(wait_time);
enigo.mouse_click(MouseButton::Left);
thread::sleep(wait_time);
#[cfg(not(target_os = "macos"))]
{
enigo.mouse_scroll_x(2);
enigo.mouse_scroll_x(2 * WHEEL_DELTA as i32);
thread::sleep(wait_time);
enigo.mouse_scroll_x(-2);
enigo.mouse_scroll_x(-2 * WHEEL_DELTA as i32);
thread::sleep(wait_time);
enigo.mouse_scroll_y(2);
enigo.mouse_scroll_y(2 * WHEEL_DELTA as i32);
thread::sleep(wait_time);
enigo.mouse_scroll_y(-2);
enigo.mouse_scroll_y(-2 * WHEEL_DELTA as i32);
thread::sleep(wait_time);
}
}

20
libs/enigo/src/win/win_impl.rs
View File

@@ -21,11 +21,9 @@ static mut LAYOUT: HKL = std::ptr::null_mut();
pub const ENIGO_INPUT_EXTRA_VALUE: ULONG_PTR = 100;
fn mouse_event(flags: u32, data: u32, dx: i32, dy: i32) -> DWORD {
let mut input: INPUT = unsafe { std::mem::MaybeUninit::zeroed().assume_init() };
input.type_ = INPUT_MOUSE;
let mut u = INPUT_u::default();
unsafe {
let dst_ptr = (&mut input.u as *mut _) as *mut u8;
let m = MOUSEINPUT {
*u.mi_mut() = MOUSEINPUT {
dx,
dy,
mouseData: data,
@@ -33,9 +31,11 @@ fn mouse_event(flags: u32, data: u32, dx: i32, dy: i32) -> DWORD {
time: 0,
dwExtraInfo: ENIGO_INPUT_EXTRA_VALUE,
};
let src_ptr = (&m as *const _) as *const u8;
std::ptr::copy_nonoverlapping(src_ptr, dst_ptr, size_of::<MOUSEINPUT>());
}
let mut input = INPUT {
type_: INPUT_MOUSE,
u,
};
unsafe { SendInput(1, &mut input as LPINPUT, size_of::<INPUT>() as c_int) }
}
@@ -154,8 +154,8 @@ impl MouseControllable for Enigo {
}
},
match button {
MouseButton::Back => XBUTTON1 as _,
MouseButton::Forward => XBUTTON2 as _,
MouseButton::Back => XBUTTON1 as u32 * WHEEL_DELTA as u32,
MouseButton::Forward => XBUTTON2 as u32 * WHEEL_DELTA as u32,
_ => 0,
},
0,
@@ -199,11 +199,11 @@ impl MouseControllable for Enigo {
}
fn mouse_scroll_x(&mut self, length: i32) {
mouse_event(MOUSEEVENTF_HWHEEL, unsafe { transmute(length * 120) }, 0, 0);
mouse_event(MOUSEEVENTF_HWHEEL, length as _, 0, 0);
}
fn mouse_scroll_y(&mut self, length: i32) {
mouse_event(MOUSEEVENTF_WHEEL, unsafe { transmute(length * 120) }, 0, 0);
mouse_event(MOUSEEVENTF_WHEEL, length as _, 0, 0);
}
}