From 0fdcf8b225be85603fcea86aebd6cd7638f3fa3d Mon Sep 17 00:00:00 2001 From: Tomoya Tanjo Date: Wed, 12 Aug 2020 16:20:29 +0900 Subject: [PATCH 1/2] Add key mappings for `Kana`, `Eisu` and `Muhenkan` --- src/lib/platform/MSWindowsKeyState.cpp | 2 +- src/lib/platform/OSXKeyState.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/platform/MSWindowsKeyState.cpp b/src/lib/platform/MSWindowsKeyState.cpp index 2f29f72f..2ce91812 100644 --- 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 index 9db3c5d1..b03137c4 100644 --- a/src/lib/platform/OSXKeyState.cpp +++ b/src/lib/platform/OSXKeyState.cpp @@ -123,6 +123,10 @@ static const KeyEntry s_controlKeys[] = { { kKeyLaunchpad, s_launchpadVK }, { kKeyBrightnessUp, s_brightnessUp }, { kKeyBrightnessDown, s_brightnessDown } + + // JIS keyboards only + { kKeyEisuToggle, kVK_JIS_Eisu }, + { kKeyKana, kVK_JIS_Kana } }; From 4aefd64adda90943cc16ba7d3c3545ecc00ec45f Mon Sep 17 00:00:00 2001 From: Tomoya Tanjo Date: Wed, 12 Aug 2020 18:33:32 +0900 Subject: [PATCH 2/2] Add missing comma --- src/lib/platform/OSXKeyState.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/platform/OSXKeyState.cpp b/src/lib/platform/OSXKeyState.cpp index b03137c4..932f5093 100644 --- a/src/lib/platform/OSXKeyState.cpp +++ b/src/lib/platform/OSXKeyState.cpp @@ -122,7 +122,7 @@ 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 },