diff --git a/libs/enigo/src/win/win_impl.rs b/libs/enigo/src/win/win_impl.rs index a2839621c..f183e94ae 100644 --- a/libs/enigo/src/win/win_impl.rs +++ b/libs/enigo/src/win/win_impl.rs @@ -359,9 +359,6 @@ impl Enigo { } fn key_to_keycode(&self, key: Key) -> u16 { - unsafe { - LAYOUT = std::ptr::null_mut(); - } // do not use the codes from crate winapi they're // wrongly typed with i32 instead of i16 use the // ones provided by win/keycodes.rs that are prefixed @@ -456,6 +453,9 @@ impl Enigo { } fn get_layoutdependent_keycode(&self, chr: char) -> u16 { + unsafe { + LAYOUT = std::ptr::null_mut(); + } // NOTE VkKeyScanW uses the current keyboard LAYOUT // to specify a LAYOUT use VkKeyScanExW and GetKeyboardLayout // or load one with LoadKeyboardLayoutW diff --git a/src/keyboard.rs b/src/keyboard.rs index 15629bb00..d683fd579 100644 --- a/src/keyboard.rs +++ b/src/keyboard.rs @@ -350,6 +350,7 @@ pub fn get_keyboard_mode_enum() -> KeyboardMode { } #[inline] +#[cfg(not(any(target_os = "android", target_os = "ios")))] pub fn is_modifier(key: &rdev::Key) -> bool { matches!( key, @@ -364,26 +365,73 @@ pub fn is_modifier(key: &rdev::Key) -> bool { ) } +#[inline] +#[cfg(not(any(target_os = "android", target_os = "ios")))] +pub fn is_numpad_rdev_key(key: &rdev::Key) -> bool { + matches!( + key, + Key::Kp0 + | Key::Kp1 + | Key::Kp2 + | Key::Kp3 + | Key::Kp4 + | Key::Kp5 + | Key::Kp6 + | Key::Kp7 + | Key::Kp8 + | Key::Kp9 + | Key::KpMinus + | Key::KpMultiply + | Key::KpDivide + | Key::KpPlus + | Key::KpDecimal + ) +} + +#[inline] +#[cfg(not(any(target_os = "android", target_os = "ios")))] +pub fn is_letter_rdev_key(key: &rdev::Key) -> bool { + matches!( + key, + Key::KeyA + | Key::KeyB + | Key::KeyC + | Key::KeyD + | Key::KeyE + | Key::KeyF + | Key::KeyG + | Key::KeyH + | Key::KeyI + | Key::KeyJ + | Key::KeyK + | Key::KeyL + | Key::KeyM + | Key::KeyN + | Key::KeyO + | Key::KeyP + | Key::KeyQ + | Key::KeyR + | Key::KeyS + | Key::KeyT + | Key::KeyU + | Key::KeyV + | Key::KeyW + | Key::KeyX + | Key::KeyY + | Key::KeyZ + ) +} + #[inline] #[cfg(not(any(target_os = "android", target_os = "ios")))] fn is_numpad_key(event: &Event) -> bool { - matches!(event.event_type, EventType::KeyPress(key) | EventType::KeyRelease(key) if match key { - Key::Kp0 | Key::Kp1 | Key::Kp2 | Key::Kp3 | Key::Kp4 | Key::Kp5 | Key::Kp6 | Key::Kp7 | Key::Kp8 | - Key::Kp9 | Key::KpMinus | Key::KpMultiply | Key::KpDivide | Key::KpPlus | Key::KpDecimal => true, - _ => false - }) + matches!(event.event_type, EventType::KeyPress(key) | EventType::KeyRelease(key) if is_numpad_rdev_key(&key)) } #[inline] #[cfg(not(any(target_os = "android", target_os = "ios")))] fn is_letter_key(event: &Event) -> bool { - matches!(event.event_type, EventType::KeyPress(key) | EventType::KeyRelease(key) if match key { - Key::KeyA | Key::KeyB | Key::KeyC | Key::KeyD | Key::KeyE | Key::KeyF | Key::KeyG | Key::KeyH | - Key::KeyI | Key::KeyJ | Key::KeyK | Key::KeyL | Key::KeyM | Key::KeyN | Key::KeyO | Key::KeyP | - Key::KeyQ | Key::KeyR | Key::KeyS | Key::KeyT | Key::KeyU | Key::KeyV | Key::KeyW | Key::KeyX | - Key::KeyY | Key::KeyZ => true, - _ => false - }) + matches!(event.event_type, EventType::KeyPress(key) | EventType::KeyRelease(key) if is_letter_rdev_key(&key)) } #[cfg(not(any(target_os = "android", target_os = "ios")))] diff --git a/src/lib.rs b/src/lib.rs index 45b4c63f3..5dcd6389c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,8 +3,6 @@ pub mod platform; mod keyboard; #[cfg(not(any(target_os = "android", target_os = "ios")))] -pub use keyboard::keycode_to_rdev_key; -#[cfg(not(any(target_os = "android", target_os = "ios")))] pub use platform::{get_cursor, get_cursor_data, get_cursor_pos, start_os_service}; #[cfg(not(any(target_os = "ios")))] /// cbindgen:ignore diff --git a/src/server/input_service.rs b/src/server/input_service.rs index 0be6f0d84..ab5f7e287 100644 --- a/src/server/input_service.rs +++ b/src/server/input_service.rs @@ -8,13 +8,12 @@ use hbb_common::{config::COMPRESS_LEVEL, get_time, protobuf::EnumOrUnknown}; use rdev::{self, EventType, Key as RdevKey, KeyCode, RawKey}; #[cfg(target_os = "macos")] use rdev::{CGEventSourceStateID, CGEventTapLocation, VirtualInput}; -use std::time::Duration; use std::{ convert::TryFrom, ops::Sub, sync::atomic::{AtomicBool, Ordering}, thread, - time::{self, Instant}, + time::{self, Duration, Instant}, }; #[cfg(target_os = "windows")] use winapi::um::winuser::{ @@ -123,7 +122,7 @@ impl Subscriber for MouseCursorSub { } } -#[cfg(not(target_os = "macos"))] +#[cfg(any(target_os = "windows", target_os = "linux"))] struct LockModesHandler { caps_lock_changed: bool, num_lock_changed: bool, @@ -138,8 +137,21 @@ impl LockModesHandler { key_event.modifiers.contains(&modifier.into()) } - #[cfg(not(target_os = "macos"))] - fn new(key_event: &KeyEvent) -> Self { + #[inline] + #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))] + fn new_handler(key_event: &KeyEvent, _is_numpad_key: bool) -> Self { + #[cfg(any(target_os = "windows", target_os = "linux"))] + { + Self::new(key_event, _is_numpad_key) + } + #[cfg(target_os = "macos")] + { + Self::new(key_event) + } + } + + #[cfg(any(target_os = "windows", target_os = "linux"))] + fn new(key_event: &KeyEvent, is_numpad_key: bool) -> Self { let mut en = ENIGO.lock().unwrap(); let event_caps_enabled = Self::is_modifier_enabled(key_event, ControlKey::CapsLock); let local_caps_enabled = en.get_key_state(enigo::Key::CapsLock); @@ -148,13 +160,18 @@ impl LockModesHandler { en.key_click(enigo::Key::CapsLock); } - let event_num_enabled = Self::is_modifier_enabled(key_event, ControlKey::NumLock); - let local_num_enabled = en.get_key_state(enigo::Key::NumLock); - #[cfg(not(target_os = "windows"))] - let disable_numlock = false; - #[cfg(target_os = "windows")] - let disable_numlock = is_numlock_disabled(key_event); - let num_lock_changed = event_num_enabled != local_num_enabled && !disable_numlock; + let mut num_lock_changed = false; + if is_numpad_key { + let local_num_enabled = en.get_key_state(enigo::Key::NumLock); + let event_num_enabled = Self::is_modifier_enabled(key_event, ControlKey::NumLock); + num_lock_changed = event_num_enabled != local_num_enabled; + } else if is_legacy_mode(key_event) { + #[cfg(target_os = "windows")] + { + num_lock_changed = + should_disable_numlock(key_event) && en.get_key_state(enigo::Key::NumLock); + } + } if num_lock_changed { en.key_click(enigo::Key::NumLock); } @@ -191,7 +208,7 @@ impl LockModesHandler { } } -#[cfg(not(target_os = "macos"))] +#[cfg(any(target_os = "windows", target_os = "linux"))] impl Drop for LockModesHandler { fn drop(&mut self) { let mut en = ENIGO.lock().unwrap(); @@ -204,6 +221,20 @@ impl Drop for LockModesHandler { } } +#[inline] +#[cfg(target_os = "windows")] +fn should_disable_numlock(evt: &KeyEvent) -> bool { + // disable numlock if press home etc when numlock is on, + // because we will get numpad value (7,8,9 etc) if not + match (&evt.union, evt.mode.enum_value_or(KeyboardMode::Legacy)) { + (Some(key_event::Union::ControlKey(ck)), KeyboardMode::Legacy) => { + return NUMPAD_KEY_MAP.contains_key(&ck.value()); + } + _ => {} + } + false +} + pub const NAME_CURSOR: &'static str = "mouse_cursor"; pub const NAME_POS: &'static str = "mouse_pos"; pub type MouseCursorService = ServiceTmpl; @@ -1010,45 +1041,6 @@ fn char_value_to_key(value: u32) -> Key { Key::Layout(std::char::from_u32(value).unwrap_or('\0')) } -#[cfg(target_os = "windows")] -fn has_numpad_key(key_event: &KeyEvent) -> bool { - key_event - .modifiers - .iter() - .filter(|&&ck| NUMPAD_KEY_MAP.get(&ck.value()).is_some()) - .count() - != 0 -} - -#[cfg(target_os = "windows")] -fn is_rdev_numpad_key(key_event: &KeyEvent) -> bool { - let code = key_event.chr(); - let key = rdev::get_win_key(code, 0); - match key { - RdevKey::Home - | RdevKey::UpArrow - | RdevKey::PageUp - | RdevKey::LeftArrow - | RdevKey::RightArrow - | RdevKey::End - | RdevKey::DownArrow - | RdevKey::PageDown - | RdevKey::Insert - | RdevKey::Delete => true, - _ => false, - } -} - -#[cfg(target_os = "windows")] -fn is_numlock_disabled(key_event: &KeyEvent) -> bool { - // disable numlock if press home etc when numlock is on, - // because we will get numpad value (7,8,9 etc) if not - match key_event.mode.unwrap() { - KeyboardMode::Map => is_rdev_numpad_key(key_event), - _ => has_numpad_key(key_event), - } -} - fn map_keyboard_mode(evt: &KeyEvent) { #[cfg(windows)] crate::platform::windows::try_change_desktop(); @@ -1372,7 +1364,7 @@ fn simulate_win2win_hotkey(code: u32, down: bool) { } #[cfg(not(any(target_os = "windows", target_os = "linux")))] -fn skip_led_sync_control_key(_evt: &KeyEvent) -> bool { +fn skip_led_sync_control_key(_key: &ControlKey) -> bool { false } @@ -1383,37 +1375,65 @@ fn skip_led_sync_control_key(_evt: &KeyEvent) -> bool { // https://github.com/rustdesk/rustdesk/issues/3928#issuecomment-1500773473 #[cfg(any(target_os = "windows", target_os = "linux"))] fn skip_led_sync_control_key(key: &ControlKey) -> bool { - [ - ControlKey::Control, - ControlKey::Meta, - ControlKey::Shift, - ControlKey::Alt, - ControlKey::Tab, - ControlKey::Return, - ] - .contains(key) + matches!( + key, + ControlKey::Control + | ControlKey::RControl + | ControlKey::Meta + | ControlKey::Shift + | ControlKey::RShift + | ControlKey::Alt + | ControlKey::RAlt + | ControlKey::Tab + | ControlKey::Return + ) +} + +#[inline] +#[cfg(any(target_os = "windows", target_os = "linux"))] +fn is_numpad_control_key(key: &ControlKey) -> bool { + matches!( + key, + ControlKey::Numpad0 + | ControlKey::Numpad1 + | ControlKey::Numpad2 + | ControlKey::Numpad3 + | ControlKey::Numpad4 + | ControlKey::Numpad5 + | ControlKey::Numpad6 + | ControlKey::Numpad7 + | ControlKey::Numpad8 + | ControlKey::Numpad9 + | ControlKey::NumpadEnter + ) } #[cfg(not(any(target_os = "windows", target_os = "linux")))] -fn skip_led_sync_rdev_key(_evt: &KeyEvent) -> bool { +fn skip_led_sync_rdev_key(_key: &RdevKey) -> bool { false } #[cfg(any(target_os = "windows", target_os = "linux"))] fn skip_led_sync_rdev_key(key: &RdevKey) -> bool { - [ - RdevKey::ControlLeft, - RdevKey::ControlRight, - RdevKey::MetaLeft, - RdevKey::MetaRight, - RdevKey::ShiftRight, - RdevKey::ShiftRight, - RdevKey::Alt, - RdevKey::AltGr, - RdevKey::Tab, - RdevKey::Return, - ] - .contains(key) + matches!( + key, + RdevKey::ControlLeft + | RdevKey::ControlRight + | RdevKey::MetaLeft + | RdevKey::MetaRight + | RdevKey::ShiftLeft + | RdevKey::ShiftRight + | RdevKey::Alt + | RdevKey::AltGr + | RdevKey::Tab + | RdevKey::Return + ) +} + +#[inline] +#[cfg(not(any(target_os = "android", target_os = "ios")))] +fn is_legacy_mode(evt: &KeyEvent) -> bool { + evt.mode.enum_value_or(KeyboardMode::Legacy) == KeyboardMode::Legacy } pub fn handle_key_(evt: &KeyEvent) { @@ -1421,21 +1441,35 @@ pub fn handle_key_(evt: &KeyEvent) { return; } + #[cfg(not(any(target_os = "android", target_os = "ios")))] let mut _lock_mode_handler = None; - match (&evt.union, evt.mode.enum_value_or(KeyboardMode::Legacy)) { - (Some(key_event::Union::Unicode(..)) | Some(key_event::Union::Seq(..)), _) => { - _lock_mode_handler = Some(LockModesHandler::new(&evt)); + #[cfg(not(any(target_os = "android", target_os = "ios")))] + match &evt.union { + Some(key_event::Union::Unicode(..)) | Some(key_event::Union::Seq(..)) => { + _lock_mode_handler = Some(LockModesHandler::new_handler(&evt, false)); } - (Some(key_event::Union::ControlKey(ck)), _) => { + Some(key_event::Union::ControlKey(ck)) => { let key = ck.enum_value_or(ControlKey::Unknown); if !skip_led_sync_control_key(&key) { - _lock_mode_handler = Some(LockModesHandler::new(&evt)); + #[cfg(target_os = "macos")] + let is_numpad_key = false; + #[cfg(any(target_os = "windows", target_os = "linux"))] + let is_numpad_key = is_numpad_control_key(&key); + _lock_mode_handler = Some(LockModesHandler::new_handler(&evt, is_numpad_key)); } } - (Some(key_event::Union::Chr(code)), KeyboardMode::Map | KeyboardMode::Translate) => { - let key = crate::keycode_to_rdev_key(*code); - if !skip_led_sync_rdev_key(&key) { - _lock_mode_handler = Some(LockModesHandler::new(evt)); + Some(key_event::Union::Chr(code)) => { + if is_legacy_mode(&evt) { + _lock_mode_handler = Some(LockModesHandler::new_handler(evt, false)); + } else { + let key = crate::keyboard::keycode_to_rdev_key(*code); + if !skip_led_sync_rdev_key(&key) { + #[cfg(target_os = "macos")] + let is_numpad_key = false; + #[cfg(any(target_os = "windows", target_os = "linux"))] + let is_numpad_key = crate::keyboard::is_numpad_rdev_key(&key); + _lock_mode_handler = Some(LockModesHandler::new_handler(evt, is_numpad_key)); + } } } _ => {}