Attachment 3773 Details for Bug 4915 – Proposed fix: move buttonMap initialisation before calling OS specifix PreInit

[patch] Proposed fix: move buttonMap initialisation before calling OS specifix PreInit

mouse.diff (text/plain), 1.39 KB, created by Matthieu Herrb on 2005-11-11 03:25:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthieu Herrb

Created: 2005-11-11 03:25:40 UTC

Size: 1.39 KB

patch

obsolete

>Index: mouse.c
>===================================================================
>RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v
>retrieving revision 1.17
>diff -u -r1.17 mouse.c
>--- mouse.c	10 Nov 2005 02:41:20 -0000	1.17
>+++ mouse.c	11 Nov 2005 11:23:17 -0000
>@@ -1013,6 +1013,14 @@
> 	return pInfo;
>     }
> 
>+    /* XXX If the default for ZAxisMapping is decided to be "4 5 6 7" again,
>+     * ButtonMapping should by default remap all button >= 4 to button+4 :
>+     * for (i = 0; i < MSE_MAXBUTTONS; i++)
>+     *     pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
>+     */
>+    for (i = 0; i < MSE_MAXBUTTONS; i++)
>+	pMse->buttonMap[i] = 1 << i;
>+
>     protocolID = ProtocolNameToID(protocol);
>     do {
> 	detected = TRUE;
>@@ -1090,14 +1098,6 @@
>     pMse->oldProtocolID = protocolID;  /* hack */
> 
>     pMse->autoProbe = FALSE;
>-    /* XXX If the default for ZAxisMapping is decided to be "4 5 6 7" again,
>-     * ButtonMapping should by default remap all button >= 4 to button+4 :
>-     * for (i = 0; i < MSE_MAXBUTTONS; i++)
>-     *     pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
>-     */
>-    for (i = 0; i < MSE_MAXBUTTONS; i++)
>-	pMse->buttonMap[i] = 1 << i;
>-
>     /* Collect the options, and process the common options. */
>     xf86CollectInputOptions(pInfo, pProto->defaults, NULL);
>     xf86ProcessCommonOptions(pInfo, pInfo->options);

Flags:

alan.coopersmith: 6.9/7.0+

Actions: View | Splinter Review

Attachments on bug 4915: 3651 | 3755 | 3773 | 3774

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.