summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-01-17 10:57:14 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-05-20 14:28:59 +1000
commitbd68738afc52268f039ff65a87937b54ee164a7d (patch)
tree0b155f411d06c113788d54a2307c6aceefddd601
parent54ea00b57859e34847cf96f91f0585ee8d803006 (diff)
downloadxf86-input-wacom-bd68738afc52268f039ff65a87937b54ee164a7d.tar.gz
Add some more comments to help explain things.
-rw-r--r--src/wcmCommon.c6
-rw-r--r--src/xf86Wacom.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/src/wcmCommon.c b/src/wcmCommon.c
index 35c0156..48a042d 100644
--- a/src/wcmCommon.c
+++ b/src/wcmCommon.c
@@ -1620,7 +1620,8 @@ static void wcmInitialTVScreens(LocalDevicePtr local)
priv->tvoffsetY = 0;
}
- /* default resolution */
+ /* default resolution. this should never be hit since we
+ * always set the tvresolution from wacomcpl */
if(!priv->tvResolution[0])
{
priv->tvResolution[0] = screenInfo.screens[0]->width/2;
@@ -1638,7 +1639,8 @@ static void wcmInitialTVScreens(LocalDevicePtr local)
priv->tvoffsetY = 60;
}
- /* default resolution */
+ /* default resolution. this should never be hit since we
+ * always set the tvresolution from wacomcpl */
if(!priv->tvResolution[0])
{
priv->tvResolution[0] = screenInfo.screens[0]->width;
diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c
index dd66ec8..bcbb2e1 100644
--- a/src/xf86Wacom.c
+++ b/src/xf86Wacom.c
@@ -361,6 +361,11 @@ void wcmInitialCoordinates(LocalDevicePtr local, int axis)
wcmMappingFactor(local);
+ /* wcmMappingFactor calls wcmVirtualTabletSize. so once we're here,
+ * sizeX contains the total width in device coordinates accounting
+ * for multiple screens (not the _actual width of the tablet, see
+ * wcmVirtualTabletSize)
+ */
if (priv->flags & ABSOLUTE_FLAG)
{
topx = priv->topX;