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

GKVE: pass correct arguments to XkbCopyKeymap 

Fix horrendous thinko.  Indicators now work perfectly.
This commit is contained in:
Daniel Stone 2006-08-24 14:51:26 +03:00 committed by Daniel Stone
parent 4adf9af313
commit 2b06c69c8f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dix/events.c
View File

@ -4651,7 +4651,8 @@ int GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type,
int key_code, int num_valuators, int key_code, int num_valuators,
int *valuators) { int *valuators) {
int numEvents = 0, ms = 0, first_valuator = 0; int numEvents = 0, ms = 0, first_valuator = 0;
KeySym sym = pDev->key->curKeySyms.map[key_code * pDev->key->curKeySyms.mapWidth]; KeySym sym = pDev->key->curKeySyms.map[key_code *
pDev->key->curKeySyms.mapWidth];
deviceKeyButtonPointer *kbp = NULL; deviceKeyButtonPointer *kbp = NULL;
deviceValuator *xv = NULL; deviceValuator *xv = NULL;
KeyClassPtr ckeyc; KeyClassPtr ckeyc;
@ -4778,7 +4779,8 @@ int GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type,
#ifdef XKB #ifdef XKB
if (!noXkbExtension && pDev->key->xkbInfo && if (!noXkbExtension && pDev->key->xkbInfo &&
pDev->key->xkbInfo->desc) { pDev->key->xkbInfo->desc) {
if (!XkbCopyKeymap(pDev->key->xkbInfo, ckeyc->xkbInfo, True)) if (!XkbCopyKeymap(pDev->key->xkbInfo->desc,
ckeyc->xkbInfo->desc, True))
FatalError("Couldn't pivot keymap from device to core!\n"); FatalError("Couldn't pivot keymap from device to core!\n");
} }
#endif #endif