zobally/RustDesk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more control keys, and VkKeyScanW -> VkKeyScanExW with forground window

Browse source 
keyboard layout
This commit is contained in:
open-trade 2022-01-12 18:11:42 +08:00
parent 8ea5d80f01
commit 3aebc43111
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libs/enigo/src/win/win_impl.rs
View file

@ -350,7 +350,10 @@ impl Enigo {
// NOTE VkKeyScanW uses the current keyboard layout
// to specify a layout use VkKeyScanExW and GetKeyboardLayout
// or load one with LoadKeyboardLayoutW
let keycode_and_shiftstate = unsafe { VkKeyScanW(chr as _) };
let current_window_thread_id =
unsafe { GetWindowThreadProcessId(GetForegroundWindow(), std::ptr::null_mut()) };
let layout = unsafe { GetKeyboardLayout(current_window_thread_id) };
let keycode_and_shiftstate = unsafe { VkKeyScanExW(chr as _, layout) };
keycode_and_shiftstate as _
} else {
0

6
src/ui/remote.rs
View file

@ -323,6 +323,12 @@ impl Handler {
Key::CapsLock | Key::NumLock | Key::ScrollLock => {
return;
}
Key::Home => Some(ControlKey::Home),
Key::End => Some(ControlKey::End),
Key::Insert => Some(ControlKey::Insert),
Key::PageUp => Some(ControlKey::PageUp),
Key::PageDown => Some(ControlKey::PageDown),
Key::Pause => Some(ControlKey::Pause),
_ => None,
};
let mut key_event = KeyEvent::new();