Merge lp:~gerard-/wizardpen/unstuck into lp:wizardpen

[Gerard Krol]

Includes compatibility for the new API (xorg-x11-1.7.x-api-changes.patch by panemade), formatting changes and it now always sends button events, so the pen will not get stuck pressed down sometimes after you draw a line.

Works fine for me with a Trust TB6300 (UC-LOGIC Tablet WP8060U), debian testing, AMD64

[Martin Owens (doctormo)]

Merged

review: Approve

=== modified file 'src/wizardpen.c'
--- src/wizardpen.c	2009-07-17 19:56:32 +0000
+++ src/wizardpen.c	2010-03-20 19:15:26 +0000
@@ -29,7 +29,7 @@
 
 #define _WIZARDPEN_C_
 /*****************************************************************************
- *	Standard Headers
+ *  Standard Headers
  ****************************************************************************/
 
 #ifdef LINUX_INPUT
@@ -71,16 +71,16 @@
 #endif
 
 /*****************************************************************************
- *	Local Headers
+ *  Local Headers
  ****************************************************************************/
 #include "wizardpen.h"
 
 /*****************************************************************************
- *	Variables without includable headers
+ *  Variables without includable headers
  ****************************************************************************/
 
 /*****************************************************************************
- *	Local Variables
+ *  Local Variables
  ****************************************************************************/
 
 float rz;
@@ -103,79 +103,79 @@
 
 _X_EXPORT InputDriverRec WIZARDPEN =
 {
-	6,
-	"wizardpen",
-	NULL,
-	WizardPenPreInit,
-	NULL,
-	NULL,
-	0
+    6,
+    "wizardpen",
+    NULL,
+    WizardPenPreInit,
+    NULL,
+    NULL,
+    0
 };
 
 #ifdef XFree86LOADER
 static XF86ModuleVersionInfo VersionRec =
 {
-	"wizardpen",
-	MODULEVENDORSTRING,
-	MODINFOSTRING1,
-	MODINFOSTRING2,
-	XORG_VERSION_CURRENT,
-	PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
-	ABI_CLASS_XINPUT,
-	ABI_XINPUT_VERSION,
-	MOD_CLASS_XINPUT,
-	{0, 0, 0, 0}
+    "wizardpen",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
+    ABI_CLASS_XINPUT,
+    ABI_XINPUT_VERSION,
+    MOD_CLASS_XINPUT,
+    {0, 0, 0, 0}
 };
 
 
 _X_EXPORT XF86ModuleData wizardpenModuleData = {
-	&VersionRec,
-	SetupProc,
-	TearDownProc
+    &VersionRec,
+    SetupProc,
+    TearDownProc
 };
 
 /*****************************************************************************
- *	Function Definitions
+ *  Function Definitions
  ****************************************************************************/
 
 static pointer
-SetupProc(	pointer module,
-		pointer options,
-		int *errmaj,
-		int *errmin )
+SetupProc(  pointer module,
+        pointer options,
+        int *errmaj,
+        int *errmin )
 {
-	xf86AddInputDriver(&WIZARDPEN, module, 0);
-	return module;
+    xf86AddInputDriver(&WIZARDPEN, module, 0);
+    return module;
 }
 
 static void
 TearDownProc( pointer p )
 {
 #if 0
-	LocalDevicePtr local = (LocalDevicePtr) p;
-	AceCadPrivatePtr priv = (AceCadPrivatePtr) local->private;
-
-	DeviceOff (local->dev);
-
-	xf86CloseSerial (local->fd);
-	XisbFree (priv->buffer);
-	xfree (priv);
-	xfree (local->name);
-	xfree (local);
+    LocalDevicePtr local = (LocalDevicePtr) p;
+    AceCadPrivatePtr priv = (AceCadPrivatePtr) local->private;
+
+    DeviceOff (local->dev);
+
+    xf86CloseSerial (local->fd);
+    XisbFree (priv->buffer);
+    xfree (priv);
+    xfree (local->name);
+    xfree (local);
 #endif
 }
 #endif
 
 static const char *default_options[] =
 {
-	"BaudRate", "9600",
-	"StopBits", "1",
-	"DataBits", "8",
-	"Parity", "Odd",
-	"Vmin", "1",
-	"Vtime", "10",
-	"FlowControl", "Xoff",
-	NULL
+    "BaudRate", "9600",
+    "StopBits", "1",
+    "DataBits", "8",
+    "Parity", "Odd",
+    "Vmin", "1",
+    "Vtime", "10",
+    "FlowControl", "Xoff",
+    NULL
 };
 
 #ifdef LINUX_INPUT
@@ -212,7 +212,7 @@
         cmp_at = 256;
     ioctl(fd, EVIOCGNAME(sizeof(name)), name);
     name[cmp_at] = '\0';
-	 if (xf86NameCmp(name, wizardpen_name) == 0)
+     if (xf86NameCmp(name, wizardpen_name) == 0)
         return TRUE;
     return FALSE;
 }
