update to xf86-input-mouse 1.4.0.

2 files changed, 77 insertions, 20 deletions

diff --git a/driver/xf86-input-mouse/man/Makefile.in b/driver/xf86-input-mouse/man/Makefile.in
index 9ba605849..dfb716009 100644
--- a/driver/xf86-input-mouse/man/Makefile.in
+++ b/driver/xf86-input-mouse/man/Makefile.in
@@ -103,8 +103,10 @@ BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -126,6 +128,7 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -136,6 +139,10 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINT = @LINT@
+LINT_FALSE = @LINT_FALSE@
+LINT_FLAGS = @LINT_FLAGS@
+LINT_TRUE = @LINT_TRUE@
 LINUXDOC = @LINUXDOC@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -151,6 +158,7 @@ MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
+OS_MOUSE_NAME = @OS_MOUSE_NAME@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,15 +176,9 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_NMEDIT = @ac_ct_NMEDIT@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -193,24 +195,32 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 inputdir = @inputdir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
diff --git a/driver/xf86-input-mouse/man/mousedrv.man b/driver/xf86-input-mouse/man/mousedrv.man
index 26ba680b9..bc6773fea 100644
--- a/driver/xf86-input-mouse/man/mousedrv.man
+++ b/driver/xf86-input-mouse/man/mousedrv.man
@@ -1,9 +1,8 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.man,v 1.6 2003/04/03 22:18:31 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH MOUSE __drivermansuffix__ __vendorversion__
 .SH NAME
-mouse \- Mouse input driver
+mouse \- __xservername__ mouse input driver
 .SH SYNOPSIS
 .nf
 .B "Section \*qInputDevice\*q"
@@ -16,9 +15,9 @@ mouse \- Mouse input driver
 .fi
 .SH DESCRIPTION
 .B mouse 
-is an __xservername__ input driver for mice.  The driver supports most available
-mouse types and interfaces.  USB mice are only supported on some OSs,
-and the level of support for PS/2 mice depends on the OS.
+is an __xservername__ input driver for mice.  The driver supports most 
+available mouse types and interfaces, though the level of support for 
+types of mice depends on the OS.
 .PP
 The
 .B mouse
@@ -26,14 +25,58 @@ driver functions as a pointer input device, and may be used as the
 X server's core pointer.  Multiple mice are supported by multiple
 instances of this driver.
 .SH SUPPORTED HARDWARE
-There is a detailed list of hardware that the
-.B mouse
-driver supports in the
-.I README.mouse
-document.  This can be found
-in __projectroot__/lib/X11/doc/, or online at
-http://www.x.org/current/mouse.html.
+.TP
+USB mouse
+USB (Universal Serial Bus) ports are present on most modern
+computers. Several devices can be plugged into this bus, including
+mice and keyboards.  Support for USB mice is platform specific.
+.TP
+PS/2 mouse
+The PS/2 mouse is an intelligent device and may have more than
+three buttons and a wheel or a roller.
+The PS/2 mouse is usually compatible with the original PS/2 mouse from IBM
+immediately after power up.
+The PS/2 mouse with additional features requires a specialized
+initialization procedure to enable these features.
+Without proper initialization, it behaves as though it were an ordinary
+two or three button mouse.
+.TP
+Serial mouse
+There have been numerous serial mouse models from a number of
+manufacturers.
+Despite the wide range of variations, there have been relatively
+few protocols (data format) with which the serial mouse talks
+to the host computer.
+
+The modern serial mouse conforms to the PnP COM device specification
+so that the host computer can automatically detect the mouse
+and load an appropriate driver.
+This driver supports this specification and can detect
+popular PnP serial mouse models on most platforms.
+.TP 
+Bus mouse
+The bus mouse connects to a dedicated interface card in an expansion
+slot.
+Some older video cards, notably those from ATI, and integrated I/O
+cards may also have a bus mouse connector.
+.PP
+The interface type of the mouse can be determined by looking at the connector 
+of the mouse.
+USB mice have a thin rectangular connector.
+PS/2 mice are equipped with a small, round DIN 6-pin connector.
+Serial mouse have a D-Sub female 9- or 25-pin connector.
+Bus mice have either a D-Sub male 9-pin connector 
+or a round DIN 9-pin connector.
+Some mice come with adapters with which the connector can 
+be converted to another.  If you are to use such an adapter,
+remember that the connector at the very end of the mouse/adapter pair is 
+what matters.
 .SH CONFIGURATION DETAILS
+.PP
+Depending on the X server version in use, input device options may be set
+in either a __xconfigfile__ file, or in the configuration files read by the
+Hardware Abstraction Layer (HAL) daemon, hald(1).
+.PP
 Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details and for options that can be used with all input drivers.  This
 section only covers configuration details specific to this driver.
@@ -69,7 +112,8 @@ default protocol setting, and specifying this option is mandatory.
 .BI "Option \*qDevice\*q \*q" string \*q
 Specifies the device through which the mouse can be accessed.  A common
 setting is "/dev/mouse", which is often a symbolic link to the real
-device.  This option is mandatory, and there is no default setting.
+device.  This option is mandatory, and there is no default setting. The server
+may however attempt to probe some default devices if this option is missing.
 .TP 7
 .BI "Option \*qButtons\*q \*q" integer \*q
 Specifies the number of mouse buttons.  In cases where the number of buttons
@@ -254,5 +298,8 @@ There are some other options that may be used to control various parameters
 for serial port communication, but they are not documented here because
 the driver sets them correctly for each mouse protocol type.
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
+Xserver(__appmansuffix__), X(__miscmansuffix__),
 README.mouse.
+
+hal(__miscmansuffix__), hald(__adminmansuffix__), fdi(__filemansuffix__).