Pull XORG-6_8_0 to CYGWIN branchYGWIN-6_8_1-MERGECYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGECYGWIN

2 files changed, 25 insertions, 16 deletions

diff --git a/README.sgml b/README.sgml
index 7de6d06..70eb869 100644
--- a/README.sgml
+++ b/README.sgml
@@ -3,19 +3,18 @@
 ]>
 
 <article>
-<title>Mouse Support in X11R6.7
+<title>Mouse Support in X11R&relvers;
 <author>Kazutaka Yokota
 <date>17 December 2002
 
 <ident>
-$Id$
 </ident>
 
 <toc>
  
 <sect>Introduction <p>
 
-This document describes mouse support in X.org Foundation's X11 &relvers; server.
+This document describes mouse support in X.org Foundation's X11R&relvers; server.
 
 Mouse configuration has often been mysterious task for
 novice users.
@@ -84,7 +83,7 @@ used in such a way, even if you can find an appropriate
 adapter with which you can connect the PS/2 mouse to a serial port
 or visa versa.
 
-X11R6.7 supports the mouse with a wheel, a roller or a knob.
+X11R&relvers; supports the mouse with a wheel, a roller or a knob.
 Its action is detected as the Z (third) axis motion of the mouse.
 As the X server or clients normally do not use the Z axis movement of the 
 pointing device, a configuration option, <tt>"ZAxisMapping"</tt>,
@@ -112,7 +111,7 @@ NetBSD/pc98       Ok        ?         Ok        NA        NA         NA
 OpenBSD           Ok        Ok        Ok        Ok*1      Ok*1       Ok*1
 OS/2              SP*2      SP*2      SP*2      SP*2      SP*2       ?
 SCO               Ok        ?         SP*1      SP*1      NA         ?
-Solaris 2.x       Ok        NA*1      ?*1       Ok        Ok         ?
+Solaris 2.x       Ok        NA*1      ?*1       Ok        Ok         SP*1
 SVR4              Ok        NA*1      SP*1      SP*1      NA         ?
 PANIX             Ok        ?         SP*1      SP*1      NA         ?
 
@@ -120,7 +119,7 @@ Ok: support is available,  NA: not available, ?: untested or unknown.
 SP: support is available in a different form
 
 *1 Refer to the following sections for details.
-*2 X11R6.7/OS2 will support any type of mouse that the OS supports, 
+*2 X11R&relvers;/OS2 will support any type of mouse that the OS supports, 
    whether it is serial, bus mouse, or PnP type. 
 
 </verb>
@@ -229,11 +228,11 @@ generic Human Interface Device (hid) <tt>/dev/uhid*</tt>. Select the
 corresponding to your mouse as the device name.
 
 <sect1>OS/2 <p>
-X11R6.7/OS2 always uses the native mouse driver of the operating system
+X11R&relvers;/OS2 always uses the native mouse driver of the operating system
 and will support any type of pointer that the OS supports, whether it is
 serial, bus mouse, or PnP type.
 If the mouse works under Presentation Manager, 
-it will also work under X11R6.7/OS2.
+it will also work under X11R&relvers;/OS2.
 
 Always specify <tt>"OSMouse"</tt> as the protocol type.
 
@@ -244,14 +243,21 @@ protocol type.
 The <tt>"OSMouse"</tt> may also be used with the serial mouse.
 
 <sect1>Solaris <p>
-Testing has been done with Solaris 2.5.1 and 2.6.  Logitech and
-Microsoft bus mice
+Testing has been done with Solaris 2.5.1, 2.6, 7, 8, 9 and pre-release
+versions of Solaris 10.  Logitech and Microsoft bus mice
 have not been tested, but might work with the <tt>/dev/logi</tt> and
 <tt>/dev/msm</tt> devices.
 Standard 2 and 3 button PS/2 mice work with the <tt>"PS/2"</tt> protocol
 type and the <tt>/dev/kdmouse</tt> device.
+USB mice work with the <tt>"VUID"</tt> protocol type and the 
+<tt>/dev/mouse</tt> device.
 The PnP serial mouse support (the <tt>"Auto"</tt> protocol) has been tested
-and does not work.
+and does not work.  The <tt>"Auto"</tt> protocol can however detect PS/2 and
+USB mice correctly.
+
+Additional USB mice can be connected using the <tt>"VUID"</tt> protocol type
+and the appropriate <tt>"/dev/usb/hid"</tt> device with the <tt>Option "StreamsModule" "usbms"</tt> line included in the associated <tt>"InputDevice"</tt>
+section.
 
 <sect1>SVR4 <p>
 The bus and PS/2 mouse may be supported with the <tt>"Xqueue"</tt> 
@@ -270,7 +276,7 @@ The PC-98 version of PANIX supports the bus mouse with the
 
 <sect>Configuring Your Mouse <p>
 
-Before using the <tt>xf86config</tt> program
+Before using the <tt>xorgconfig</tt> program
 to set up mouse configuration, you must identify the interface type,
 the device name and the protocol type of your mouse.
 Blindly trying every possible combination of mouse settings 
@@ -469,7 +475,7 @@ If the buttons <tt>N3</tt> and <tt>N4</tt> actually exist in this mouse,
 their actions won't be detected by the X server.
 
 NOTE #1: horizontal movement may not always be detected
-by the current version of the X11R6.7 X servers,
+by the current version of the X11R&relvers; X servers,
 because there appears to be no accepted standard as to how the horizontal
 direction is encoded in mouse data.
 
diff --git a/src/mouse.c b/src/mouse.c
index 77eb716..f1d73d7 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.1.4.1.2.1 2004/03/17 20:31:18 ago Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.3 2004/07/24 17:35:39 herrb Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.79 2003/11/03 05:11:48 tsi Exp $ */
 /*
  *
@@ -1636,7 +1636,10 @@ MouseProc(DeviceIntPtr device, int what)
 	if (pInfo->fd == -1)
 	    xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name);
 	else {
-	    pMse->buffer = XisbNew(pInfo->fd, 64);
+	    if (pMse->xisbscale)
+		pMse->buffer = XisbNew(pInfo->fd, pMse->xisbscale * 4);
+	    else
+		pMse->buffer = XisbNew(pInfo->fd, 64);
 	    if (!pMse->buffer) {
 		xf86CloseSerial(pInfo->fd);
 		pInfo->fd = -1;
@@ -3568,7 +3571,7 @@ static XF86ModuleVersionInfo xf86MouseVersionRec =
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 0, 0,
     ABI_CLASS_XINPUT,
     ABI_XINPUT_VERSION,