summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-07-06 14:25:13 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-07-06 14:25:13 +1000
commitb2af6179bf0abe42fdfc4f0b1a4efdc50c592051 (patch)
tree0b703b518031283ab4e18c577b33417f81892558
parentf9fdadc2cdc49659fd8a4e573b1d0a0309757057 (diff)
downloadxf86-input-wacom-b2af6179bf0abe42fdfc4f0b1a4efdc50c592051.tar.gz
Don't adjust the tablet area property for multimonitor.
The interactions between tablet_area in multimonitor setups are complicated to say the least. Amongst other issues, it caused the calibration to be out by a bit and rather unpredictable. Force the area property to always be in device coordinates. This means that clients that need this property now also need to set the property in device coordinates which may be difficult if the axis ranges have already been adjusted. Only way for clients: reset the property with -1 values, read the values, then set from there. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/wcmXCommand.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c
index a208b46..174e301 100644
--- a/src/wcmXCommand.c
+++ b/src/wcmXCommand.c
@@ -377,8 +377,11 @@ int wcmSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
data->values[3] = area->bottomY;
QueueWorkProc(reset_area_property, serverClient, data);
}
- } else /* offset for multimonitor */
+ }
+#if 0
+ else /* offset for multimonitor */
wcmAdjustArea(pInfo, area);
+#endif
priv->topX = area->topX;
priv->topY = area->topY;