Attachment 315636 Details for Bug 233717 – Patch 1/2 synaptics-0.14.6-midbutton-timeout.patch

[patch] Patch 1/2 synaptics-0.14.6-midbutton-timeout.patch

synaptics-0.14.6-midbutton-timeout.patch (text/plain), 2.59 KB, created by Pete Zaitcev on 2008-09-03 12:31:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete Zaitcev

Created: 2008-09-03 12:31:19 UTC

Size: 2.59 KB

patch

obsolete

>--- synaptics-0.14.6/synaptics.c	2008-08-28 17:58:42.000000000 +0930
>+++ synaptics-0.14.6/synaptics.c.midbutton-timeout	2008-08-28 17:58:49.000000000 +0930
>@@ -843,6 +843,8 @@ HandleMidButtonEmulation(SynapticsPrivat
> 
>     while (!done) {
> 	switch (priv->mid_emu_state) {
>+	case MBE_LEFT_CLICK:
>+	case MBE_RIGHT_CLICK:
> 	case MBE_OFF:
> 	    priv->button_delay_millis = hw->millis;
> 	    if (hw->left) {
>@@ -858,7 +860,12 @@ HandleMidButtonEmulation(SynapticsPrivat
> 				 hw->millis);
> 	    if (timeleft > 0)
> 		*delay = MIN(*delay, timeleft);
>-	    if (!hw->left || (timeleft <= 0)) {
>+
>+            /* timeout, but within the same ReadInput cycle! */
>+            if ((timeleft <= 0) && !hw->left) {
>+		priv->mid_emu_state = MBE_LEFT_CLICK;
>+		done = TRUE;
>+            } else if ((!hw->left) || (timeleft <= 0)) {
> 		hw->left = TRUE;
> 		priv->mid_emu_state = MBE_TIMEOUT;
> 		done = TRUE;
>@@ -874,7 +881,12 @@ HandleMidButtonEmulation(SynapticsPrivat
> 				 hw->millis);
> 	    if (timeleft > 0)
> 		*delay = MIN(*delay, timeleft);
>-	    if (!hw->right || (timeleft <= 0)) {
>+
>+	     /* timeout, but within the same ReadInput cycle! */
>+            if ((timeleft <= 0) && !hw->right) {
>+		priv->mid_emu_state = MBE_RIGHT_CLICK;
>+		done = TRUE;
>+            } else if (!hw->right || (timeleft <= 0)) {
> 		hw->right = TRUE;
> 		priv->mid_emu_state = MBE_TIMEOUT;
> 		done = TRUE;
>@@ -1721,6 +1733,16 @@ HandleState(LocalDevicePtr local, struct
>     if (dx || dy)
> 	xf86PostMotionEvent(local->dev, 0, 0, 2, dx, dy);
> 
>+    if (priv->mid_emu_state == MBE_LEFT_CLICK)
>+    {
>+	xf86PostButtonEvent(local->dev, FALSE, 1, 1, 0, 0);
>+	xf86PostButtonEvent(local->dev, FALSE, 1, 0, 0, 0);
>+    } else if (priv->mid_emu_state == MBE_RIGHT_CLICK)
>+    {
>+	xf86PostButtonEvent(local->dev, FALSE, 3, 1, 0, 0);
>+	xf86PostButtonEvent(local->dev, FALSE, 3, 0, 0, 0);
>+    }
>+
>     change = buttons ^ priv->lastButtons;
>     while (change) {
> 	id = ffs(change); /* number of first set bit 1..32 is returned */
>--- synaptics-0.14.6/synaptics.h	2008-08-28 17:58:42.000000000 +0930
>+++ synaptics-0.14.6/synaptics.h.midbutton-timeout	2008-08-28 18:02:47.000000000 +0930
>@@ -153,7 +153,9 @@
>     MBE_RIGHT,			/* Right button pressed, waiting for left button or timeout */
>     MBE_MID,			/* Left and right buttons pressed, waiting for both buttons
> 				   to be released */
>-    MBE_TIMEOUT			/* Waiting for both buttons to be released. */
>+    MBE_TIMEOUT,		/* Waiting for both buttons to be released. */
>+    MBE_LEFT_CLICK,		/* Emulate left button click. */
>+    MBE_RIGHT_CLICK,		/* Emulate right button click. */
> };
> 
> /* See docs/tapndrag.dia for a state machine diagram */

Actions: View | Diff

Attachments on bug 233717: 150807 | 291113 | 315013 | 315014 | 315158 | 315278 | 315636 | 315637