Attachment 79316 Details for Bug 144682

[patch] Fix for broken mouse wheel event handling

mouse-wheel-multibit.diff (text/plain), 3.32 KB, created by Matthias Hopf on 2006-04-20 18:39:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Hopf

Created: 2006-04-20 18:39:26 UTC

Size: 3.32 KB

patch

obsolete

>? man/mouse.4
>Index: ChangeLog
>===================================================================
>RCS file: /cvs/xorg/driver/xf86-input-mouse/ChangeLog,v
>retrieving revision 1.16
>diff -u -p -r1.16 ChangeLog
>--- ChangeLog	7 Apr 2006 17:59:54 -0000	1.16
>+++ ChangeLog	20 Apr 2006 18:24:34 -0000
>@@ -1,3 +1,9 @@
>+2006-04-20  Matthias Hopf  <mhopf@suse.de>
>+
>+	* src/mouse.c: (MousePostEvent):
>+	Overhaul of wheel processing. Does work correctly with multibit
>+	zaxis events now.
>+
> 2006-04-06  Adam Jackson  <ajax@freedesktop.org>
> 
> 	* configure.ac:
>Index: src/mouse.c
>===================================================================
>RCS file: /cvs/xorg/driver/xf86-input-mouse/src/mouse.c,v
>retrieving revision 1.27
>diff -u -p -r1.27 mouse.c
>--- src/mouse.c	7 Apr 2006 17:59:54 -0000	1.27
>+++ src/mouse.c	20 Apr 2006 18:24:35 -0000
>@@ -2332,7 +2332,7 @@ MousePostEvent(InputInfoPtr pInfo, int t
> 	       int dx, int dy, int dz, int dw)
> {
>     MouseDevPtr pMse;
>-    int zbutton = 0;
>+    int zbutton = 0, wbutton = 0, zbuttoncount = 0, wbuttoncount = 0;
>     int i, b, buttons = 0;
> 
>     pMse = pInfo->private;
>@@ -2353,6 +2353,7 @@ MousePostEvent(InputInfoPtr pInfo, int t
>     /* XXX Could this go in the conversion_proc? */
>     switch (pMse->negativeZ) {
>     case MSE_NOZMAP:	/* do nothing */
>+	dz = 0;
> 	break;
>     case MSE_MAPTOX:
> 	if (dz != 0) {
>@@ -2367,20 +2368,46 @@ MousePostEvent(InputInfoPtr pInfo, int t
> 	}
> 	break;
>     default:	/* buttons */
>-	buttons &= ~(pMse->negativeZ | pMse->positiveZ
>-		   | pMse->negativeW | pMse->positiveW);
>-	if (dw < 0 || dz < -1)
>-	    zbutton = pMse->negativeW;
>-	else if (dz < 0)
>+	buttons &= ~(pMse->negativeZ | pMse->positiveZ);
>+	if (dz < 0) {
> 	    zbutton = pMse->negativeZ;
>-	else if (dw > 0 || dz > 1)
>-	    zbutton = pMse->positiveW;
>-	else if (dz > 0)
>+	    zbuttoncount = -dz;
>+	} else if (dz > 0) {
> 	    zbutton = pMse->positiveZ;
>-	buttons |= zbutton;
>+	    zbuttoncount = dz;
>+	}
> 	dz = 0;
> 	break;
>     }
>+    switch (pMse->negativeW) {
>+    case MSE_NOZMAP:	/* do nothing */
>+	dw = 0;
>+	break;
>+    case MSE_MAPTOX:
>+	if (dw != 0) {
>+	    dx = dw;
>+	    dw = 0;
>+	}
>+	break;
>+    case MSE_MAPTOY:
>+	if (dw != 0) {
>+	    dy = dw;
>+	    dw = 0;
>+	}
>+	break;
>+    default:	/* buttons */
>+	buttons &= ~(pMse->negativeW | pMse->positiveW);
>+	if (dw < 0) {
>+	    wbutton = pMse->negativeW;
>+	    wbuttoncount = -dw;
>+	} else if (dw > 0) {
>+	    wbutton = pMse->positiveW;
>+	    wbuttoncount = dw;
>+	}
>+	dw = 0;
>+	break;
>+    }
>+
> 
>     /* Apply angle offset */
>     if (pMse->angleOffset != 0) {
>@@ -2397,16 +2424,19 @@ MousePostEvent(InputInfoPtr pInfo, int t
> 	dx = dy;
> 	dy = tmp;
>     }
>-    MouseDoPostEvent(pInfo, buttons, dx, dy);
> 
>-    /*
>-     * If dz has been mapped to a button `down' event, we need to cook up
>-     * a corresponding button `up' event.
>-     */
>-    if (zbutton) {
>-	buttons &= ~zbutton;
>-	MouseDoPostEvent(pInfo, buttons, 0, 0);
>-    }
>+    /* If mouse wheel movement has to be mapped on a button, we need to
>+     * loop for button press and release events. */
>+    do {
>+        MouseDoPostEvent(pInfo, buttons | zbutton | wbutton, dx, dy);
>+	dx = dy = 0;
>+	if (zbutton || wbutton)
>+	    MouseDoPostEvent(pInfo, buttons, 0, 0);
>+	if (--zbuttoncount <= 0)
>+	    zbutton = 0;
>+	if (--wbuttoncount <= 0)
>+	    wbutton = 0;
>+    } while (zbutton || wbutton);
> 
>     pMse->lastButtons = truebuttons;
> }

Actions: View | Diff

Attachments on bug 144682: 66418 | 73345 | 79316 | 79405