Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-mouse

7 files changed, 38 insertions, 50 deletions

diff --git a/COPYING b/COPYING
index 8a618a6..844bdb1 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,5 @@
-Copyright 2004-2005, 2008-2010 Sun Microsystems, Inc.  All rights reserved.
+Copyright (c) 2004-2005, 2008-2010, Oracle and/or its affiliates.
+All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/README b/README
index 984814f..8daf558 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
-  Mouse Support in X11R7.5
-  Kazutaka Yokota
-  17 December 2002
+  Mouse Support in xf86-input-mouse
+  Original version written by Kazutaka Yokota for XFree86 on 17 December 2002
+  Updated by Alan Coopersmith for X.Org releases
   ____________________________________________________________
 
   Table of Contents
@@ -56,8 +56,10 @@
   1.  Introduction
 
 
-  This document describes mouse support in X.Org Foundation's X11R7.5
-  server.
+  This document describes mouse support in the xf86-input-mouse driver
+  for the Xorg X server.   This driver is mainly used on non-Linux
+  operating systems such as BSD & Solaris, as modern Linux systems use
+  the xf86-input-evdev driver instead.
 
   Mouse configuration has often been mysterious task for novice users.
   However, once you learn several basics, it is straightforward to write
@@ -67,13 +69,13 @@
   2.  Supported Hardware
 
 
-  The X.Org Foundation X server supports four classes of mice: serial,
+  The xf86-input-mouse driver supports four classes of mice: serial,
   bus and PS/2 mice, and additional mouse types supported by specific
   operating systems, such as USB mice.
 
 
      Serial mouse
-        The serial mouse has been the most popular pointing device for
+        The serial mouse was once the most popular pointing device for
         PCs.  There have been numerous serial mouse models from a number
         of manufactures.  Despite the wide range of variations, there
         have been relatively few protocols (data format) with which the
