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

Input: Clarify valuator FatalError messages 

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Daniel Stone 2009-01-17 20:07:40 +02:00
parent ddb46c1421
commit b5ece46b76
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Xi/exevents.c
View File

@ -753,10 +753,11 @@ UpdateDeviceState(DeviceIntPtr device, xEvent* xE, int count)
int first = xV->first_valuator; int first = xV->first_valuator;
BOOL change = FALSE; BOOL change = FALSE;
if (xV->num_valuators && if (xV->num_valuators && !v)
(!v || (xV->num_valuators && FatalError("Valuators reported for non-valuator device '%s'\n",
(first + xV->num_valuators > v->numAxes)))) device->name);
FatalError("Bad valuators reported for device %s\n", if (first + xV->num_valuators > v->numAxes)
FatalError("Too many valuators reported for device '%s'\n",
device->name); device->name);
if (v && v->axisVal) { if (v && v->axisVal) {
/* v->axisVal is always in absolute coordinates. Only the /* v->axisVal is always in absolute coordinates. Only the