andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Xi: valuator/button labels are called labels now, not 'names'

Browse Source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-06-17 09:04:08 +10:00
parent bc2ff53650
commit 09cef75739
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/extinit.c
View File

@ -712,7 +712,7 @@ SDeviceChangedEvent(xXIDeviceChangedEvent* from, xXIDeviceChangedEvent* to)
case ValuatorClass:
{
xXIValuatorInfo* ai = (xXIValuatorInfo*)any;
swapl(&ai->name, n);
swapl(&ai->label, n);
swapl(&ai->min.integral, n);
swapl(&ai->min.frac, n);
swapl(&ai->max.integral, n);

4
Xi/xiquerydevice.c
View File

@ -314,7 +314,7 @@ ListValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info, int axisnumber)
info->type = ValuatorClass;
info->length = sizeof(xXIValuatorInfo)/4;
info->name = v->axes[axisnumber].label;
info->label = v->axes[axisnumber].label;
info->min.integral = v->axes[axisnumber].min_value;
info->min.frac = 0;
info->max.integral = v->axes[axisnumber].max_value;
@ -335,7 +335,7 @@ SwapValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info)
char n;
swaps(&info->type, n);
swaps(&info->length, n);
swapl(&info->name, n);
swapl(&info->label, n);
swapl(&info->min.integral, n);
swapl(&info->min.frac, n);
swapl(&info->max.integral, n);