Attachment 3888 Details for Bug 1752 – Updated patch

[patch] Updated patch

diff.mouse_e3b_1 (text/plain), 1.25 KB, created by Egbert Eich on 2005-11-24 04:11:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2005-11-24 04:11:58 UTC

Size: 1.25 KB

patch

obsolete

>Index: mouse.c
>===================================================================
>RCS file: /work/eich/freedesktop/cvs/xorg/xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v
>retrieving revision 1.11
>diff -u -r1.11 mouse.c
>--- mouse.c	15 Aug 2005 23:48:35 -0000	1.11
>+++ mouse.c	23 Nov 2005 17:14:38 -0000
>@@ -396,8 +396,10 @@
> 
>     pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
> 					      "Emulate3Buttons", FALSE);
>-    if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons"))
>+    if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
> 	pMse->emulate3ButtonsSoft = TRUE;
>+	pMse->emulate3Buttons = TRUE;
>+    }
>     
>     pMse->emulate3Timeout = xf86SetIntOption(pInfo->options,
> 					     "Emulate3Timeout", 50);
>@@ -2183,6 +2185,9 @@
> 	buttons &= ~wheelButtonMask;
>     }
> 
>+    if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
>+	buttonTimer(pInfo);
>+
>     if (dx || dy)
> 	xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
> 
>@@ -2259,7 +2264,8 @@
> 	}
> 
>         if (pMse->emulate3Buttons
>-	    && (!(buttons & 0x02) || Emulate3ButtonsSoft(pInfo))) {
>+	    && (!(buttons & 0x02) || Emulate3ButtonsSoft(pInfo)) 
>+	    && (!pMse->emulate3ButtonsSoft || (!dx && !dy))) {
> 
>             /* handle all but buttons 1 & 3 normally */
>

Actions: View | Splinter Review

Attachments on bug 1752: 3804 | 3806 | 3885 | 3888 | 4062

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.