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

fix lock screen for mac and linux

Browse Source
This commit is contained in:
rustdesk 2022-04-24 02:37:27 +08:00
parent 6bc0c3ce98
commit f42a77ad22
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/connection.rs
View File

@ -1071,8 +1071,7 @@ impl Connection {
}
log::info!("#{} Connection closed: {}", self.inner.id(), reason);
if lock && self.lock_after_session_end && self.keyboard {
crate::platform::lock_screen();
super::video_service::switch_to_primary();
lock_screen();
}
self.tx_to_cm.send(ipc::Data::Close).ok();
self.port_forward_socket.take();

36
src/server/input_service.rs
View File

@ -439,6 +439,39 @@ pub fn is_enter(evt: &KeyEvent) -> bool {
return false;
}
pub fn lock_screen() {
cfg_if::cfg_if! {
if #[cfg(target_os = "linux")] {
// xdg_screensaver lock not work on Linux from our service somehow
// loginctl lock-session also not work, they both work run rustdesk from cmd
std::thread::spawn(|| {
let mut key_event = KeyEvent::new();
key_event.down = true;
key_event.set_chr('l' as _);
key_event.modifiers.push(ControlKey::Meta.into());
handle_key(&key_event);
key_event.down = false;
handle_key(&key_event);
});
} else if #[cfg(target_os = "macos")] {
// CGSession -suspend not real lock screen, it is user switch
std::thread::spawn(|| {
let mut key_event = KeyEvent::new();
key_event.down = true;
key_event.set_chr('q' as _);
key_event.modifiers.push(ControlKey::Meta.into());
key_event.modifiers.push(ControlKey::Control.into());
handle_key(&key_event);
key_event.down = false;
handle_key(&key_event);
});
} else {
crate::platform::lock_screen();
}
}
super::video_service::switch_to_primary();
}
lazy_static::lazy_static! {
static ref KEY_MAP: HashMap<i32, Key> =
[
@ -646,8 +679,7 @@ fn handle_key_(evt: &KeyEvent) {
allow_err!(send_sas());
});
} else if ck.value() == ControlKey::LockScreen.value() {
crate::platform::lock_screen();
super::video_service::switch_to_primary();
lock_screen();
}
}
Some(key_event::Union::chr(chr)) => {