Module Name:    xsrc
Committed By:   christos
Date:           Fri Apr  4 12:50:09 UTC 2014

Modified Files:
        xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_KbdMap.c

Log Message:
PR/48347: Yasushi Oshima: Cannot input Japanese special keys of JP106 keyboard
with NetBSD/evbarm(RPI) or some arch.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
    xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.9 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.10
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.9	Thu Mar 20 02:40:47 2014
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c	Fri Apr  4 08:50:09 2014
@@ -345,17 +345,33 @@ static CARD8 wsUsbMap[] = {
 	/* 132 */ KEY_NOTUSED,
 	/* 133 */ KEY_NOTUSED,
 	/* 134 */ KEY_NOTUSED,
-	/* 135 */ KEY_NOTUSED,
-	/* 136 */ KEY_NOTUSED,
-	/* 137 */ KEY_NOTUSED,
-	/* 138 */ KEY_NOTUSED,
-	/* 139 */ KEY_NOTUSED,
+/*
+ * Special keycode for For Japanese keyboard
+ * Override atKeyname HKTG and BSlash2 code to unique for JP106 keybaord
+ */
+#undef KEY_HKTG
+#define KEY_HKTG	200	/* Japanee Hiragana Katakana Toggle */
+#undef KEY_BSlash2
+#define KEY_BSlash2	203	/* Japanese '\_' key */
+
+	/* 135 */ KEY_BSlash2,	/* Japanese 106 kbd: '\_' */
+	/* 136 */ KEY_HKTG,	/* Japanese 106 kbd: Hiragana Katakana toggle */
+	/* 137 */ KEY_Yen,	/* Japanese 106 kbd: '\|' */
+	/* 138 */ KEY_XFER,	/* Japanese 106 kbd: Henkan */
+	/* 139 */ KEY_NFER,	/* Japanese 106 kbd: Muhenkan */
 	/* 140 */ KEY_NOTUSED,
 	/* 141 */ KEY_NOTUSED,
 	/* 142 */ KEY_NOTUSED,
 	/* 143 */ KEY_NOTUSED,
-	/* 144 */ KEY_NOTUSED,
-	/* 145 */ KEY_NOTUSED,
+/*
+ * Special keycode for For Korean keyboard
+ * Define Hangul and Hangul_Hanja unique key code
+ * These keys also use KANA and EISU on some Macintosh Japanese USB Keyboards
+ */
+#define KEY_Hangul		201	/* Also KANA Key on Mac JP USB kbd */
+#define KEY_Hangul_Hanja	202	/* Also EISU Key on Mac JP USB kbd */
+	/* 144 */ KEY_Hangul,		/* Korean 106 kbd: Hangul */
+	/* 145 */ KEY_Hangul_Hanja,	/* Korean 106 kbd: Hangul Hanja */
 	/* 146 */ KEY_NOTUSED,
 	/* 147 */ KEY_NOTUSED,
 	/* 148 */ KEY_NOTUSED,

Reply via email to