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

input: replace -1 as default axis limit with NO_AXIS_LIMIT define. 

This allows easier refacturing of the coordinate limit handling. Grepping for
-1 is boring.
This commit is contained in:
Peter Hutterer 2008-04-30 11:45:19 +09:30
parent 00acb40f2b
commit ffaccc2dc9
4 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Xi/exevents.c
View File

@ -1153,13 +1153,22 @@ InitProximityClassDeviceStruct(DeviceIntPtr dev)
return TRUE; return TRUE;
} }
/**
* Initialise the device's valuators. The memory must already be allocated,
* this function merely inits the matching axis (specified through axnum) to
* sane values.
*
* It is a condition that (minval < maxval).
*
* @see InitValuatorClassDeviceStruct
*/
_X_EXPORT void _X_EXPORT void
InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, int maxval, InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, int maxval,
int resolution, int min_res, int max_res) int resolution, int min_res, int max_res)
{ {
AxisInfoPtr ax; AxisInfoPtr ax;
if (!dev || !dev->valuator) if (!dev || !dev->valuator || minval > maxval)
return; return;
ax = dev->valuator->axes + axnum; ax = dev->valuator->axes + axnum;

15
dix/devices.c
View File

@ -1187,7 +1187,8 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes,
AllocateMotionHistory(dev); AllocateMotionHistory(dev);
for (i=0; i<numAxes; i++) { for (i=0; i<numAxes; i++) {
InitValuatorAxisStruct(dev, i, -1, -1, 0, 0, 0); InitValuatorAxisStruct(dev, i, NO_AXIS_LIMITS, NO_AXIS_LIMITS,
0, 0, 0);
valc->axisVal[i]=0; valc->axisVal[i]=0;
} }
return TRUE; return TRUE;
@ -1203,10 +1204,10 @@ InitAbsoluteClassDeviceStruct(DeviceIntPtr dev)
return FALSE; return FALSE;
/* we don't do anything sensible with these, but should */ /* we don't do anything sensible with these, but should */
abs->min_x = -1; abs->min_x = NO_AXIS_LIMITS;
abs->min_y = -1; abs->min_y = NO_AXIS_LIMITS;
abs->max_x = -1; abs->max_x = NO_AXIS_LIMITS;
abs->max_y = -1; abs->max_y = NO_AXIS_LIMITS;
abs->flip_x = 0; abs->flip_x = 0;
abs->flip_y = 0; abs->flip_y = 0;
abs->rotation = 0; abs->rotation = 0;
@ -1214,8 +1215,8 @@ InitAbsoluteClassDeviceStruct(DeviceIntPtr dev)
abs->offset_x = 0; abs->offset_x = 0;
abs->offset_y = 0; abs->offset_y = 0;
abs->width = -1; abs->width = NO_AXIS_LIMITS;
abs->height = -1; abs->height = NO_AXIS_LIMITS;
abs->following = 0; abs->following = 0;
abs->screen = 0; abs->screen = 0;

17
dix/getevents.c
View File

@ -358,14 +358,15 @@ clipAxis(DeviceIntPtr pDev, int axisNum, int *val)
{ {
AxisInfoPtr axes = pDev->valuator->axes + axisNum; AxisInfoPtr axes = pDev->valuator->axes + axisNum;
/* Don't clip if min_value and max_value are the same, or if an invalid /* InitValuatoraAxisStruct ensures that (min < max) */
range is specified. */
if(axes->min_value < axes->max_value) { if (axes->min_value != NO_AXIS_LIMITS &&
if (*val < axes->min_value) *val < axis->min_value)
*val = axes->min_value; *val = axes->min_value;
if (*val > axes->max_value)
*val = axes->max_value; if (axes->max_value != NO_AXIS_LIMITS &&
} *val > axes->max_value)
*val = axes->max_value;
} }
/** /**

2
include/input.h
View File

@ -63,6 +63,8 @@ SOFTWARE.
#define POINTER_ABSOLUTE (1 << 2) #define POINTER_ABSOLUTE (1 << 2)
#define POINTER_ACCELERATE (1 << 3) #define POINTER_ACCELERATE (1 << 3)
#define NO_AXIS_LIMITS -1
#define MAP_LENGTH 256 #define MAP_LENGTH 256
#define DOWN_LENGTH 32 /* 256/8 => number of bytes to hold 256 bits */ #define DOWN_LENGTH 32 /* 256/8 => number of bytes to hold 256 bits */
#define NullGrab ((GrabPtr)NULL) #define NullGrab ((GrabPtr)NULL)