frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated fix for ABNT2 and HK_Toggle keys.

This commit is contained in:
Alexander Gottwald 2005-02-08 15:20:01 +00:00
parent 384099457e
commit 70d3a9192f
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xwin/ChangeLog
View File

@ -1,3 +1,9 @@
2005-02-08 Alexander Gottwald <ago at freedesktop dot org>
* winkeybd.c:
* winkeynames.h:
Updated fix for ABNT2 and HK_Toggle keys.
2005-02-08 Alexander Gottwald <ago at freedesktop dot org> 2005-02-08 Alexander Gottwald <ago at freedesktop dot org>
* winkeybd.h: * winkeybd.h:

16
hw/xwin/winkeybd.c
View File

@ -78,14 +78,28 @@ winTranslateKey (WPARAM wParam, LPARAM lParam, int *piScanCode)
{ {
int iKeyFixup = g_iKeyMap[wParam * WIN_KEYMAP_COLS + 1]; int iKeyFixup = g_iKeyMap[wParam * WIN_KEYMAP_COLS + 1];
int iKeyFixupEx = g_iKeyMap[wParam * WIN_KEYMAP_COLS + 2]; int iKeyFixupEx = g_iKeyMap[wParam * WIN_KEYMAP_COLS + 2];
int iParamScanCode = LOBYTE (HIWORD (lParam));
/* Branch on special extended, special non-extended, or normal key */ /* Branch on special extended, special non-extended, or normal key */
if ((HIWORD (lParam) & KF_EXTENDED) && iKeyFixupEx) if ((HIWORD (lParam) & KF_EXTENDED) && iKeyFixupEx)
*piScanCode = iKeyFixupEx; *piScanCode = iKeyFixupEx;
else if (iKeyFixup) else if (iKeyFixup)
*piScanCode = iKeyFixup; *piScanCode = iKeyFixup;
else if (wParam == 0 && iParamScanCode == 0x70)
*piScanCode = KEY_HKTG;
else else
*piScanCode = LOBYTE (HIWORD (lParam)); switch (iParamScanCode)
{
case 0x70:
*piScanCode = KEY_HKTG;
break;
case 0x73:
*piScanCode = KEY_BSlash2;
break;
default:
*piScanCode = iParamScanCode;
break;
}
} }

4
hw/xwin/winkeynames.h
View File

@ -187,15 +187,15 @@
#define KEY_F13 /* F13 0x6e */ 110 #define KEY_F13 /* F13 0x6e */ 110
#define KEY_F14 /* F14 0x6f */ 111 #define KEY_F14 /* F14 0x6f */ 111
#define KEY_F15 /* F15 0x70 */ 112 #define KEY_F15 /* F15 0x70 */ 112
#define KEY_HKTG /* Hirugana/Katakana tog 0x70 */ 112
#define KEY_F16 /* F16 0x71 */ 113 #define KEY_F16 /* F16 0x71 */ 113
#define KEY_F17 /* F17 0x72 */ 114 #define KEY_F17 /* F17 0x72 */ 114
#define KEY_KP_DEC /* KP_DEC 0x73 */ 115 #define KEY_KP_DEC /* KP_DEC 0x73 */ 115
#define KEY_BSlash2 /* \ _ 0x73 */ 115
#define KEY_KP_Equal /* Equal (Keypad) 0x76 */ 118 #define KEY_KP_Equal /* Equal (Keypad) 0x76 */ 118
#define KEY_XFER /* Kanji Transfer 0x79 */ 121 #define KEY_XFER /* Kanji Transfer 0x79 */ 121
#define KEY_NFER /* No Kanji Transfer 0x7b */ 123 #define KEY_NFER /* No Kanji Transfer 0x7b */ 123
#define KEY_Yen /* Yen 0x7d */ 125 #define KEY_Yen /* Yen 0x7d */ 125
#define KEY_HKTG /* Hirugana/Katakana tog 0xc8 */ 200
#define KEY_BSlash2 /* \ _ 0xcb */ 203
/* These are for "notused" and "unknown" entries in translation maps. */ /* These are for "notused" and "unknown" entries in translation maps. */
#define KEY_NOTUSED 0 #define KEY_NOTUSED 0