summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hw/xwin/ChangeLog7
-rw-r--r--hw/xwin/winkeybd.h4
-rwxr-xr-xhw/xwin/winkeynames.h4
3 files changed, 11 insertions, 4 deletions
diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog
index 39b59c1dd..db9396ef2 100644
--- a/hw/xwin/ChangeLog
+++ b/hw/xwin/ChangeLog
@@ -1,6 +1,13 @@
2005-01-10 Alexander Gottwald <ago at freedesktop dot org>
* winkeybd.h
+ * winkeynames.h:
+ Adjust keysyms for Hiragana_Katakana toggle and backslash/underscore
+ on Japanese and ABNT2 keyboards
+
+2005-01-10 Alexander Gottwald <ago at freedesktop dot org>
+
+ * winkeybd.h
* winkeyhook.c
* winwndproc.c:
Make keyhook feature work in multiwindowmode too
diff --git a/hw/xwin/winkeybd.h b/hw/xwin/winkeybd.h
index 31c0cbc23..f0f8dbc5f 100644
--- a/hw/xwin/winkeybd.h
+++ b/hw/xwin/winkeybd.h
@@ -161,10 +161,10 @@ g_iKeyMap [] = {
/* 109 */ 0, 0, 0,
/* 110 */ 0, 0, 0,
/* 111 */ VK_DIVIDE, 0, KEY_KP_Divide,
- /* 112 */ 0, 0, 0,
+ /* 112 */ VK_KANA, KEY_HKTG, 0,
/* 113 */ 0, 0, 0,
/* 114 */ 0, 0, 0,
- /* 115 */ 0, 0, 0,
+ /* 115 */ 0, KEY_BSlash2, 0,
/* 116 */ 0, 0, 0,
/* 117 */ 0, 0, 0,
/* 118 */ 0, 0, 0,
diff --git a/hw/xwin/winkeynames.h b/hw/xwin/winkeynames.h
index 661a8b15f..5a7305806 100755
--- a/hw/xwin/winkeynames.h
+++ b/hw/xwin/winkeynames.h
@@ -187,15 +187,15 @@
#define KEY_F13 /* F13 0x6e */ 110
#define KEY_F14 /* F14 0x6f */ 111
#define KEY_F15 /* F15 0x70 */ 112
-#define KEY_HKTG /* Hirugana/Katakana tog 0x70 */ 112
#define KEY_F16 /* F16 0x71 */ 113
#define KEY_F17 /* F17 0x72 */ 114
#define KEY_KP_DEC /* KP_DEC 0x73 */ 115
-#define KEY_BSlash2 /* \ _ 0x73 */ 115
#define KEY_KP_Equal /* Equal (Keypad) 0x76 */ 118
#define KEY_XFER /* Kanji Transfer 0x79 */ 121
#define KEY_NFER /* No Kanji Transfer 0x7b */ 123
#define KEY_Yen /* Yen 0x7d */ 125
+#define KEY_HKTG /* Hiragana/Katakana tog 0xc8 */ 200
+#define KEY_BSlash2 /* \ _ 0xcb */ 203
/* These are for "notused" and "unknown" entries in translation maps. */
#define KEY_NOTUSED 0