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

fix macos mmatch

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2022-12-12 21:45:46 +08:00
parent 11ab258878
commit 194e1206b4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/keyboard.rs
View File

@ -7,7 +7,9 @@ use crate::flutter::FlutterHandler;
use crate::ui::remote::SciterHandler; use crate::ui::remote::SciterHandler;
use crate::ui_session_interface::Session; use crate::ui_session_interface::Session;
use hbb_common::{log, message_proto::*}; use hbb_common::{log, message_proto::*};
use rdev::{Event, EventType, Key, GrabError}; #[cfg(target_os = "linux")]
use rdev::GrabError;
use rdev::{Event, EventType, Key};
use std::{ use std::{
collections::{HashMap, HashSet}, collections::{HashMap, HashSet},
sync::{ sync::{
@ -594,7 +596,8 @@ pub fn legacy_keyboard_mode(event: &Event, key_event: &mut KeyEvent) {
} }
pub fn map_keyboard_mode(event: &Event, key_event: &mut KeyEvent) { pub fn map_keyboard_mode(event: &Event, key_event: &mut KeyEvent) {
let peer = get_peer_platform(); let mut peer = get_peer_platform().to_lowercase();
peer.retain(|c| !c.is_whitespace());
let key = match event.event_type { let key = match event.event_type {
EventType::KeyPress(key) => { EventType::KeyPress(key) => {
@ -608,8 +611,8 @@ pub fn map_keyboard_mode(event: &Event, key_event: &mut KeyEvent) {
_ => return, _ => return,
}; };
let keycode: u32 = match peer.as_str() { let keycode: u32 = match peer.as_str() {
"Windows" => rdev::win_keycode_from_key(key).unwrap_or_default().into(), "windows" => rdev::win_keycode_from_key(key).unwrap_or_default().into(),
"MacOS" => rdev::macos_keycode_from_key(key).unwrap_or_default().into(), "macos" => rdev::macos_keycode_from_key(key).unwrap_or_default().into(),
_ => rdev::linux_keycode_from_key(key).unwrap_or_default().into(), _ => rdev::linux_keycode_from_key(key).unwrap_or_default().into(),
}; };
key_event.set_chr(keycode); key_event.set_chr(keycode);