Release 0.7.5-4release-0_7_6release-0.7.6

10 files changed, 109 insertions, 82 deletions

diff --git a/ChangeLog b/ChangeLog
index db27af1..f5b8d50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-10-09   Ping Cheng <pingc@wacom.com>
+	* Updated install scripts to install wacom man
+	  page, wacom.4x.gz, under /usr/share/man/man4
+	* Updated release version to 0.7.6
+	* Ready to label the source
+
+2006-10-06   Ping Cheng <pingc@wacom.com>
+	* Updated xf86Wacom.h to support Xorg 7.1
+	* Fixed a bug in src/2.6.16/wacom_sys.c
+	* Updates xidump and xsetwacom
+
+2006-10-03   Ping Cheng <pingc@wacom.com>
+        * Updated configure.in and acinclude.m4 for x86_64
+        * Updated src/2.6.16/wacom_sys.c to sync with kernel.org
+
 2006-09-27   Ping Cheng <pingc@wacom.com>
 	* Updated wacserial.c (Adam Marmbrant)
 	* Updated package configuration scripts 
diff --git a/acinclude.m4 b/acinclude.m4
index b17419d..6fbadee 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -50,7 +50,7 @@ AC_HELP_STRING([--enable-xserver64], [Use specified X server bit [[default=usual
 ],
 [
 	if test "$WCM_OPTION_XSERVER64" = ""; then
-		if test `uname -a | grep -c "64"` = 0; then
+		if test `uname -m | grep -c "64"` = 0; then
 			WCM_OPTION_XSERVER64=no
 		else
 			WCM_OPTION_XSERVER64=yes
diff --git a/configure.in b/configure.in
index 75e10a7..fb97b2a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_PREREQ(2.58)
 AC_INIT(src/2.4/wacom.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(linuxwacom, 0.7.5)
+AM_INIT_AUTOMAKE(linuxwacom, 0.7.6)
 AM_MAINTAINER_MODE
 AC_PROG_CC
 AC_PROG_AWK
@@ -183,21 +183,29 @@ AC_ARG_ENABLE(hid,
 AC_HELP_STRING([--enable-hid], [Enable building hid.o [[default=no]]]),
 	, enable_hid=no)
 if test "$enable_hid" != "no"; then
-	kver=`echo $WCM_KERNEL_VER | grep -c "2.4"`
-	if test "$WCM_ENV_KERNEL" != "yes"; then
+	kver=`echo $WCM_KERNEL_VER | grep "2.6"`
+	kver=`echo $kver | cut -f 3 -d.`
+	if test $kver -ge 18; then
 		echo "***"; echo "*** WARNING:";
-		echo "*** Unable to compile hid.o without kernel build environment"
-		echo "*** hid.o will not be built"
+		echo "*** No need to build (usb)hid.ko for kernel 2.6.18 or later"
 		echo "***"
 	else
-		WCM_OPTION_HID=yes
-		if test $kver != 0; then
-			if test "$WCM_KERNEL_VER" = "2.4.22"; then
+		kver=`echo $WCM_KERNEL_VER | grep -c "2.4"`
+		if test "$WCM_ENV_KERNEL" != "yes"; then
+			echo "***"; echo "*** WARNING:";
+			echo "*** Unable to compile hid.o without kernel build environment"
+			echo "*** hid.o will not be built"
+			echo "***"
+		else
+			WCM_OPTION_HID=yes
+			if test $kver != 0; then
+				if test "$WCM_KERNEL_VER" = "2.4.22"; then
 				cp $WCM_KERNELDIR/drivers/usb/hid-input.c src/$WCM_KERNEL_VER
 				cp $WCM_KERNELDIR/drivers/usb/hiddev.c src/$WCM_KERNEL_VER
+				fi
 			fi
+			WCM_MODULES="$WCM_MODULES hid.o"
 		fi
-		WCM_MODULES="$WCM_MODULES hid.o"
 	fi
 fi
 
@@ -481,8 +489,7 @@ fi
 dnl Check for x86_64 kernel and ARCH for kernel 2.4
 kver=`echo $WCM_KERNEL_VER | grep -c "2.4"`
 if test $kver != 0; then
-	WCM_ARCH=`echo $WCM_ARCH | cut -f 1 -d-`
-	if test "$WCM_ARCH" = "x86-64"; then
+	if test "$WCM_ARCH" = "x86_64"; then
 		WCM_OPTION_HID=no
 		WCM_OPTION_WACOM=no
 		WCM_OPTION_INPUT=no
@@ -493,6 +500,9 @@ if test $kver != 0; then
 	fi
 fi
 
+dnl Create man page file for the current driver
+gzip -f src/wacom.4x
+
 dnl Separate test output from file-generation output
 echo 
 
@@ -595,7 +605,7 @@ echo "----------------------------------------"
 
 dnl Check for x86_64 kernel
 kver=`echo $WCM_KERNEL_VER | grep -c "2.4"`
-if test "$WCM_ARCH" = "x86-64" && test $kver != 0; then
+if test "$WCM_ARCH" = "x86_64" && test $kver != 0; then
 	echo ""
 	echo "***"; echo "*** Note:";
 	echo "*** For x86-64 kernel, we only support kernel 2.4.30 and kernel 2.6.* "
diff --git a/src/2.6.16/wacom_sys.c b/src/2.6.16/wacom_sys.c
index 75b8578..7a55e25 100644
--- a/src/2.6.16/wacom_sys.c
+++ b/src/2.6.16/wacom_sys.c
@@ -230,8 +230,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
 	strlcat(wacom->phys, "/input0", sizeof(wacom->phys));
 
 	wacom_wac->features = get_wacom_feature(id);
-	if (wacom_wac->features->pktlen > 10)
-		BUG();
+	BUG_ON(wacom_wac->features->pktlen > 10);
 
 	input_dev->name = wacom_wac->features->name;
 	wacom->wacom_wac = wacom_wac;
@@ -290,8 +289,8 @@ static void wacom_disconnect(struct usb_interface *intf)
 		input_unregister_device(wacom->dev);
 		usb_free_urb(wacom->irq);
 		usb_buffer_free(interface_to_usbdev(intf), 10, wacom->wacom_wac->data, wacom->data_dma);
-		kfree(wacom);
 		kfree(wacom->wacom_wac);
+		kfree(wacom);
 	}
 }
 
diff --git a/src/Makefile.am b/src/Makefile.am
index f6dfc2f..bd0c463 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS = . wacomxi util xdrv @WCM_KERNEL_VER@
 
+wmanpagedir = /usr/share/man/man4
+wmanpage_HEADERS = wacom.4x.gz
+
 EXTRA_DIST = wacom.4x
diff --git a/src/util/xidump.c b/src/util/xidump.c
index d66eed2..2b965d5 100755
--- a/src/util/xidump.c
+++ b/src/util/xidump.c
@@ -199,7 +199,7 @@ int ListDevices(Display* pDisp, const char* pszDeviceName)
 								pVal->motion_buffer);
 						for (k=0; k<pVal->num_axes; ++k)
 						{
-							printf("    axis[%d]: res=%d, max=%d, max=%d\n",
+							printf("    axis[%d]: res=%d, min=%d, max=%d\n",
 								k, /* index */
 								pVal->axes[k].resolution,
 								pVal->axes[k].min_value,
diff --git a/src/util/xsetwacom.c b/src/util/xsetwacom.c
index 0337ffe..d476907 100755
--- a/src/util/xsetwacom.c
+++ b/src/util/xsetwacom.c
@@ -94,187 +94,187 @@ struct _PARAMINFO
 static PARAMINFO gParamInfo[] =
 {
 	{ "TopX",
-		"Bounding rect left coordinate in tablet units",
+		"Bounding rect left coordinate in tablet units. ",
 		XWACOM_PARAM_TOPX, VALUE_REQUIRED },
 
 	{ "TopY",
-		"Bounding rect top coordinate in tablet units",
+		"Bounding rect top coordinate in tablet units . ",
 		XWACOM_PARAM_TOPY, VALUE_REQUIRED },
 
 	{ "BottomX",
-		"Bounding rect right coordinate in tablet units",
+		"Bounding rect right coordinate in tablet units. ",
 		XWACOM_PARAM_BOTTOMX, VALUE_REQUIRED },
 
 	{ "BottomY",
-		"Bounding rect bottom coordinate in tablet units",
+		"Bounding rect bottom coordinate in tablet units. ",
 		XWACOM_PARAM_BOTTOMY, VALUE_REQUIRED },
 
 	{ "Button1",
-		"X11 event to which button 1 should be mapped",
+		"X11 event to which button 1 should be mapped. ",
 		XWACOM_PARAM_BUTTON1, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 1 },
 
 	{ "Button2",
-		"X11 event to which button 2 should be mapped",
+		"X11 event to which button 2 should be mapped. ",
 		XWACOM_PARAM_BUTTON2, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 2 },
 
 	{ "Button3",
-		"X11 event to which button 3 should be mapped",
+		"X11 event to which button 3 should be mapped. ",
 		XWACOM_PARAM_BUTTON3, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 3 },
 
 	{ "Button4",
-		"X11 event to which button 4 should be mapped",
+		"X11 event to which button 4 should be mapped. ",
 		XWACOM_PARAM_BUTTON4, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 4 },
 
 	{ "Button5",
-		"X11 event to which button 5 should be mapped",
+		"X11 event to which button 5 should be mapped. ",
 		XWACOM_PARAM_BUTTON5, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 5 },
 
 	{ "Button6",
-		"X11 event to which button 6 should be mapped",
+		"X11 event to which button 6 should be mapped. ",
 		XWACOM_PARAM_BUTTON6, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 6 },
 
 	{ "Button7",
-		"X11 event to which button 7 should be mapped",
+		"X11 event to which button 7 should be mapped. ",
 		XWACOM_PARAM_BUTTON7, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 7 },
 
 	{ "Button8",
-		"X11 event to which button 8 should be mapped",
+		"X11 event to which button 8 should be mapped. ",
 		XWACOM_PARAM_BUTTON8, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 8 },
 
 	{ "Button9",
-		"X11 event to which button 9 should be mapped",
+		"X11 event to which button 9 should be mapped. ",
 		XWACOM_PARAM_BUTTON9, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 9 },
 
 	{ "Button10",
-		"X11 event to which button 10 should be mapped",
+		"X11 event to which button 10 should be mapped. ",
 		XWACOM_PARAM_BUTTON10, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 10 },
 
 	{"Button11",
-		"X11 event to which button 11 should be mapped",
+		"X11 event to which button 11 should be mapped. ",
 		XWACOM_PARAM_BUTTON11, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 11 },
 
 	{"Button12",
-		"X11 event to which button 12 should be mapped",
+		"X11 event to which button 12 should be mapped. ",
 		XWACOM_PARAM_BUTTON12, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 12 },
 
 	{"Button13",
-		"X11 event to which button 13 should be mapped",
+		"X11 event to which button 13 should be mapped. ",
 		XWACOM_PARAM_BUTTON13, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 13 },
 
 	{"Button14", 
-		"X11 event to which button 14 should be mapped",
+		"X11 event to which button 14 should be mapped. ",
 		XWACOM_PARAM_BUTTON14, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 14 },
 
 	{"Button15", 
-		"X11 event to which button 15 should be mapped",
+		"X11 event to which button 15 should be mapped. ",
 		XWACOM_PARAM_BUTTON15, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 15 },
 
 	{"Button16",
-		"X11 event to which button 16 should be mapped",
+		"X11 event to which button 16 should be mapped. ",
 		XWACOM_PARAM_BUTTON16, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 16 },
 
 	{"Button17", 
-		"X11 event to which button 17 should be mapped",
+		"X11 event to which button 17 should be mapped. ",
 		XWACOM_PARAM_BUTTON17, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 17 },
 
 	{"Button18", 
-		"X11 event to which button 18 should be mapped",
+		"X11 event to which button 18 should be mapped. ",
 		XWACOM_PARAM_BUTTON18, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 18 },
 
 	{"Button19", 
-		"X11 event to which button 19 should be mapped",
+		"X11 event to which button 19 should be mapped. ",
 		XWACOM_PARAM_BUTTON19, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 19 },
 
 	{"Button20", 
-		"X11 event to which button 20 should be mapped",
+		"X11 event to which button 20 should be mapped. ",
 		XWACOM_PARAM_BUTTON20, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 20 },
 
 	{"Button21", 
-		"X11 event to which button 21 should be mapped",
+		"X11 event to which button 21 should be mapped. ",
 		XWACOM_PARAM_BUTTON21, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 21 },
 
 	{"Button22", 
-		"X11 event to which button 22 should be mapped",
+		"X11 event to which button 22 should be mapped. ",
 		XWACOM_PARAM_BUTTON22, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 22 },
 
 	{"Button23", 
-		"X11 event to which button 23 should be mapped",
+		"X11 event to which button 23 should be mapped. ",
 		XWACOM_PARAM_BUTTON23, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 23 },
 	{"Button24", 
-		"X11 event to which button 24 should be mapped",
+		"X11 event to which button 24 should be mapped. ",
 		XWACOM_PARAM_BUTTON24, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 24 },
 
 	{"Button25", 
-		"X11 event to which button 25 should be mapped",
+		"X11 event to which button 25 should be mapped. ",
 		XWACOM_PARAM_BUTTON25, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 25 },
 
 	{"Button26", 
-		"X11 event to which button 26 should be mapped",
+		"X11 event to which button 26 should be mapped. ",
 		XWACOM_PARAM_BUTTON26, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 26 },
 
 	{"Button27", 
-		"X11 event to which button 27 should be mapped",
+		"X11 event to which button 27 should be mapped. ",
 		XWACOM_PARAM_BUTTON27, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 27 },
 
 	{"Button28", 
-		"X11 event to which button 28 should be mapped",
+		"X11 event to which button 28 should be mapped. ",
 		XWACOM_PARAM_BUTTON28, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 28 },
 
 	{"Button29", 
-		"X11 event to which button 29 should be mapped",
+		"X11 event to which button 29 should be mapped. ",
 		XWACOM_PARAM_BUTTON29, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 29 },
 
 	{"Button30", 
-		"X11 event to which button 30 should be mapped",
+		"X11 event to which button 30 should be mapped. ",
 		XWACOM_PARAM_BUTTON30, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 30 },
 
 	{"Button31", 
-		"X11 event to which button 31 should be mapped",
+		"X11 event to which button 31 should be mapped. ",
 		XWACOM_PARAM_BUTTON31, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 31 },
 
 	{"Button32", 
-		"X11 event to which button 32 should be mapped",
+		"X11 event to which button 32 should be mapped. ",
 		XWACOM_PARAM_BUTTON32, VALUE_OPTIONAL, 0, 0, 0, 
 		ACTION_VALUE, 32 },
 
 	{ "DebugLevel",
-		"Level of debugging trace, default is 1",
+		"Level of debugging trace, default is 1. ",
 		XWACOM_PARAM_DEBUGLEVEL, VALUE_OPTIONAL, RANGE, 
 		1, 100, SINGLE_VALUE, 1 },
 
 	{ "PressCurve",
-		"Bezier curve for pressure (default is 0 0 100 100)",
+		"Bezier curve for pressure (default is 0 0 100 100). ",
 		XWACOM_PARAM_PRESSCURVE, VALUE_OPTIONAL, RANGE, 0, 100,
 		PACKED_CURVE },
 
@@ -285,55 +285,56 @@ static PARAMINFO gParamInfo[] =
 		0, 1, BOOLEAN_VALUE, 1 },	
 
 	{ "Mode",
-		"Switches cursor movement mode (default is absolute)",
+		"Switches cursor movement mode (default is absolute). ",
 		XWACOM_PARAM_MODE, VALUE_OPTIONAL, RANGE, 
 		0, 1, BOOLEAN_VALUE, 1 },	
 
 	{ "SpeedLevel",
-		"Sets relative cursor movement speed (default is 6)",
+		"Sets relative cursor movement speed (default is 6). ",
 		XWACOM_PARAM_SPEEDLEVEL, VALUE_OPTIONAL, RANGE, 
 		1, 11, SINGLE_VALUE, 6 },	
 
 	{ "ClickForce",
-		"Sets tip/eraser pressure threshold = ClickForce*MaxZ/100"
+		"Sets tip/eraser pressure threshold = ClickForce*MaxZ/100 "
 		"(default is 6)",
 		XWACOM_PARAM_CLICKFORCE, VALUE_OPTIONAL, RANGE, 
 		1, 21, SINGLE_VALUE, 6 },	
 
 	{ "Accel",
-		"Sets relative cursor movement acceleration"
+		"Sets relative cursor movement acceleration "
 		"(default is 1)",
 		XWACOM_PARAM_ACCEL, VALUE_OPTIONAL, RANGE, 
 		1, 7, SINGLE_VALUE, 1 },
 	
 	{ "xyDefault",
-		"Resets the bounding coordinates to default in tablet units",
+		"Resets the bounding coordinates to default in tablet units. ",
 		XWACOM_PARAM_XYDEFAULT, VALUE_OPTIONAL },
 
 	{ "gimp",
 		"Turns on/off Gimp support in Xinerama-enabled "
-		"multi-monitor desktop, default is on",
+		"multi-monitor desktop, default is on.",
 		XWACOM_PARAM_GIMP, VALUE_OPTIONAL, 
 		RANGE, 0, 1, BOOLEAN_VALUE, 1 },
 
 	{ "mmonitor",
-		"Turns on/off across monitor movement in"
-		"multi-monitor desktop, default is on",
+		"Turns on/off across monitor movement in "
+		"multi-monitor desktop, default is on ",
 		XWACOM_PARAM_MMT, VALUE_OPTIONAL, 
 		RANGE, 0, 1, BOOLEAN_VALUE, 1 },
 
 	{ "TPCButton",
-		"Turns on/off Tablet PC buttons."
+		"Turns on/off Tablet PC buttons. "
 		"default is off for regular tablets, "
 		"on for Tablet PC. ",
 		XWACOM_PARAM_TPCBUTTON, VALUE_OPTIONAL, 
 		RANGE, 0, 1, BOOLEAN_VALUE, 1 },
 
 	{ "CursorProx", 
-		"Set max cursor distance and hysteresis for proximity-out "
-		"in max_distance/256 units",
+		"Sets cursor distance and hysteresis for proximity-out "
+		"in distance from the tablet. distance = value&0xffff. "
+		"hysteresis = (value>>16) & 0xffff (default is 256 8)",
 		XWACOM_PARAM_CURSORPROX, VALUE_OPTIONAL, 0, 0, 0, 
-		TWO_VALUES, 0x00100080 },
+		TWO_VALUES, 0x00080080 },
 		
 	{ "Rotate",
 		"Sets the rotation of the tablet. "
@@ -343,11 +344,11 @@ static PARAMINFO gParamInfo[] =
 		XWACOM_VALUE_ROTATE_NONE },
  
 	{ "GetTabletID", 
-		"Returns the tablet ID of the associated device.",
+		"Returns the tablet ID of the associated device. ",
 		XWACOM_PARAM_TID, VALUE_REQUIRED },
 
 	{ "GetModel",
-		"Writes tablet models to /etc/wacom.dat",
+		"Writes tablet models to /etc/wacom.dat. ",
 		XWACOM_PARAM_GETMODEL, VALUE_OPTIONAL },
 
 	{ NULL }
@@ -457,7 +458,7 @@ static int ListParam(WACOMCONFIG *hConfig, char** argv)
 	printf ("Examples:\n"
 		"  xsetwacom set stylus Button1 \"button 5\"\n"
 		"  xsetwacom set stylus Button3 \"dblclick 1\"\n"
-		"  xsetwacom set pad Button2 \"core key control F2\"\n"
+		"  xsetwacom set pad Button2 \"core key ctrl alt  F2\"\n"
 		"  xsetwacom set pad Button10 \"core key ctrl alt backspace\"\n");
 
 	return 0;
diff --git a/src/wacom.4x b/src/wacom.4x
index 6f47672..11f727d 100644
--- a/src/wacom.4x
+++ b/src/wacom.4x
@@ -1,7 +1,7 @@
 .\" $XFree86: xc/programs/Xserver/hw/xfree86/input/wacom/wacom.man,v 1.1 2001/01/24 00:06:39 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH WACOM 4 "linuxwacom 0.7.5" "X Version 11"
+.TH WACOM 4 "linuxwacom 0.7.6" "X Version 11"
 .SH NAME
 wacom \- Wacom input driver
 .SH SYNOPSIS
@@ -105,15 +105,15 @@ Y coordinate of the bottom corner of the active zone.
 .B Option \fI"ButtonsOnly"\fP \fI"on"\fP
 disables the device's motion events.
 .TP 4
-.B Option \fI"ButtonM"\fP \fI"N"\fP
-reports a button N click when button M is pressed,  where M is one of the 
-wacom supported button numbers,  it can be 1 to 16 and N can be an integer 
-between 1 and 19. The default value for button M is M.  When N is less than 17,  
-button M is assigned to the function of button N.  When N is 17,  button M is 
-a left-double-click.  When N is 18, button M is ignored, i.e., no button event 
-will be reported when clicking on button M. When N is 19, button M is assigned 
-to Mode Toggle, switching between relative and absolute mode, which is especially 
-useful to switch windows in a multi-monitor environment.
+.B Option \fI"ButtonM"\fP \fI"AC"\fP
+reports an action AC when button M is pressed,  where M 
+is one of the device supported  button numbers,  it can be 1 
+to 32. The default action reported to Xinput is mouse button M click.  
+To assign it to a left-double-click, use "dblclick 1".  
+To ignore the button click, i.e., to not report any button click event 
+to Xinput,  use "0" or "button 0".  Use "modetoggle" to assign  
+it to switching between relative and absolute mode,  which is  
+useful to switch windows in a multi-monitor  environment.
 .TP 4
 .B Option \fI"TPCButton"\fP \fI"on"\fP
 enables the stylus buttons as  Tablet PC buttons,  i.e., reports stylus button
diff --git a/src/xdrv/xf86Wacom.c b/src/xdrv/xf86Wacom.c
index 87cd277..048612e 100755
--- a/src/xdrv/xf86Wacom.c
+++ b/src/xdrv/xf86Wacom.c
@@ -97,7 +97,7 @@
  * 2006-07-17 47-pc0.7.5 - Support button/key combined events
  */
 
-static const char identification[] = "$Identification: 47-0.7.5 $";
+static const char identification[] = "$Identification: 47-0.7.6 $";
 
 /****************************************************************************/
 
diff --git a/src/xdrv/xf86Wacom.h b/src/xdrv/xf86Wacom.h
index d233f86..8d26198 100755
--- a/src/xdrv/xf86Wacom.h
+++ b/src/xdrv/xf86Wacom.h
@@ -67,7 +67,6 @@
 #define NEED_XF86_TYPES
 #if !defined(DGUX)
 #include <xf86_ansic.h>
-#include <xisb.h>
 #endif
 #include <xf86_OSproc.h>
 #include <xf86Xinput.h>