@@ -253,7 +253,7 @@
     xf86MsgVerb(X_INFO, verb, "%s: probing event devices for WizardPen tablets\n", local->name);
     for (i = 0; ; i++) {
         int fd = -1;
-	      Bool is_wizardpen;
+          Bool is_wizardpen;
 
         np = SET_EVENT_NUM(fname, i);
         if (np < 0 || np >= EV_DEV_NAME_MAXLEN) {
@@ -334,98 +334,98 @@
     /* deprecated box settings, Z axis */
     s = xf86FindOptionValue(local->options, "ClickPressureLevel");
     if (s && strlen(s) > 0) {
-	xf86Msg(X_WARNING, "%s: Option \"ClickPressureLevel\" "
-	    "is DEPRECATED, please use \"TopZ\"\n", local->name);
-	priv->topZ = atoi(s);
-	xf86Msg(X_CONFIG, "%s: TopZ = %d\n", local->name, priv->topZ);
+        xf86Msg(X_WARNING, "%s: Option \"ClickPressureLevel\" "
+            "is DEPRECATED, please use \"TopZ\"\n", local->name);
+        priv->topZ = atoi(s);
+        xf86Msg(X_CONFIG, "%s: TopZ = %d\n", local->name, priv->topZ);
     }
     /* end of deprecated box settings, Z axis */
 
     /* box settings */
     s = xf86FindOptionValue(local->options, "TopX");
     if (s && strlen(s) > 0) {
-	priv->topX = atoi(s);
-	xf86Msg(X_CONFIG, "%s: TopX = %d\n", local->name, priv->topX);
+        priv->topX = atoi(s);
+        xf86Msg(X_CONFIG, "%s: TopX = %d\n", local->name, priv->topX);
     }
 
     s = xf86FindOptionValue(local->options, "TopY");
     if (s && strlen(s) > 0) {
-	priv->topY = atoi(s);
-	xf86Msg(X_CONFIG, "%s: TopY = %d\n", local->name, priv->topY);
+        priv->topY = atoi(s);
+        xf86Msg(X_CONFIG, "%s: TopY = %d\n", local->name, priv->topY);
     }
 
     s = xf86FindOptionValue(local->options, "TopZ");
     if (s && strlen(s) > 0) {
-	priv->topZ = atoi(s);
-	xf86Msg(X_CONFIG, "%s: TopZ = %d\n", local->name, priv->topZ);
+        priv->topZ = atoi(s);
+        xf86Msg(X_CONFIG, "%s: TopZ = %d\n", local->name, priv->topZ);
     }
 
     s = xf86FindOptionValue(local->options, "BottomX");
     if (s && strlen(s) > 0) {
-	priv->bottomX = atoi(s);
-	xf86Msg(X_CONFIG, "%s: BottomX = %d\n", local->name, priv->bottomX);
+        priv->bottomX = atoi(s);
+        xf86Msg(X_CONFIG, "%s: BottomX = %d\n", local->name, priv->bottomX);
     }
 
     s = xf86FindOptionValue(local->options, "BottomY");
     if (s && strlen(s) > 0) {
-	priv->bottomY = atoi(s);
-	xf86Msg(X_CONFIG, "%s: BottomY = %d\n", local->name, priv->bottomY);
+        priv->bottomY = atoi(s);
+        xf86Msg(X_CONFIG, "%s: BottomY = %d\n", local->name, priv->bottomY);
     }
 
     s = xf86FindOptionValue(local->options, "BottomZ");
     if (s && strlen(s) > 0) {
-	priv->bottomZ = atoi(s);
-	xf86Msg(X_CONFIG, "%s: BottomZ = %d\n", local->name, priv->bottomZ);
+        priv->bottomZ = atoi(s);
+        xf86Msg(X_CONFIG, "%s: BottomZ = %d\n", local->name, priv->bottomZ);
     }
 
     s = xf86FindOptionValue(local->options, "ScreenX");
     if (s && strlen(s) > 0) {
-	screenmaxx = atoi(s);
-	xf86Msg(X_CONFIG, "%s: ScreenX = %d\n", local->name, screenmaxx);
+        screenmaxx = atoi(s);
+        xf86Msg(X_CONFIG, "%s: ScreenX = %d\n", local->name, screenmaxx);
     }else
-	screenmaxx = screenInfo.screens[0]->width;
-    
+        screenmaxx = screenInfo.screens[0]->width;
+
     s = xf86FindOptionValue(local->options, "ScreenY");
     if (s && strlen(s) > 0) {
-	screenmaxy = atoi(s);
-	xf86Msg(X_CONFIG, "%s: ScreenY = %d\n", local->name, screenmaxy);
+        screenmaxy = atoi(s);
+        xf86Msg(X_CONFIG, "%s: ScreenY = %d\n", local->name, screenmaxy);
     }else
-	screenmaxy = screenInfo.screens[0]->height;
+        screenmaxy = screenInfo.screens[0]->height;
 
     s = xf86FindOptionValue(local->options, "debugyn");
     if (s && strlen(s) > 0) {
-	debugyn = atoi(s);
-	xf86Msg(X_CONFIG, "%s: debugyn = %d\n", local->name, debugyn);
+        debugyn = atoi(s);
+        xf86Msg(X_CONFIG, "%s: debugyn = %d\n", local->name, debugyn);
     }
 
     s = xf86FindOptionValue(local->options, "MouseSpeed");
     if (s && strlen(s) > 0) {
-	mousespeed = atoi(s);
-	xf86Msg(X_CONFIG, "%s: MouseSpeed = %d\n", local->name, mousespeed);
+        mousespeed = atoi(s);
+        xf86Msg(X_CONFIG, "%s: MouseSpeed = %d\n", local->name, mousespeed);
     }
-    
+
     s = xf86FindOptionValue(local->options, "MouseAccel");
     if (s && strlen(s) > 0) {
-	mouseaccel = atoi(s);
-	xf86Msg(X_CONFIG, "%s: MouseAccel = %d\n", local->name, mouseaccel);
+        mouseaccel = atoi(s);
+        xf86Msg(X_CONFIG, "%s: MouseAccel = %d\n", local->name, mouseaccel);
     }
 
     s = xf86FindOptionValue(local->options, "Rotate90");
     if (s && strlen(s) > 0) {
-	int rotate;
-	rotate90 = atoi(s);
-	xf86Msg(X_CONFIG, "%s: Rotate90 = %d\n", local->name, rotate90);
-	if(rotate90){
-		int temp;
-		temp = priv->bottomY;
-		priv->bottomY = priv->bottomX;
-		priv->bottomX = temp;
-		temp = priv->topY;
-		priv->topY = priv->topX;
-		priv->topX = temp;
-	}
+        int rotate;
+        rotate90 = atoi(s);
+        xf86Msg(X_CONFIG, "%s: Rotate90 = %d\n", local->name, rotate90);
+        if(rotate90){
+            int temp;
+            temp = priv->bottomY;
+            priv->bottomY = priv->bottomX;
+            priv->bottomX = temp;
+            temp = priv->topY;
+            priv->topY = priv->topX;
+            priv->topX = temp;
+        }
     }
-    
+
     /* end of box settings */
 
     // increment setting
@@ -631,14 +631,25 @@
     LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
     WizardPenPrivatePtr priv = (WizardPenPrivatePtr) (local->private);
     priv->wizardpenOldX = 0;
-	priv->wizardpenOldY = 0;
-	priv->wizardpenOldZ = 0;
-	unsigned char map[] =
+    priv->wizardpenOldY = 0;
+    priv->wizardpenOldZ = 0;
+    unsigned char map[] =
     {0, 1, 2, 3, 4, 5};
     xf86MsgVerb(X_INFO, 4, "%s Init\n", local->name);
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+    Atom label=0;
+    Atom atoms[MAX_VALUATORS] = { 0 };
+#endif
+
     /* 3 buttons changed to SIX */
-    if (InitButtonClassDeviceStruct (dev, 6, map) == FALSE)
+    if (InitButtonClassDeviceStruct(
+        dev,
+        6,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+        atoms,
+#endif
+        map) == FALSE)
     {
         xf86Msg(X_ERROR, "%s: unable to allocate ButtonClassDeviceStruct\n", local->name);
         return !Success;
@@ -657,52 +668,58 @@
 
 
     /* 3 axes */
-    if (InitValuatorClassDeviceStruct (dev, 3,
+    if (InitValuatorClassDeviceStruct(dev, 3,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+        atoms,
+#endif
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
-                                       xf86GetMotionEvents,
+        xf86GetMotionEvents,
 #endif
-                local->history_size,
-                ((priv->flags & ABSOLUTE_FLAG)? Absolute: Relative)|OutOfProximity)
-            == FALSE)
+        local->history_size,
+        ((priv->flags & ABSOLUTE_FLAG)? Absolute: Relative)|OutOfProximity) == FALSE)
     {
         xf86Msg(X_ERROR, "%s: unable to allocate ValuatorClassDeviceStruct\n", local->name);
         return !Success;
     }
     else
     {
-	
         InitValuatorAxisStruct(dev,
                 0,
-                0,			/* min val */
-                /*screenInfo.screens[0]->width,*/	/* max val */
-                screenmaxx,			/* max val */
-                1000,			/* resolution */
-                0,			/* min_res */
-                1000);			/* max_res */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+                label,
+#endif
+                0,          /* min val */
+                screenmaxx, /* max val */
+                1000,       /* resolution */
+                0,          /* min_res */
+                1000);      /* max_res */
         InitValuatorAxisStruct(dev,
                 1,
-                0,			/* min val */
-                /*screenInfo.screens[0]->height,*/	/* max val */
-                screenmaxy,	/* max val */
-                1000,			/* resolution */
-                0,			/* min_res */
-                1000);			/* max_res */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+                label,
+#endif
+                0,          /* min val */
+                screenmaxy, /* max val */
+                1000,       /* resolution */
+                0,          /* min_res */
+                1000);      /* max_res */
         InitValuatorAxisStruct(dev,
                 2,
-                0,			/* min val */
-                /*priv->bottomZ,*/	/* max val */
-		1023,
-                1000,			/* resolution */
-                0,			/* min_res */
-                1000);		/* max_res */
-	
-	if(rotate90){
-		int tempval;
-		tempval = screenmaxx;
-		screenmaxx = screenmaxy;
-		screenmaxy = tempval;
-	}
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+                label,
+#endif
+                0,          /* min val */
+                1023,       /* max val */
+                1000,       /* resolution */
+                0,          /* min_res */
+                1000);      /* max_res */
 
+        if (rotate90) {
+            int tempval;
+            tempval = screenmaxx;
+            screenmaxx = screenmaxy;
+            screenmaxy = tempval;
+        }
     }
 
     if (InitProximityClassDeviceStruct (dev) == FALSE)
