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

fix shift + 'a' for mac

Browse Source
This commit is contained in:
rustdesk 2022-06-10 12:00:59 +08:00
parent a8df7d01ba
commit 7dfa038c6d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/enigo/src/macos/macos_impl.rs
View File

@ -338,7 +338,7 @@ impl KeyboardControllable for Enigo {
fn key_click(&mut self, key: Key) { fn key_click(&mut self, key: Key) {
let keycode = self.key_to_keycode(key); let keycode = self.key_to_keycode(key);
if keycode == 0 { if keycode == u16::MAX {
return; return;
} }
@ -355,7 +355,7 @@ impl KeyboardControllable for Enigo {
fn key_down(&mut self, key: Key) -> crate::ResultType { fn key_down(&mut self, key: Key) -> crate::ResultType {
let code = self.key_to_keycode(key); let code = self.key_to_keycode(key);
if code == 0 { if code == u16::MAX {
return Err("".into()); return Err("".into());
} }
if let Some(src) = self.event_source.as_ref() { if let Some(src) = self.event_source.as_ref() {
@ -489,7 +489,7 @@ impl Enigo {
Key::Layout(c) => self.map_key_board(c), Key::Layout(c) => self.map_key_board(c),
Key::Super | Key::Command | Key::Windows | Key::Meta => kVK_Command, Key::Super | Key::Command | Key::Windows | Key::Meta => kVK_Command,
_ => 0, _ => u16::MAX,
} }
} }
@ -500,7 +500,7 @@ impl Enigo {
if ch == '-' || ch == '=' || ch == '.' || ch == '/' || (ch >= '0' && ch <= '9') { if ch == '-' || ch == '=' || ch == '.' || ch == '/' || (ch >= '0' && ch <= '9') {
return self.map_key_board_en(ch); return self.map_key_board_en(ch);
} }
let mut code = 0; let mut code = u16::MAX;
unsafe { unsafe {
let (keyboard, layout) = get_layout(); let (keyboard, layout) = get_layout();
if !keyboard.is_null() && !layout.is_null() { if !keyboard.is_null() && !layout.is_null() {
@ -509,10 +509,10 @@ impl Enigo {
let name = get_string(name_ref as _); let name = get_string(name_ref as _);
if let Some(name) = name { if let Some(name) = name {
if let Some(m) = self.char_to_vkey_map.get(&name) { if let Some(m) = self.char_to_vkey_map.get(&name) {
code = *m.get(&ch).unwrap_or(&0); code = *m.get(&ch).unwrap_or(&u16::MAX);
} else { } else {
let m = get_map(&name, layout); let m = get_map(&name, layout);
code = *m.get(&ch).unwrap_or(&0); code = *m.get(&ch).unwrap_or(&u16::MAX);
self.char_to_vkey_map.insert(name.clone(), m); self.char_to_vkey_map.insert(name.clone(), m);
} }
} }
@ -522,7 +522,7 @@ impl Enigo {
CFRelease(keyboard); CFRelease(keyboard);
} }
} }
if code > 0 { if code != u16::MAX {
return code; return code;
} }
self.map_key_board_en(ch) self.map_key_board_en(ch)
@ -578,7 +578,7 @@ impl Enigo {
'.' => kVK_ANSI_Period, '.' => kVK_ANSI_Period,
'/' => kVK_ANSI_Slash, '/' => kVK_ANSI_Slash,
'`' => kVK_ANSI_Grave, '`' => kVK_ANSI_Grave,
_ => 0, _ => u16::MAX,
} }
} }
} }