From 1588e44d61b255ed3eb99529e90dd7e18e4779d9 Mon Sep 17 00:00:00 2001
From: fufesou <shuanglongchen@yeah.net>
Date: Wed, 8 Feb 2023 19:17:43 +0800
Subject: [PATCH] win, translate mode, fix dead key

Signed-off-by: fufesou <shuanglongchen@yeah.net>
---
 Cargo.lock                  |  2 +-
 src/keyboard.rs             | 21 +++++++++++++--------
 src/ui_session_interface.rs |  6 +++---
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c53c573f2..83f623ca7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4405,7 +4405,7 @@ dependencies = [
 [[package]]
 name = "rdev"
 version = "0.5.0-2"
-source = "git+https://github.com/fufesou/rdev#4d8231f05e14c5a04cd7d2c1288e87ad52d39e4c"
+source = "git+https://github.com/fufesou/rdev#cedc4e62744566775026af4b434ef799804c1130"
 dependencies = [
  "cocoa",
  "core-foundation 0.9.3",
diff --git a/src/keyboard.rs b/src/keyboard.rs
index 17c52abf7..5b9920714 100644
--- a/src/keyboard.rs
+++ b/src/keyboard.rs
@@ -193,8 +193,8 @@ pub mod client {
 #[cfg(windows)]
 pub fn update_grab_get_key_name() {
     match get_keyboard_mode_enum() {
-        KeyboardMode::Map => rdev::set_get_key_name(false),
-        KeyboardMode::Translate => rdev::set_get_key_name(true),
+        KeyboardMode::Map => rdev::set_get_key_unicode(false),
+        KeyboardMode::Translate => rdev::set_get_key_unicode(true),
         _ => {}
     };
 }
@@ -256,6 +256,7 @@ pub fn start_grab_loop() {
         if let Err(error) = rdev::grab(func) {
             log::error!("rdev Error: {:?}", error)
         }
+        rdev::set_event_popup(false);
     });
 
     #[cfg(target_os = "linux")]
@@ -757,12 +758,10 @@ pub fn map_keyboard_mode(event: &Event, mut key_event: KeyEvent) -> Option<KeyEv
 fn try_fill_unicode(event: &Event, key_event: &KeyEvent, events: &mut Vec<KeyEvent>) {
     match &event.unicode {
         Some(unicode_info) => {
-            if !unicode_info.is_dead {
-                for code in &unicode_info.unicode {
-                    let mut evt = key_event.clone();
-                    evt.set_unicode(*code as _);
-                    events.push(evt);
-                }
+            for code in &unicode_info.unicode {
+                let mut evt = key_event.clone();
+                evt.set_unicode(*code as _);
+                events.push(evt);
             }
         }
         None => {}
@@ -816,6 +815,12 @@ pub fn translate_virtual_keycode(event: &Event, mut key_event: KeyEvent) -> Opti
 
 pub fn translate_keyboard_mode(event: &Event, key_event: KeyEvent) -> Vec<KeyEvent> {
     let mut events: Vec<KeyEvent> = Vec::new();
+    if let Some(unicode_info) = &event.unicode {
+        if unicode_info.is_dead {
+            return events;
+        }
+    }
+
     #[cfg(target_os = "windows")]
     unsafe {
         if event.scan_code == 0x021D {
diff --git a/src/ui_session_interface.rs b/src/ui_session_interface.rs
index dc0e365ab..87ea8e9eb 100644
--- a/src/ui_session_interface.rs
+++ b/src/ui_session_interface.rs
@@ -368,8 +368,8 @@ impl<T: InvokeUiSession> Session<T> {
         #[cfg(target_os = "windows")]
         {
             match &self.lc.read().unwrap().keyboard_mode as _ {
-                "legacy" => rdev::set_get_key_name(true),
-                "translate" => rdev::set_get_key_name(true),
+                "legacy" => rdev::set_get_key_unicode(true),
+                "translate" => rdev::set_get_key_unicode(true),
                 _ => {}
             }
         }
@@ -381,7 +381,7 @@ impl<T: InvokeUiSession> Session<T> {
     pub fn leave(&self) {
         #[cfg(target_os = "windows")]
         {
-            rdev::set_get_key_name(false);
+            rdev::set_get_key_unicode(false);
         }
         IS_IN.store(false, Ordering::SeqCst);
         keyboard::client::change_grab_status(GrabState::Wait);