Merge pull request debauchee#832 from tom-tan/add-os-barrier-keymap-f…

…or-jis-kbd Add key mappings for `Kana`, `Eisu_toggle` and `Muhenkan`
florianhofhammer · Aug 22, 2020 · b204520 · b204520
2 parents d58a9fb + 4aefd64
commit b204520
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/lib/platform/MSWindowsKeyState.cpp b/src/lib/platform/MSWindowsKeyState.cpp
@@ -69,7 +69,7 @@ const KeyID				MSWindowsKeyState::s_virtualKey[] =
 	/* 0x01a */ { kKeyNone },		// undefined
 	/* 0x01b */ { kKeyEscape },		// VK_ESCAPE
 	/* 0x01c */ { kKeyHenkan },		// VK_CONVERT		
-	/* 0x01d */ { kKeyNone },		// VK_NONCONVERT	
+	/* 0x01d */ { kKeyMuhenkan },	// VK_NONCONVERT	
 	/* 0x01e */ { kKeyNone },		// VK_ACCEPT		
 	/* 0x01f */ { kKeyNone },		// VK_MODECHANGE	
 	/* 0x020 */ { kKeyNone },		// VK_SPACE

diff --git a/src/lib/platform/OSXKeyState.cpp b/src/lib/platform/OSXKeyState.cpp
@@ -122,7 +122,11 @@ static const KeyEntry    s_controlKeys[] = {
     { kKeyMissionControl, s_missionControlVK },
     { kKeyLaunchpad, s_launchpadVK },
     { kKeyBrightnessUp,  s_brightnessUp },
-    { kKeyBrightnessDown, s_brightnessDown }
+    { kKeyBrightnessDown, s_brightnessDown },
+
+    // JIS keyboards only
+    { kKeyEisuToggle, kVK_JIS_Eisu },
+    { kKeyKana, kVK_JIS_Kana }
 };