Merge lp:~a-lown0/wizardpen/gpen into lp:wizardpen

[Ali Lown]

Re-made this branch so that it is a direct branch from wizardpen.
Hopefully this will make the merge a bit easier to see.

[Ali Lown (a-lown0)]

[quote]Would it also work if you only suppress the button event, but still update the pressure status?[/quote]
Would, but there is no point. The reason pressure gets disabled is because the F509 sends pressure events which were making the computer think a left-click whenever one of the side buttons (which are mapped to middle/right-click) were pressed.

[quote]Also, the "//HACK, do avoid having to do conditional sections depending on tablet type" is a bit scary. I'd rather prefer a configuration option like "AlwaysTapToClick" that would only send standard clicks when none of the buttons is pressed, and sends the other buttons when you tap.[/quote]
I don't understand quite what you are saying this option should do. The 'HACK' is clearing of the middle click event because some click patterns (due to the re-use of the BTN_TOUCH event for when the stylus tip is pressed) would prevent the un-set event from being sent.

Also: would it be worth adding 2 options to enable the user to choose the event sent for each button (rather than hard-coding in middle/right-clicks)?

[Gerard Krol (gerard-)]

I changed the indentation from tabs to spaces and committed it. I think the logic could maybe be simplified a little but we can as well do that from trunk at a later date.

review: Approve

[Gerard Krol (gerard-)]

Making the buttons configurable would be really nice but as you can already do that using xinput it doesn't have high priority. I also wouldn't know what would be the best way, maybe a nice gui tool on top of xinput is all we need.

=== modified file 'src/wizardpen.c'
--- src/wizardpen.c	2010-03-21 17:50:57 +0000
+++ src/wizardpen.c	2010-03-21 20:57:25 +0000
@@ -904,6 +904,9 @@
                         break;
 
                     case ABS_PRESSURE:
+			if(priv->pressuredis)
+				break; /* Disable pressure events because this is actually part of a button event */
+
                         /* send button events if pressure crosses topZ threshold */
                         oldz = z;
                         z = event->value;
@@ -967,6 +970,62 @@
                         if(priv->debugLevel)
                             xf86Msg(X_CONFIG, "BTN_RIGHT event is %d\n", event->value);
                         break;
+
+
+			/*Code for handling the buttons on GPEN styluses
+			 * Pressure MUST be disabled otherwise left-click events will be sent.
+			F509:
+			Top button: BTN_STYLUS = 1, BTN_STYLUS = 0
+			Bottom button: BTN_TOUCH =1, BTN_STYLUS = 1, BTN_TOUCH = 0, BTN_STYLUS = 0
+
+			560:
+			1st side button: BTN_STYLUS =1, BTN_STYLUS = 0
+			2nd side button: BTN_STYLUS2 = 1, BTN_STYLUS2 = 0
+			*/
+		     case BTN_TOUCH:
+			if(priv->debugLevel)
+		            xf86Msg(X_CONFIG, "BTN_TOUCH event is %d\n", event->value);
+			priv->activebuttons ^= WIZARDPEN_BTN_TOUCH; //Toggle event
+			if(!event->value)
+			{
+			    buttons = set_bit(buttons, 2, 0); /* try to clear events to prevent some becoming 'locked' in the active state */
+			    buttons = set_bit(buttons, 1, 0);
+			}
+			break;
+		     case BTN_STYLUS:
+			if(priv->debugLevel)
+			    xf86Msg(X_CONFIG, "BTN_STYLUS event is %d\n", event->value);
+			priv->activebuttons ^= WIZARDPEN_BTN_STYLUS;
+
+			buttons = set_bit(buttons, 1, 0); //HACK, to avoid having to do conditional sections depending on tablet type
+			
+			if(priv->activebuttons & WIZARDPEN_BTN_TOUCH)
+			    buttons = set_bit(buttons, 2, event->value);
+			else
+			{
+			    buttons = set_bit(buttons, 1, event->value);
+			    if(!event->value)
+			        buttons = set_bit(buttons, 2, 0); /* Clear right click event as well, due to clearing order */
+			}
+			
+			priv->pressuredis = event->value;
+
+			break;
+		     case BTN_STYLUS2:
+			if(priv->debugLevel)
+			    xf86Msg(X_CONFIG, "BTN_STYLUS2 event is %d\n", event->value);
+			priv->activebuttons ^= WIZARDPEN_BTN_STYLUS2;
+
+			buttons = set_bit(buttons, 2, event->value);
+			priv->pressuredis = event->value;
+
+			break;	     
+		     
+		     default:
+			if(priv->debugLevel)
+			xf86Msg(X_CONFIG, "BTN_DEFAULT event is %d\n", event->value);
+			break;
+
                 }
                 break; // EV_KEY
             case EV_MSC:
 
=== modified file 'src/wizardpen.h'
--- src/wizardpen.h	2010-03-21 14:02:17 +0000
+++ src/wizardpen.h	2010-03-21 20:57:25 +0000
@@ -49,6 +49,10 @@
 
 #define WIZARDPEN_PROMPT        "P"     /* Prompt for current position */
 
+#define WIZARDPEN_BTN_TOUCH 	1	/* Used for stylus button events */
+#define WIZARDPEN_BTN_STYLUS 	2
+#define WIZARDPEN_BTN_STYLUS2 	4
+
 #define PHASING_BIT     0x80
 #define PROXIMITY_BIT   0x40
 #define TABID_BIT       0x20
@@ -99,6 +103,8 @@
     int rotate90;
     int mouseSpeed;
     int mouseAccel;
+    int pressuredis;
+    int activebuttons;
 } WizardPenPrivateRec, *WizardPenPrivatePtr;