Merge pull request #11 from fufesou/fix/macos_convert_unicode

fix: macos, convert unicode, shift
rustdesk-org · Dec 10, 2024 · f9b60b1 · f9b60b1
2 parents c6982ca + 3678a58
commit f9b60b1
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/src/macos/common.rs b/src/macos/common.rs
@@ -208,15 +208,21 @@ pub unsafe fn convert(
             EventType::KeyPress(..) => {
                 let code =
                     cg_event.get_integer_value_field(EventField::KEYBOARD_EVENT_KEYCODE) as u32;
-                if code == kVK_Shift as _ || code == kVK_RightShift as _ {
-                    return None;
+                #[allow(non_upper_case_globals)]
+                let skip_unicode = match code as CGKeyCode {
+                    kVK_Shift | kVK_RightShift | kVK_ForwardDelete => true,
+                    _ => false,
+                };
+                if skip_unicode {
+                    None
+                } else {
+                    let flags = cg_event.get_flags();
+                    let s = keyboard_state.create_unicode_for_key(code, flags);
+                    // if s.is_none() {
+                    //     s = Some(key_to_name(_k).to_owned())
+                    // }
+                    s
                 }
-                let flags = cg_event.get_flags();
-                let s = keyboard_state.create_unicode_for_key(code, flags);
-                // if s.is_none() {
-                //     s = Some(key_to_name(_k).to_owned())
-                // }
-                s
             }
             EventType::KeyRelease(..) => None,
             _ => None,