@@ -738,7 +755,7 @@
 }
 
 #ifdef LINUX_INPUT
-#define set_bit(byte,nb,bit)	(bit ? byte | (1<<nb) : byte & (~(1<<nb)))
+#define set_bit(byte,nb,bit)    (bit ? byte | (1<<nb) : byte & (~(1<<nb)))
 static void
 USBReadInput (LocalDevicePtr local)
 {
@@ -778,312 +795,289 @@
         return;
     } else {
         if (!avail) {
-           // If the device wasn't available last time we checked 
+           // If the device wasn't available last time we checked
             xf86Msg(X_INFO, "%s: device %s is available again\n", local->name, xf86FindOptionValue(local->options, "Device"));
             priv->flags |= AVAIL_FLAG;
         }
     }
 
     for (event = (struct input_event *)eventbuf;
-            event < (struct input_event *)(eventbuf+len); event++) 
-				{
-	         switch (event->type) {
-            case EV_SYN:// 2.6.x 
+         event < (struct input_event *)(eventbuf+len);
+         event++)
+    {
+        switch (event->type) {
+            case EV_SYN:// 2.6.x
                 if (event->code != SYN_REPORT && event->code != 0)
                     xf86Msg(X_ERROR, "%s: unknown EV_SYN code %d\n", local->name, event->code);
                 break;
-	    case EV_REL:
-		if(debugyn)
-                xf86Msg(X_ERROR, "EV_REL! %s: event type/code/value %d/%d/%d\n", local->name, event->type, event->code, event->value);
-	        int xaccel, yaccel;
-		
-		switch(event->code){
-			case REL_X:
-				xaccel = 1;
-				if(mouseaccel){
-				    if(abs(event->value) > 2){
-					xaccel = 2;
-				    }else if(abs(event->value) > 4){
-					xaccel = 3;
-				    }else if(abs(event->value) > 6){
-					xaccel = 4;
-				    }
-				}
-				x = x + (xaccel * mousespeed * event->value);
-				if(x < priv->topX){
-					x = 1 + priv->topX;
-				}
-				if( x > priv->bottomX){
-					x = priv->bottomX;
-				}
-			break;
-			case REL_Y:
-				yaccel = 1;
-				if(mouseaccel){
-				    if(abs(event->value) > 2){
-					yaccel = 2;
-				    }else if(abs(event->value) > 4){
-					yaccel = 3;
-				    }else if(abs(event->value) > 6){
-					yaccel = 4;
-				    }
-				}
-				y = y + (yaccel * mousespeed * event->value);
-				if(y < priv->topY){
-					y = 1 + priv->topY;
-				}
-				if( y > priv->bottomY){
-					y = priv->bottomY;
-				}
-			break;
-			case REL_WHEEL:
-				if (event->value < 0){
-                        		buttons = set_bit(buttons,4,1);
-                			delta = buttons ^ priv->wizardpenOldButtons;
-                			while (delta) {
-                    				id = ffs(delta);
-                    				delta &= ~(1 << (id-1));
-						if(rotate90)	
-                    				xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_y, screenmaxx - report_x,report_z);  
-						else
-                    				xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_x, report_y,report_z);  
-                			}
-        				priv->wizardpenOldButtons = buttons;
-                        		buttons = set_bit(buttons,4,0);
-                			delta = buttons ^ priv->wizardpenOldButtons;
-                			while (delta)
-                			{
-                    				id = ffs(delta);
-                    				delta &= ~(1 << (id-1));
-						if(rotate90)	
-                    				xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_y, screenmaxx - report_x,report_z);  
-						else
-                    				xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_x, report_y,report_z);  
-                			}
-				}
-				if (event->value > 0){
-                        		buttons = set_bit(buttons,3,1);
-                			delta = buttons ^ priv->wizardpenOldButtons;
-                			while (delta) {
-                    				id = ffs(delta);
-                    				delta &= ~(1 << (id-1));
-						if(rotate90)
-                    				xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_y, screenmaxx - report_x,report_z);  
-						else
-                    				xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_x, report_y,report_z);  
-                			}
-        				priv->wizardpenOldButtons = buttons;
-                        		buttons = set_bit(buttons,3,0);
-                			delta = buttons ^ priv->wizardpenOldButtons;
-                			while (delta)
-                			{
-                    				id = ffs(delta);
-                    				delta &= ~(1 << (id-1));
-						if(rotate90)
-                    				xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_y, screenmaxx - report_x,report_z);  
-						else
-                    				xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_x, report_y,report_z);  
-                			}
-				}
-			break;
-		}
-		break;
+            case EV_REL:
+                if(debugyn)
+                    xf86Msg(X_ERROR, "EV_REL! %s: event type/code/value %d/%d/%d\n", local->name, event->type, event->code, event->value);
+                int xaccel, yaccel;
+                switch (event->code) {
+                    case REL_X:
+                        xaccel = 1;
+                        if(mouseaccel) {
+                            if(abs(event->value) > 2) {
+                                xaccel = 2;
+                            } else if(abs(event->value) > 4) {
+                                xaccel = 3;
+                            } else if(abs(event->value) > 6) {
+                                xaccel = 4;
+                            }
+                        }
+                        x = x + (xaccel * mousespeed * event->value);
+                        if (x < priv->topX) {
+                            x = 1 + priv->topX;
+                        }
+                        if (x > priv->bottomX) {
+                            x = priv->bottomX;
+                        }
+                        break;
+                    case REL_Y:
+                        yaccel = 1;
+                        if(mouseaccel){
+                            if (abs(event->value) > 2) {
+                                yaccel = 2;
+                            } else if(abs(event->value) > 4) {
+                                yaccel = 3;
+                            } else if(abs(event->value) > 6) {
+                                yaccel = 4;
+                            }
+                        }
+                        y = y + (yaccel * mousespeed * event->value);
+                        if (y < priv->topY) {
+                            y = 1 + priv->topY;
+                        }
+                        if (y > priv->bottomY) {
+                            y = priv->bottomY;
+                        }
+                        break;
+                    case REL_WHEEL:
+                        if (event->value < 0) {
+                            buttons = set_bit(buttons,4,1);
+                            delta = buttons ^ priv->wizardpenOldButtons;
+                            while (delta) {
+                                id = ffs(delta);
+                                delta &= ~(1 << (id-1));
+                                if(rotate90)
+                                    xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_y, screenmaxx - report_x,report_z);
+                                else
+                                    xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_x, report_y,report_z);
+                            }
+                            priv->wizardpenOldButtons = buttons;
+                            buttons = set_bit(buttons,4,0);
+                            delta = buttons ^ priv->wizardpenOldButtons;
+                            while (delta)
+                            {
+                                id = ffs(delta);
+                                delta &= ~(1 << (id-1));
+                                if(rotate90)
+                                    xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_y, screenmaxx - report_x,report_z);
+                                else
+                                    xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_x, report_y,report_z);
+                            }
+                        }
+                        if (event->value > 0) {
+                            buttons = set_bit(buttons,3,1);
+                            delta = buttons ^ priv->wizardpenOldButtons;
+                            while (delta) {
+                                id = ffs(delta);
+                                delta &= ~(1 << (id-1));
+                                if(rotate90)
+                                    xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_y, screenmaxx - report_x,report_z);
+                                else
+                                    xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_x, report_y,report_z);
+                            }
+                            priv->wizardpenOldButtons = buttons;
+                            buttons = set_bit(buttons,3,0);
+                            delta = buttons ^ priv->wizardpenOldButtons;
+                            while (delta)
+                            {
+                                id = ffs(delta);
+                                delta &= ~(1 << (id-1));
+                                if(rotate90)
+                                    xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_y, screenmaxx - report_x,report_z);
+                                else
+                                    xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_x, report_y,report_z);
+                            }
+                        }
+                        break;
+                }
+                break;
             case EV_ABS:
                 switch (event->code) {
                     case ABS_X:
-			x = event->value;
-			if(debugyn)
-			xf86Msg(X_CONFIG, "ABS_X x is %d\n", x);
-                    break;	
-		    case ABS_Z:    
-			x = event->value;
-			if(debugyn)
-			xf86Msg(X_CONFIG, "ABS_Z x is %d\n", x);
-                    break;
-		    case ABS_RX:
+                        x = event->value;
+                        if(debugyn)
+                        xf86Msg(X_CONFIG, "ABS_X x is %d\n", x);
+                        break;
+                    case ABS_Z:
+                        x = event->value;
+                        if(debugyn)
+                        xf86Msg(X_CONFIG, "ABS_Z x is %d\n", x);
+                        break;
+                    case ABS_RX:
                         y = event->value;
-			if(debugyn)
-			xf86Msg(X_CONFIG, "ABS_RX y is %d\n", y);
-                    break;
+                        if(debugyn)
+                            xf86Msg(X_CONFIG, "ABS_RX y is %d\n", y);
+                        break;
                     case ABS_Y:
                         y = event->value;
-			if(debugyn)
-			xf86Msg(X_CONFIG, "ABS_Y y is %d\n", y);
-                    break;
+                        if(debugyn)
+                           xf86Msg(X_CONFIG, "ABS_Y y is %d\n", y);
+                        break;
 
                     case ABS_PRESSURE:
-			/* mpa send button events if pressure 
-			   crosses topZ threshold */
-			oldz = z;
-                    	z = event->value;
-			if ( z <= priv->topZ && oldz > priv->topZ){ 
-                        	buttons = set_bit(buttons,0,0);
-			if(debugyn)
-			xf86Msg(X_CONFIG, "setting PEN UP event\n");
-			}
-			if ( oldz <= priv->topZ && z > priv->topZ ){
-                        	buttons = set_bit(buttons,0,1);
-			if(debugyn)
-			        xf86Msg(X_CONFIG, "setting PEN DOWN event\n");
-			}
-			if(debugyn)
-			xf86Msg(X_CONFIG, "ABS_PRESSURE z is %d\n", z);
-                    break;
+                        /* mpa send button events if pressure
+                           crosses topZ threshold */
+                        oldz = z;
+                        z = event->value;
+                        if (z <= priv->topZ && oldz > priv->topZ) {
+                            buttons = set_bit(buttons,0,0);
+                            if(debugyn)
+                                xf86Msg(X_CONFIG, "setting PEN UP event\n");
+                        }
+                        if ( oldz <= priv->topZ && z > priv->topZ ) {
+                            buttons = set_bit(buttons,0,1);
+                            if(debugyn)
+                                xf86Msg(X_CONFIG, "setting PEN DOWN event\n");
+                        }
+                        if(debugyn)
+                            xf86Msg(X_CONFIG, "ABS_PRESSURE z is %d\n", z);
+                        break;
 
                     case ABS_MISC:
                         break;
 
                 }
