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

Ignore dead keys in Linux

Browse Source
This commit is contained in:
Asura 2022-08-02 06:07:44 -07:00
parent 1996a27c72
commit 5dfc41a7b8
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -3795,7 +3795,7 @@ dependencies = [
[[package]] [[package]]
name = "rdev" name = "rdev"
version = "0.5.0-2" version = "0.5.0-2"
source = "git+https://github.com/asur4s/rdev#d009906ba983f26c7b6f6f1a5e3c76bf43164294" source = "git+https://github.com/asur4s/rdev#c1175a394d811473e87ea79cb9a511a0f9b71764"
dependencies = [ dependencies = [
"cocoa", "cocoa",
"core-foundation 0.9.3", "core-foundation 0.9.3",

12
src/ui/remote.rs
View File

@ -1077,7 +1077,17 @@ impl Handler {
let string = match KEYBOARD.lock() { let string = match KEYBOARD.lock() {
Ok(mut keyboard) => { Ok(mut keyboard) => {
let string = keyboard.add(&evt.event_type).unwrap_or_default(); let string = keyboard.add(&evt.event_type).unwrap_or_default();
if keyboard.last_is_dead && string == "" { #[cfg(target_os = "windows")]
let is_dead = keyboard.last_is_dead;
#[cfg(target_os = "linux")]
let is_dead = unsafe {
CStr::from_ptr(XKeysymToString(*keyboard.keysym))
.to_str()
.unwrap_or_default()
.to_owned()
.starts_with("dead")
};
if is_dead && string == "" {
return; return;
} }
string string