summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasushi Oshima <oshima-ya@yagoto-urayama.jp>2015-07-20 10:49:49 +0200
committerThomas Klausner <wiz@NetBSD.org>2015-07-23 18:11:06 +0200
commitccf63a61f39e1f107a67c33d6a7ad24ea4c76b7e (patch)
tree6852d7b3685501b2936ef0cc64d04f5afd7e92a2
parent13d320076e5de2d6c3cbc170fc7e31c526ed8499 (diff)
downloadxorg-driver-xf86-input-keyboard-ccf63a61f39e1f107a67c33d6a7ad24ea4c76b7e.tar.gz
Add defines for Japanese 106-key USB keyboards.
Via http://gnats.netbsd.org/48347 Signed-off-by: Thomas Klausner <wiz@NetBSD.org> Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/bsd_KbdMap.c30
1 files changed, 23 insertions, 7 deletions
diff --git a/src/bsd_KbdMap.c b/src/bsd_KbdMap.c
index 123ab96..21f337d 100644
--- a/src/bsd_KbdMap.c
+++ b/src/bsd_KbdMap.c
@@ -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 keycodes for Japanese keyboards
+ * Override atKeyname HKTG and BSlash2 code to unique values for JP106 keyboards
+ */
+#undef KEY_HKTG
+#define KEY_HKTG 200 /* Japanese 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 keycodes for Korean keyboards
+ * Define Hangul and Hangul_Hanja unique key codes
+ * 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,