-                break; // EV_ABS 
+                break; // EV_ABS
 
             case EV_KEY:
                 switch (event->code) {
                     case BTN_TOOL_PEN:
                         prox = event->value;
-			if(debugyn)
-			xf86Msg(X_CONFIG, "BTN_TOOL_PEN prox is %d\n", prox);
+                        if(debugyn)
+                            xf86Msg(X_CONFIG, "BTN_TOOL_PEN prox is %d\n", prox);
                         break;
 
                     case BTN_LEFT:
-			buttons = set_bit(buttons,0,event->value);
-			if(debugyn)
-			xf86Msg(X_CONFIG, "NEW BTN_LEFT event is %d\n", event->value);
-	            case BTN_SIDE:
+                        buttons = set_bit(buttons,0,event->value);
+                        if(debugyn)
+                            xf86Msg(X_CONFIG, "NEW BTN_LEFT event is %d\n", event->value);
+                        // NO BREAK
+                    case BTN_SIDE:
                         /* mpa stop sending original pen up/down button
-			events in favor of button code above */
-			/*  buttons = set_bit(buttons,0,event->value);*/
-			if(debugyn)
-			xf86Msg(X_CONFIG, "ignored BTN_SIDE event is %d\n", event->value);
+                        events in favor of button code above */
+                        /*  buttons = set_bit(buttons,0,event->value);*/
+                        if(debugyn)
+                            xf86Msg(X_CONFIG, "ignored BTN_SIDE event is %d\n", event->value);
                         break;
 
-		     case BTN_EXTRA:
-			if(debugyn)
-			xf86Msg(X_CONFIG, "NEW BTN_EXTRA event is %d\n", event->value);
-		     case BTN_MIDDLE:
+                    case BTN_EXTRA:
+                        if(debugyn)
+                            xf86Msg(X_CONFIG, "NEW BTN_EXTRA event is %d\n", event->value);
+                        // NO BREAK
+                    case BTN_MIDDLE:
                         buttons = set_bit(buttons,1,event->value);
-			if(debugyn)
-			xf86Msg(X_CONFIG, "BTN_MIDDLE event is %d\n", event->value);
+                        if(debugyn)
+                            xf86Msg(X_CONFIG, "BTN_MIDDLE event is %d\n", event->value);
                         break;
 
-		     case BTN_FORWARD:
-			if(debugyn)
-			xf86Msg(X_CONFIG, "BTN_FORWARD event is %d\n", event->value);
+                     case BTN_FORWARD:
+                        if(debugyn)
+                            xf86Msg(X_CONFIG, "BTN_FORWARD event is %d\n", event->value);
+                        // NO BREAK
                      case BTN_RIGHT:
                         buttons = set_bit(buttons,2,event->value);
-			if(debugyn)
-			xf86Msg(X_CONFIG, "BTN_RIGHT event is %d\n", event->value);
+                        if(debugyn)
+                            xf86Msg(X_CONFIG, "BTN_RIGHT event is %d\n", event->value);
                         break;
                 }