@@ -92,14 +94,15 @@
         integrated I/O cards may also have a bus mouse connector.  Some
         bus mice are known as `InPort mouse'.
 
-        Note that some mouse manufactures have sold a package including
+        Note that some mouse manufacturers have sold a package including
         a serial mouse and a serial interface card.  Don't confuse this
         type of products with the genuine bus mouse.
 
 
      PS/2 mouse
-        They are sometimes called `Mouse-port mouse'.  The PS/2 mouse is
-        becoming increasingly common and popular.
+        They are sometimes called `Mouse-port mouse'.  The PS/2 mouse was
+        common for a generation after serial mice, and most laptops still
+        use the PS/2 protocol for built-in pointer devices.
 
         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
@@ -115,17 +118,16 @@
         computers. Several devices can be plugged into this bus,
         including mice and keyboards.
 
-        The server includes support for USB mice on some systems.
+        This driver includes support for USB mice on some systems.
 
   Many mice nowadays can be used both as a serial mouse and as a PS/2
-  mouse.  They has a logic to distinguish which interface it is
-  connected to.  However, the mouse which is not marketed as compatible
-  with both serial and PS/2 mouse interface lacks this logic and cannot
-  be 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.
-
-  X11R7.5 supports the mouse with a wheel, a roller or a knob.  Its
+  mouse, or as both a PS/2 and a USB mouse.  They have logic to distinguish
+  which interface it is connected to.  However, a mouse which is not
+  marketed as compatible with both mouse interfaces lacks this logic and
+  cannot be used in such a way, even if you can find an appropriate adapter
+  with which you can connect the mouse to a different format port.
+
+  This driver supports a 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, "ZAxisMapping", is provided
@@ -155,7 +157,6 @@
   NetBSD            Ok        Ok        Ok        SP*1      SP*1       SP*1
   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         SP*1
   SVR4              Ok        NA*1      SP*1      SP*1      NA         ?
@@ -165,8 +166,6 @@
   SP: support is available in a different form
 
   *1 Refer to the following sections for details.
-  *2 X11R7.5/OS2 will support any type of mouse that the OS supports,
-     whether it is serial, bus mouse, or PnP type.
 
 
 
@@ -303,7 +302,7 @@
 
   3.14.  Solaris
 
-  Testing has been done with Solaris 2.5.1, 2.6, 7, 8, 9 and 10.
+  Testing has been done with Solaris 2.5.1, 2.6, 7, 8, 9, 10, and 11.
 
   On Solaris 10 1/06 and later versions with "virtual mouse" support,
   all PS/2 and USB mice connected to the system can be accessed via the
@@ -320,9 +319,9 @@
   mice correctly.
 
   Additional USB mice can be connected using the "VUID" protocol type
-  and the appropriate "/dev/usb/hid" device with the Option
-  "StreamsModule" "usbms" line included in the associated "InputDevice"
-  section.
+  and the appropriate "/dev/usb/hid" device with the
+       Option "StreamsModule" "usbms"
+  line included in the associated "InputDevice" section.
 
 
 
@@ -346,7 +345,7 @@
   4.  Configuring Your Mouse
 
 
-  Before using the xorgconfig program to set up mouse configuration, you
+  Before editing the xorg.conf file 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 will lead you nowhere.
diff --git a/configure.ac b/configure.ac
index 48ab33c..8c99ac5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-mouse],
-        [1.5.0],
+        [1.6.0],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-input-mouse])
 AC_CONFIG_SRCDIR([Makefile.am])
diff --git a/man/Makefile.am b/man/Makefile.am
index c3b2b90..419175e 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
-# 
+#
 
 drivermandir = $(DRIVER_MAN_DIR)
 
diff --git a/src/mouse.c b/src/mouse.c
index 99d1f2b..a296021 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1546,26 +1546,14 @@ post_event:
 
 /*
  * MouseCtrl --
- *      Alter the control parameters for the mouse. Note that all special
- *      protocol values are handled by dix.
+ *      Alter the control parameters for the mouse. Note that all
+ *      settings are now handled by dix.
  */
 
 static void
 MouseCtrl(DeviceIntPtr device, PtrCtrl *ctrl)
 {
-    InputInfoPtr pInfo;
-    MouseDevPtr pMse;
-
-    pInfo = device->public.devicePrivate;
-    pMse = pInfo->private;
-
-#ifdef EXTMOUSEDEBUG
-    ErrorF("MouseCtrl pMse=%p\n", pMse);
-#endif
-    
-    pMse->num       = ctrl->num;
-    pMse->den       = ctrl->den;
-    pMse->threshold = ctrl->threshold;
+    /* This function intentionally left blank */
 }
 
 /*
diff --git a/src/sun_mouse.c b/src/sun_mouse.c
index ddcdd90..42ab933 100644
--- a/src/sun_mouse.c
+++ b/src/sun_mouse.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004-2005, 2008-2010 Sun Microsystems, Inc.
+ * Copyright (c) 2004-2005, 2008-2010, Oracle and/or its affiliates.
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -469,6 +469,9 @@ static void vuidMouseSendScreenSize(ScreenPtr pScreen, VuidMsePtr pVuidMse)
     ScrnInfoPtr pScr = XF86SCRNINFO(pScreen);
     int result;
 
+    if (!pScr->currentMode)
+	return;
+
     if ((pVuidMse->absres.width != pScr->currentMode->HDisplay) || 
 	(pVuidMse->absres.height != pScr->currentMode->VDisplay))
     {
diff --git a/src/xf86OSmouse.h b/src/xf86OSmouse.h
index 09b8525..33b2232 100644
--- a/src/xf86OSmouse.h
+++ b/src/xf86OSmouse.h
@@ -214,9 +214,6 @@ typedef struct _MouseDevRec {
     int			oldBaudRate;
     int			sampleRate;
     int			lastButtons;
-    int			threshold;	/* acceleration */
-    int			num;
-    int			den;
     int			buttons;	/* # of buttons */
     int			emulateState;	/* automata state for 2 button mode */
     Bool		emulate3Buttons;