weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor keyboard mode by enum

Browse Source
This commit is contained in:
Asura
2022-07-19 15:43:13 +08:00
parent 0bacc1c250
commit 02b4d7f1d9
4 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/connection.rs
View File

@@ -420,11 +420,11 @@ impl Connection {
}
MessageInput::Key((mut msg, press)) => {
// todo: press and down have similar meanings.
if press && msg.mode == 0 {
if press && msg.mode.unwrap() == KeyboardMode::Legacy {
msg.down = true;
}
handle_key(&msg);
if press && msg.mode == 0 {
if press && msg.mode.unwrap() == KeyboardMode::Legacy {
msg.down = false;
handle_key(&msg);
}

10
src/server/input_service.rs
View File

@@ -450,7 +450,7 @@ pub fn lock_screen() {
key_event.down = true;
key_event.set_chr('l' as _);
key_event.modifiers.push(ControlKey::Meta.into());
key_event.mode = 0;
key_event.mode = KeyboardMode::Legacy;
handle_key(&key_event);
key_event.down = false;
handle_key(&key_event);
@@ -463,7 +463,7 @@ pub fn lock_screen() {
key_event.set_chr('q' as _);
key_event.modifiers.push(ControlKey::Meta.into());
key_event.modifiers.push(ControlKey::Control.into());
key_event.mode = 0;
key_event.mode = KeyboardMode::Legacy;
handle_key(&key_event);
key_event.down = false;
handle_key(&key_event);
@@ -787,11 +787,11 @@ fn handle_key_(evt: &KeyEvent) {
return;
}
match evt.mode {
0 => {
match evt.mode.unwrap() {
KeyboardMode::Legacy => {
legacy_keyboard_map(evt);
}
1 => {
KeyboardMode::Map => {
map_keyboard_map(evt);
}
_ => {