fix missing brace, trim unused variables

This commit is contained in:
Daniel Stone 2006-08-15 15:54:13 +03:00 committed by Daniel Stone
parent 5d073697ad
commit cd3f744b1f

View File

@ -4711,11 +4711,10 @@ GetKeyboardEvents(xEvent *events, DeviceIntPtr pDev, int type, int key_code) {
int GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type, 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, numRepeatEvents = 0, ms = 0, first_valuator = 0, i = 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;
xEvent *repeatEvents = NULL;
KeyClassPtr ckeyc; KeyClassPtr ckeyc;
#ifdef XKB #ifdef XKB
xkbMapNotify mn; xkbMapNotify mn;
@ -4779,6 +4778,7 @@ int GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type,
num_valuators, valuators); num_valuators, valuators);
events += numEvents; events += numEvents;
} }
}
ms = GetTimeInMillis(); ms = GetTimeInMillis();
@ -4960,7 +4960,6 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
deviceKeyButtonPointer *kbp = NULL; deviceKeyButtonPointer *kbp = NULL;
deviceValuator *xv = NULL; deviceValuator *xv = NULL;
AxisInfoPtr axes = NULL; AxisInfoPtr axes = NULL;
xEvent *ev = NULL;
Bool sendValuators = (type == MotionNotify || flags & POINTER_ABSOLUTE); Bool sendValuators = (type == MotionNotify || flags & POINTER_ABSOLUTE);
DeviceIntPtr cp = inputInfo.pointer; DeviceIntPtr cp = inputInfo.pointer;