-                break; // EV_KEY 
-	    case EV_MSC:
-		 break;
+                break; // EV_KEY
+            case EV_MSC:
+                break;
             default:
                 xf86Msg(X_ERROR, "%s: unknown event type/code/value %d/%d/%d\n", local->name, event->type, event->code, event->value);
         } /* switch event->type */
 
         /* mpa If pressure is below threshold, set pressure and reported
-		pressure to 0 */ 
-        if (z <= priv->topZ){
-	        report_z = 0;
-		/*z = 0;*/
-	}else if(z >= priv->bottomZ){
-		/*z = priv->bottomZ;*/
-		/*report_z = priv->bottomZ - priv->topZ;*/
-		report_z = 1023;
-	}else{  /* mpa Otherwise scale down by min pressure val */
-		report_z = z - priv->topZ;
-		rz = report_z;
-		report_z = 1023.0 * (rz / (priv->bottomZ - priv->topZ));
-	} 
-	/* mpa now scale back up so we again report a range of 0 to 1023 */ 
-        /*merged with above if/then/else
-	if(report_z >= (priv->bottomZ - priv->topZ)){
-		report_z = 1023;
-	}else if (report_z){
-		rz = report_z;
-		report_z = 1023.0 * (rz / (priv->bottomZ - priv->topZ));
-	}
-	*/
-
+        pressure to 0 */
+        if (z <= priv->topZ) {
+            report_z = 0;
+        } else if(z >= priv->bottomZ) {
+            report_z = 1023;
+        } else { /* mpa Otherwise scale down by min pressure val */
+            report_z = z - priv->topZ;
+            rz = report_z;
+            report_z = 1023.0 * (rz / (priv->bottomZ - priv->topZ));
+        }
+
+        if (x>priv->topX && x<priv->bottomX)
+            report_x = (x-priv->topX) * screenmaxx / (priv->bottomX-priv->topX);
+        else{
+            if(x<priv->topX)
+                report_x = 0;
+            else
+                report_x = screenmaxx;
+        }
+        if (y>priv->topY && y<priv->bottomY)
+            report_y = (y-priv->topY) * screenmaxy / (priv->bottomY-priv->topY);
+        else {
+            if(y<priv->topY)
+                report_y = 0;
+            else
+                report_y = screenmaxy;
+        }
+
+        if (rotate90) {
+            int tempval;
+            if (report_y < 0)
+                report_y = 0;
+            if (report_x < 0)
+                report_x = 0;
+            tempval = report_x;
+            report_x = (screenmaxy - report_y);
+            if (report_x > 1278)
+                report_x = 1278;
+            report_y = tempval;
+        }
+        
+        // We ALWAYS send button events right after we notice them
+        // The pen might get stuck in pressed down state otherwise
+        if (priv->wizardpenOldButtons != buttons)
+        {
+            int delta = buttons ^ priv->wizardpenOldButtons;
+            while (delta)
+            {
+                int id = ffs(delta);
+                delta &= ~(1 << (id-1));
+                xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_x, report_y, report_z); 
+            }
+        }
+        priv->wizardpenOldButtons = buttons;
+        
         /* Linux Kernel 2.6.x sends EV_SYN/SYN_REPORT as an event terminator,
          * whereas 2.4.x sends EV_ABS/ABS_MISC. We have to support both.
          */
