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

Fix numlock in wayland

Browse Source
This commit is contained in:
asur4s 2022-09-04 02:29:14 -04:00
parent 071720fe8b
commit 7c2f26eab2
2 changed files with 17 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/server/input_service.rs
View File

@ -820,10 +820,7 @@ fn legacy_keyboard_mode(evt: &KeyEvent) {
} }
#[cfg(not(target_os = "macos"))] #[cfg(not(target_os = "macos"))]
let mut to_release = Vec::new(); let mut to_release = Vec::new();
#[cfg(not(target_os = "macos"))]
let mut has_cap = false;
#[cfg(windows)]
let mut has_numlock = false;
if evt.down { if evt.down {
let ck = if let Some(key_event::Union::ControlKey(ck)) = evt.union { let ck = if let Some(key_event::Union::ControlKey(ck)) = evt.union {
ck.value() ck.value()
@ -846,45 +843,19 @@ fn legacy_keyboard_mode(evt: &KeyEvent) {
} }
} }
#[cfg(not(target_os = "macos"))] #[cfg(not(target_os = "macos"))]
{ if !get_modifier_state(key.clone(), &mut en) {
if key == &Key::CapsLock { if *IS_X11.lock().unwrap() {
has_cap = true; tfc_key_down_or_up(key.clone(), true, false);
} else if key == &Key::NumLock {
#[cfg(windows)]
{
has_numlock = true;
}
} else { } else {
if !get_modifier_state(key.clone(), &mut en) { en.key_down(key.clone()).ok();
if *IS_X11.lock().unwrap() {
tfc_key_down_or_up(key.clone(), true, false);
} else {
en.key_down(key.clone()).ok();
}
modifier_sleep();
to_release.push(key);
}
} }
modifier_sleep();
to_release.push(key);
} }
} }
} }
} }
#[cfg(not(target_os = "macos"))]
if has_cap != en.get_key_state(Key::CapsLock) {
if *IS_X11.lock().unwrap() {
tfc_key_down_or_up(Key::CapsLock, true, true);
} else {
en.key_down(Key::CapsLock).ok();
en.key_up(Key::CapsLock);
}
}
#[cfg(windows)]
if crate::common::valid_for_numlock(evt) {
if has_numlock != en.get_key_state(Key::NumLock) {
en.key_down(Key::NumLock).ok();
en.key_up(Key::NumLock);
}
}
match evt.union { match evt.union {
Some(key_event::Union::ControlKey(ck)) => { Some(key_event::Union::ControlKey(ck)) => {
if let Some(key) = KEY_MAP.get(&ck.value()) { if let Some(key) = KEY_MAP.get(&ck.value()) {
@ -979,11 +950,6 @@ fn legacy_keyboard_mode(evt: &KeyEvent) {
en.key_up(key.clone()); en.key_up(key.clone());
} }
} }
#[cfg(windows)]
if disable_numlock {
en.key_down(Key::NumLock).ok();
en.key_up(Key::NumLock);
}
} }
fn translate_keyboard_mode(evt: &KeyEvent) { fn translate_keyboard_mode(evt: &KeyEvent) {

13
src/server/uinput.rs
View File

@ -314,7 +314,7 @@ pub mod service {
fn map_key(key: &enigo::Key) -> ResultType<evdev::Key> { fn map_key(key: &enigo::Key) -> ResultType<evdev::Key> {
if let Some(k) = KEY_MAP.get(&key) { if let Some(k) = KEY_MAP.get(&key) {
log::info!("mapkey {:?}, get {:?}", &key, &k); log::trace!("mapkey {:?}, get {:?}", &key, &k);
return Ok(k.clone()); return Ok(k.clone());
} else { } else {
match key { match key {
@ -351,12 +351,10 @@ pub mod service {
// ignore // ignore
} }
DataKeyboard::KeyDown(enigo::Key::Raw(code)) => { DataKeyboard::KeyDown(enigo::Key::Raw(code)) => {
log::info!("keycode {:?}", *code - 8);
let down_event = InputEvent::new(EventType::KEY, *code - 8, 1); let down_event = InputEvent::new(EventType::KEY, *code - 8, 1);
allow_err!(keyboard.emit(&[down_event])); allow_err!(keyboard.emit(&[down_event]));
} }
DataKeyboard::KeyUp(enigo::Key::Raw(code)) => { DataKeyboard::KeyUp(enigo::Key::Raw(code)) => {
log::info!("keycode {:?}", *code - 8);
let down_event = InputEvent::new(EventType::KEY, *code - 8, 0); let down_event = InputEvent::new(EventType::KEY, *code - 8, 0);
allow_err!(keyboard.emit(&[down_event])); allow_err!(keyboard.emit(&[down_event]));
} }
@ -388,6 +386,14 @@ pub mod service {
false false
} }
} }
} else if enigo::Key::NumLock == *key {
match keyboard.get_led_state() {
Ok(leds) => leds.contains(evdev::LedType::LED_NUML),
Err(_e) => {
// log::debug!("Failed to get led state {}", &_e);
false
}
}
} else { } else {
match keyboard.get_key_state() { match keyboard.get_key_state() {
Ok(keys) => match key { Ok(keys) => match key {
@ -403,7 +409,6 @@ pub mod service {
keys.contains(evdev::Key::KEY_LEFTALT) keys.contains(evdev::Key::KEY_LEFTALT)
|| keys.contains(evdev::Key::KEY_RIGHTALT) || keys.contains(evdev::Key::KEY_RIGHTALT)
} }
enigo::Key::NumLock => keys.contains(evdev::Key::KEY_NUMLOCK),
enigo::Key::Meta => { enigo::Key::Meta => {
keys.contains(evdev::Key::KEY_LEFTMETA) keys.contains(evdev::Key::KEY_LEFTMETA)
|| keys.contains(evdev::Key::KEY_RIGHTMETA) || keys.contains(evdev::Key::KEY_RIGHTMETA)