aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-09-26 13:49:28 +0930
committerPeter Hutterer <peter.hutterer@redhat.com>2008-09-30 12:24:07 +0930
commit90d1d494f82255b07d07800d8270ad754163b7ab (patch)
tree575e174c1f1db167b048a1a01a7ac6dfe54b4efd
parentAdd evdev-properties.h file with #defines for all property names. (diff)
downloadxf86-input-evdev-90d1d494f82255b07d07800d8270ad754163b7ab.tar.gz
xf86-input-evdev-90d1d494f82255b07d07800d8270ad754163b7ab.tar.bz2
xf86-input-evdev-90d1d494f82255b07d07800d8270ad754163b7ab.zip
Cleanup: "valid_vals" should be "vals" now.
-rw-r--r--src/emuWheel.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/emuWheel.c b/src/emuWheel.c
index a053720..b0e244f 100644
--- a/src/emuWheel.c
+++ b/src/emuWheel.c
@@ -336,7 +336,7 @@ EvdevWheelEmuInitProperty(DeviceIntPtr dev)
InputInfoPtr pInfo = dev->public.devicePrivate;
EvdevPtr pEvdev = pInfo->private;
int rc = TRUE;
- INT32 valid_vals[4] = { TRUE, FALSE};
+ INT32 vals[4] = { TRUE, FALSE};
if (!dev->button) /* don't init prop for keyboards */
return;
@@ -350,14 +350,14 @@ EvdevWheelEmuInitProperty(DeviceIntPtr dev)
XISetDevicePropertyDeletable(dev, prop_wheel_emu, FALSE);
- valid_vals[0] = pEvdev->emulateWheel.X.up_button;
- valid_vals[1] = pEvdev->emulateWheel.X.down_button;
- valid_vals[2] = pEvdev->emulateWheel.Y.up_button;
- valid_vals[3] = pEvdev->emulateWheel.Y.down_button;
+ vals[0] = pEvdev->emulateWheel.X.up_button;
+ vals[1] = pEvdev->emulateWheel.X.down_button;
+ vals[2] = pEvdev->emulateWheel.Y.up_button;
+ vals[3] = pEvdev->emulateWheel.Y.down_button;
prop_wheel_axismap = MakeAtom(EVDEV_PROP_WHEEL_AXES, strlen(EVDEV_PROP_WHEEL_AXES), TRUE);
rc = XIChangeDeviceProperty(dev, prop_wheel_axismap, XA_INTEGER, 8,
- PropModeReplace, 4, valid_vals, FALSE);
+ PropModeReplace, 4, vals, FALSE);
if (rc != Success)
return;