diff --git a/Cargo.lock b/Cargo.lock index 96ff5a811..62b412062 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4993,7 +4993,7 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "tfc" version = "0.6.1" -source = "git+https://github.com/asur4s/The-Fat-Controller#8ef82be83d8d941f08bdb84e77bea52290f92050" +source = "git+https://github.com/asur4s/The-Fat-Controller#a091f887edc2440b17d86c9ba580f2f35ce0cfcc" dependencies = [ "core-graphics 0.22.3", "unicode-segmentation", diff --git a/src/server/input_service.rs b/src/server/input_service.rs index 1e6a10613..ffcaf32a9 100644 --- a/src/server/input_service.rs +++ b/src/server/input_service.rs @@ -673,6 +673,7 @@ fn map_keyboard_mode(evt: &KeyEvent) { fn tfc_key_down_or_up(key: Key, down: bool, up: bool) { if let Key::Layout(chr) = key { + log::info!("tfc_key_down_or_up :{:?}", chr); if down { TFC_CONTEXT.lock().unwrap().unicode_char_down(chr); } @@ -705,7 +706,6 @@ fn tfc_key_down_or_up(key: Key, down: bool, up: bool) { Key::F9 => TFC_Key::F9, Key::Home => TFC_Key::Home, Key::LeftArrow => TFC_Key::LeftArrow, - Key::Option => TFC_Key::Alt, Key::PageDown => TFC_Key::PageDown, Key::PageUp => TFC_Key::PageUp, Key::Return => TFC_Key::ReturnOrEnter, @@ -725,24 +725,15 @@ fn tfc_key_down_or_up(key: Key, down: bool, up: bool) { Key::Numpad8 => TFC_Key::N8, Key::Numpad9 => TFC_Key::N9, Key::Decimal => TFC_Key::NumpadDecimal, - // Key::Cancel => TFC_Key::Cancel, Key::Clear => TFC_Key::NumpadClear, Key::Pause => TFC_Key::PlayPause, - // Key::Kana => TFC_Key::, - // Key::Hangul => "Hangul", - // Key::Hanja => "Hanja", - // Key::Kanji => "Kanji", - // Key::Select => TFC_Key::Sel, - // Key::Print => TFC_Key::P, - // Key::Execute => "Execute", - // Key::Snapshot => "3270_PrintScreen", - // Key::Insert => TFC_Key:, - // Key::Help => "Help", - // Key::Separator => "KP_Separator", - // Key::Scroll => "Scroll_Lock", - // Key::NumLock => "Num_Lock", + Key::Print => TFC_Key::Print, + Key::Snapshot => TFC_Key::PrintScreen, + Key::Insert => TFC_Key::Insert, + Key::Scroll => TFC_Key::ScrollLock, + Key::NumLock => TFC_Key::NumLock, Key::RWin => TFC_Key::Meta, - // Key::Apps => "Menu", + Key::Apps => TFC_Key::Apps, Key::Multiply => TFC_Key::NumpadMultiply, Key::Add => TFC_Key::NumpadPlus, Key::Subtract => TFC_Key::NumpadMinus, @@ -758,6 +749,7 @@ fn tfc_key_down_or_up(key: Key, down: bool, up: bool) { } }; + log::info!("tfc_key_down_or_up: {:?}", key); if down { TFC_CONTEXT.lock().unwrap().key_down(key); }