hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

https://github.com/rustdesk/rustdesk/issues/366

Browse Source
This commit is contained in:
open-trade 2022-01-24 15:51:29 +08:00
parent 1cda704628
commit ea2fe3eff0
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ extern "system" {
/// The main struct for handling the event emitting /// The main struct for handling the event emitting
#[derive(Default)] #[derive(Default)]
pub struct Enigo; pub struct Enigo;
static mut LAYOUT: HKL = std::ptr::null_mut();
fn mouse_event(flags: u32, data: u32, dx: i32, dy: i32) -> DWORD { fn mouse_event(flags: u32, data: u32, dx: i32, dy: i32) -> DWORD {
let mut input = INPUT { let mut input = INPUT {
@ -35,6 +36,18 @@ fn mouse_event(flags: u32, data: u32, dx: i32, dy: i32) -> DWORD {
} }
fn keybd_event(flags: u32, vk: u16, scan: u16) -> DWORD { fn keybd_event(flags: u32, vk: u16, scan: u16) -> DWORD {
let mut scan = scan;
unsafe {
// https://github.com/rustdesk/rustdesk/issues/366
if scan == 0 {
if LAYOUT.is_null() {
let current_window_thread_id =
GetWindowThreadProcessId(GetForegroundWindow(), std::ptr::null_mut());
LAYOUT = GetKeyboardLayout(current_window_thread_id);
}
scan = MapVirtualKeyExW(vk as _, 0, LAYOUT) as _;
}
}
let mut input = INPUT { let mut input = INPUT {
type_: INPUT_KEYBOARD, type_: INPUT_KEYBOARD,
u: unsafe { u: unsafe {
@ -253,6 +266,9 @@ impl Enigo {
} }
fn key_to_keycode(&self, key: Key) -> u16 { fn key_to_keycode(&self, key: Key) -> u16 {
unsafe {
LAYOUT = std::ptr::null_mut();
}
// do not use the codes from crate winapi they're // do not use the codes from crate winapi they're
// wrongly typed with i32 instead of i16 use the // wrongly typed with i32 instead of i16 use the
// ones provided by win/keycodes.rs that are prefixed // ones provided by win/keycodes.rs that are prefixed
@ -347,13 +363,13 @@ impl Enigo {
// get the first char from the string ignore the rest // get the first char from the string ignore the rest
// ensure its not a multybyte char // ensure its not a multybyte char
if let Some(chr) = string.chars().nth(0) { if let Some(chr) = string.chars().nth(0) {
// NOTE VkKeyScanW uses the current keyboard layout // NOTE VkKeyScanW uses the current keyboard LAYOUT
// to specify a layout use VkKeyScanExW and GetKeyboardLayout // to specify a LAYOUT use VkKeyScanExW and GetKeyboardLayout
// or load one with LoadKeyboardLayoutW // or load one with LoadKeyboardLayoutW
let current_window_thread_id = let current_window_thread_id =
unsafe { GetWindowThreadProcessId(GetForegroundWindow(), std::ptr::null_mut()) }; unsafe { GetWindowThreadProcessId(GetForegroundWindow(), std::ptr::null_mut()) };
let layout = unsafe { GetKeyboardLayout(current_window_thread_id) }; unsafe { LAYOUT = GetKeyboardLayout(current_window_thread_id) };
let keycode_and_shiftstate = unsafe { VkKeyScanExW(chr as _, layout) }; let keycode_and_shiftstate = unsafe { VkKeyScanExW(chr as _, LAYOUT) };
keycode_and_shiftstate as _ keycode_and_shiftstate as _
} else { } else {
0 0