-        if (!(  (event->type == EV_SYN && event->code == SYN_REPORT) ||
-                    (event->type == EV_ABS && event->code == ABS_MISC)
-             )) {
-            continue;
-        }
-	if(x>priv->topX && x<priv->bottomX)
-    	/*report_x = (x-priv->topX) * screenInfo.screens[0]->width / (priv->bottomX-priv->topX);*/
-    	report_x = (x-priv->topX) * screenmaxx / (priv->bottomX-priv->topX);
-	else{
-		if(x<priv->topX)
-			report_x = 0;
-		else
-			report_x = screenmaxx; /*screenInfo.screens[0]->width;*/
-	}
-	if(y>priv->topY && y<priv->bottomY)
-    	/*report_y = (y-priv->topY) * screenInfo.screens[0]->height / (priv->bottomY-priv->topY);*/
-    	report_y = (y-priv->topY) * screenmaxy / (priv->bottomY-priv->topY);
-	else{
-		if(y<priv->topY)
-			report_y = 0;
-		else
-			report_y = screenmaxy; /*screenInfo.screens[0]->height;*/
-	}
-	if(rotate90){
-		int tempval;
-		if (report_y < 0)
-			report_y = 0;
-		if (report_x < 0)
-			report_x = 0;
-		tempval = report_x;
-		report_x = (screenmaxy - report_y);
-		if (report_x > 1278)
-			report_x = 1278;
-		report_y = tempval;
-	}
-	if (1)
+        if ((event->type == EV_SYN && event->code == SYN_REPORT) ||
+            (event->type == EV_ABS && event->code == ABS_MISC))
         {
             if (!(priv->wizardpenOldProximity))
                 if (!is_core_pointer)
                 {
-	            /* mpa send value of report_z rather than z */
-                    xf86PostProximityEvent(local->dev, 1, 0, 3 , 
-				report_x, report_y, report_z);
+                    xf86PostProximityEvent(local->dev, 1, 0, 3 ,
+                        report_x, report_y, report_z);
                 }
 
-	    
-	    /* mpa send value of report_z rather than z */
             xf86PostMotionEvent(local->dev, 1, 0, 3, report_x, report_y, report_z);
-            if (priv->wizardpenOldButtons != buttons)
-            {
-                int delta = buttons ^ priv->wizardpenOldButtons;
-                while (delta)
-                {
-                    int id = ffs(delta);
-                    delta &= ~(1 << (id-1));
-                    xf86PostButtonEvent(local->dev, 1, id, (buttons&(1<<(id-1))), 0, 3, report_x, report_y,report_z);  /*mpa send report_z instead of z*/
-                }
-            }
-        }
-        else
-        {
-            if (!is_core_pointer)
-                if (priv->wizardpenOldProximity)
-                {
-                    xf86PostProximityEvent(local->dev, 0, 0, 3, report_x,report_y,report_z);
-                }
-            priv->wizardpenOldProximity = 0;
-        }
 
