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

miscellaneous warning fixes 

Use the correct type for time, and fix the mi prototype of EnqueueEvent.
This commit is contained in:
Daniel Stone 2006-10-25 01:07:36 +03:00 committed by Daniel Stone
parent 2a74b8a91d
commit 11fb58be77
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dix/getevents.c
View File

@ -117,7 +117,8 @@ _X_EXPORT int
GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type, GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type,
int key_code, int first_valuator, int key_code, int first_valuator,
int num_valuators, int *valuators) { int num_valuators, int *valuators) {
int numEvents = 0, ms = 0, i = 0; int numEvents = 0, i = 0;
CARD32 ms = 0;
int final_valuator = first_valuator + num_valuators; int final_valuator = first_valuator + num_valuators;
KeySym sym = pDev->key->curKeySyms.map[key_code * KeySym sym = pDev->key->curKeySyms.map[key_code *
pDev->key->curKeySyms.mapWidth]; pDev->key->curKeySyms.mapWidth];
@ -378,7 +379,8 @@ _X_EXPORT int
GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
int flags, int first_valuator, int num_valuators, int flags, int first_valuator, int num_valuators,
int *valuators) { int *valuators) {
int num_events = 0, ms = 0, final_valuator = 0; int num_events = 0, final_valuator = 0;
CARD32 ms = 0;
deviceKeyButtonPointer *kbp = NULL; deviceKeyButtonPointer *kbp = NULL;
Bool sendValuators = (type == MotionNotify || flags & POINTER_ABSOLUTE); Bool sendValuators = (type == MotionNotify || flags & POINTER_ABSOLUTE);
DeviceIntPtr cp = inputInfo.pointer; DeviceIntPtr cp = inputInfo.pointer;

1
mi/mipointer.h
View File

@ -73,6 +73,7 @@ typedef struct _miPointerScreenFuncRec {
int /* y */ int /* y */
); );
void (*EnqueueEvent)( void (*EnqueueEvent)(
DeviceIntPtr /* pDev */,
xEventPtr /* event */ xEventPtr /* event */
); );
void (*NewEventScreen)( void (*NewEventScreen)(