[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/input/wacom wacom.man, 1.1.4.1, 1.1.4.2 xf86Wacom.c, 1.1.4.6, 1.1.4.7

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/wacom
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/input/wacom

Modified Files:
      Tag: XORG-CURRENT
	wacom.man xf86Wacom.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: wacom.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/wacom/wacom.man,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/wacom.man	5 Mar 2004 13:40:51 -0000	1.1.4.1
+++ b/wacom.man	15 Apr 2004 10:17:08 -0000	1.1.4.2
@@ -15,7 +15,7 @@
 .fi
 .SH DESCRIPTION
 .B wacom 
-is an XFree86 input driver for Wacom devices.
+is an __xservername__ input driver for Wacom devices.
 .PP
 The
 .B wacom
@@ -25,7 +25,7 @@
 This driver supports the Wacom IV and Wacom V protocols.
 Preliminary support is available for USB devices on some Linux platforms.
 .SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details and for options that can be used with all input drivers.  This
 section only covers configuration details specific to this driver.
 .PP
@@ -111,6 +111,6 @@
 devices for some models of tablets (Intuos and Graphire).
 .RE
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
 .SH AUTHORS
 Frederic Lepied <lepied at xfree86.org>

Index: xf86Wacom.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -u -d -r1.1.4.6 -r1.1.4.7
--- a/xf86Wacom.c	5 Mar 2004 13:40:51 -0000	1.1.4.6
+++ b/xf86Wacom.c	15 Apr 2004 10:17:08 -0000	1.1.4.7
@@ -2778,7 +2778,7 @@
     if (first != 0 || num == 1)
       return FALSE;
    
-#ifdef XINERAMA
+#ifdef PANORAMIX
     if (!noPanoramiXExtension && (priv->flags & ABSOLUTE_FLAG) &&
                 priv->common->wcmGimp) {
 	int i, totalWidth, leftPadding = 0;
@@ -2872,7 +2872,7 @@
     valuators[0] = x / priv->factorX + 0.5;
     valuators[1] = y / priv->factorY + 0.5;
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
     if (!noPanoramiXExtension && (priv->flags & ABSOLUTE_FLAG) &&
                 priv->common->wcmGimp) {
 	int i, totalWidth, leftPadding = 0;
@@ -3003,7 +3003,7 @@
 	    leftPadding += screenInfo.screens[i]->width;
 	}
     }
-#ifdef XINERAMA
+#ifdef PANORAMIX
     else if (!noPanoramiXExtension && priv->common->wcmGimp) {
 	screenToSet = priv->screen_no;
 	for (i = 0; i < screenToSet; i++)
@@ -5264,7 +5264,7 @@
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 0, 0,
     ABI_CLASS_XINPUT,
     ABI_XINPUT_VERSION,