diff options
| -rw-r--r-- | src/XExtInt.c | 33 | ||||
| -rw-r--r-- | src/XGetFCtl.c | 14 | ||||
| -rw-r--r-- | src/XIQueryVersion.c | 6 | ||||
| -rw-r--r-- | src/XListDev.c | 3 |
4 files changed, 15 insertions, 41 deletions
diff --git a/src/XExtInt.c b/src/XExtInt.c index 27638bd..fd1ae6c 100644 --- a/src/XExtInt.c +++ b/src/XExtInt.c @@ -73,35 +73,6 @@ SOFTWARE. #define DONT_ENQUEUE False #define FP1616toDBL(x) ((x) * 1.0 / (1 << 16)) -extern void _xibaddevice( - Display * /* dpy */, - int * /* error */ -); - -extern void _xibadclass( - Display * /* dpy */, - int * /* error */ -); - -extern void _xibadevent( - Display * /* dpy */, - int * /* error */ -); - -extern void _xibadmode( - Display * /* dpy */, - int * /* error */ -); - -extern void _xidevicebusy( - Display * /* dpy */, - int * /* error */ -); - -extern int _XiGetDevicePresenceNotifyEvent( - Display * /* dpy */ -); - int copy_classes(XIDeviceInfo *to, xXIAnyInfo* from, int *nclasses); int size_classes(xXIAnyInfo* from, int nclasses); @@ -496,7 +467,6 @@ XInputWireToEvent( xEvent *event) { unsigned int type, reltype; - unsigned int i, j; XExtDisplayInfo *info = XInput_find_display(dpy); XEvent *save = (XEvent *) info->data; @@ -621,6 +591,7 @@ XInputWireToEvent( { deviceValuator *xev = (deviceValuator *) event; int save_type = save->type - info->codes->first_event; + int i; if (save_type == XI_DeviceKeyPress || save_type == XI_DeviceKeyRelease) { XDeviceKeyEvent *kev = (XDeviceKeyEvent *) save; @@ -716,6 +687,7 @@ XInputWireToEvent( pev->axis_data[0] = xev->valuator0; } } else if (save_type == XI_DeviceStateNotify) { + int j; XDeviceStateNotifyEvent *sev = (XDeviceStateNotifyEvent *) save; XInputClass *any = (XInputClass *) & sev->data[0]; XValuatorStatus *v; @@ -760,6 +732,7 @@ XInputWireToEvent( break; case XI_DeviceStateNotify: { + int j; XDeviceStateNotifyEvent *stev = (XDeviceStateNotifyEvent *) save; deviceStateNotify *sev = (deviceStateNotify *) event; char *data; diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c index 2961034..43afa00 100644 --- a/src/XGetFCtl.c +++ b/src/XGetFCtl.c @@ -181,18 +181,18 @@ XGetFeedbackControl( } case IntegerFeedbackClass: { - xIntegerFeedbackState *i; + xIntegerFeedbackState *ifs; XIntegerFeedbackState *I; - i = (xIntegerFeedbackState *) f; + ifs = (xIntegerFeedbackState *) f; I = (XIntegerFeedbackState *) Feedback; - I->class = i->class; + I->class = ifs->class; I->length = sizeof(XIntegerFeedbackState); - I->id = i->id; - I->resolution = i->resolution; - I->minVal = i->min_value; - I->maxVal = i->max_value; + I->id = ifs->id; + I->resolution = ifs->resolution; + I->minVal = ifs->min_value; + I->maxVal = ifs->max_value; break; } case StringFeedbackClass: diff --git a/src/XIQueryVersion.c b/src/XIQueryVersion.c index 225737f..3f2e73e 100644 --- a/src/XIQueryVersion.c +++ b/src/XIQueryVersion.c @@ -60,15 +60,15 @@ _xiQueryVersion(Display * dpy, int *major, int *minor, XExtDisplayInfo *info) if (_XiCheckExtInit(dpy, XInput_2_0, info) == -1) { XExtensionVersion *ext; - XExtDisplayInfo *info = XInput_find_display(dpy); + XExtDisplayInfo *extinfo = XInput_find_display(dpy); - if (!info || !info->data) { + if (!extinfo || !extinfo->data) { *major = 0; *minor = 0; return BadRequest; } - ext = ((XInputData*)info->data)->vers; + ext = ((XInputData*)extinfo->data)->vers; *major = ext->major_version; *minor = ext->minor_version; diff --git a/src/XListDev.c b/src/XListDev.c index 6b91238..bd6e70a 100644 --- a/src/XListDev.c +++ b/src/XListDev.c @@ -106,7 +106,7 @@ SizeClassInfo(xAnyClassPtr *any, int num_classes) static void ParseClassInfo(xAnyClassPtr *any, XAnyClassPtr *Any, int num_classes) { - int j, k; + int j; for (j = 0; j < num_classes; j++) { switch ((*any)->class) { @@ -134,6 +134,7 @@ ParseClassInfo(xAnyClassPtr *any, XAnyClassPtr *Any, int num_classes) } case ValuatorClass: { + int k; XValuatorInfoPtr V = (XValuatorInfoPtr) *Any; xValuatorInfoPtr v = (xValuatorInfoPtr) *any; XAxisInfoPtr A; |