ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Use XGetKeyboardMapping instead of XKeycodeToKeysym.

This commit is contained in:
Alexandre Julliard 2012-06-01 14:29:02 +02:00
parent 4fa2945544
commit c8a22a4d1f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/winex11.drv/keyboard.c
View File

@ -61,6 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(keyboard);
WINE_DECLARE_DEBUG_CHANNEL(key);
static int min_keycode, max_keycode, keysyms_per_keycode;
static KeySym *key_mapping;
static WORD keyc2vkey[256], keyc2scan[256];
static int NumLockMask, ScrollLockMask, AltGrMask; /* mask in the XKeyEvent state */
@ -1106,7 +1107,7 @@ static inline KeySym keycode_to_keysym( Display *display, KeyCode keycode, int i
#ifdef HAVE_XKB
if (use_xkb) return XkbKeycodeToKeysym(display, keycode, 0, index);
#endif
return XKeycodeToKeysym(display, keycode, index);
return key_mapping[(keycode - min_keycode) * keysyms_per_keycode + index];
}
/* Returns the Windows virtual key code associated with the X event <e> */
@ -1612,7 +1613,6 @@ static void set_kbd_layout_preload_key(void)
*/
void X11DRV_InitKeyboard( Display *display )
{
KeySym *ksp;
XModifierKeymap *mmp;
KeySym keysym;
KeyCode *kcp;
@ -1645,11 +1645,9 @@ void X11DRV_InitKeyboard( Display *display )
wine_tsx11_lock();
XDisplayKeycodes(display, &min_keycode, &max_keycode);
ksp = XGetKeyboardMapping(display, min_keycode,
max_keycode + 1 - min_keycode, &keysyms_per_keycode);
/* We are only interested in keysyms_per_keycode.
There is no need to hold a local copy of the keysyms table */
XFree(ksp);
if (key_mapping) XFree( key_mapping );
key_mapping = XGetKeyboardMapping(display, min_keycode,
max_keycode + 1 - min_keycode, &keysyms_per_keycode);
mmp = XGetModifierMapping(display);
kcp = mmp->modifiermap;