Date: Tue, 7 Apr 2009 17:19:41 -0400 From: Jung-uk Kim <jkim@FreeBSD.org> To: freebsd-current@FreeBSD.org Cc: "Sean C. Farley" <scf@freebsd.org>, Manfred Lotz <manfred.lotz@arcor.de>, Robert Noland <rnoland@freebsd.org> Subject: Re: xorg loops Message-ID: <200904071719.43150.jkim@FreeBSD.org> In-Reply-To: <1239137910.1947.23.camel@balrog.2hip.net> References: <49D8D03B.8090302@arcor.de> <200904071652.29530.jkim@FreeBSD.org> <1239137910.1947.23.camel@balrog.2hip.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary-00=_vN82J0PE6JdcXU/ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Tuesday 07 April 2009 04:58 pm, Robert Noland wrote: > On Tue, 2009-04-07 at 16:52 -0400, Jung-uk Kim wrote: > > On Sunday 05 April 2009 09:04 pm, Robert Noland wrote: > > > On Sun, 2009-04-05 at 19:53 -0500, Sean C. Farley wrote: > > > > While the mouse driver is patched, I do not see where > > > > XPS2_SUPPORT is actually set anywhere in the build. > > > > > > I remember messing with that after the last upgrade, when I was > > > trying to deal with mice issues. jkim@ said something about it > > > only being supported on more recent platforms. > > > > http://lists.freebsd.org/pipermail/cvs-src/2008-April/089763.html > > http://lists.freebsd.org/pipermail/cvs-src/2008-April/090051.html > > http://lists.freebsd.org/pipermail/cvs-src/2008-April/090052.html > > http://lists.freebsd.org/pipermail/cvs-ports/2008-April/146815.ht > >ml > > > > > > Defining it allows the driver to detect my mouse. Actually, > > > > before the patch it would not even let me set it to > > > > GlidePointPS/2. > > > > It seems the xserver patch is in the attic now: > > > > http://www.freebsd.org/cgi/cvsweb.cgi/ports/x11-servers/xorg-serv > >er/files/Attic/patch-Xserver-hw-xfree86-os-support-xf86_OSlib.h > > > > I think you should restore the patch, rebuild, and reinstall > > xserver and xf86-input-mouse to enable it. Alternatively, it can > > be moved to configure script of xf86-input-mouse, I think. I > > don't know which is prefered by X.org developers theses days. :-( > > Hrm, all of the os-support stuff is moved to the mouse driver > now... Okay, try the attached patch, then. Jung-uk Kim --Boundary-00=_vN82J0PE6JdcXU/ Content-Type: text/plain; charset="iso-8859-1"; name="xf86-input-mouse.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xf86-input-mouse.diff" --- x11-drivers/xf86-input-mouse/Makefile.orig 2009-04-07 16:34:36.000000000 -0400 +++ x11-drivers/xf86-input-mouse/Makefile 2009-04-07 17:15:48.000000000 -0400 @@ -7,7 +7,7 @@ PORTNAME= xf86-input-mouse PORTVERSION= 1.4.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org --- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c.orig 2009-02-04 13:31:00.000000000 -0500 +++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c 2009-04-07 17:11:06.000000000 -0400 @@ -1,11 +1,18 @@ --- src/bsd_mouse.c.orig 2008-11-26 23:11:36.000000000 -0500 -+++ src/bsd_mouse.c 2009-02-04 12:56:32.000000000 -0500 ++++ src/bsd_mouse.c 2009-04-07 17:10:17.000000000 -0400 @@ -1,4 +1,3 @@ - /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. * -@@ -75,11 +74,13 @@ +@@ -71,15 +70,20 @@ + static const char *FindDevice(InputInfoPtr, const char *, int); + + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) ++#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106) ++#define XPS2_SUPPORT ++#endif + /* These are for FreeBSD and DragonFly */ #define DEFAULT_MOUSE_DEV "/dev/mouse" #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse" #define DEFAULT_PS2_DEV "/dev/psm0" @@ -19,7 +26,7 @@ NULL }; #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT) -@@ -100,7 +101,11 @@ +@@ -100,7 +104,11 @@ #if defined(__NetBSD__) return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) @@ -32,7 +39,7 @@ #else return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO; #endif -@@ -179,10 +184,31 @@ +@@ -179,10 +187,31 @@ { MOUSE_PROTO_THINK, "ThinkingMouse" }, { MOUSE_PROTO_SYSMOUSE, "SysMouse" } }; @@ -65,7 +72,7 @@ int i; mousehw_t hw; mousemode_t mode; -@@ -190,10 +216,16 @@ +@@ -190,10 +219,16 @@ if (pInfo->fd == -1) return NULL; @@ -83,7 +90,7 @@ /* interrogate the driver and get some intelligence on the device. */ hw.iftype = MOUSE_IF_UNKNOWN; hw.model = MOUSE_MODEL_GENERIC; -@@ -209,9 +241,18 @@ +@@ -209,9 +244,18 @@ protoPara[0] = mode.syncmask[0]; protoPara[1] = mode.syncmask[1]; } @@ -104,7 +111,7 @@ } } } -@@ -234,41 +275,41 @@ +@@ -234,41 +278,41 @@ (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) { /* * As the FreeBSD sysmouse driver defaults to protocol level 0 @@ -163,7 +170,7 @@ } return FALSE; } -@@ -276,17 +317,17 @@ +@@ -276,17 +320,17 @@ static const char * FindDevice(InputInfoPtr pInfo, const char *protocol, int flags) { @@ -185,7 +192,7 @@ #endif } else { /* -@@ -295,28 +336,32 @@ +@@ -295,28 +339,32 @@ * the test for whether /dev/sysmouse is usable can be made. */ if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) { @@ -231,7 +238,7 @@ break; } } -@@ -782,7 +827,9 @@ +@@ -782,7 +830,9 @@ p->CheckProtocol = CheckProtocol; #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE) p->SetupAuto = SetupAuto; --Boundary-00=_vN82J0PE6JdcXU/--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904071719.43150.jkim>