Fixed a few small bugsrelease-0_7_8-3release-0.7.8-3

10 files changed, 45 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index 2ecc177..4616128 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-15  Ping Cheng <pingc@wacom.com>
+	* Fixed a wacom.c bug for 2.4 and older 2.6's
+	* Fixed a double click issue
+	* Updated wacomcpl
+	* Label 0.7.8-3
+
 2007-07-24  Ping Cheng <pingc@wacom.com>
 	* Fixed a xsetwacom bug
 	* Updated wacomcpl
diff --git a/src/2.4.22/wacom.c b/src/2.4.22/wacom.c
index 40a64b6..a812240 100644
--- a/src/2.4.22/wacom.c
+++ b/src/2.4.22/wacom.c
@@ -135,6 +135,7 @@ MODULE_LICENSE("GPL");
 #define STYLUS_DEVICE_ID	0x02
 #define CURSOR_DEVICE_ID	0x06
 #define ERASER_DEVICE_ID	0x0A
+#define PAD_DEVICE_ID		0x0F
 
 static int kwacomd_pid = 0;			/* PID of kwacomd */
 static DECLARE_COMPLETION(kwacomd_exited);
diff --git a/src/2.4.30x86-64/wacom.c b/src/2.4.30x86-64/wacom.c
index bbd9bf3..f09b9fe 100644
--- a/src/2.4.30x86-64/wacom.c
+++ b/src/2.4.30x86-64/wacom.c
@@ -104,7 +104,7 @@ MODULE_LICENSE("GPL");
 #define STYLUS_DEVICE_ID	0x02
 #define CURSOR_DEVICE_ID	0x06
 #define ERASER_DEVICE_ID	0x0A
