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

fix unexpected repeating key input on remote linux https://github.com/rustdesk/rustdesk/issues/189

Browse Source
This commit is contained in:
rustdesk 2021-08-06 14:23:50 +08:00
parent 9d7dced7e7
commit 3200002e52
2 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/connection.rs
View File

@ -644,7 +644,10 @@ impl Connection {
} }
Some(message::Union::key_event(mut me)) => { Some(message::Union::key_event(mut me)) => {
if self.keyboard { if self.keyboard {
if me.press { // handle all down as press
// fix unexpected repeating key on remote linux, seems also fix abnormal alt/shift, which
// make sure all key are released
if me.press || me.down {
if let Some(key_event::Union::unicode(_)) = me.union { if let Some(key_event::Union::unicode(_)) = me.union {
handle_key(&me); handle_key(&me);
} else if let Some(key_event::Union::seq(_)) = me.union { } else if let Some(key_event::Union::seq(_)) = me.union {

27
src/ui/remote.rs
View File

@ -901,33 +901,6 @@ impl Handler {
} }
if let Some(mut key_event) = self.get_key_event(down_or_up, &name, code) { if let Some(mut key_event) = self.get_key_event(down_or_up, &name, code) {
// Linux has different repeated key down handling from mac and windows
/* // below cause hang some time, not find why, so disable. so shift + repeat char not work for mac->linux, win->linux works fine, linux->linux not test yet
if self.peer_platform() == "Linux" {
if down_or_up == 1 {
let mut is_repeat = false;
if let Some(x) = self.read().unwrap().last_down_key.as_ref() {
is_repeat = x.0 == name && x.1 == code && x.2 == extended;
}
if is_repeat {
self.key_down_or_up(
0,
name.clone(),
code,
alt,
ctrl,
shift,
command,
extended,
);
log::debug!("Repeated key down");
}
self.write().unwrap().last_down_key = Some((name, code, extended));
} else {
self.write().unwrap().last_down_key.take();
}
}
*/
if alt if alt
&& !crate::is_control_key(&key_event, &ControlKey::Alt) && !crate::is_control_key(&key_event, &ControlKey::Alt)
&& !crate::is_control_key(&key_event, &ControlKey::RAlt) && !crate::is_control_key(&key_event, &ControlKey::RAlt)