-        priv->wizardpenOldButtons = buttons;
-        priv->wizardpenOldX = x;
-        priv->wizardpenOldY = y;
-        priv->wizardpenOldZ = z;
-        priv->wizardpenOldProximity = prox;
+            priv->wizardpenOldX = x;
+            priv->wizardpenOldY = y;
+            priv->wizardpenOldZ = z;
+            priv->wizardpenOldProximity = prox;
+        }
     }
-    /*xf86Msg(X_INFO, "ACECAD Tablet Sortie Read Input\n");*/
 }
 #endif
 
@@ -1102,24 +1096,24 @@
         int v0, int v1, int v2, int v3, int v4, int v5, int *x, int *y)
 {
     WizardPenPrivatePtr priv = (WizardPenPrivatePtr)(local->private);
-	if(v0>priv->topX && v0<priv->bottomX)
-    	/**x = (v0-priv->topX) * screenInfo.screens[0]->width / (priv->bottomX-priv->topX);*/
-    	*x = (v0-priv->topX) * screenmaxx / (priv->bottomX-priv->topX);
-	else{
-		if(v0<priv->topX)
-			*x = priv->topX;
-		else
-			*x = priv->bottomX;
-	}
-	if(v1>priv->topY && v1<priv->bottomY)
-    	/**y = (v1-priv->topY) * screenInfo.screens[0]->width / (priv->bottomY-priv->topY);*/
-    	*y = (v1-priv->topY) * screenmaxy / (priv->bottomY-priv->topY);
-	else{
-		if(v1<priv->topY)
-			*y = priv->topY;
-		else
-			*y = priv->bottomY;
-	}
+    if(v0>priv->topX && v0<priv->bottomX)
+        /**x = (v0-priv->topX) * screenInfo.screens[0]->width / (priv->bottomX-priv->topX);*/
+        *x = (v0-priv->topX) * screenmaxx / (priv->bottomX-priv->topX);
+    else{
+        if(v0<priv->topX)
+            *x = priv->topX;
+        else
+            *x = priv->bottomX;
+    }
+    if(v1>priv->topY && v1<priv->bottomY)
+        /**y = (v1-priv->topY) * screenInfo.screens[0]->width / (priv->bottomY-priv->topY);*/
+        *y = (v1-priv->topY) * screenmaxy / (priv->bottomY-priv->topY);
+    else{
+        if(v1<priv->topY)
+            *y = priv->topY;
+        else
+            *y = priv->bottomY;
+    }
     return TRUE;
 }
 
@@ -1185,7 +1179,7 @@
 
 #define BITS_PER_LONG (sizeof(long) * 8)
 #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
-#define test_bit(bit, array)	((array[LONG(bit)] >> OFF(bit)) & 1)
+#define test_bit(bit, array)    ((array[LONG(bit)] >> OFF(bit)) & 1)
 #define OFF(x)  ((x)%BITS_PER_LONG)
 #define LONG(x) ((x)/BITS_PER_LONG)
 
@@ -1193,11 +1187,11 @@
 static Bool
 USBQueryHardware (LocalDevicePtr local)
 {
-    WizardPenPrivatePtr	priv = (WizardPenPrivatePtr) local->private;
-    unsigned long	bit[EV_MAX][NBITS(KEY_MAX)];
-    int			i, j;
-    int			abs[5];
-    char		name[256] = "Unknown";
+    WizardPenPrivatePtr priv = (WizardPenPrivatePtr) local->private;
+    unsigned long   bit[EV_MAX][NBITS(KEY_MAX)];
+    int         i, j;
+    int         abs[5];
+    char        name[256] = "Unknown";
 
     ioctl(local->fd, EVIOCGNAME(sizeof(name)), name);
     xf86MsgVerb(X_PROBED, 4, "Kernel Input device name: \"%s\"\n", name);
@@ -1215,17 +1209,17 @@
                         switch (j) {
                             case ABS_X:
                                 if(!priv->bottomX)
-											  priv->bottomX = abs[2];
+                                    priv->bottomX = abs[2];
                                 break;
 
                             case ABS_Y:
-										  if(!priv->bottomY)
-                                		priv->bottomY = abs[2];
+                                if(!priv->bottomY)
+                                    priv->bottomY = abs[2];
                                 break;
 
                             case ABS_PRESSURE:
-										  if(!priv->bottomZ)
-                                		priv->bottomZ = abs[2];
+                                if(!priv->bottomZ)
+                                    priv->bottomZ = abs[2];
                                 break;
                         }
                     }
 
