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

dmx: when setting up device axis, use the correct counter number 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Lee Leahu 2009-10-17 00:45:44 -05:00 committed by Peter Hutterer
parent 010d5e2865
commit 664a8e37fd
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/dmx/input/dmxinputinit.c
View File

@ -474,9 +474,9 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
Relative); Relative);
for (i = 0; i < info.numRelAxes; i++) for (i = 0; i < info.numRelAxes; i++)
InitValuatorAxisStruct(pDevice, i, axis_labels[i], InitValuatorAxisStruct(pDevice, i, axis_labels[i],
info.minval[0], info.maxval[0], info.minval[i], info.maxval[i],
info.res[0], info.res[i],
info.minres[0], info.maxres[0]); info.minres[i], info.maxres[i]);
} else if (info.numRelAxes) { } else if (info.numRelAxes) {
InitValuatorClassDeviceStruct(pDevice, info.numRelAxes, InitValuatorClassDeviceStruct(pDevice, info.numRelAxes,
axis_labels, axis_labels,
@ -484,20 +484,20 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
Relative); Relative);
for (i = 0; i < info.numRelAxes; i++) for (i = 0; i < info.numRelAxes; i++)
InitValuatorAxisStruct(pDevice, i, axis_labels[i], InitValuatorAxisStruct(pDevice, i, axis_labels[i],
info.minval[0], info.minval[i],
info.maxval[0], info.res[0], info.maxval[i], info.res[i],
info.minres[0], info.maxres[0]); info.minres[i], info.maxres[i]);
} else if (info.numAbsAxes) { } else if (info.numAbsAxes) {
InitValuatorClassDeviceStruct(pDevice, info.numAbsAxes, InitValuatorClassDeviceStruct(pDevice, info.numAbsAxes,
axis_labels, axis_labels,
dmxPointerGetMotionBufferSize(), dmxPointerGetMotionBufferSize(),
Absolute); Absolute);
for (i = 0; i < info.numAbsAxes; i++) for (i = 0; i < info.numAbsAxes; i++)
InitValuatorAxisStruct(pDevice, i+info.numRelAxes, InitValuatorAxisStruct(pDevice, i,
axis_labels[i + info.numRelAxes], axis_labels[i],
info.minval[i+1], info.maxval[i+1], info.minval[i], info.maxval[i],
info.res[i+1], info.minres[i+1], info.res[i], info.minres[i],
info.maxres[i+1]); info.maxres[i]);
} }
} }
if (info.focusClass) InitFocusClassDeviceStruct(pDevice); if (info.focusClass) InitFocusClassDeviceStruct(pDevice);