summaryrefslogtreecommitdiff
path: root/dix/devices.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-10-22 15:49:40 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2010-10-22 16:18:59 +1000
commit5cf3b654fccf09de63a3f983c85096cda78fb693 (patch)
tree52499ca647f1dc3fb510df4efdd017fbe0580972 /dix/devices.c
parente909af88bf17dbadcc00d50c13a5bdb6001367be (diff)
input: move proximity state into ProximityClassRec.
Previously the OutOfProximity bit in the valuator mode. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Diffstat (limited to 'dix/devices.c')
-rw-r--r--dix/devices.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/dix/devices.c b/dix/devices.c
index 45edd375c..a4c8e76aa 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1251,9 +1251,12 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels,
valc->numMotionEvents = numMotionEvents;
valc->motionHintWindow = NullWindow;
valc->numAxes = numAxes;
- valc->mode = mode;
valc->axes = (AxisInfoPtr)(valc + 1);
valc->axisVal = (double *)(valc->axes + numAxes);
+
+ if (mode & OutOfProximity)
+ InitProximityClassDeviceStruct(dev);
+
dev->valuator = valc;
AllocateMotionHistory(dev);