xsrc/54784: Cannot input some keys in JP keyboard on Xorg server when specify wskbd Protocol

[oshima-ya%yagoto-urayama.jp@localhost]

>Number:         54784
>Category:       xsrc
>Synopsis:       Cannot input some keys in JP keyboard on Xorg server when specify wskbd Protocol
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    xsrc-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Dec 18 14:55:00 +0000 2019
>Originator:     Yasushi Oshima
>Release:        NetBSD 9.0_RC1
>Organization:
>Environment:
NetBSD tachibana 9.0_RC1 NetBSD 9.0_RC1 (GENERIC) #0: Wed Dec 18 12:23:18 JST 2019  oshima@sudachi:/export/netbsd-9/20191218/obj/amd64/sys/arch/amd64/compile/GENERIC amd64
>Description:
When set X kbd to Protocol wskbd and JP map,
cannot input some keys in japanese keyboard.

These keys:
 '\|' (Left of Back Space on JP106)
 '\_' (Left of Right-Shift on JP106)
 Muhenkan (Left of SPACE BAR on JP106)
 Henkan (Right of SPACE BAR on JP106)
 KATAKANA-HIRAGANA (Right of Henkan on JP106, or Left of MENU/WIN)

This is the same PR/48347, this problem was pointed out in it,
but  PR was closed already.
I sent a patch for pckbd(WsXtMap) again.
>How-To-Repeat:
Put PS/2 Japanese keyboard to PC or prepare note-pc which has japanese keyboard.
Set xorg.conf as the following,


Section "InputDevice"
        Identifier  "Keyboard0"
        Driver      "kbd"
        Option      "Protocol" "wskbd"
        Option      "Device" "/dev/wskbd0"
        Option      "XkbModel" "jp106"
        Option      "XkbLayout" "jp"
EndSection

Run Xserver and Input the following keys.

 '\|' (Left of Back Space on JP106)
 '\_' (Left of Right-Shift on JP106)
 Muhenkan (Left of SPACE BAR on JP106)
 Henkan (Right of SPACE BAR on JP106)
 KATAKANA-HIRAGANA (Right of Henkan on JP106, or Left of MENU/WIN)
>Fix:
Patch for xf86-input-keyboard:

--- a/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c
+++ b/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c
@@ -581,20 +581,20 @@ static CARD8 wsXtMap[] = {
 	/* 109 */ KEY_NOTUSED,
 	/* 110 */ KEY_NOTUSED,
 	/* 111 */ KEY_NOTUSED,
-	/* 112 */ KEY_NOTUSED,
+	/* 112 */ KEY_HKTG,
 	/* 113 */ KEY_NOTUSED,
 	/* 114 */ KEY_NOTUSED,
-	/* 115 */ KEY_NOTUSED,
+	/* 115 */ KEY_BSlash2,
 	/* 116 */ KEY_NOTUSED,
 	/* 117 */ KEY_NOTUSED,
 	/* 118 */ KEY_NOTUSED,
 	/* 119 */ KEY_NOTUSED,
 	/* 120 */ KEY_NOTUSED,
-	/* 121 */ KEY_NOTUSED,
+	/* 121 */ KEY_XFER,
 	/* 122 */ KEY_NOTUSED,
-	/* 123 */ KEY_NOTUSED,
+	/* 123 */ KEY_NFER,
 	/* 124 */ KEY_NOTUSED,
-	/* 125 */ KEY_NOTUSED,
+	/* 125 */ KEY_Yen,
 	/* 126 */ KEY_NOTUSED,
 	/* 127 */ KEY_Pause,
 	/* 128 */ KEY_NOTUSED,


(https://gist.github.com/oshimaya/465f1a9420bb1928cde9973234963e2a)