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

Convert some leftover axes->mode access to valuator_get_mode() 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
Peter Hutterer 2010-10-22 15:10:32 +10:00
parent dd11f734a9
commit 58554f1c64
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xi/xiquerydevice.c
View File

@ -349,7 +349,7 @@ ListValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info, int axisnumber,
info->value.frac = (int)(v->axisVal[axisnumber] * (1 << 16) * (1 << 16)); info->value.frac = (int)(v->axisVal[axisnumber] * (1 << 16) * (1 << 16));
info->resolution = v->axes[axisnumber].resolution; info->resolution = v->axes[axisnumber].resolution;
info->number = axisnumber; info->number = axisnumber;
info->mode = v->axes[axisnumber].mode; info->mode = valuator_get_mode(dev, axisnumber);
info->sourceid = v->sourceid; info->sourceid = v->sourceid;
if (!reportState) if (!reportState)

4
dix/getevents.c
View File

@ -780,7 +780,7 @@ moveRelative(DeviceIntPtr dev, int *x, int *y, ValuatorMask *mask)
if (valuator_mask_isset(mask, i)) if (valuator_mask_isset(mask, i))
{ {
dev->last.valuators[i] += valuator_mask_get(mask, i); dev->last.valuators[i] += valuator_mask_get(mask, i);
if (dev->valuator->axes[i].mode == Absolute) if (valuator_get_mode(dev, i) == Absolute)
clipAxis(dev, i, &dev->last.valuators[i]); clipAxis(dev, i, &dev->last.valuators[i]);
valuator_mask_set(mask, i, dev->last.valuators[i]); valuator_mask_set(mask, i, dev->last.valuators[i]);
} }
@ -1252,7 +1252,7 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type, const Valuato
for (i = 0; i < valuator_mask_num_valuators(&mask); i++) for (i = 0; i < valuator_mask_num_valuators(&mask); i++)
{ {
if (valuator_mask_isset(&mask, i) && if (valuator_mask_isset(&mask, i) &&
pDev->valuator->axes[i].mode == Relative) valuator_get_mode(pDev, i) == Relative)
valuator_mask_unset(&mask, i); valuator_mask_unset(&mask, i);
} }