From owner-cvs-all@FreeBSD.ORG Tue Apr 1 18:14:35 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11E731065671; Tue, 1 Apr 2008 18:14:35 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F3BD18FC26; Tue, 1 Apr 2008 18:14:34 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31IEYe2092594; Tue, 1 Apr 2008 18:14:34 GMT (envelope-from jkim@repoman.freebsd.org) Received: (from jkim@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31IEYXP092593; Tue, 1 Apr 2008 18:14:34 GMT (envelope-from jkim) Message-Id: <200804011814.m31IEYXP092593@repoman.freebsd.org> From: Jung-uk Kim Date: Tue, 1 Apr 2008 18:14:34 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: ports/x11-servers/xorg-server Makefile ports/x11-servers/xorg-server/files patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c patch-config-hal.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Apr 2008 18:14:35 -0000 jkim 2008-04-01 18:14:34 UTC FreeBSD ports repository Modified files: x11-servers/xorg-server Makefile Added files: x11-servers/xorg-server/files patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c patch-config-hal.c Log: Fix mouse probing issues with HAL support: - Do not probe /dev/psm0 as SysMouse if HAL support is enabled. - Add /dev/ums0 as SysMouse if HAL support is disabled. - Do not force sysmouse(4) mode unless device is /dev/sysmouse. When moused(8) is not running, current mode level is untouched. - Correcly check if moused is actually running. Checking pid file is not enough because it may be /var/run/moused..pid when it is invoked by devd(8) for USB mice. - Do not attach device if it is opened by moused. - Correctly add device path for HAL. This patch is tested with many possible combinations of moused(8), HAL, PS/2 mouse, USB mouse, and xorg.conf. Tested by: cokane, jkim, marcus, Matthew Seaman (m dot seaman at infracaninophile dot co dot uk) Revision Changes Path 1.55 +1 -1 ports/x11-servers/xorg-server/Makefile 1.1 +143 -0 ports/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c (new) 1.1 +10 -0 ports/x11-servers/xorg-server/files/patch-config-hal.c (new)