-#define ERASER_DEVICE_ID	0x0A
+#define PAD_DEVICE_ID		0x0F
 
 struct wacom_features {
 	char *name;
diff --git a/src/2.6.10/wacom.c b/src/2.6.10/wacom.c
index 37f257e..1e58561 100644
--- a/src/2.6.10/wacom.c
+++ b/src/2.6.10/wacom.c
@@ -99,7 +99,7 @@ MODULE_LICENSE(DRIVER_LICENSE);
 #define STYLUS_DEVICE_ID	0x02
 #define CURSOR_DEVICE_ID	0x06
 #define ERASER_DEVICE_ID	0x0A
-#define ERASER_DEVICE_ID	0x0A
+#define PAD_DEVICE_ID		0x0F
 
 enum {
 	PENPARTNER = 0,
@@ -437,7 +437,7 @@ static void wacom_graphire_irq(struct urb *urb, struct pt_regs *regs)
 			case 2: /* Mouse with wheel */
 				input_report_key(dev, BTN_MIDDLE, data[1] & 0x04);
 				if ( wacom->features->type == G4 ||
-						wacom->features->type == WACOM_MO ) {
+						wacom->features->type == MO ) {
 					rw = data[7] & 0x04 ? (data[7] & 0x03)-4 : data[7] & 0x03;
 					input_report_rel(dev, REL_WHEEL, -rw);
 				else
@@ -450,7 +450,7 @@ static void wacom_graphire_irq(struct urb *urb, struct pt_regs *regs)
 				input_report_key(dev, BTN_LEFT, data[1] & 0x01);
 				input_report_key(dev, BTN_RIGHT, data[1] & 0x02);
 				if ( wacom->features->type == G4 ||
-						wacom->features->type == WACOM_MO ) 
+						wacom->features->type == MO ) 
 					input_report_abs(dev, ABS_DISTANCE, data[6]);
 				else
 					input_report_abs(dev, ABS_DISTANCE, data[7]);
diff --git a/src/2.6.8/wacom.c b/src/2.6.8/wacom.c
index 586453f..619e3d5 100644
--- a/src/2.6.8/wacom.c
+++ b/src/2.6.8/wacom.c
@@ -101,7 +101,7 @@ MODULE_LICENSE(DRIVER_LICENSE);
 #define STYLUS_DEVICE_ID	0x02
 #define CURSOR_DEVICE_ID	0x06
 #define ERASER_DEVICE_ID	0x0A
-#define ERASER_DEVICE_ID	0x0A
+#define PAD_DEVICE_ID		0x0F
 
 enum {
 	PENPARTNER = 0,
@@ -436,7 +436,7 @@ static void wacom_graphire_irq(struct urb *urb, struct pt_regs *regs)
 			case 2: /* Mouse with wheel */
 				input_report_key(dev, BTN_MIDDLE, data[1] & 0x04);
 				if ( wacom->features->type == G4 ||
-						wacom->features->type == WACOM_MO ) {
+						wacom->features->type == MO ) {
 					rw = data[7] & 0x04 ? (data[7] & 0x03)-4 : (data[7] & 0x03);
 					input_report_rel(dev, REL_WHEEL, -rw);
 				} else
@@ -449,7 +449,7 @@ static void wacom_graphire_irq(struct urb *urb, struct pt_regs *regs)
 				input_report_key(dev, BTN_LEFT, data[1] & 0x01);
 				input_report_key(dev, BTN_RIGHT, data[1] & 0x02);
 				if ( wacom->features->type == G4 ||
-						wacom->features->type == WACOM_MO ) 
+						wacom->features->type == MO ) 
 					input_report_abs(dev, ABS_DISTANCE, data[6]);
 				else
 					input_report_abs(dev, ABS_DISTANCE, data[7]);
diff --git a/src/2.6.9/wacom.c b/src/2.6.9/wacom.c
index 6841066..9a55307 100644
--- a/src/2.6.9/wacom.c
+++ b/src/2.6.9/wacom.c
@@ -100,7 +100,7 @@ MODULE_LICENSE(DRIVER_LICENSE);
 #define STYLUS_DEVICE_ID	0x02
 #define CURSOR_DEVICE_ID	0x06
 #define ERASER_DEVICE_ID	0x0A
-#define ERASER_DEVICE_ID	0x0A
+#define PAD_DEVICE_ID		0x0F
 
 enum {
 	PENPARTNER = 0,
@@ -436,7 +436,7 @@ static void wacom_graphire_irq(struct urb *urb, struct pt_regs *regs)
 			case 2: /* Mouse with wheel */
 				input_report_key(dev, BTN_MIDDLE, data[1] & 0x04);
 				if ( wacom->features->type == G4 ||
-						wacom->features->type == WACOM_MO ) {
+						wacom->features->type == MO ) {
 					rw = data[7] & 0x04 ? (data[7] & 0x03)-4 : (data[7] & 0x03);
 					input_report_rel(dev, REL_WHEEL, -rw);
 				} else
@@ -449,7 +449,7 @@ static void wacom_graphire_irq(struct urb *urb, struct pt_regs *regs)
 				input_report_key(dev, BTN_LEFT, data[1] & 0x01);
 				input_report_key(dev, BTN_RIGHT, data[1] & 0x02);
 				if ( wacom->features->type == G4 ||
-						wacom->features->type == WACOM_MO ) 
+						wacom->features->type == MO ) 
 					input_report_abs(dev, ABS_DISTANCE, data[6]);
 				else
 					input_report_abs(dev, ABS_DISTANCE, data[7]);
@@ -613,25 +613,25 @@ static int wacom_intuos_inout(struct urb *urb)
 
 	/* Exit report */
 	if ((data[1] & 0xfe) == 0x80) {
-		wacom_report_abs(wcombo, ABS_X, 0);
-		wacom_report_abs(wcombo, ABS_Y, 0);
-		wacom_report_abs(wcombo, ABS_DISTANCE, 0);
+		input_report_abs(dev, ABS_X, 0);
+		input_report_abs(dev, ABS_Y, 0);
+		input_report_abs(dev, ABS_DISTANCE, 0);
 		if (wacom->tool[idx] >= BTN_TOOL_MOUSE) {
-			wacom_report_key(wcombo, BTN_LEFT, 0);
-			wacom_report_key(wcombo, BTN_MIDDLE, 0);
-			wacom_report_key(wcombo, BTN_RIGHT, 0);
-			wacom_report_key(wcombo, BTN_SIDE, 0);
-			wacom_report_key(wcombo, BTN_EXTRA, 0);
-			wacom_report_abs(wcombo, ABS_THROTTLE, 0);
-			wacom_report_abs(wcombo, ABS_RZ, 0);
+			input_report_key(dev, BTN_LEFT, 0);
+			input_report_key(dev, BTN_MIDDLE, 0);
+			input_report_key(dev, BTN_RIGHT, 0);
+			input_report_key(dev, BTN_SIDE, 0);
+			input_report_key(dev, BTN_EXTRA, 0);
+			input_report_abs(dev, ABS_THROTTLE, 0);
+			input_report_abs(dev, ABS_RZ, 0);
  		} else {
-			wacom_report_abs(wcombo, ABS_PRESSURE, 0);
-			wacom_report_abs(wcombo, ABS_TILT_X, 0);
-			wacom_report_abs(wcombo, ABS_TILT_Y, 0);
-			wacom_report_key(wcombo, BTN_STYLUS, 0);
-			wacom_report_key(wcombo, BTN_STYLUS2, 0);
-			wacom_report_key(wcombo, BTN_TOUCH, 0);
-			wacom_report_abs(wcombo, ABS_WHEEL, 0);
+			input_report_abs(dev, ABS_PRESSURE, 0);
+			input_report_abs(dev, ABS_TILT_X, 0);
+			input_report_abs(dev, ABS_TILT_Y, 0);
+			input_report_key(dev, BTN_STYLUS, 0);
+			input_report_key(dev, BTN_STYLUS2, 0);
+			input_report_key(dev, BTN_TOUCH, 0);
+			input_report_abs(dev, ABS_WHEEL, 0);
 		}
 		input_report_key(dev, wacom->tool[idx], 0);
 		input_report_abs(dev, ABS_MISC, 0); /* reset tool id */
diff --git a/src/util/xsetwacom.c b/src/util/xsetwacom.c
index 29c6ce1..9c1f54b 100755
--- a/src/util/xsetwacom.c
+++ b/src/util/xsetwacom.c
@@ -334,7 +334,7 @@ static PARAMINFO gParamInfo[] =
 		TV_NONE, TV_LEFT_RIGHT, SINGLE_VALUE, TV_NONE },
 
 	{ "Mode",
-		"Switches cursor movement mode (default is absolute). ",
+		"Switches cursor movement mode (default is absolute/on). ",
 		XWACOM_PARAM_MODE, VALUE_OPTIONAL, RANGE, 
 		0, 1, BOOLEAN_VALUE, 1 },	
 
@@ -411,7 +411,7 @@ static PARAMINFO gParamInfo[] =
 
 	{ "RawFilter",
 		"Enables and disables filtering of raw data, "
-		"default is true.",
+		"default is true/on.",
 		XWACOM_PARAM_RAWFILTER, VALUE_OPTIONAL, RANGE, 
 		0, 1, BOOLEAN_VALUE, 1 },	
 
diff --git a/src/wacom.4x b/src/wacom.4x
index f21f1d8..5706f8d 100644
--- a/src/wacom.4x
+++ b/src/wacom.4x
@@ -142,7 +142,8 @@ you should NOT add this option.  The default is "none".
 specifies different resolutions for the two screens in TwinView setup.  For example, 
 if the resolution of screen 1 (res1) is 1024x768 and screen 2 (res2) is 1280x1024, 
 the option will be set to:
-            Option "TVResolution" "1024x768,1280x1024"
+            Option "TVResolution" "1024x768,1280x1024" 
+
 This option is used only when TwinView option is not none.  It is unnecessary to add 
 this option if your screens are displaying in the same resolutions.
 .TP 4
@@ -169,7 +170,7 @@ described by TopX, TopY, BottomX, BottomY.
 sets the level of debugging info reported.  There are 12 levels, specified by 
 the integers between 1 and 12.  Once it is defined, all the debug messages 
 with a level less than or equal to the number will be logged into 
-/etc/X11/XFree86.0.log.
+/etc/X11/Xorg.0.log.
 .TP 4
 .B Option \fI"CursorProx"\fP \fI"number"\fP
 sets the max distance from tablet to stop reporting movement for cursor in relative mode. Default for Intuos series is 10, for Graphire series (including Volitos) is 42.
@@ -178,8 +179,7 @@ sets the max distance from tablet to stop reporting movement for cursor in relat
 sets the serial number associated with the physical device. This allows
 to have multiple devices of the same type (i.e. multiple pens). This
 option is only available on wacom V devices (Intuos series and Cintiq 21U). 
-To see which serial number belongs to a device, you have to set the 
-DebugLevel to 6 and watch the output of the X log.
+To see which serial number belongs to a device, you need to run the utility program, xsetwacom, which comes with linuxwacom package.
 .TP 4
 .B Option \fI"Threshold"\fP \fI"number"\fP
 sets the pressure threshold used to generate a button 1 events of stylus.
diff --git a/src/wacomxi/wacomcpl-exec b/src/wacomxi/wacomcpl-exec
index c97dd54..2f31c50 100755
--- a/src/wacomxi/wacomcpl-exec
+++ b/src/wacomxi/wacomcpl-exec
@@ -89,6 +89,8 @@ proc updateXinitrc {device option value} {
 
     if { ![ file exists ~/.xinitrc ] } {
 	exec echo "xsetwacom set $device $option \"$value\"" > ~/.xinitrc
+	exec echo "# run the primary system script" >> ~/.xinitrc
+	exec echo ". /etc/X11/xinit/xinitrc" >> ~/.xinitrc
     } else {
 	file copy -force ~/.xinitrc ~/.xinitrc.bak
 	file copy -force ~/.xinitrc /tmp/xinitrc1
diff --git a/src/xdrv/wcmCommon.c b/src/xdrv/wcmCommon.c
index d08b550..71b69df 100755
--- a/src/xdrv/wcmCommon.c
+++ b/src/xdrv/wcmCommon.c
@@ -507,9 +507,10 @@ static void sendAButton(LocalDevicePtr local, int button, int mask,
 
 	case AC_DBLCLICK:
 		/* Dynamically modify the button map as required --
-		 * to be moved in the place where button mappings are changed
+		 * to be moved in the place where button mappings are changed.
+		 * Only left double is supported.
 		 */
-		local->dev->button->map [button_idx] = button & AC_CODE;
+		local->dev->button->map [button_idx] = 1;
 
 		if (mask)
 		{