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

Compatible with legacy mode in client

Browse Source
This commit is contained in:
Asura 2022-07-19 15:09:45 +08:00
parent 19ebbb145a
commit 0bacc1c250
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ui/remote.rs
View File

@ -921,14 +921,14 @@ impl Handler {
key_event.set_control_key(ControlKey::CtrlAltDel); key_event.set_control_key(ControlKey::CtrlAltDel);
// todo // todo
key_event.down = true; key_event.down = true;
self.send_key_event(key_event, 3); self.send_key_event(key_event, 0);
} else { } else {
let mut key_event = KeyEvent::new(); let mut key_event = KeyEvent::new();
key_event.set_control_key(ControlKey::Delete); key_event.set_control_key(ControlKey::Delete);
self.legacy_modifiers(&mut key_event, true, true, false, false); self.legacy_modifiers(&mut key_event, true, true, false, false);
// todo // todo
key_event.press = true; key_event.press = true;
self.send_key_event(key_event, 3); self.send_key_event(key_event, 0);
} }
} }
@ -937,7 +937,7 @@ impl Handler {
key_event.set_control_key(ControlKey::LockScreen); key_event.set_control_key(ControlKey::LockScreen);
// todo // todo
key_event.down = true; key_event.down = true;
self.send_key_event(key_event, 3); self.send_key_event(key_event, 0);
} }
fn transfer_file(&mut self) { fn transfer_file(&mut self) {
@ -965,6 +965,7 @@ impl Handler {
self.send(Data::Message(msg_out)); self.send(Data::Message(msg_out));
} }
#[allow(dead_code)]
fn convert_numpad_keys(&mut self, key: RdevKey) -> RdevKey { fn convert_numpad_keys(&mut self, key: RdevKey) -> RdevKey {
if get_key_state(enigo::Key::NumLock) { if get_key_state(enigo::Key::NumLock) {
return key; return key;
@ -1000,13 +1001,9 @@ impl Handler {
} else { } else {
rdev::macos_keycode_from_key(key).unwrap_or_default().into() rdev::macos_keycode_from_key(key).unwrap_or_default().into()
}; };
key_event.set_chr(keycode);
if down_or_up == true { key_event.set_chr(keycode);
key_event.down = true; key_event.down = down_or_up;
} else {
key_event.down = false;
}
if get_key_state(enigo::Key::CapsLock) { if get_key_state(enigo::Key::CapsLock) {
key_event.modifiers.push(ControlKey::CapsLock.into()); key_event.modifiers.push(ControlKey::CapsLock.into());
@ -1065,7 +1062,7 @@ impl Handler {
} }
fn legacy_keyboard_mode(&mut self, down_or_up: bool, key: RdevKey, evt: Event) { fn legacy_keyboard_mode(&mut self, down_or_up: bool, key: RdevKey, evt: Event) {
// legacy mode(3): Generate characters locally, look for keycode on other side. // legacy mode(0): Generate characters locally, look for keycode on other side.
let peer = self.peer_platform(); let peer = self.peer_platform();
let is_win = peer == "Windows"; let is_win = peer == "Windows";
@ -1273,12 +1270,12 @@ impl Handler {
key_event.down = true; key_event.down = true;
} }
dbg!(&key_event); dbg!(&key_event);
self.send_key_event(key_event, 3) self.send_key_event(key_event, 0)
} }
fn key_down_or_up(&mut self, down_or_up: bool, key: RdevKey, evt: Event) { fn key_down_or_up(&mut self, down_or_up: bool, key: RdevKey, evt: Event) {
// Call different functions according to keyboard mode. // Call different functions according to keyboard mode.
let mode = std::env::var("KEYBOARD_MOAD").unwrap_or(String::from("map")); let mode = std::env::var("KEYBOARD_MOAD").unwrap_or(String::from("legacy"));
match mode.as_str() { match mode.as_str() {
"map" => { "map" => {
if down_or_up == true { if down_or_up == true {
@ -1289,9 +1286,7 @@ impl Handler {
self.map_keyboard_mode(down_or_up, key); self.map_keyboard_mode(down_or_up, key);
} }
"legacy" => self.legacy_keyboard_mode(down_or_up, key, evt), "legacy" => self.legacy_keyboard_mode(down_or_up, key, evt),
_ => { _ => self.legacy_keyboard_mode(down_or_up, key, evt),
self.map_keyboard_mode(down_or_up, key);
}
} }
} }