diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2005-02-08 10:13:06 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2005-02-08 10:13:06 +0000 |
| commit | 7ac7809c1e056d0dd5dcd46b2e947f0be1a53648 (patch) | |
| tree | f4181f4c932ae28c024578d049b063a66463fbf4 | |
| parent | 0427022d76f07b2dec03efdb7265aae07770db77 (diff) | |
Backout ABNT2 and HK_Toggle fix since it broke keys F1 and F4.
| -rw-r--r-- | hw/xwin/ChangeLog | 6 | ||||
| -rw-r--r-- | hw/xwin/winkeybd.h | 4 | ||||
| -rwxr-xr-x | hw/xwin/winkeynames.h | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog index bc17fdbd8..4353edf96 100644 --- a/hw/xwin/ChangeLog +++ b/hw/xwin/ChangeLog @@ -1,3 +1,9 @@ +2005-02-08 Alexander Gottwald <ago at freedesktop dot org> + + * winkeybd.h: + * winkeynames.h: + Backout ABNT2 and HK_Toggle fix since it broke keys F1 and F4. + 2005-02-07 Alexander Gottwald <ago at freedesktop dot org> * winlayouts.h: diff --git a/hw/xwin/winkeybd.h b/hw/xwin/winkeybd.h index f0f8dbc5f..31c0cbc23 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 */ VK_KANA, KEY_HKTG, 0, + /* 112 */ 0, 0, 0, /* 113 */ 0, 0, 0, /* 114 */ 0, 0, 0, - /* 115 */ 0, KEY_BSlash2, 0, + /* 115 */ 0, 0, 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 5a7305806..661a8b15f 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 |