feat(win): map (no)convert scancodes (#1166)

Try adding code for previously-unmapped JIS keys. Not tested. #1160.
jtroo · Aug 4, 2024 · f51b8df · f51b8df
1 parent 4a8268f
commit f51b8df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/oskbd/windows/interception_convert.rs b/src/oskbd/windows/interception_convert.rs
@@ -326,8 +326,8 @@ impl TryFrom<OsCodeWrapper> for Stroke {
             // ScanCode::Help => 0x63,
             // ScanCode::AltPrintScreen = 0x55, /* Alt + print screen. */
             // ScanCode::SBCSChar = 0x77,
-            // ScanCode::Convert = 0x79,
-            // ScanCode::NonConvert = 0x7B,
+            OsCode::KEY_HENKAN => (ScanCode::Convert, KeyState::empty()),
+            OsCode::KEY_MUHENKAN => (ScanCode::NonConvert, KeyState::empty()),
             OsCode::KEY_PREVIOUSSONG => (ScanCode::Q, KeyState::E0),
             OsCode::KEY_NEXTSONG => (ScanCode::P, KeyState::E0), // 0x19
             OsCode::KEY_KPENTER => (ScanCode::Enter, KeyState::E0), // 0x1C

diff --git a/src/oskbd/windows/scancode_to_usvk.rs b/src/oskbd/windows/scancode_to_usvk.rs
@@ -1,5 +1,6 @@
 use kanata_parser::keys::OsCode;
 
+#[rustfmt::skip]
 #[allow(unused)]
 pub fn u16_to_osc(input: u16) -> Option<OsCode> {
     Some(if input < 0xE000 {
@@ -103,6 +104,8 @@ pub fn u16_to_osc(input: u16) -> Option<OsCode> {
             0x6E => OsCode::KEY_F23,
             0x76 => OsCode::KEY_F24,
             0x70 => OsCode::KEY_KATAKANA,
+            0x79 => OsCode::KEY_HENKAN,   // Convert
+            0x7B => OsCode::KEY_MUHENKAN, // Noconvert
             // Note: the OEM keys below don't seem to correspond to the same VK OEM
             // mappings as the LLHOOK codes.
             // ScanCode::Oem1 = 0x5A, /* VK_OEM_WSCTRL */
@@ -117,8 +120,6 @@ pub fn u16_to_osc(input: u16) -> Option<OsCode> {
             // ScanCode::Help => 0x63,
             // ScanCode::AltPrintScreen = 0x55, /* Alt + print screen. */
             // ScanCode::SBCSChar = 0x77,
-            // ScanCode::Convert = 0x79,
-            // ScanCode::NonConvert = 0x7B,
             _ => return None,
         }
     } else {