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

Convet numpad

Browse Source
This commit is contained in:
asur4s 2022-09-06 07:09:24 -04:00
parent 51e13c5f5a
commit cc4e6b591d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ui_session_interface.rs
View File

@ -60,8 +60,8 @@ impl<T: InvokeUi> Session<T> {
pub fn get_keyboard_mode(&self) -> String { pub fn get_keyboard_mode(&self) -> String {
return std::env::var("KEYBOARD_MODE") return std::env::var("KEYBOARD_MODE")
.unwrap_or(String::from("legacy")) .unwrap_or(String::from("legacy"))
.to_lowercase(); .to_lowercase();
} }
pub fn save_keyboard_mode(&self, value: String) { pub fn save_keyboard_mode(&self, value: String) {
@ -301,16 +301,15 @@ impl<T: InvokeUi> Session<T> {
} else { } else {
key key
}; };
#[cfg(not(windows))]
let key = self.convert_numpad_keys(key);
let peer = self.peer_platform(); let peer = self.peer_platform();
let mut key_event = KeyEvent::new(); let mut key_event = KeyEvent::new();
// According to peer platform. // According to peer platform.
let keycode: u32 = if peer == "Linux" { let keycode: u32 = if peer == "Linux" {
rdev::linux_keycode_from_key(key).unwrap_or_default().into() rdev::linux_keycode_from_key(key).unwrap_or_default().into()
} else if peer == "Windows" { } else if peer == "Windows" {
#[cfg(not(windows))]
let key = self.convert_numpad_keys(key);
rdev::win_keycode_from_key(key).unwrap_or_default().into() rdev::win_keycode_from_key(key).unwrap_or_default().into()
} else { } else {
// Without Clear Key on Mac OS // Without Clear Key on Mac OS
@ -417,7 +416,7 @@ impl<T: InvokeUi> Session<T> {
if get_key_state(enigo::Key::CapsLock) { if get_key_state(enigo::Key::CapsLock) {
key_event.modifiers.push(ControlKey::CapsLock.into()); key_event.modifiers.push(ControlKey::CapsLock.into());
} }
if self.peer_platform() != "Mac OS" { if self.peer_platform() != "Mac OS" {
if get_key_state(enigo::Key::NumLock) { if get_key_state(enigo::Key::NumLock) {
key_event.modifiers.push(ControlKey::NumLock.into()); key_event.modifiers.push(ControlKey::NumLock.into());
@ -1360,4 +1359,4 @@ async fn start_one_port_forward<T: InvokeUi>(
async fn send_note(url: String, id: String, conn_id: i32, note: String) { async fn send_note(url: String, id: String, conn_id: i32, note: String) {
let body = serde_json::json!({ "id": id, "Id": conn_id, "note": note }); let body = serde_json::json!({ "id": id, "Id": conn_id, "note": note });
allow_err!(crate::post_request(url, body.to_string(), "").await); allow_err!(crate::post_request(url, body.to_string(), "").await);
} }