From e24f5e7eed10b321500fb6fdfe64d7e8bb766d87 Mon Sep 17 00:00:00 2001
From: fufesou <shuanglongchen@yeah.net>
Date: Mon, 13 Feb 2023 14:55:57 +0800
Subject: [PATCH] mid commit

Signed-off-by: fufesou <shuanglongchen@yeah.net>
---
 libs/hbb_common/protos/message.proto |  2 ++
 src/keyboard.rs                      | 33 ++++------------------------
 src/server/input_service.rs          |  7 +++---
 3 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/libs/hbb_common/protos/message.proto b/libs/hbb_common/protos/message.proto
index ed2706382..7e3d0b0a4 100644
--- a/libs/hbb_common/protos/message.proto
+++ b/libs/hbb_common/protos/message.proto
@@ -201,6 +201,8 @@ message KeyEvent {
   bool press = 2;
   oneof union {
     ControlKey control_key = 3;
+    // high word, sym key code. win: virtual-key code, linux: keysym ?, macos: 
+    // low word, position key code. win: scancode, linux: key code, macos: key code
     uint32 chr = 4;
     uint32 unicode = 5;
     string seq = 6;
diff --git a/src/keyboard.rs b/src/keyboard.rs
index 9ca5a16f0..02f34132f 100644
--- a/src/keyboard.rs
+++ b/src/keyboard.rs
@@ -785,34 +785,9 @@ fn is_hot_key_modifiers_down() -> bool {
     return false;
 }
 
-pub fn translate_virtual_keycode(event: &Event, mut key_event: KeyEvent) -> Option<KeyEvent> {
-    match event.event_type {
-        EventType::KeyPress(..) => {
-            key_event.down = true;
-        }
-        EventType::KeyRelease(..) => {
-            key_event.down = false;
-        }
-        _ => return None,
-    };
-
-    let mut peer = get_peer_platform().to_lowercase();
-    peer.retain(|c| !c.is_whitespace());
-
-    // #[cfg(target_os = "windows")]
-    // let keycode = match peer.as_str() {
-    //     "windows" => event.code,
-    //     "macos" => {
-    //         if hbb_common::config::LocalConfig::get_kb_layout_type() == "ISO" {
-    //             rdev::win_scancode_to_macos_iso_code(event.scan_code)?
-    //         } else {
-    //             rdev::win_scancode_to_macos_code(event.scan_code)?
-    //         }
-    //     }
-    //     _ => rdev::win_scancode_to_linux_code(event.scan_code)?,
-    // };
-
-    key_event.set_chr(event.code as _);
+pub fn translate_vk_scan_code(event: &Event, mut key_event: KeyEvent) -> Option<KeyEvent> {
+    let mut key_event = map_keyboard_mode(event, key_event)?;
+    key_event.set_chr((key_event.chr() & 0x0000FFFF) | ((event.code as u32) << 16));
     Some(key_event)
 }
 
@@ -853,7 +828,7 @@ pub fn translate_keyboard_mode(event: &Event, key_event: KeyEvent) -> Vec<KeyEve
     try_fill_unicode(event, &key_event, &mut events);
 
     if events.is_empty() {
-        if let Some(evt) = translate_virtual_keycode(event, key_event) {
+        if let Some(evt) = translate_vk_scan_code(event, key_event) {
             events.push(evt);
         }
     }
diff --git a/src/server/input_service.rs b/src/server/input_service.rs
index 2b19bbaff..0f40cb7d6 100644
--- a/src/server/input_service.rs
+++ b/src/server/input_service.rs
@@ -1089,10 +1089,6 @@ fn translate_process_virtual_keycode(vk: u32, down: bool) {
 
 fn translate_keyboard_mode(evt: &KeyEvent) {
     match evt.union {
-        Some(key_event::Union::Unicode(_unicode)) => {
-            #[cfg(target_os = "windows")]
-            allow_err!(rdev::simulate_unicode(_unicode as _));
-        }
         Some(key_event::Union::Seq(seq)) => {
             ENIGO.lock().unwrap().key_sequence(&seq);
         }
@@ -1101,6 +1097,9 @@ fn translate_keyboard_mode(evt: &KeyEvent) {
             #[cfg(target_os = "windows")]
             translate_process_virtual_keycode(evt.chr(), evt.down)
         }
+        Some(key_event::Union::Unicode(..)) => {
+            // Do not handle unicode for now.
+        }
         _ => {
             log::debug!("Unreachable. Unexpected key event {:?}", &evt);
         }