From 1f876171067c04fc21fccd5a3051f982fd85c0f0 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 21 Oct 2009 19:07:36 +0000 Subject: Updated to xorg-server-1.7.99.1 --- xorg-server/hw/dmx/input/dmxinputinit.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'xorg-server/hw/dmx/input/dmxinputinit.c') diff --git a/xorg-server/hw/dmx/input/dmxinputinit.c b/xorg-server/hw/dmx/input/dmxinputinit.c index d8402e87f..5a486a464 100644 --- a/xorg-server/hw/dmx/input/dmxinputinit.c +++ b/xorg-server/hw/dmx/input/dmxinputinit.c @@ -474,9 +474,9 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) Relative); for (i = 0; i < info.numRelAxes; i++) InitValuatorAxisStruct(pDevice, i, axis_labels[i], - info.minval[0], info.maxval[0], - info.res[0], - info.minres[0], info.maxres[0]); + info.minval[i], info.maxval[i], + info.res[i], + info.minres[i], info.maxres[i]); } else if (info.numRelAxes) { InitValuatorClassDeviceStruct(pDevice, info.numRelAxes, axis_labels, @@ -484,20 +484,20 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) Relative); for (i = 0; i < info.numRelAxes; i++) InitValuatorAxisStruct(pDevice, i, axis_labels[i], - info.minval[0], - info.maxval[0], info.res[0], - info.minres[0], info.maxres[0]); + info.minval[i], + info.maxval[i], info.res[i], + info.minres[i], info.maxres[i]); } else if (info.numAbsAxes) { InitValuatorClassDeviceStruct(pDevice, info.numAbsAxes, axis_labels, dmxPointerGetMotionBufferSize(), Absolute); for (i = 0; i < info.numAbsAxes; i++) - InitValuatorAxisStruct(pDevice, i+info.numRelAxes, - axis_labels[i + info.numRelAxes], - info.minval[i+1], info.maxval[i+1], - info.res[i+1], info.minres[i+1], - info.maxres[i+1]); + InitValuatorAxisStruct(pDevice, i, + axis_labels[i], + info.minval[i], info.maxval[i], + info.res[i], info.minres[i], + info.maxres[i]); } } if (info.focusClass) InitFocusClassDeviceStruct(pDevice); @@ -933,7 +933,7 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI) } /** Re-initialize all the devices described in \a dmxInput. Called from - #dmxReconfig before the cursor is redisplayed. */ + #dmxAdjustCursorBoundaries before the cursor is redisplayed. */ void dmxInputReInit(DMXInputInfo *dmxInput) { int i; @@ -946,7 +946,7 @@ void dmxInputReInit(DMXInputInfo *dmxInput) } /** Re-initialize all the devices described in \a dmxInput. Called from - #dmxReconfig after the cursor is redisplayed. */ + #dmxAdjustCursorBoundaries after the cursor is redisplayed. */ void dmxInputLateReInit(DMXInputInfo *dmxInput) { int i; -- cgit v1.2.3