Subject: Re: xsrc/.../bsd_mouse.c
To: Iain Hibbert <plunky@rya-online.net>
From: Michael Lorenz <macallan@netbsd.org>
List: tech-x11
Date: 11/02/2006 18:19:23
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello,

On Nov 2, 2006, at 13:42, Iain Hibbert wrote:

>> Please also submit to bugzilla.freedesktop.org. Thanks.
>
> I think this is for xorg? should I be sending xfree86 fixes anywhere,  
> or
> is that dead and gone now? (I'm sure I've seen comments that we are  
> just
> about the only consumers of xfree86 now)

XFree86 is still kinda-sorta alive so sending your fix to them might  
still be a good idea.

> Would these changes need to be fed upstream someplace, or is it ok to
> commit to xsrc?

Both.

> Is it possible to build and use xorg natively? (my source is some weeks
> out of date but I can update)

Absolutely. Pain in the rear but definitely possible.
Have a look at xsrc/xorg/util/modular/build.sh, that's the least  
painful way.

> Index: xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c
> ===================================================================
> RCS file:  
> /cvsroot/xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/ 
> bsd_mouse.c,v
> retrieving revision 1.9
> diff -u -r1.9 bsd_mouse.c
> --- xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c	18  
> Mar 2005 14:55:15 -0000	1.9
> +++ xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c	31  
> Oct 2006 19:19:48 -0000
> @@ -571,6 +571,11 @@
>  	    dz = event->value;
>  	    break;
>  #endif
> +#ifdef WSCONS_EVENT_MOUSE_DELTA_W
> +	case WSCONS_EVENT_MOUSE_DELTA_W:
> +	    dw = event->value;
> +	    break;
> +#endif
>          case WSCONS_EVENT_MOUSE_ABSOLUTE_X:
>              miPointerPosition (&x, &y);
>              miPointerAbsoluteCursor (event->value, y,  
> TSTOMILLI(event->time));
> @@ -586,6 +591,12 @@
>          case WSCONS_EVENT_MOUSE_ABSOLUTE_Z:
>              ++event;
>              continue;
> +
> +#ifdef WSCONS_EVENT_MOUSE_ABSOLUTE_W
> +	case WSCONS_EVENT_MOUSE_ABSOLUTE_W:
> +	    ++event;
> +	    continue;
> +#endif
>
>  	default:
>  	    xf86Msg(X_WARNING, "%s: bad wsmouse event type=%d\n",  
> pInfo->name,
> Index: xorg/xserver/xorg/hw/xfree86/os-support/bsd/bsd_mouse.c
> ===================================================================
> RCS file:  
> /cvsroot/xsrc/xorg/xserver/xorg/hw/xfree86/os-support/bsd/ 
> bsd_mouse.c,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 bsd_mouse.c
> --- xorg/xserver/xorg/hw/xfree86/os-support/bsd/bsd_mouse.c	15 Mar  
> 2006 17:13:34 -0000	1.1.1.1
> +++ xorg/xserver/xorg/hw/xfree86/os-support/bsd/bsd_mouse.c	31 Oct  
> 2006 19:19:48 -0000
> @@ -431,6 +431,11 @@
>  	    dz = event->value;
>  	    break;
>  #endif
> +#ifdef WSCONS_EVENT_MOUSE_DELTA_W
> +	case WSCONS_EVENT_MOUSE_DELTA_W:
> +	    dw = event->value;
> +	    break;
> +#endif
>  	default:
>  	    xf86Msg(X_WARNING, "%s: bad wsmouse event type=%d\n",  
> pInfo->name,
>  		    event->type);
>
>
Looks straight forward enough to me.

have fun
Michael
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iQEVAwUBRUp8/MpnzkX8Yg2nAQJ+NQgAurPax6xLfppjA5a+sm/SsRF/86Z6Rq5S
MiDmjimvideBjQjwfQUg6MikJTar1XtyMknduqVDe0dvmkxRE7pJ41jU7AGXhdz8
tz2Fe44DMxBIa3k+l78huGvuWl8pbe9HIv882o6aPe621/Le+bRuV2bs4qfjKdYc
atGDlgHoZtWscqtJC3ACKbRUDFmCutrnPy+VPD4EYYCuvIN3wPiySU85C+zen/J9
xMCm2DCtMjSnrlh/wKaidcPKVl3PyLJzjFj3kPfbWQTrWn05yKP+WrVBCMqwRz1m
48s0WJjm040Bno7jLrKfPZB3nZtxpbvFl6un6VERaRqGwIAzZ81aww==
=1U8k
-----END PGP SIGNATURE-----