=== modified file 'src/wizardpen.h'
--- src/wizardpen.h	2009-06-24 19:51:16 +0000
+++ src/wizardpen.h	2010-03-20 19:15:26 +0000
@@ -1,8 +1,8 @@
-/* 
+/*
  * Copyright (c) 2001 Edouard TISSERANT <[e-mail]>
  * Parts inspired from Shane Watts <[e-mail]> Xfree 3 Acecad Driver
  * Thanks to Emily, from AceCad, For giving me documents.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
@@ -29,37 +29,37 @@
 #define _WIZARDPEN_H_
 
 /******************************************************************************
- *		Definitions
- *		structs, typedefs, #defines, enums
+ *      Definitions
+ *      structs, typedefs, #defines, enums
  *****************************************************************************/
-#define WIZARDPEN_PACKET_SIZE	7
-
-#define WIZARDPEN_CONFIG		"a"		/* Send configuration (max coords) */
-
-#define WIZARDPEN_ABSOLUTE		'F'		/* Absolute mode */
-#define WIZARDPEN_RELATIVE		'E'		/* Relative mode */
-
-#define WIZARDPEN_UPPER_ORIGIN	"b"		/* Origin upper left */
-
-#define WIZARDPEN_PROMPT_MODE	"B"		/* Prompt mode */
-#define WIZARDPEN_STREAM_MODE	"@"		/* Stream mode */
-#define WIZARDPEN_INCREMENT	'I'		/* Set increment */
-#define WIZARDPEN_BINARY_FMT	"zb"		/* Binary reporting */
-
-#define WIZARDPEN_PROMPT		"P"		/* Prompt for current position */
-
-#define PHASING_BIT		0x80
-#define PROXIMITY_BIT		0x40
-#define TABID_BIT		0x20
-#define XSIGN_BIT		0x10
-#define YSIGN_BIT		0x08
-#define BUTTON_BITS		0x07
-#define COORD_BITS		0x7f
-
-#define ABSOLUTE_FLAG		1
-#define USB_FLAG		2
-#define AUTODEV_FLAG		4
-#define AVAIL_FLAG		8
+#define WIZARDPEN_PACKET_SIZE   7
+
+#define WIZARDPEN_CONFIG        "a"     /* Send configuration (max coords) */
+
+#define WIZARDPEN_ABSOLUTE      'F'     /* Absolute mode */
+#define WIZARDPEN_RELATIVE      'E'     /* Relative mode */
+
+#define WIZARDPEN_UPPER_ORIGIN  "b"     /* Origin upper left */
+
+#define WIZARDPEN_PROMPT_MODE   "B"     /* Prompt mode */
+#define WIZARDPEN_STREAM_MODE   "@"     /* Stream mode */
+#define WIZARDPEN_INCREMENT     'I'     /* Set increment */
+#define WIZARDPEN_BINARY_FMT    "zb"    /* Binary reporting */
+
+#define WIZARDPEN_PROMPT        "P"     /* Prompt for current position */
+
+#define PHASING_BIT     0x80
+#define PROXIMITY_BIT   0x40
+#define TABID_BIT       0x20
+#define XSIGN_BIT       0x10
+#define YSIGN_BIT       0x08
+#define BUTTON_BITS     0x07
+#define COORD_BITS      0x7f
+
+#define ABSOLUTE_FLAG   1
+#define USB_FLAG        2
+#define AUTODEV_FLAG    4
+#define AVAIL_FLAG      8
 
 #define NOTAVAIL ((errno == ENODEV) || (errno == ENXIO) || (errno == ENOENT))
 
@@ -69,34 +69,34 @@
 
 static const char * wizardpen_initstr = WIZARDPEN_BINARY_FMT WIZARDPEN_STREAM_MODE;
 
-typedef struct 
+typedef struct
 {
-    XISBuffer	*buffer;
-    int		wizardpenInc;		/* increment between transmits */
-    int		wizardpenOldX;		/* previous X position */
-    int		wizardpenOldY;		/* previous Y position */
-    int		wizardpenOldZ;		/* previous Z position */
-    int		wizardpenOldProximity;	/* previous proximity */
-    int		wizardpenOldButtons;	/* previous buttons state */
-    int		wizardpenMaxX;		/* max X value */
-    int		wizardpenMaxY;		/* max Y value */
-    int		wizardpenMaxZ;		/* max Y value */
-    char	wizardpenReportSpeed;	/* report speed */
-    int		flags;			/* various flags */
-    int		packeti;		/* number of bytes read */
-    int		PacketSize;		/* number of bytes read */
-    unsigned char packet[WIZARDPEN_PACKET_SIZE];	/* data read on the device */
-	 int topZ;
-	 int bottomZ;
-	 int topX;
-	 int topY;
-	 int bottomX;
-	 int bottomY;
+    XISBuffer   *buffer;
+    int     wizardpenInc;           /* increment between transmits */
+    int     wizardpenOldX;          /* previous X position */
+    int     wizardpenOldY;          /* previous Y position */
+    int     wizardpenOldZ;          /* previous Z position */
+    int     wizardpenOldProximity;  /* previous proximity */
+    int     wizardpenOldButtons;    /* previous buttons state */
+    int     wizardpenMaxX;          /* max X value */
+    int     wizardpenMaxY;          /* max Y value */
+    int     wizardpenMaxZ;          /* max Y value */
+    char    wizardpenReportSpeed;   /* report speed */
+    int     flags;                  /* various flags */
+    int     packeti;                /* number of bytes read */
+    int     PacketSize;             /* number of bytes read */
+    unsigned char packet[WIZARDPEN_PACKET_SIZE];    /* data read on the device */
+    int topZ;
+    int bottomZ;
+    int topX;
+    int topY;
+    int bottomX;
+    int bottomY;
 } WizardPenPrivateRec, *WizardPenPrivatePtr;
 
 
 /******************************************************************************
- *		Declarations
+ *      Declarations
  *****************************************************************************/
 #ifdef XFree86LOADER
 static MODULESETUPPROTO( SetupProc );