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

Fix compiler error

Browse Source
This commit is contained in:
Asura 2022-07-19 01:04:23 -07:00
parent 02b4d7f1d9
commit cbdc28ee20
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/input_service.rs
View File

@ -447,11 +447,14 @@ pub fn lock_screen() {
// loginctl lock-session also not work, they both work run rustdesk from cmd // loginctl lock-session also not work, they both work run rustdesk from cmd
std::thread::spawn(|| { std::thread::spawn(|| {
let mut key_event = KeyEvent::new(); let mut key_event = KeyEvent::new();
key_event.down = true;
key_event.set_chr('l' as _); key_event.set_chr('l' as _);
key_event.modifiers.push(ControlKey::Meta.into()); key_event.modifiers.push(ControlKey::Meta.into());
key_event.mode = KeyboardMode::Legacy; key_event.mode = KeyboardMode::Legacy.into();
key_event.down = true;
handle_key(&key_event); handle_key(&key_event);
key_event.down = false; key_event.down = false;
handle_key(&key_event); handle_key(&key_event);
}); });
@ -459,11 +462,13 @@ pub fn lock_screen() {
// CGSession -suspend not real lock screen, it is user switch // CGSession -suspend not real lock screen, it is user switch
std::thread::spawn(|| { std::thread::spawn(|| {
let mut key_event = KeyEvent::new(); let mut key_event = KeyEvent::new();
key_event.down = true;
key_event.set_chr('q' as _); key_event.set_chr('q' as _);
key_event.modifiers.push(ControlKey::Meta.into()); key_event.modifiers.push(ControlKey::Meta.into());
key_event.modifiers.push(ControlKey::Control.into()); key_event.modifiers.push(ControlKey::Control.into());
key_event.mode = KeyboardMode::Legacy; key_event.mode = KeyboardMode::Legacy.into();
key_event.down = true;
handle_key(&key_event); handle_key(&key_event);
key_event.down = false; key_event.down = false;
handle_key(&key_event); handle_key(&key_event);
@ -829,7 +834,7 @@ mod test {
// set key/char base on char // set key/char base on char
let mut evt = KeyEvent::new(); let mut evt = KeyEvent::new();
evt.set_chr(66); evt.set_chr(66);
evt.mode = 1; evt.mode = ProtobufEnum::new(KeyboardMode::Legacy);
evt.modifiers.push(ControlKey::CapsLock.into()); evt.modifiers.push(ControlKey::CapsLock.into());

3
src/ui/remote.rs
View File

@ -41,7 +41,6 @@ use hbb_common::{
time::{self, Duration, Instant, Interval}, time::{self, Duration, Instant, Interval},
}, },
Stream, Stream,
protobuf::ProtobufEnumOrUnknown,
}; };
use hbb_common::{config::TransferSerde, fs::TransferJobMeta}; use hbb_common::{config::TransferSerde, fs::TransferJobMeta};
use rdev::{Event, EventType::*, Key as RdevKey}; use rdev::{Event, EventType::*, Key as RdevKey};
@ -959,7 +958,7 @@ impl Handler {
fn send_key_event(&mut self, mut evt: KeyEvent, keyboard_mode: KeyboardMode) { fn send_key_event(&mut self, mut evt: KeyEvent, keyboard_mode: KeyboardMode) {
// mode: legacy(0), map(1), translate(2), auto(3) // mode: legacy(0), map(1), translate(2), auto(3)
evt.mode = ProtobufEnumOrUnknown::new(keyboard_mode); evt.mode = keyboard_mode.into();
let mut msg_out = Message::new(); let mut msg_out = Message::new();
msg_out.set_key_event(evt); msg_out.set_key_event(evt);
log::info!("{:?}", msg_out); log::info!("{:?}", msg_out);