win, translate mode, debug almost done

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2023-02-06 18:13:17 +08:00
parent 6eec0041bd
commit ddc9792d15
6 changed files with 14 additions and 43 deletions

View File

@@ -210,8 +210,8 @@ pub fn start_grab_loop() {
if KEYBOARD_HOOKED.load(Ordering::SeqCst) {
let keyboard_mode = client::process_event(&event, None);
if keyboard_mode == KeyboardMode::Translate {
// shift
if event.scan_code == 0x2A {
// SHIFT(0x2A) RSHIFT(0x36)
if event.scan_code == 0x2A || event.scan_code == 0x36 {
return Some(event);
}
}
@@ -396,11 +396,6 @@ pub fn event_to_key_events(event: &Event, keyboard_mode: KeyboardMode, lock_mode
}
}
println!(
"REMOVE ME ========================= key_events {:?}",
&key_events
);
key_events
}

View File

@@ -1070,7 +1070,6 @@ fn legacy_keyboard_mode(evt: &KeyEvent) {
fn translate_keyboard_mode(evt: &KeyEvent) {
match evt.union {
Some(key_event::Union::Unicode(unicode)) => {
println!("REMOVE ME ========================= simulate_unicode {}", unicode);
allow_err!(rdev::simulate_unicode(unicode as _));
},
Some(key_event::Union::Chr(..)) => {

View File

@@ -364,14 +364,8 @@ impl<T: InvokeUiSession> Session<T> {
#[cfg(target_os = "windows")]
{
match &self.lc.read().unwrap().keyboard_mode as _ {
"legacy" => {
println!("REMOVE ME =========================== enter legacy ");
rdev::set_get_key_name(true);
}
"translate" => {
println!("REMOVE ME =========================== enter translate ");
rdev::set_get_key_name(true);
}
"legacy" => rdev::set_get_key_name(true),
"translate" => rdev::set_get_key_name(true),
_ => {}
}
}
@@ -383,7 +377,6 @@ impl<T: InvokeUiSession> Session<T> {
pub fn leave(&self) {
#[cfg(target_os = "windows")]
{
println!("REMOVE ME =========================== leave ");
rdev::set_get_key_name(false);
}
IS_IN.store(false, Ordering::SeqCst);