Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[KBDJA][NTUSER] Improve scancode_to_vk data (#4515)

Browse source 
- Fix scancode_to_vk variable.
- Add special handling to win32k!ProcessKeyEvent function for Japanese.
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-05-15 12:53:12 +09:00 committed by GitHub
parent 81aa81e38f
commit 99d9fc698f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dll/keyboard/kbdja/kbdja.c
View file

@ -48,16 +48,17 @@ ROSDATA USHORT scancode_to_vk[] = {
VK_LCONTROL, VK_LCONTROL,
'A', 'S', 'D', 'F', 'A', 'S', 'D', 'F',
'G', 'H', 'J', 'K', 'G', 'H', 'J', 'K',
'L', VK_OEM_PLUS, VK_OEM_1, VK_PROCESSKEY, 'L', VK_OEM_PLUS, VK_OEM_1, VK_KANJI | KBDSPECIAL,
VK_LSHIFT, VK_OEM_6, VK_LSHIFT, VK_OEM_6,
/* - 2c - */ /* - 2c - */
/* Third letters row */ /* Third letters row */
'Z', 'X', 'C', 'V', 'Z', 'X', 'C', 'V',
'B', 'N', 'M', VK_OEM_COMMA, 'B', 'N', 'M', VK_OEM_COMMA,
VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT, VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KBDEXT,
/* - 37 - */ /* - 37 - */
/* Bottom Row */ /* Bottom Row */
VK_MULTIPLY, VK_LMENU, VK_SPACE, VK_CAPITAL, VK_MULTIPLY | KBDMULTIVK,
VK_LMENU, VK_SPACE, VK_OEM_ATTN | KBDSPECIAL,
/* - 3b - */ /* - 3b - */
/* F-Keys */ /* F-Keys */
@ -88,16 +89,15 @@ ROSDATA USHORT scancode_to_vk[] = {
VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20,
VK_F21, VK_F22, VK_F23, VK_F21, VK_F22, VK_F23,
/* - 6f - */ /* - 6f - */
/* Not sure who uses these codes */ VK_EMPTY, VK_OEM_COPY | KBDSPECIAL, VK_EMPTY,
VK_EMPTY, VK_EMPTY, VK_EMPTY,
/* - 72 - */ /* - 72 - */
VK_EMPTY, VK_OEM_102, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_OEM_102, VK_EMPTY, VK_EMPTY,
/* - 76 - */ /* - 76 - */
/* One more f-key */ /* One more f-key */
VK_F24, VK_F24,
/* - 77 - */ /* - 77 - */
VK_EMPTY, VK_EMPTY, VK_CONVERT, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_CONVERT | KBDSPECIAL, VK_EMPTY,
VK_NONCONVERT, VK_EMPTY, VK_OEM_5, VK_EMPTY, /* PA1 */ VK_NONCONVERT | KBDSPECIAL, VK_EMPTY, VK_OEM_5, VK_EMPTY, /* PA1 */
VK_EMPTY, VK_EMPTY,
/* - 80 - */ /* - 80 - */
0 0
@ -205,7 +205,7 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
{ '7', 0, {'7', '\''} }, { '7', 0, {'7', '\''} },
{ '8', 0, {'8', '('} }, { '8', 0, {'8', '('} },
{ '9', 0, {'9', ')'} }, { '9', 0, {'9', ')'} },
{ '0', 0, {'0', 0 } }, { '0', 0, {'0', WCH_NONE} },
/*Japanese Keys*/ /*Japanese Keys*/
{ VK_OEM_7, 0, { '^','~'} }, { VK_OEM_7, 0, { '^','~'} },

13
win32ss/user/ntuser/keyboard.c
View file

@ -811,6 +811,19 @@ ProcessKeyEvent(WORD wVk, WORD wScanCode, DWORD dwFlags, BOOL bInjected, DWORD d
/* Get virtual key without shifts (VK_(L|R)* -> VK_*) */ /* Get virtual key without shifts (VK_(L|R)* -> VK_*) */
wSimpleVk = IntSimplifyVk(wVk); wSimpleVk = IntSimplifyVk(wVk);
if (PRIMARYLANGID(gusLanguageID) == LANG_JAPANESE)
{
/* Japanese special! */
if (IS_KEY_DOWN(gafAsyncKeyState, VK_SHIFT))
{
if (wSimpleVk == VK_OEM_ATTN)
wSimpleVk = VK_CAPITAL;
else if (wSimpleVk == VK_OEM_COPY)
wSimpleVk = VK_OEM_FINISH;
}
}
bWasSimpleDown = IS_KEY_DOWN(gafAsyncKeyState, wSimpleVk); bWasSimpleDown = IS_KEY_DOWN(gafAsyncKeyState, wSimpleVk);
/* Update key without shifts */ /* Update key without shifts */