From 2b06c69c8feaf3bdc065635ee711efa45b3033b3 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 24 Aug 2006 14:51:26 +0300 Subject: [PATCH] GKVE: pass correct arguments to XkbCopyKeymap Fix horrendous thinko. Indicators now work perfectly. --- dix/events.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dix/events.c b/dix/events.c index 6372a207d..581fa0800 100644 --- a/dix/events.c +++ b/dix/events.c @@ -4651,7 +4651,8 @@ int GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type, int key_code, int num_valuators, int *valuators) { 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; deviceValuator *xv = NULL; KeyClassPtr ckeyc; @@ -4778,7 +4779,8 @@ int GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type, #ifdef XKB if (!noXkbExtension && pDev->key->xkbInfo && 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"); } #endif