Author: dnusinow Date: 2005-07-05 19:55:35 -0500 (Tue, 05 Jul 2005) New Revision: 310
Modified: trunk/debian/TODO trunk/debian/patches/000_stolen_from_linuxwacom_wacom_driver.diff Log: - Slight cleanup of 000_stolen_from_linuxwacom_wacom_driver.diff. Thanks to Eugene Konvev and Nathanael Nerode for verifying and fixing this one up! Modified: trunk/debian/TODO =================================================================== --- trunk/debian/TODO 2005-07-03 21:54:43 UTC (rev 309) +++ trunk/debian/TODO 2005-07-06 00:55:35 UTC (rev 310) @@ -9,10 +9,6 @@ ----------------------------- * Review all xfree86 4.3.0.dfsg.1-13 and -14 patches. [neroden] -000_stolen_from_sourceforge_wacom_driver.diff -- NEEDS HELP - Probably replaced by 000_stolen_from_linuxwacom_wacom_driver.diff. - Unfortunately that patch does not say which upstream version was taken, - unlike the old patch. That should be fixed. 003b_xfs_fixes.diff -- NEEDS INFO, probably NEEDS PORTING -- similar patch present under same name -- The xfree86 version looks more up-to-date than the xorg version. Modified: trunk/debian/patches/000_stolen_from_linuxwacom_wacom_driver.diff =================================================================== --- trunk/debian/patches/000_stolen_from_linuxwacom_wacom_driver.diff 2005-07-03 21:54:43 UTC (rev 309) +++ trunk/debian/patches/000_stolen_from_linuxwacom_wacom_driver.diff 2005-07-06 00:55:35 UTC (rev 310) @@ -1,3 +1,10 @@ +$Id$ + +This patch updates the wacom input driver from +http://linuxwacom.sourceforge.net/ up to version 0.6.4. + +This patch and changes to the Imakefile by Fabio M. Di Nitto. + --- xc/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c.orig 2004-11-04 10:40:44.067137232 +0100 +++ xc/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c 2004-11-04 10:45:00.967082504 +0100 @@ -1,7 +1,6 @@ @@ -854,9 +861,9 @@ + { + if (priv->twinview != TV_NONE && priv->screen_no == -1) + { -+ priv->tvoffsetX = 60; -+ priv->tvoffsetY = 60; -+ } ++ priv->tvoffsetX = 60; ++ priv->tvoffsetY = 60; ++ } -#ifdef LINUX_INPUT -static WacomDeviceClass gWacomUSBDevice = @@ -6610,7 +6617,7 @@ + +#define FILTER_PRESSURE_RES 2048 /* maximum points in pressure curve */ + -+typedef enum { TV_NONE = 0, TV_ABOVE_BELOW = 1, TV_LEFT_RIGHT = 2 } tvMode; ++typedef enum { TV_NONE = 0, TV_ABOVE_BELOW = 1, TV_LEFT_RIGHT = 2 } tvMode; + +struct _WacomDeviceRec +{ @@ -7331,10 +7338,10 @@ + WacomCommonPtr common = priv->common; + int rx, ry, rz, rtx, rty, rrot, rth, rw; + int is_core_pointer, is_absolute, doffsetX=0, doffsetY=0; -+ int aboveBelowSwitch = (priv->twinview == TV_ABOVE_BELOW) -+ ? ((y < priv->topY) ? -1 : ((priv->bottomY < y) ? 1 : 0)) : 0; ++ int aboveBelowSwitch = (priv->twinview == TV_ABOVE_BELOW) ++ ? ((y < priv->topY) ? -1 : ((priv->bottomY < y) ? 1 : 0)) : 0; + int leftRightSwitch = (priv->twinview == TV_LEFT_RIGHT) -+ ? ((x < priv->topX) ? -1 : ((priv->bottomX < x) ? 1 : 0)) : 0; ++ ? ((x < priv->topX) ? -1 : ((priv->bottomX < x) ? 1 : 0)) : 0; + + DBG(7, ErrorF("[%s] prox=%s x=%d y=%d z=%d " + "b=%s b=%d tx=%d ty=%d wl=%d rot=%d th=%d\n", @@ -7347,31 +7354,31 @@ + is_absolute = (priv->flags & ABSOLUTE_FLAG); + is_core_pointer = xf86IsCorePointer(local->dev); + -+ if ( is_proximity || x || y || z || buttons || tx || ty || wheel ) -+ { -+ switch ( leftRightSwitch ) -+ { -+ case -1: -+ doffsetX = 0; -+ break; -+ case 1: -+ doffsetX = priv->bottomX - priv->topX - 2*priv->tvoffsetX; -+ break; -+ } -+ switch ( aboveBelowSwitch ) -+ { -+ case -1: -+ doffsetY = 0; -+ break; -+ case 1: -+ doffsetY = priv->bottomY - priv->topY - 2*priv->tvoffsetY; -+ break; -+ } -+ } -+ -+ x += doffsetX; -+ y += doffsetY; ++ if ( is_proximity || x || y || z || buttons || tx || ty || wheel ) ++ { ++ switch ( leftRightSwitch ) ++ { ++ case -1: ++ doffsetX = 0; ++ break; ++ case 1: ++ doffsetX = priv->bottomX - priv->topX - 2*priv->tvoffsetX; ++ break; ++ } ++ switch ( aboveBelowSwitch ) ++ { ++ case -1: ++ doffsetY = 0; ++ break; ++ case 1: ++ doffsetY = priv->bottomY - priv->topY - 2*priv->tvoffsetY; ++ break; ++ } ++ } + ++ x += doffsetX; ++ y += doffsetY; ++ + DBG(6, ErrorF("[%s] %s prox=%d\tx=%d\ty=%d\tz=%d\t" + "button=%s\tbuttons=%d\t on channel=%d\n", + local->name, @@ -8172,7 +8179,7 @@ + priv->tvoffsetX = 0; /* none X edge offset for TwinView setup */ + priv->tvoffsetY = 0; /* none Y edge offset for TwinView setup */ + for (i=0; i<4; i++) -+ priv->tvResolution[i] = 0; /* unconfigured twinview resolution */ ++ priv->tvResolution[i] = 0; /* unconfigured twinview resolution */ + + /* JEJ - throttle sampling code */ + priv->throttleValue = 0; @@ -8697,43 +8704,43 @@ + xf86Msg(X_CONFIG, "%s: Accel = %d\n", dev->identifier, + priv->accel); + -+ s = xf86FindOptionValue(local->options, "Twinview"); ++ s = xf86FindOptionValue(local->options, "Twinview"); + if (s) xf86Msg(X_CONFIG, "%s: Twinview = %s\n", dev->identifier, s); + if (s && xf86NameCmp(s, "none") == 0) -+ { -+ priv->twinview = TV_NONE; -+ } ++ { ++ priv->twinview = TV_NONE; ++ } + else if (s && xf86NameCmp(s, "horizontal") == 0) -+ { -+ priv->twinview = TV_LEFT_RIGHT; ++ { ++ priv->twinview = TV_LEFT_RIGHT; + /* default resolution */ + if(!priv->tvResolution[0]) + { + priv->tvResolution[0] = screenInfo.screens[0]->width/2; -+ priv->tvResolution[1] = screenInfo.screens[0]->height; -+ priv->tvResolution[2] = priv->tvResolution[0]; ++ priv->tvResolution[1] = screenInfo.screens[0]->height; ++ priv->tvResolution[2] = priv->tvResolution[0]; + priv->tvResolution[3] = priv->tvResolution[1]; + } -+ } ++ } + else if (s && xf86NameCmp(s, "vertical") == 0) -+ { -+ priv->twinview = TV_ABOVE_BELOW; ++ { ++ priv->twinview = TV_ABOVE_BELOW; + /* default resolution */ + if(!priv->tvResolution[0]) + { -+ priv->tvResolution[0] = screenInfo.screens[0]->width; -+ priv->tvResolution[1] = screenInfo.screens[0]->height/2; -+ priv->tvResolution[2] = priv->tvResolution[0]; ++ priv->tvResolution[0] = screenInfo.screens[0]->width; ++ priv->tvResolution[1] = screenInfo.screens[0]->height/2; ++ priv->tvResolution[2] = priv->tvResolution[0]; + priv->tvResolution[3] = priv->tvResolution[1]; + } -+ } ++ } + else if (s) -+ { -+ xf86Msg(X_ERROR, "%s: invalid Twinview (should be none, vertical or horizontal). Using none.\n", -+ dev->identifier); -+ priv->twinview = TV_NONE; ++ { ++ xf86Msg(X_ERROR, "%s: invalid Twinview (should be none, vertical or horizontal). Using none.\n", ++ dev->identifier); ++ priv->twinview = TV_NONE; + } -+ ++ + /* mark the device configured */ + local->flags |= XI86_POINTER_CAPABLE | XI86_CONFIGURED; + -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
