[winpr,input] fix japanese mapping

use japanese 109 layout instead of 106 layout
This commit is contained in:
akallabeth 2025-01-13 15:37:25 +01:00
parent 2c727222d1
commit 94554fd3ca
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
2 changed files with 54 additions and 67 deletions

View File

@ -547,7 +547,7 @@
/**
* Keyboard Type 7
*
* https://kbdlayout.info/kbd106/virtualkeys
* https://kbdlayout.info/kbdjpn/virtualkeys
*/
#define KBD7_T00 VK_NONE
@ -563,7 +563,7 @@
#define KBD7_T0A VK_KEY_9
#define KBD7_T0B VK_KEY_0
#define KBD7_T0C VK_OEM_MINUS
#define KBD7_T0D VK_OEM_7
#define KBD7_T0D VK_OEM_PLUS
#define KBD7_T0E VK_BACK
#define KBD7_T0F VK_TAB
#define KBD7_T10 VK_KEY_Q
@ -576,8 +576,8 @@
#define KBD7_T17 VK_KEY_I
#define KBD7_T18 VK_KEY_O
#define KBD7_T19 VK_KEY_P
#define KBD7_T1A VK_OEM_3 /* NE */
#define KBD7_T1B VK_OEM_4 /* NE */
#define KBD7_T1A VK_OEM_4
#define KBD7_T1B VK_OEM_6
#define KBD7_T1C VK_RETURN
#define KBD7_T1D VK_LCONTROL
#define KBD7_T1E VK_KEY_A
@ -589,11 +589,11 @@
#define KBD7_T24 VK_KEY_J
#define KBD7_T25 VK_KEY_K
#define KBD7_T26 VK_KEY_L
#define KBD7_T27 VK_OEM_PLUS
#define KBD7_T28 VK_OEM_1
#define KBD7_T29 VK_OEM_AUTO /* NE */
#define KBD7_T27 VK_OEM_1
#define KBD7_T28 VK_OEM_7
#define KBD7_T29 VK_OEM_3
#define KBD7_T2A VK_LSHIFT
#define KBD7_T2B VK_OEM_6 /* NE */
#define KBD7_T2B VK_OEM_5
#define KBD7_T2C VK_KEY_Z
#define KBD7_T2D VK_KEY_X
#define KBD7_T2E VK_KEY_C
@ -608,7 +608,7 @@
#define KBD7_T37 VK_MULTIPLY
#define KBD7_T38 VK_LMENU
#define KBD7_T39 VK_SPACE
#define KBD7_T3A VK_DBE_ALPHANUMERIC
#define KBD7_T3A VK_CAPITAL
#define KBD7_T3B VK_F1
#define KBD7_T3C VK_F2
#define KBD7_T3D VK_F3
@ -621,13 +621,13 @@
#define KBD7_T44 VK_F10
#define KBD7_T45 VK_NUMLOCK
#define KBD7_T46 VK_SCROLL
#define KBD7_T47 VK_HOME /* VK_HOME */
#define KBD7_T48 VK_UP /* VK_UP */
#define KBD7_T49 VK_PRIOR /* VK_PRIOR */
#define KBD7_T47 VK_HOME
#define KBD7_T48 VK_UP
#define KBD7_T49 VK_PRIOR
#define KBD7_T4A VK_SUBTRACT
#define KBD7_T4B VK_LEFT /* VK_LEFT */
#define KBD7_T4C VK_CLEAR /* VK_CLEAR */
#define KBD7_T4D VK_RIGHT /* VK_RIGHT */
#define KBD7_T4B VK_LEFT
#define KBD7_T4C VK_CLEAR
#define KBD7_T4D VK_RIGHT
#define KBD7_T4E VK_ADD
#define KBD7_T4F VK_END
#define KBD7_T50 VK_DOWN
@ -636,20 +636,20 @@
#define KBD7_T53 VK_DELETE
#define KBD7_T54 VK_SNAPSHOT
#define KBD7_T55 VK_NONE
#define KBD7_T56 VK_NONE
#define KBD7_T56 VK_OEM_102
#define KBD7_T57 VK_F11
#define KBD7_T58 VK_F12
#define KBD7_T59 VK_CLEAR
#define KBD7_T5A VK_NONAME /* NE */
#define KBD7_T5B VK_NONAME /* NE */
#define KBD7_T5C VK_NONAME /* NE */
#define KBD7_T5A VK_OEM_WSCTRL
#define KBD7_T5B VK_DBE_KATAKANA
#define KBD7_T5C VK_OEM_JUMP
#define KBD7_T5D VK_DBE_FLUSHSTRING
#define KBD7_T5E VK_NONE /* NE */
#define KBD7_T5F VK_NONAME /* NE */
#define KBD7_T5E VK_OEM_BACKTAB
#define KBD7_T5F VK_OEM_AUTO
#define KBD7_T60 VK_NONE
#define KBD7_T61 VK_NONE /* NE */
#define KBD7_T62 VK_NONE /* NE */
#define KBD7_T63 VK_NONE
#define KBD7_T61 VK_NONE
#define KBD7_T62 VK_DBE_NOCODEINPUT
#define KBD7_T63 VK_HELP
#define KBD7_T64 VK_F13
#define KBD7_T65 VK_F14
#define KBD7_T66 VK_F15
@ -661,21 +661,21 @@
#define KBD7_T6C VK_F21
#define KBD7_T6D VK_F22
#define KBD7_T6E VK_F23
#define KBD7_T6F VK_NONE /* NE */
#define KBD7_T70 VK_OEM_COPY /* NE */
#define KBD7_T71 VK_NONE /* NE */
#define KBD7_T6F VK_OEM_PA3
#define KBD7_T70 VK_NONE
#define KBD7_T71 VK_OEM_RESET
#define KBD7_T72 VK_NONE
#define KBD7_T73 VK_OEM_102
#define KBD7_T73 VK_ABNT_C1
#define KBD7_T74 VK_NONE
#define KBD7_T75 VK_NONE
#define KBD7_T76 VK_F24
#define KBD7_T77 VK_NONE
#define KBD7_T78 VK_NONE
#define KBD7_T79 VK_CONVERT /* NE */
#define KBD7_T79 VK_NONE
#define KBD7_T7A VK_NONE
#define KBD7_T7B VK_NONCONVERT /* NE */
#define KBD7_T7B VK_OEM_PA1
#define KBD7_T7C VK_TAB
#define KBD7_T7D VK_OEM_5
#define KBD7_T7D VK_NONE
#define KBD7_T7E VK_ABNT_C2
#define KBD7_T7F VK_OEM_PA2
@ -711,7 +711,7 @@
#define KBD7_X5B VK_LWIN
#define KBD7_X5C VK_RWIN
#define KBD7_X5D VK_APPS
#define KBD7_X5E VK_POWER
#define KBD7_X5E VK_NONE
#define KBD7_X5F VK_SLEEP
#define KBD7_X65 VK_BROWSER_SEARCH
#define KBD7_X66 VK_BROWSER_FAVORITES
@ -722,8 +722,8 @@
#define KBD7_X6B VK_LAUNCH_APP1
#define KBD7_X6C VK_LAUNCH_MAIL
#define KBD7_X6D VK_LAUNCH_MEDIA_SELECT
#define KBD7_XF1 VK_IME_OFF /* NE */
#define KBD7_XF2 VK_IME_ON /* NE */
#define KBD7_XF1 VK_IME_OFF
#define KBD7_XF2 VK_IME_ON
/**
* X11 Keycodes

View File

@ -167,39 +167,26 @@ static const DWORD KBD7X_1[128] = {
* https://kbdlayout.info/kbdkor/virtualkeys
*/
// clang-format off
static const DWORD KBD8T[128] = {
VK_NONE, VK_ESCAPE, VK_KEY_1, VK_KEY_3,
VK_KEY_4, VK_KEY_5, VK_KEY_6, VK_KEY_7,
VK_KEY_8, VK_KEY_9, VK_KEY_0, VK_OEM_MINUS,
VK_OEM_PLUS, VK_BACK, VK_TAB, VK_KEY_Q,
VK_KEY_W, VK_KEY_E, VK_KEY_R, VK_KEY_T,
VK_KEY_Y, VK_KEY_U, VK_KEY_I, VK_KEY_O,
VK_KEY_P, VK_OEM_4, VK_OEM_6, VK_RETURN,
VK_LCONTROL, VK_KEY_A, VK_KEY_S, VK_KEY_D,
VK_KEY_F, VK_KEY_G, VK_KEY_H, VK_KEY_J,
VK_KEY_K, VK_KEY_L, VK_OEM_1, VK_OEM_7,
VK_OEM_3, VK_LSHIFT, VK_OEM_5, VK_KEY_Z,
VK_KEY_X, VK_KEY_C, VK_KEY_V, VK_KEY_B,
VK_KEY_N, VK_KEY_M, VK_OEM_COMMA, VK_OEM_PERIOD,
VK_OEM_2, VK_RSHIFT, VK_MULTIPLY, VK_LMENU,
VK_SPACE, VK_CAPITAL, VK_F1, VK_F2,
VK_F3, VK_F4, VK_F5, VK_F6,
VK_F7, VK_F8, VK_F9, VK_F10,
VK_NUMLOCK, VK_SCROLL, VK_HOME, VK_UP,
VK_PRIOR, VK_SUBTRACT, VK_LEFT, VK_CLEAR,
VK_RIGHT, VK_ADD, VK_END, VK_DOWN,
VK_NEXT, VK_INSERT, VK_DELETE, VK_SNAPSHOT,
VK_OEM_102, VK_F11, VK_F12, VK_CLEAR,
VK_OEM_WSCTRL, VK_DBE_KATAKANA, VK_OEM_JUMP, VK_DBE_FLUSHSTRING,
VK_OEM_BACKTAB, VK_OEM_AUTO, VK_NONE, VK_DBE_NOCODEINPUT,
VK_HELP, VK_NONE, VK_F13, VK_F14,
VK_F15, VK_F16, VK_F17, VK_F18,
VK_F19, VK_F20, VK_F21, VK_F22,
VK_F23, VK_OEM_PA3, VK_NONE, VK_OEM_RESET,
VK_NONE, VK_ABNT_C1, VK_NONE, VK_NONE,
VK_F24, VK_NONE, VK_NONE, VK_NONE,
VK_NONE, VK_OEM_PA1, VK_TAB, VK_ABNT_C2,
VK_OEM_PA2
static const DWORD KBD8T[128] = {
VK_NONE, VK_ESCAPE, VK_KEY_1, VK_KEY_3, VK_KEY_4, VK_KEY_5, VK_KEY_6,
VK_KEY_7, VK_KEY_8, VK_KEY_9, VK_KEY_0, VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK,
VK_TAB, VK_KEY_Q, VK_KEY_W, VK_KEY_E, VK_KEY_R, VK_KEY_T, VK_KEY_Y,
VK_KEY_U, VK_KEY_I, VK_KEY_O, VK_KEY_P, VK_OEM_4, VK_OEM_6, VK_RETURN,
VK_LCONTROL, VK_KEY_A, VK_KEY_S, VK_KEY_D, VK_KEY_F, VK_KEY_G, VK_KEY_H,
VK_KEY_J, VK_KEY_K, VK_KEY_L, VK_OEM_1, VK_OEM_7, VK_OEM_3, VK_LSHIFT,
VK_OEM_5, VK_KEY_Z, VK_KEY_X, VK_KEY_C, VK_KEY_V, VK_KEY_B, VK_KEY_N,
VK_KEY_M, VK_OEM_COMMA, VK_OEM_PERIOD, VK_OEM_2, VK_RSHIFT, VK_MULTIPLY, VK_LMENU,
VK_SPACE, VK_CAPITAL, VK_F1, VK_F2, VK_F3, VK_F4, VK_F5,
VK_F6, VK_F7, VK_F8, VK_F9, VK_F10, VK_NUMLOCK, VK_SCROLL,
VK_HOME, VK_UP, VK_PRIOR, VK_SUBTRACT, VK_LEFT, VK_CLEAR, VK_RIGHT,
VK_ADD, VK_END, VK_DOWN, VK_NEXT, VK_INSERT, VK_DELETE, VK_SNAPSHOT,
VK_NONE, VK_OEM_102, VK_F11, VK_F12, VK_CLEAR, VK_OEM_WSCTRL,VK_DBE_KATAKANA,
VK_OEM_JUMP, VK_DBE_FLUSHSTRING,VK_OEM_BACKTAB,VK_OEM_AUTO, VK_NONE, VK_DBE_NOCODEINPUT,VK_HELP,
VK_NONE, VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18,
VK_F19, VK_F20, VK_F21, VK_F22, VK_F23, VK_OEM_PA3, VK_NONE,
VK_OEM_RESET,VK_NONE, VK_ABNT_C1, VK_NONE, VK_NONE, VK_F24, VK_NONE,
VK_NONE, VK_NONE, VK_NONE, VK_OEM_PA1, VK_TAB, VK_NONE, VK_ABNT_C2,
VK_OEM_PA2
};
static const DWORD KBD8X[256] = {