Attachment 306690 Details for Bug 448420 – linuxwacom patch

linuxwacom patch

linuxwacom-0.7.4-3-fix-multiscreen.patch (text/x-patch), 4.31 KB, created by Alan Matsuoka on 2008-05-26 17:43:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Matsuoka

Created: 2008-05-26 17:43:28 UTC

Size: 4.31 KB

patch

obsolete

>diff -Naur linuxwacom-0.7.4-3/src/wcmCommon.c linuxwacom-0.7.4-3.it169353/src/wcmCommon.c
>--- linuxwacom-0.7.4-3/src/wcmCommon.c	2006-06-19 18:42:52.000000000 +0100
>+++ linuxwacom-0.7.4-3.it169353/src/wcmCommon.c	2008-04-25 18:46:01.000000000 +0100
>@@ -125,16 +125,16 @@
> 		return;
> 	}
> 
>-	/* YHJ - these don't need to be calculated every time */
>-	for (i = 0; i < priv->numScreen; i++)
>-	{
>-		totalWidth += screenInfo.screens[i]->width;
>-		if (maxHeight < screenInfo.screens[i]->height)
>-			maxHeight = screenInfo.screens[i]->height;
>-	}
>-	/* YHJ - looks nasty. sorry. */	
>+	/* YHJ - looks nasty. sorry. */
> 	if (priv->screen_no == -1)
> 	{
>+		/* YHJ - these don't need to be calculated every time */
>+		for (i = 0; i < priv->numScreen; i++)
>+		{
>+			totalWidth += screenInfo.screens[i]->width;
>+			if (maxHeight < screenInfo.screens[i]->height)
>+				maxHeight = screenInfo.screens[i]->height;
>+		}
> 		for (i = 0; i < priv->numScreen; i++)
> 		{
> 			if (v0 * totalWidth <= (leftPadding + 
>@@ -147,46 +147,22 @@
> 		}
> 	}
> #ifdef PANORAMIX
>-	else if (!noPanoramiXExtension && priv->common->wcmGimp)
>+	else 
> 	{
> 		screenToSet = priv->screen_no;
>-		for (i = 0; i < screenToSet; i++)
>-			leftPadding += screenInfo.screens[i]->width;
>-		v0 = (sizeX * leftPadding + v0
>-			* screenInfo.screens[screenToSet]->width) /
>-			(double)totalWidth + 0.5;
>-		v1 = v1 * screenInfo.screens[screenToSet]->height /
>-			(double)maxHeight + 0.5;
>+		totalWidth = screenInfo.screens[screenToSet]->width;
>+		maxHeight = screenInfo.screens[screenToSet]->height;
> 	}
>-
>-	if (!noPanoramiXExtension && priv->common->wcmGimp)
>-	{
>-		priv->factorX = totalWidth/sizeX;
>-		priv->factorY = maxHeight/sizeY;
>-		x = (v0 - sizeX
>-			* leftPadding / totalWidth) * priv->factorX + 0.5;
>-		y = v1 * priv->factorY + 0.5;
>+	priv->factorX = totalWidth/sizeX;
>+	priv->factorY = maxHeight/sizeY;
>+	x = (v0 - sizeX * leftPadding / totalWidth) * priv->factorX + 0.5;
>+	y = v1 * priv->factorY + 0.5;
> 		
>-		if (x >= screenInfo.screens[screenToSet]->width)
>-			x = screenInfo.screens[screenToSet]->width - 1;
>-		if (y >= screenInfo.screens[screenToSet]->height)
>-			y = screenInfo.screens[screenToSet]->height - 1;
>-	}
>-	else
>+	if (x >= screenInfo.screens[screenToSet]->width)
>+		x = screenInfo.screens[screenToSet]->width - 1;
>+	if (y >= screenInfo.screens[screenToSet]->height)
>+		y = screenInfo.screens[screenToSet]->height - 1;
> #endif
>-	{
>-		if (priv->screen_no == -1)
>-			v0 = (v0 * totalWidth - sizeX * leftPadding)
>-				/ screenInfo.screens[screenToSet]->width;
>-		else
>-			screenToSet = priv->screen_no;
>-		priv->factorX = screenInfo.screens[screenToSet]->width / sizeX;
>-		priv->factorY = screenInfo.screens[screenToSet]->height / sizeY;
>-
>-		x = v0 * priv->factorX + 0.5;
>-		y = v1 * priv->factorY + 0.5;
>-	}
>-
> 	xf86XInputSetScreen(local, screenToSet, x, y);
> 	DBG(10, ErrorF("xf86WcmSetScreen current=%d ToSet=%d\n", 
> 		priv->currentScreen, screenToSet));
>diff -Naur linuxwacom-0.7.4-3/src/xf86Wacom.c linuxwacom-0.7.4-3.it169353/src/xf86Wacom.c
>--- linuxwacom-0.7.4-3/src/xf86Wacom.c	2006-06-19 18:42:52.000000000 +0100
>+++ linuxwacom-0.7.4-3.it169353/src/xf86Wacom.c	2008-04-25 18:26:58.000000000 +0100
>@@ -1154,14 +1154,21 @@
> 		}
> 
> #ifdef PANORAMIX
>-		if (!noPanoramiXExtension && priv->common->wcmGimp 
>-			&& priv->common->wcmMMonitor)
>+		if (priv->common->wcmMMonitor)
> 		{
> 			int i, totalWidth, leftPadding = 0;
>-			for (i = 0; i < priv->currentScreen; i++)
>-				leftPadding += screenInfo.screens[i]->width;
>-			for (totalWidth = leftPadding; i < priv->numScreen; i++)
>-				totalWidth += screenInfo.screens[i]->width;
>+			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;
> 		}
>@@ -1262,8 +1269,7 @@
> #ifdef NEVER 
> /* This is for absolute screen mapping */
> #ifdef PANORAMIX
>-	if (!noPanoramiXExtension && (priv->flags & ABSOLUTE_FLAG) && 
>-		priv->common->wcmGimp && priv->common->wcmMMonitor)
>+	if ((priv->flags & ABSOLUTE_FLAG) && priv->common->wcmMMonitor)
> 	{
> 		int i, totalWidth, leftPadding = 0;
> 		for (i = 0; i < priv->currentScreen; i++)

Actions: View

Attachments on bug 448420: 306690 | 306691 | 306692