Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE

4 files changed, 33 insertions, 33 deletions

diff --git a/README.sgml b/README.sgml
index 88c647c..d7e4d26 100644
--- a/README.sgml
+++ b/README.sgml
@@ -1,31 +1,30 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
 <article>
-<title>Mouse Support in XFree86
+<title>Mouse Support in X11R6.7
 <author>Kazutaka Yokota
 <date>17 December 2002
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mouse.sgml,v 1.13 2002/12/17 20:55:22 dawes Exp $
 </ident>
 
 <toc>
  
 <sect>Introduction <p>
 
-This document describes mouse support in XFree86 &relvers;.
+This document describes mouse support in X.org Foundation's X11 &relvers; server.
 
 Mouse configuration has often been mysterious task for
 novice users.
 However, once you learn several basics, it is straightforward
 to write the mouse <tt>"InputDevice"</tt>
-section in the <tt>XF86Config</tt> file by hand.
+section in the <tt>xorg.conf</tt> file by hand.
 
 <sect>Supported Hardware <p>
 
-The XFree86 X server supports three classes of mice:
+The X.org Foundation X server supports three classes of mice:
 serial, bus and PS/2 mice.
 
 <descrip>
@@ -41,7 +40,7 @@ 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.
-The XFree86 X server supports this specification and can detect
+The X server supports this specification and can detect
 popular PnP serial mouse models on most platforms.
 
 <tag>Bus mouse</tag>
@@ -73,7 +72,7 @@ USB (Universal Serial Bus) ports are present on most modern
 computers. Several devices can be plugged into this bus, including
 mices and keyboards. 
 
-The XFree86 server includes support for USB mices on some systems.
+The server includes support for USB mices on some systems.
 </descrip>
 
 Many mice nowadays can be used both as a serial mouse and as a PS/2 mouse.
@@ -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.
 
-XFree86 supports the mouse with a wheel, a roller or a knob.
+X11R6.7 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>,
@@ -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 XFree86/OS2 will support any type of mouse that the OS supports, 
+*2 X11R6.7/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>
-XFree86/OS2 always uses the native mouse driver of the operating system
+X11R6.7/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 XFree86/OS2.
+it will also work under X11R6.7/OS2.
 
 Always specify <tt>"OSMouse"</tt> as the protocol type.
 
@@ -329,7 +328,7 @@ protocol type for the PS/2 mouse and the X server will automatically
 adjust itself.
 
 <tag>Serial mouse</tag>
-The XFree86 server supports a wide range of mice, both old and new.
+The server supports a wide range of mice, both old and new.
 If your mouse is of a relatively new model, it may conform to the
 PnP COM device specification and the X server may be able to 
 detect an appropriate protocol type for the mouse automatically.
@@ -389,8 +388,8 @@ but you find that not all features of the mouse is available, that is
 because the X server does not have native support for that model of mouse
 and is using a ``compatible'' protocol according to PnP information.
 
-If you suspect this is the case with your mouse, please send a report to
-<email>XFree86@XFree86.Org</email>.
+If you suspect this is the case with your mouse, please enter a
+bugreport in bugzilla.freedesktop.org, using the xorg product.
 
 <tag>USB mouse</tag>
 If your mouse is connected to the USB port, it can either be supported 
@@ -407,7 +406,7 @@ Please refer to the OS support section of this file for more information.
 
 </descrip>
 
-<sect>XF86Config Options <p>
+<sect>xorg.conf Options <p>
 
 The old <tt>Pointer</tt> section has been replaced by a more general
 <tt>InputDevice</tt> section.  The following is a minimal example
@@ -469,7 +468,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 XFree86 X servers,
+by the current version of the X11R6.7 X servers,
 because there appears to be no accepted standard as to how the horizontal
 direction is encoded in mouse data.
 
@@ -479,8 +478,7 @@ Moreover, there are some mice whose two wheels are both mounted vertically,
 and the direction of the second vertical wheel does not match the
 first one's.
 
-Currently this option can not be set in the <tt>XF86Setup</tt> program.
-You need to edit the <tt>XF86Config</tt> file by hand to add this option.
+You need to edit the <tt>xorg.conf</tt> file by hand to add this option.
 
 <sect1>Resolution <p>
 The following option will set the mouse device resolution to <tt>N</tt>
@@ -491,7 +489,6 @@ counts per inch, if possible:
 </verb>
 
 Not all mice and OSs can support this option.
-This option can be set in the <tt>XF86Setup</tt> program.
 
 <sect1>Drag Lock Buttons <p>
 Some people find it difficult or inconvenient to hold a trackball
diff --git a/man/mouse.man b/man/mouse.man
index 0b2dac1..6a86bae 100644
--- a/man/mouse.man
+++ b/man/mouse.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.man,v 1.7 2003/05/29 21:48:10 herrb Exp $ 
+.\" $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__
@@ -16,7 +16,7 @@ mouse \- Mouse input driver
 .fi
 .SH DESCRIPTION
 .B mouse 
-is an XFree86 input driver for mice.  The driver supports most available
+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.
 .PP
@@ -34,7 +34,7 @@ document.  This can be found
 in __projectroot__/lib/X11/doc/, or online at
 http://www.xfree86.org/current/mouse.html.
 .SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+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.
 .PP
@@ -224,5 +224,5 @@ 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"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__),
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
 README.mouse.
diff --git a/src/mouse.c b/src/mouse.c
index 21ad16a..bb99b9b 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.80 2003/12/08 23:49:42 dawes Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.79 2003/11/03 05:11:48 tsi Exp $ */
 /*
  *
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
@@ -372,17 +373,16 @@ static void
 MouseCommonOptions(InputInfoPtr pInfo)
 {
     MouseDevPtr pMse;
-    MessageType from = X_DEFAULT;
+    MessageType buttons_from = X_CONFIG;
     char *s;
     int origButtons;
 
     pMse = pInfo->private;
 
     pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
-    from = X_CONFIG;
     if (!pMse->buttons) {
 	pMse->buttons = MSE_DFLTBUTTONS;
-	from = X_DEFAULT;
+	buttons_from = X_DEFAULT;
     }
     origButtons = pMse->buttons;
 
@@ -394,7 +394,10 @@ MouseCommonOptions(InputInfoPtr pInfo)
     pMse->emulate3Timeout = xf86SetIntOption(pInfo->options,
 					     "Emulate3Timeout", 50);
     if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
-	xf86Msg(X_CONFIG, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
+	MessageType from = X_CONFIG;
+	if (pMse->emulate3ButtonsSoft)
+	    from = X_DEFAULT;
+	xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
 		pInfo->name, pMse->emulate3Timeout);
     }
 
@@ -659,8 +662,8 @@ MouseCommonOptions(InputInfoPtr pInfo)
 		pInfo->name, wheelButton, pMse->wheelInertia);
     }
     if (origButtons != pMse->buttons)
-	from = X_CONFIG;
-    xf86Msg(from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
+	buttons_from = X_CONFIG;
+    xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
     
 }
 /*
@@ -3565,7 +3568,7 @@ static XF86ModuleVersionInfo xf86MouseVersionRec =
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 0, 0,
     ABI_CLASS_XINPUT,
     ABI_XINPUT_VERSION,
diff --git a/src/pnp.c b/src/pnp.c
index 0ae100f..80dc667 100644
--- a/src/pnp.c
+++ b/src/pnp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/pnp.c,v 1.21 2003/11/03 05:11:49 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/pnp.c,v 1.20tsi Exp $ */
 /*
  * Copyright 1998 by Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
  *