Support dual Cintiq with TwinView setuprelease-0_7_7-6release-0.7.7-6

2 files changed, 22 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 8648b77..215e52a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-20   Ping Cheng <pingc@wacom.com>
+	* Fixed an install typo
+	* Fixed a dual Cintiq TwinView setup in wacom_drv.o 
+
 2007-02-16   Ping Cheng <pingc@wacom.com>
 	* Updated install script to deal with broken uname -p 
 	* Support pad as core and non-core device
diff --git a/src/xdrv/xf86Wacom.c b/src/xdrv/xf86Wacom.c
index 9ea8baf..c594ede 100755
--- a/src/xdrv/xf86Wacom.c
+++ b/src/xdrv/xf86Wacom.c
@@ -1429,29 +1429,29 @@ static Bool xf86WcmDevConvert(LocalDevicePtr local, int first, int num,
 				v0 < priv->topX ? 0 : v0 - priv->topX;
 			v1 = v1 > priv->bottomY ? priv->bottomY - priv->topY : 
 				v1 < priv->topY ? 0 : v1 - priv->topY;
-		}
 
 #ifdef PANORAMIX
-		if (priv->common->wcmMMonitor)
-		{
-			int i, totalWidth, leftPadding = 0;
-			if (priv->screen_no == -1)
+			if (priv->common->wcmMMonitor)
 			{
-				for (i = 0; i < priv->currentScreen; i++)
-					leftPadding += screenInfo.screens[i]->width;
-				for (totalWidth = leftPadding; i < priv->numScreen; i++)
-					totalWidth += screenInfo.screens[i]->width;
-			}
-			else
-			{
-				leftPadding = 0;
-				totalWidth = screenInfo.screens[priv->currentScreen]->width;
+				int i, totalWidth, leftPadding = 0;
+				if (priv->screen_no == -1)
+				{
+					for (i = 0; i < priv->currentScreen; i++)
+						leftPadding += screenInfo.screens[i]->width;
+					for (totalWidth = leftPadding; i < priv->numScreen; i++)
+						totalWidth += screenInfo.screens[i]->width;
+				}
+				else
+				{
+					leftPadding = 0;
+					totalWidth = screenInfo.screens[priv->currentScreen]->width;
+				}
+				v0 -= (priv->bottomX - priv->topX) * leftPadding
+					/ (double)totalWidth + 0.5;
 			}
-			v0 -= (priv->bottomX - priv->topX) * leftPadding
-				/ (double)totalWidth + 0.5;
-		}
 #endif
-		if (priv->twinview != TV_NONE)
+		}
+		else
 		{
 			v0 -= priv->topX - priv->tvoffsetX;
 			v1 -= priv->topY - priv->tvoffsetY;