mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-06-11 12:43:12 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: osx, reset modifiers' state after locking screen (#11806)

Browse Source 
https://github.com/rustdesk/rustdesk/issues/11802

Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou 2025-05-19 21:02:07 +08:00 committed by GitHub
parent 118552ad0e
commit 6144a1c97e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,9 +141,27 @@ impl Enigo {
self.flags |= flag; self.flags |= flag;
} }
fn post(&self, event: CGEvent) { // Just check F11 for minimal changes.
// event.set_flags(CGEventFlags::CGEventFlagNull); will cause `F11` not working. no idea why. // Since enigo (legacy mode) is deprecated, it is currently in maintenance only.
if !self.ignore_flags && self.flags != CGEventFlags::CGEventFlagNull { fn post(&self, event: CGEvent, keycode: Option<u16>) {
if keycode == Some(kVK_F11) {
// Some key events require the flags to work.
// We can't simply set the flag to `CGEventFlags::CGEventFlagNull`.
// eg. `F11` requires flags `CGEventFlags::CGEventFlagSecondaryFn | 0x20000000` to work.
self.post_event(event, false);
} else {
// macOS system may use the previous event flag to generate the next event.
// Only found this issue when locking the screen.
// When we use enigo to lock the screen, the next mouse event will have the flag
// `CGEventFlagControl | CGEventFlagCommand | 0x20000000`.
// The key event will also have the flag `CGEventFlagControl | CGEventFlagCommand | 0x20000000`.
// Therefore, we need to set the flag to `event.set_flags(self.flags)` to avoid this.
self.post_event(event, true);
}
}
fn post_event(&self, event: CGEvent, force_flags: bool) {
if !self.ignore_flags && (force_flags || self.flags != CGEventFlags::CGEventFlagNull) {
event.set_flags(self.flags); event.set_flags(self.flags);
} }
event.set_integer_value_field(EventField::EVENT_SOURCE_USER_DATA, ENIGO_INPUT_EXTRA_VALUE); event.set_integer_value_field(EventField::EVENT_SOURCE_USER_DATA, ENIGO_INPUT_EXTRA_VALUE);
@ -205,7 +223,7 @@ impl MouseControllable for Enigo {
if let Ok(event) = if let Ok(event) =
CGEvent::new_mouse_event(src.clone(), event_type, dest, CGMouseButton::Left) CGEvent::new_mouse_event(src.clone(), event_type, dest, CGMouseButton::Left)
{ {
self.post(event); self.post(event, None);
} }
} }
} }
@ -270,7 +288,7 @@ impl MouseControllable for Enigo {
if let Some(v) = btn_value { if let Some(v) = btn_value {
event.set_integer_value_field(EventField::MOUSE_EVENT_BUTTON_NUMBER, v); event.set_integer_value_field(EventField::MOUSE_EVENT_BUTTON_NUMBER, v);
} }
self.post(event); self.post(event, None);
} }
} }
Ok(()) Ok(())
@ -309,7 +327,7 @@ impl MouseControllable for Enigo {
if let Some(v) = btn_value { if let Some(v) = btn_value {
event.set_integer_value_field(EventField::MOUSE_EVENT_BUTTON_NUMBER, v); event.set_integer_value_field(EventField::MOUSE_EVENT_BUTTON_NUMBER, v);
} }
self.post(event); self.post(event, None);
} }
} }
} }
@ -395,7 +413,7 @@ impl KeyboardControllable for Enigo {
if let Some(src) = self.event_source.as_ref() { if let Some(src) = self.event_source.as_ref() {
if let Ok(event) = CGEvent::new_keyboard_event(src.clone(), 0, true) { if let Ok(event) = CGEvent::new_keyboard_event(src.clone(), 0, true) {
event.set_string(cluster); event.set_string(cluster);
self.post(event); self.post(event, None);
} }
} }
} }
@ -409,11 +427,11 @@ impl KeyboardControllable for Enigo {
if let Some(src) = self.event_source.as_ref() { if let Some(src) = self.event_source.as_ref() {
if let Ok(event) = CGEvent::new_keyboard_event(src.clone(), keycode, true) { if let Ok(event) = CGEvent::new_keyboard_event(src.clone(), keycode, true) {
self.post(event); self.post(event, Some(keycode));
} }
if let Ok(event) = CGEvent::new_keyboard_event(src.clone(), keycode, false) { if let Ok(event) = CGEvent::new_keyboard_event(src.clone(), keycode, false) {
self.post(event); self.post(event, Some(keycode));
} }
} }
} }
@ -425,18 +443,17 @@ impl KeyboardControllable for Enigo {
} }
if let Some(src) = self.event_source.as_ref() { if let Some(src) = self.event_source.as_ref() {
if let Ok(event) = CGEvent::new_keyboard_event(src.clone(), code, true) { if let Ok(event) = CGEvent::new_keyboard_event(src.clone(), code, true) {
self.post(event); self.post(event, Some(code));
} }
} }
Ok(()) Ok(())
} }
fn key_up(&mut self, key: Key) { fn key_up(&mut self, key: Key) {
let code = self.key_to_keycode(key);
if let Some(src) = self.event_source.as_ref() { if let Some(src) = self.event_source.as_ref() {
if let Ok(event) = if let Ok(event) = CGEvent::new_keyboard_event(src.clone(), code, false) {
CGEvent::new_keyboard_event(src.clone(), self.key_to_keycode(key), false) self.post(event, Some(code));
{
self.post(event);
} }
} }
} }

2
src/server/input_service.rs
View File

@ -1205,7 +1205,7 @@ pub fn handle_key(evt: &KeyEvent) {
// If we don't sleep, the key press/release events may not take effect. // If we don't sleep, the key press/release events may not take effect.
// //
// For example, the controlled side osx `12.7.6` or `15.1.1` // For example, the controlled side osx `12.7.6` or `15.1.1`
// If we input characters quickly and continuously, and press or release "Shift" for a short period of time, // If we input characters quickly and continuously, and press or release "Shift" for a short period of time,
// it is possible that after releasing "Shift", the controlled side will still print uppercase characters. // it is possible that after releasing "Shift", the controlled side will still print uppercase characters.
// Though it is not very easy to reproduce. // Though it is not very easy to reproduce.
key_sleep(); key_sleep();