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

refact keyboard handler

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-04-08 19:48:27 +08:00
parent f72593c281
commit e2dbfb7f1b
1 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/server/input_service.rs
View File

@ -140,7 +140,7 @@ impl LockModesHandler {
} }
#[cfg(not(target_os = "macos"))] #[cfg(not(target_os = "macos"))]
fn new(key_event: &KeyEvent) -> Self { fn new(key_event: &KeyEvent, is_numpad_key: bool) -> Self {
let mut en = ENIGO.lock().unwrap(); let mut en = ENIGO.lock().unwrap();
let event_caps_enabled = Self::is_modifier_enabled(key_event, ControlKey::CapsLock); let event_caps_enabled = Self::is_modifier_enabled(key_event, ControlKey::CapsLock);
let local_caps_enabled = en.get_key_state(enigo::Key::CapsLock); let local_caps_enabled = en.get_key_state(enigo::Key::CapsLock);
@ -154,16 +154,9 @@ impl LockModesHandler {
#[cfg(not(target_os = "windows"))] #[cfg(not(target_os = "windows"))]
let disable_numlock = false; let disable_numlock = false;
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
let disable_numlock = if key_event.mode == KeyboardMode::Legacy.into() { let disable_numlock = is_numlock_disabled(key_event);
// disable numlock if press home etc when numlock is on, let num_lock_changed =
// because we will get numpad value (7,8,9 etc) if not is_numpad_key && event_num_enabled != local_num_enabled && !disable_numlock;
has_numpad_key(key_event)
} else {
false
};
let disable_numlock = false;
println!("REMOVE ME ======================= event_num_enabled {}, local_num_enabled {}", event_num_enabled, local_num_enabled);
let num_lock_changed = event_num_enabled != local_num_enabled && !disable_numlock;
if num_lock_changed { if num_lock_changed {
en.key_click(enigo::Key::NumLock); en.key_click(enigo::Key::NumLock);
} }
@ -213,6 +206,18 @@ impl Drop for LockModesHandler {
} }
} }
#[inline]
#[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
if key_event.mode.enum_value_or(KeyboardMode::Legacy) == KeyboardMode::Legacy {
has_numpad_key(key_event)
} else {
false
}
}
pub const NAME_CURSOR: &'static str = "mouse_cursor"; pub const NAME_CURSOR: &'static str = "mouse_cursor";
pub const NAME_POS: &'static str = "mouse_pos"; pub const NAME_POS: &'static str = "mouse_pos";
pub type MouseCursorService = ServiceTmpl<MouseCursorSub>; pub type MouseCursorService = ServiceTmpl<MouseCursorSub>;
@ -1374,7 +1379,14 @@ fn skip_led_sync_control_key(key: &ControlKey) -> bool {
| ControlKey::RAlt | ControlKey::RAlt
| ControlKey::Tab | ControlKey::Tab
| ControlKey::Return | ControlKey::Return
| ControlKey::Numpad0 )
}
#[inline]
fn is_numpad_control_key(key: &ControlKey) -> bool {
matches!(
key,
ControlKey::Numpad0
| ControlKey::Numpad1 | ControlKey::Numpad1
| ControlKey::Numpad2 | ControlKey::Numpad2
| ControlKey::Numpad3 | ControlKey::Numpad3
@ -1395,20 +1407,19 @@ fn skip_led_sync_rdev_key(_evt: &KeyEvent) -> bool {
#[cfg(any(target_os = "windows", target_os = "linux"))] #[cfg(any(target_os = "windows", target_os = "linux"))]
fn skip_led_sync_rdev_key(key: &RdevKey) -> bool { fn skip_led_sync_rdev_key(key: &RdevKey) -> bool {
crate::is_numpad_rdev_key(key) matches!(
|| matches!( key,
key, RdevKey::ControlLeft
RdevKey::ControlLeft | RdevKey::ControlRight
| RdevKey::ControlRight | RdevKey::MetaLeft
| RdevKey::MetaLeft | RdevKey::MetaRight
| RdevKey::MetaRight | RdevKey::ShiftLeft
| RdevKey::ShiftLeft | RdevKey::ShiftRight
| RdevKey::ShiftRight | RdevKey::Alt
| RdevKey::Alt | RdevKey::AltGr
| RdevKey::AltGr | RdevKey::Tab
| RdevKey::Tab | RdevKey::Return
| RdevKey::Return )
)
} }
pub fn handle_key_(evt: &KeyEvent) { pub fn handle_key_(evt: &KeyEvent) {
@ -1416,23 +1427,22 @@ pub fn handle_key_(evt: &KeyEvent) {
return; return;
} }
println!("REMOVE ME ============================== {:?}", &evt);
let mut _lock_mode_handler = None; let mut _lock_mode_handler = None;
match (&evt.union, evt.mode.enum_value_or(KeyboardMode::Legacy)) { match (&evt.union, evt.mode.enum_value_or(KeyboardMode::Legacy)) {
(Some(key_event::Union::Unicode(..)) | Some(key_event::Union::Seq(..)), _) => { (Some(key_event::Union::Unicode(..)) | Some(key_event::Union::Seq(..)), _) => {
_lock_mode_handler = Some(LockModesHandler::new(&evt)); _lock_mode_handler = Some(LockModesHandler::new(&evt, false));
} }
(Some(key_event::Union::ControlKey(ck)), _) => { (Some(key_event::Union::ControlKey(ck)), _) => {
let key = ck.enum_value_or(ControlKey::Unknown); let key = ck.enum_value_or(ControlKey::Unknown);
if !skip_led_sync_control_key(&key) { if !skip_led_sync_control_key(&key) {
_lock_mode_handler = Some(LockModesHandler::new(&evt)); _lock_mode_handler = Some(LockModesHandler::new(&evt, is_numpad_control_key(&key)));
} }
} }
(Some(key_event::Union::Chr(code)), KeyboardMode::Map | KeyboardMode::Translate) => { (Some(key_event::Union::Chr(code)), KeyboardMode::Map | KeyboardMode::Translate) => {
let key = crate::keycode_to_rdev_key(*code); let key = crate::keycode_to_rdev_key(*code);
if !skip_led_sync_rdev_key(&key) { if !skip_led_sync_rdev_key(&key) {
_lock_mode_handler = Some(LockModesHandler::new(evt)); _lock_mode_handler =
Some(LockModesHandler::new(evt, crate::is_numpad_rdev_key(&key)));
} }
} }
_ => {} _ => {}