From 16d9a3dce013e547fbb44cb0b1ffff76b6af863d Mon Sep 17 00:00:00 2001 From: Toru Yamada Date: Wed, 30 Jun 2021 20:15:34 +0900 Subject: [PATCH] Support "Kana" and "Eisu" keys on Japanese Apple Pro Keyboard (JIS) (#7040) * Support "Kana" and "Eisu" keys on Japanese Apple Pro Keyboard (JIS) * Update ChangeLog Co-authored-by: Serhii Hadzhilov Co-authored-by: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com> --- ChangeLog | 1 + src/lib/platform/OSXKeyState.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 61473aa5b1..3468361c82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ Enhancements: - #7035 Add Fedora 34 build - #7037 Add Ubuntu 21.04 build - #7030 | #7041 | #7043 Add user notification for secure input on Mac +- #7040 Support "Kana" and "Eisu" keys on Japanese Apple Pro Keyboard (JIS) =========== v1.14.0-stable diff --git a/src/lib/platform/OSXKeyState.cpp b/src/lib/platform/OSXKeyState.cpp index 57b750e080..f000a4cc1f 100644 --- a/src/lib/platform/OSXKeyState.cpp +++ b/src/lib/platform/OSXKeyState.cpp @@ -118,6 +118,11 @@ static const KeyEntry s_controlKeys[] = { // toggle modifiers { kKeyNumLock, s_numLockVK }, { kKeyCapsLock, s_capsLockVK }, + + // for Apple Pro JIS Keyboard, map Kana (IME activate) to Henkan (show next IME conversion), and + // Eisu (IME deactivate) to Zenkaku (IME activation toggle) on Windows Japanese keyboard (OADG109A) + { kKeyHenkan, kVK_JIS_Kana }, + { kKeyZenkaku, kVK_JIS_Eisu }, { kKeyMissionControl, s_missionControlVK }, { kKeyLaunchpad, s_launchpadVK },