diff options
| author | Javier Acosta <javier.acosta@oracle.com> | 2010-12-23 09:43:51 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-05 23:26:49 -0800 |
| commit | bd099b5a87399d6ff1fd324172bfcc4bc07a362b (patch) | |
| tree | becfa361348ccc638e57e4ab2da316d7f409190b | |
| parent | cb8b2fca90810a1a2d6e5f930e4eac0f929947c6 (diff) | |
Make key codes for Sun Japanese keyboard match xkb-config mappings
Solaris bug #7005752:
http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=7005752
Signed-off-by: Javier Acosta <javier.acosta@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | src/sun_kbdMap.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/sun_kbdMap.c b/src/sun_kbdMap.c index 174aed9..1e0a366 100644 --- a/src/sun_kbdMap.c +++ b/src/sun_kbdMap.c @@ -37,10 +37,6 @@ /* Map the Solaris keycodes to the "XFree86" keycodes. */ -/* Additional Sun Japanese Keyboard Keys not defined in atKeynames.h */ -#define KEY_Kanji 0x82 -#define KEY_Execute 0x83 - /* * Additional Korean 106 Keyboard Keys not defined in atKeynames.h * These are exactly same USB usage id with Kana(0x90) and Eisu(0x91) keys @@ -479,10 +475,10 @@ static unsigned char usbmap[256] = { /* 133 */ KEY_NOTUSED, /* 134 */ KEY_NOTUSED, /* 135 */ KEY_BSlash2, /* Sun Japanese Kbd: Backslash / Underscore */ - /* 136 */ KEY_XFER, /* Sun Japanese Kbd: Henkan Mode */ + /* 136 */ KEY_HKTG, /* Sun Japanese type7 Kbd: Hirugana/Katakana */ /* 137 */ KEY_Yen, /* Sun Japanese Kbd: Yen / Brokenbar */ - /* 138 */ KEY_Kanji, /* Sun Japanese Kbd: Kanji */ - /* 139 */ KEY_Execute, /* Sun Japanese Kbd: Execute */ + /* 138 */ KEY_XFER, /* Sun Japanese Kbd: Kanji Transfer */ + /* 139 */ KEY_NFER, /* Sun Japanese Kbd: No Kanji Transfer */ /* 140 */ KEY_NOTUSED, /* 141 */ KEY_NOTUSED, /* 142 */ KEY_NOTUSED, @@ -604,8 +600,6 @@ KbdGetMapping (InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap) * Add Sun keyboard keysyms to default map */ #define map_for_key(k,c) map[(k * GLYPHS_PER_KEY) + c] - map_for_key(KEY_Kanji, 0) = XK_Kanji; - map_for_key(KEY_Execute, 0) = XK_Execute; map_for_key(KEY_Power, 0) = SunXK_PowerSwitch; map_for_key(KEY_Power, 1) = SunXK_PowerSwitchShift; map_for_key(KEY_Mute, 0) = SunXK_AudioMute; |