Merge pull request #1214 from tom-tan/add-mappings-for-jp

Add JP specific key mappings
This commit is contained in:
Povilas Kanapickas 2021-08-19 14:43:23 +03:00 committed by GitHub
commit 0c02b3d54b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions

View File

@ -61,12 +61,12 @@ const KeyID MSWindowsKeyState::s_virtualKey[] =
/* 0x012 */ { kKeyAlt_L }, // VK_MENU /* 0x012 */ { kKeyAlt_L }, // VK_MENU
/* 0x013 */ { kKeyPause }, // VK_PAUSE /* 0x013 */ { kKeyPause }, // VK_PAUSE
/* 0x014 */ { kKeyCapsLock }, // VK_CAPITAL /* 0x014 */ { kKeyCapsLock }, // VK_CAPITAL
/* 0x015 */ { kKeyKana }, // VK_HANGUL, VK_KANA /* 0x015 */ { kKeyNone }, // undefined
/* 0x016 */ { kKeyNone }, // undefined /* 0x016 */ { kKeyKana }, // VK_HANGUL, VK_KANA, VK_IME_ON
/* 0x017 */ { kKeyNone }, // VK_JUNJA /* 0x017 */ { kKeyNone }, // VK_JUNJA
/* 0x018 */ { kKeyNone }, // VK_FINAL /* 0x018 */ { kKeyNone }, // VK_FINAL
/* 0x019 */ { kKeyKanzi }, // VK_HANJA, VK_KANJI /* 0x019 */ { kKeyKanzi }, // VK_HANJA, VK_KANJI
/* 0x01a */ { kKeyNone }, // undefined /* 0x01a */ { kKeyEisuToggle }, // VK_IME_OFF
/* 0x01b */ { kKeyEscape }, // VK_ESCAPE /* 0x01b */ { kKeyEscape }, // VK_ESCAPE
/* 0x01c */ { kKeyHenkan }, // VK_CONVERT /* 0x01c */ { kKeyHenkan }, // VK_CONVERT
/* 0x01d */ { kKeyMuhenkan }, // VK_NONCONVERT /* 0x01d */ { kKeyMuhenkan }, // VK_NONCONVERT

View File

@ -43,6 +43,9 @@ static const UInt32 s_launchpadVK = 131;
static const UInt32 s_osxNumLock = 1 << 16; static const UInt32 s_osxNumLock = 1 << 16;
static const UInt32 s_int4VK = 0x8a; // international4
static const UInt32 s_int5VK = 0x8b; // international5
struct KeyEntry { struct KeyEntry {
public: public:
KeyID m_keyID; KeyID m_keyID;
@ -126,7 +129,10 @@ static const KeyEntry s_controlKeys[] = {
// JIS keyboards only // JIS keyboards only
{ kKeyEisuToggle, kVK_JIS_Eisu }, { kKeyEisuToggle, kVK_JIS_Eisu },
{ kKeyKana, kVK_JIS_Kana } { kKeyKana, kVK_JIS_Kana },
{ kKeyMuhenkan, s_int5VK },
{ kKeyHenkan, s_int4VK },
{ kKeyZenkaku, kVK_ANSI_Grave }
}; };