merge ^/branches/released .

13 files changed, 1240 insertions, 753 deletions

diff --git a/xorg-server/doc/Makefile.am b/xorg-server/doc/Makefile.am
index 8cb3649fe..12a600b42 100644
--- a/xorg-server/doc/Makefile.am
+++ b/xorg-server/doc/Makefile.am
@@ -1,3 +1,15 @@
-SUBDIRS = man xml

+SUBDIRS = dtrace

 

-dist_noinst_DATA = smartsched

+if ENABLE_DEVEL_DOCS

+if HAVE_XMLTO

+

+# Main DocBook/XML files (DOCTYPE book)

+docbook = Xserver-spec.xml Xinput.xml

+

+# Generate DocBook/XML output formats with or without stylesheets

+include $(top_srcdir)/devbook.am

+

+endif HAVE_XMLTO

+endif ENABLE_DEVEL_DOCS

+

+EXTRA_DIST = smartsched

diff --git a/xorg-server/doc/Xinput.xml b/xorg-server/doc/Xinput.xml
new file mode 100644
index 000000000..1ae7afe7b
--- /dev/null
+++ b/xorg-server/doc/Xinput.xml
@@ -0,0 +1,1209 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+
+
+<!-- lifted from troff+ms+XMan by doclifter -->
+<book id="porting">
+
+<bookinfo>
+   <title>X11 Input Extension Porting Document</title>
+   <releaseinfo>X Version 11, Release 6.7</releaseinfo>
+   <authorgroup>
+      <author>
+         <firstname>George</firstname><surname>Sachs</surname>
+         <affiliation><orgname>Hewlett-Packard</orgname></affiliation>
+      </author>
+   </authorgroup>
+   <corpname>X Consortium Standard</corpname>
+   <copyright><year>1989</year><holder>Hewlett-Packard Company</holder></copyright>
+   <copyright><year>1990</year><holder>Hewlett-Packard Company</holder></copyright>
+   <copyright><year>1991</year><holder>Hewlett-Packard Company</holder></copyright>
+
+   <copyright><year>1989</year><holder>X Consortium</holder></copyright>
+   <copyright><year>1990</year><holder>X Consortium</holder></copyright>
+   <copyright><year>1991</year><holder>X Consortium</holder></copyright>
+   <affiliation><orgname>X Consortium</orgname></affiliation>
+   <productnumber>X Version 11, Release 6.7</productnumber>
+
+<legalnotice>
+
+
+<para>
+Permission to use, copy, modify, and distribute this documentation for any purpose and without fee is
+hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+Hewlett-Packard makes no representations about the suitability for any purpose of the information in this
+document. It is provided "as is" without express or implied warranty. This document is only a draft stan-
+dard of the X Consortium and is therefore subject to change.
+</para>
+
+<para>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &ldquo;Software&rdquo;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</para>
+
+<para>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &ldquo;Software&rdquo;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</para>
+
+<para>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</para>
+
+<para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.</para>
+
+<para>Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium.</para>
+
+<para>X Window System is a trademark of The Open Group.</para>
+</legalnotice>
+
+</bookinfo>
+
+<chapter id="x11_input_extension_porting_document">
+<title>X11 Input Extension Porting Document</title>
+
+<para>
+This document is intended to aid the process of integrating the 
+X11 Input Extension into an X server.
+</para>
+<para>
+<!-- .LP -->
+Most of the functionality provided by the input extension is 
+device- and implementation-independent, and should require no changes.  
+The functionality is implemented by
+routines that typically reside in the server source tree directory 
+extensions/server/xinput.
+This extension includes functions to enable and disable input extension devices,
+select input, grab and focus those device, query and change key 
+and button mappings, and others.  The only input extension requirements 
+for the device-dependent part of X are that the input devices be 
+correctly initialized and input events from those devices be correctly
+generated.  Device-dependent X is responsible for reading input data from 
+the input device hardware and if necessary, reformatting it into X events.
+</para>
+<para>
+<!-- .LP -->
+The process of initializing input extension devices is similar to that used 
+for the core devices, and is described in the following sections.  When
+multiple input devices are attached to X server, the choice of which devices
+to initially use as the core X pointer and keyboard is left 
+implementation-dependent.  It is also up to each implementation to decide
+whether all input devices will be opened by the server during its 
+initialization and kept open for the life of the server.  The alternative is
+to open only the X keyboard and X pointer during server initialization, and
+open other input devices only when requested by a client to do so.  Either
+type of implementation is supported by the input extension.
+</para>
+<para>
+<!-- .LP -->
+Input extension events generated by the X server use the same 32-byte xEvent
+wire event as do core input events.  However, additional information must be
+sent for input extension devices, requiring that multiple xEvents be generated
+each time data is received from an input extension device.  These xEvents are
+combined into a single client XEvent by the input extension library.  A later
+section of this document describes the format and generation of input extension
+events.
+</para>
+<sect1 id="Initializing_Extension_Devices">
+<title>Initializing Extension Devices</title>
+<para>
+<!-- .LP -->
+Extension input devices are initialized in the same manner as the core 
+X input devices.  Device-Independent X provides functions that can be 
+called from DDX to initialize these devices.  Which functions are called
+and when will vary by implementation, and will depend on whether the 
+implementation opens all the input devices available to X when X is initialized,
+or waits until a client requests that a device be opened.
+In the simplest case, DDX will open all input devices as part of its
+initialization, when the InitInput routine is called.
+</para>
+<sect2 id="Summary_of_Calling_Sequence">
+<title>Summary of Calling Sequence</title>
+<para>
+<!-- .LP -->
+<literallayout class="monospaced">
+Device-Independent X       |  Device-Dependent X
+--------------------       |  -------------------             
+                           |                                        
+InitInput --------------&gt;  |  - do device-specific initialization
+                           |                                        
+                           |  - call AddInputDevice  (deviceProc,AutoStart)
+AddInputDevice             |   
+  - creates DeviceIntRec   |
+  - records deviceProc     |
+  - adds new device to     | 
+    list of off_devices.   |
+sets dev-&gt;startup=AutoStart|           
+                           |  - call one of:                       
+                           |    - RegisterPointerDevice (X pointer)
+                           |      - processInputProc = ProcessPointerEvents
+                           |    - RegisterKeyboardDevice (X keyboard)
+                           |      - processInputProc = ProcessKeyboardEvents
+                           |    - RegisterOtherDevice  (extension device)
+                           |      - processInputProc = ProcessOtherEvents
+                           |                                        
+                           |                                        
+InitAndStartDevices -----&gt; |  - calls deviceProc with parameters
+                           |    (DEVICE_INIT, AutoStart)
+sets dev-&gt;inited = return  |
+  value from deviceProc    |    
+                           |                                        
+                           |  - in deviceProc, do one of:                       
+                           |    - call InitPointerDeviceStruct (X pointer)
+                           |    - call InitKeyboardDeviceStruct (X keybd)
+                           |    - init extension device by calling some of:
+                           |      - InitKeyClassDeviceStruct
+                           |      - InitButtonClassDeviceStruct
+                           |      - InitValuatorClassDeviceStruct
+                           |      - InitValuatorAxisStruct
+                           |      - InitFocusClassDeviceStruct
+                           |      - InitProximityClassDeviceStruct
+                           |      - InitKbdFeedbackClassDeviceStruct
+                           |      - InitPtrFeedbackClassDeviceStruct
+                           |      - InitLedFeedbackClassDeviceStruct
+                           |      - InitStringFeedbackClassDeviceStruct
+                           |      - InitIntegerFeedbackClassDeviceStruct
+                           |      - InitBellFeedbackClassDeviceStruct
+                           |    - init device name and type by:
+                           |      - calling MakeAtom with one of the 
+                           |        predefined names
+                           |      - calling AssignTypeAndName
+                           |                                        
+                           |                                        
+for each device added      |                                        
+    by AddInputDevice,     |                                        
+    InitAndStartDevices    |                                        
+    calls EnableDevice if  |  - EnableDevice calls deviceProc with 
+    dev-&gt;startup &amp;         |    (DEVICE_ON, AutoStart)
+    dev-&gt;inited            |  
+                           |                                        
+If deviceProc returns      |  - core devices are now enabled, extension
+    Success, EnableDevice  |    devices are now available to be accessed
+    move the device from   |    through the input extension protocol
+    inputInfo.off_devices  |    requests.                           
+    to inputInfo.devices   |                                        
+</literallayout>
+</para>
+</sect2>
+<sect2 id="Initialization_Called_From_InitInput">
+<title>Initialization Called From InitInput</title>
+<para>
+<!-- .LP -->
+InitInput is the first DDX input entry point called during X server startup.
+This routine is responsible for
+device- and implementation- specific initialization, and for calling
+AddInputDevice to create and initialize the DeviceIntRec structure for each
+input device.  AddInputDevice is passed the address of a procedure to be called
+by the DIX routine InitAndStartDevices when input devices are enabled.
+This procedure is expected to perform X initialization for the input device.
+</para>
+<para>
+<!-- .LP -->
+If the device is to be used as the X pointer, DDX should then call
+RegisterPointerDevice, passing the DeviceIntRec pointer,
+to initialize the device as the X pointer.
+</para>
+<para>
+<!-- .LP -->
+If the device is to be used as the X keyboard, DDX should instead call
+RegisterKeyboardDevice to initialize the device as the X keyboard.
+</para>
+<para>
+<!-- .LP -->
+If the device is to be used as an extension device, DDX should instead
+call RegisterOtherDevice, passing the DeviceIntPtr returned by
+AddInputDevice.
+</para>
+<para>
+<!-- .LP -->
+A sample InitInput implementation is shown below.
+</para>
+<para>
+<!-- .LP -->
+<literallayout class="monospaced">
+InitInput(argc,argv)
+    {
+    int i, numdevs, ReadInput();
+    DeviceIntPtr dev;
+    LocalDevice localdevs[LOCAL_MAX_DEVS];
+    DeviceProc kbdproc, ptrproc, extproc;
+
+    /**************************************************************
+     * Open the appropriate input devices, determine which are 
+     * available, and choose an X pointer and X keyboard device
+     * in some implementation-dependent manner.
+     ***************************************************************/
+
+    open_input_devices (&amp;numdevs, localdevs);
+
+    /**************************************************************
+     * Register a WakeupHandler to handle input when it is generated.
+     ***************************************************************/
+
+    RegisterBlockAndWakeupHandlers (NoopDDA, ReadInput, NULL);
+
+    /**************************************************************
+     * Register the input devices with DIX.
+     ***************************************************************/
+
+    for (i=0; i&lt;numdevs; i++)
+        {
+        if (localdevs[i].use == IsXKeyboard)
+            {
+            dev = AddInputDevice (kbdproc, TRUE);
+            RegisterKeyboardDevice (dev);
+            }
+        else if (localdevs[i].use == IsXPointer)
+            {
+            dev = AddInputDevice (ptrproc, TRUE);
+            RegisterPointerDevice (dev);
+            }
+        else 
+            {
+            dev = AddInputDevice (extproc, FALSE);
+            RegisterOtherDevice (dev);
+            }
+        if (dev == NULL)
+            FatalError ("Too many input devices.");
+        dev-&gt;devicePrivate = (pointer) &amp;localdevs[i];
+        }
+</literallayout>
+</para>
+</sect2>
+<sect2 id="Initialization_Called_From_InitAndStartDevices">
+<title>Initialization Called From InitAndStartDevices</title>
+<para>
+<!-- .LP -->
+After InitInput has returned,
+InitAndStartDevices is the DIX routine that is called to enable input devices. 
+It calls the device control routine that was passed to AddInputDevice,
+with a mode value of DEVICE_INIT.  The action taken by the device control
+routine depends on how the device is to be used.  If the device is to be
+the X pointer, the device control routine should call
+InitPointerDeviceStruct to initialize it.  If the device is to be the
+X keyboard, the device control routine should call
+InitKeyboardDeviceStruct.  Since input extension devices may support various
+combinations of keys, buttons, valuators, and feedbacks,
+each class of input that it supports must be initialized.
+Entry points are defined by DIX to initialize each of the supported classes of
+input, and are described in the following sections.
+</para>
+<para>
+<!-- .LP -->
+A sample device control routine called from InitAndStartDevices is 
+shown below.
+</para>
+<para>
+<!-- .LP -->
+<literallayout class="monospaced">
+Bool extproc (dev, mode)
+    DeviceIntPtr dev;
+    int mode;
+    {
+    LocalDevice *localdev = (LocalDevice *) dev-&gt;devicePrivate;
+
+    switch (mode)
+        {
+        case DEVICE_INIT:
+            if (strcmp(localdev-&gt;name, XI_TABLET) == 0)
+                {
+                /****************************************************
+                 * This device reports proximity, has buttons,
+                 * reports two axes of motion, and can be focused.
+                 * It also supports the same feedbacks as the X pointer
+                 * (acceleration and threshold can be set).
+                 ****************************************************/
+
+                InitButtonClassDeviceStruct (dev, button_count, button_map);
+                InitValuatorClassDeviceStruct (dev, localdev-&gt;n_axes,);
+                    motionproc, MOTION_BUF_SIZE, Absolute);
+                for (i=0; i&lt;localdev-&gt;n_axes; i++)
+                    InitValuatorAxisStruct (dev, i, min_val, max_val, 
+                        resolution);
+                InitFocusClassDeviceStruct (dev);
+                InitProximityClassDeviceStruct (dev);
+                InitPtrFeedbackClassDeviceStruct (dev, p_controlproc);
+                }
+            else if (strcmp(localdev-&gt;name, XI_BUTTONBOX) == 0)
+                {
+                /****************************************************
+                 * This device has keys and LEDs, and can be focused.
+                 ****************************************************/
+
+                InitKeyClassDeviceStruct (dev, syms, modmap);
+                InitFocusClassDeviceStruct (dev);
+                InitLedFeedbackClassDeviceStruct (dev, ledcontrol);
+                }
+            else if (strcmp(localdev-&gt;name, XI_KNOBBOX) == 0)
+                {
+                /****************************************************
+                 * This device reports motion.
+                 * It can be focused.
+                 ****************************************************/
+
+                InitValuatorClassDeviceStruct (dev, localdev-&gt;n_axes,);
+                    motionproc, MOTION_BUF_SIZE, Absolute);
+                for (i=0; i&lt;localdev-&gt;n_axes; i++)
+                    InitValuatorAxisStruct (dev, i, min_val, max_val, 
+                        resolution);
+                InitFocusClassDeviceStruct (dev);
+                }
+            localdev-&gt;atom = 
+                MakeAtom(localdev-&gt;name, strlen(localdev-&gt;name), FALSE);
+            AssignTypeAndName (dev, localdev-&gt;atom, localdev-&gt;name);
+            break;
+        case DEVICE_ON:
+            AddEnabledDevice (localdev-&gt;file_ds);
+            dev-&gt;on = TRUE;
+            break;
+        case DEVICE_OFF:
+            dev-&gt;on = FALSE;
+            RemoveEnabledDevice (localdev-&gt;file_ds);
+            break;
+        case DEVICE_CLOSE:
+            break;
+        }
+    }
+</literallayout>
+</para>
+<para>
+<!-- .LP -->
+The device control routine is called with a mode value of DEVICE_ON
+by the DIX routine EnableDevice, which is called from InitAndStartDevices.  
+When called with this mode, it should call AddEnabledDevice to cause the 
+server to begin checking for available input from this device.
+</para>
+<para>
+<!-- .LP -->
+&gt;From InitAndStartDevices, EnableDevice is called for all devices that have
+the "inited" and "startup" fields in the DeviceIntRec set to TRUE.  The
+"inited" field is set by InitAndStartDevices to the value returned by
+the deviceproc when called with a mode value of DEVICE_INIT.  The "startup"
+field is set by AddInputDevice to value of the second parameter (autoStart).
+</para>
+<para>
+<!-- .LP -->
+When the server is first initialized, it should only be checking for input
+from the core X keyboard and pointer.  One way to accomplish this is to
+call AddInputDevice for the core X keyboard and pointer with an
+autoStart value equal to TRUE, while calling AddInputDevice for 
+input extension devices with an autoStart value equal to FALSE.  If this is 
+done, EnableDevice will skip all input extension devices during server
+initialization.  In this case,
+the OpenInputDevice routine should set the "startup" field to TRUE
+when called for input extension devices.  This will cause ProcXOpenInputDevice
+to call EnableDevice for those devices when a client first does an
+XOpenDevice request.
+</para>
+</sect2>
+<sect2 id="DIX_Input_Class_Initialization_Routines">
+<title>DIX Input Class Initialization Routines</title>
+<para>
+<!-- .LP -->
+DIX routines are defined to initialize each of the defined input classes.
+The defined classes are:
+<!-- .RS -->
+<!-- .in +5n -->
+</para>
+<itemizedlist>
+  <listitem>
+    <para>
+KeyClass - the device has keys.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+ButtonClass - the device has buttons.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+ValuatorClass - the device reports motion data or positional data.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+Proximitylass - the device reports proximity information.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+FocusClass - the device can be focused.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+FeedbackClass - the device supports some kind of feedback
+<!-- .in -5n -->
+<!-- .RE -->
+    </para>
+  </listitem>
+</itemizedlist>
+<para>
+<!-- .LP -->
+DIX routines are provided to initialize the X pointer and keyboard, as in
+previous releases of X.  During X initialization, InitPointerDeviceStruct 
+is called to initialize the X pointer, and InitKeyboardDeviceStruct is
+called to initialize the X keyboard.  There is no
+corresponding routine for extension input devices, since they do not all
+support the same classes of input.  Instead, DDX is responsible for the 
+initialization of the input classes supported by extension devices.  
+A description of the routines provided by DIX to perform that initialization
+follows.
+</para>
+<sect3 id="InitKeyClassDeviceStruct">
+<title>InitKeyClassDeviceStruct</title>
+<para>
+<!-- .LP -->
+This function is provided to allocate and initialize a KeyClassRec, and 
+should be called for extension devices that have keys.  It is passed a pointer
+to the device, and pointers to arrays of keysyms and modifiers reported by
+the device.  It returns FALSE if the KeyClassRec could not be allocated,
+or if the maps for the keysyms and and modifiers could not be allocated.
+Its parameters are:
+</para>
+<para>
+<!-- .LP -->
+<literallayout class="monospaced">
+Bool
+InitKeyClassDeviceStruct(dev, pKeySyms, pModifiers)
+    DeviceIntPtr dev;
+    KeySymsPtr pKeySyms;
+    CARD8 pModifiers[];
+</literallayout>
+</para>
+<para>
+<!-- .LP -->
+The DIX entry point InitKeyboardDeviceStruct calls this routine for the
+core X keyboard.  It must be called explicitly for extension devices
+that have keys.
+</para>
+</sect3>
+<sect3 id="InitButtonClassDeviceStruct">
+<title>InitButtonClassDeviceStruct</title>
+<para>
+<!-- .LP -->
+This function is provided to allocate and initialize a ButtonClassRec, and 
+should be called for extension devices that have buttons.  It is passed a 
+pointer to the device, the number of buttons supported, and a map of the 
+reported button codes.  It returns FALSE if the ButtonClassRec could not be 
+allocated.  Its parameters are:
+</para>
+<para>
+<!-- .LP -->
+<literallayout class="monospaced">
+Bool
+InitButtonClassDeviceStruct(dev, numButtons, map)
+    register DeviceIntPtr dev;
+    int numButtons;
+    CARD8 *map;
+</literallayout>
+</para>
+<para>
+<!-- .LP -->
+The DIX entry point InitPointerDeviceStruct calls this routine for the
+core X pointer.  It must be called explicitly for extension devices that
+have buttons.
+</para>
+</sect3>
+<sect3 id="InitValuatorClassDeviceStruct">
+<title>InitValuatorClassDeviceStruct</title>
+<para>
+<!-- .LP -->
+This function is provided to allocate and initialize a ValuatorClassRec, and 
+should be called for extension devices that have valuators.  It is passed the
+number of axes of motion reported by the device, the address of the motion
+history procedure for the device, the size of the motion history buffer,
+and the mode (Absolute or Relative) of the device.  It returns FALSE if 
+the ValuatorClassRec could not be allocated.  Its parameters are:
+</para>
+<para>
+<!-- .LP -->
+<literallayout class="monospaced">
+Bool
+InitValuatorClassDeviceStruct(dev, numAxes, motionProc, numMotionEvents, mode)
+    DeviceIntPtr dev;
+    int (*motionProc)();
+    int numAxes;
+    int numMotionEvents;
+    int mode;
+</literallayout>
+</para>
+<para>
+<!-- .LP -->
+The DIX entry point InitPointerDeviceStruct calls this routine for the
+core X pointer.  It must be called explicitly for extension devices that
+report motion.
+</para>
+</sect3>
+<sect3 id="InitValuatorAxisStruct">
+<title>InitValuatorAxisStruct</title>
+<para>
+<!-- .LP -->
+This function is provided to initialize an XAxisInfoRec, and 
+should be called for core and extension devices that have valuators.  
+The space for the XAxisInfoRec is allocated by 
+the InitValuatorClassDeviceStruct function, but is not initialized.
+</para>
+<para>
+<!-- .LP -->
+InitValuatorAxisStruct should be called once for each axis of motion 
+reported by the device.  Each
+invocation should be passed the axis number (starting with 0), the
+minimum value for that axis, the maximum value for that axis, and the
+resolution of the device in counts per meter.  If the device reports
+relative motion, 0 should be reported as the minimum and maximum values.
+InitValuatorAxisStruct has the following parameters:
+<literallayout class="monospaced">
+InitValuatorAxisStruct(dev, axnum, minval, maxval, resolution)
+    DeviceIntPtr dev;
+    int axnum;
+    int minval;
+    int maxval;
+    int resolution;
+</literallayout>
+</para>
+<para>
+<!-- .LP -->
+This routine is not called by InitPointerDeviceStruct for the
+core X pointer.  It must be called explicitly for core and extension devices 
+that report motion.
+</para>
+</sect3>
+<sect3 id="InitFocusClassDeviceStruct">
+<title>InitFocusClassDeviceStruct</title>
+<para>
+<!-- .LP -->
+This function is provided to allocate and initialize a FocusClassRec, and 
+should be called for extension devices that can be focused.  It is passed a
+pointer to the device, and returns FALSE if the allocation fails.
+It has the following parameter:
+<literallayout class="monospaced">
+Bool
+InitFocusClassDeviceStruct(dev)
+    DeviceIntPtr dev;
+</literallayout>
+</para>
+<para>
+<!-- .LP -->
+The DIX entry point InitKeyboardDeviceStruct calls this routine for the
+core X keyboard.  It must be called explicitly for extension devices
+that can be focused.  Whether or not a particular device can be focused
+is left implementation-dependent.
+</para>
+</sect3>
+<sect3 id="InitProximityClassDeviceStruct">
+<title>InitProximityClassDeviceStruct</title>
+<para>
+<!-- .LP -->
+This function is provided to allocate and initialize a ProximityClassRec, and 
+should be called for extension absolute pointing devices that report proximity.
+It is passed a pointer to the device, and returns FALSE if the allocation fails.
+It has the following parameter:
+<literallayout class="monospaced">
+Bool
+InitProximityClassDeviceStruct(dev)
+    DeviceIntPtr dev;
+</literallayout>
+</para>
+</sect3>
+<sect3 id="Initializing_Feedbacks">
+<title>Initializing Feedbacks</title>
+<para>
+<!-- .LP -->
+</para>
+<sect4 id="InitKbdFeedbackClassDeviceStruct">
+<title>InitKbdFeedbackClassDeviceStruct</title>
+<para>
+<!-- .LP -->
+This function is provided to allocate and initialize a KbdFeedbackClassRec, and 
+may be called for extension devices that support some or all of the 
+feedbacks that the core keyboard supports.  It is passed a
+pointer to the device, a pointer to the procedure that sounds the bell,
+and a pointer to the device control procedure.
+It returns FALSE if the allocation fails, and has the following parameters:
+<literallayout class="monospaced">
+Bool
+InitKbdFeedbackClassDeviceStruct(dev, bellProc, controlProc)
+    DeviceIntPtr dev;
+    void (*bellProc)();
+    void (*controlProc)();
+</literallayout>
+The DIX entry point InitKeyboardDeviceStruct calls this routine for the
+core X keyboard.  It must be called explicitly for extension devices
+that have the same feedbacks as a keyboard.  Some feedbacks, such as LEDs and
+bell, can be supported either with a KbdFeedbackClass or with BellFeedbackClass
+and LedFeedbackClass feedbacks.
+</para>
+</sect4>
+<sect4 id="InitPtrFeedbackClassDeviceStruct">
+<title>InitPtrFeedbackClassDeviceStruct</title>
+<para>
+<!-- .LP -->
+This function is provided to allocate and initialize a PtrFeedbackClassRec, and 
+should be called for extension devices that allow the setting of acceleration
+and threshold.  It is passed a pointer to the device,
+and a pointer to the device control procedure.
+It returns FALSE if the allocation fails, and has the following parameters:
+<literallayout class="monospaced">
+Bool
+InitPtrFeedbackClassDeviceStruct(dev, controlProc)
+    DeviceIntPtr dev;
+    void (*controlProc)();
+</literallayout>
+</para>
+<para>
+<!-- .LP -->
+The DIX entry point InitPointerDeviceStruct calls this routine for the
+core X pointer.  It must be called explicitly for extension devices
+that support the setting of acceleration and threshold.
+</para>
+</sect4>
+<sect4 id="InitLedFeedbackClassDeviceStruct">
+<title>InitLedFeedbackClassDeviceStruct</title>
+<para>
+<!-- .LP -->
+This function is provided to allocate and initialize a LedFeedbackClassRec, and 
+should be called for extension devices that have LEDs.
+It is passed a pointer to the device,
+and a pointer to the device control procedure.
+It returns FALSE if the allocation fails, and has the following parameters:
+<literallayout class="monospaced">
+Bool
+InitLedFeedbackClassDeviceStruct(dev, controlProc)
+    DeviceIntPtr dev;
+    void (*controlProc)();
+</literallayout>
+</para>
+<para>
+<!-- .LP -->
+Up to 32 LEDs per feedback can be supported, and a device may have 
+multiple feedbacks of the same type.
+</para>
+</sect4>
+<sect4 id="InitBellFeedbackClassDeviceStruct">
+<title>InitBellFeedbackClassDeviceStruct</title>
+<para>
+<!-- .LP -->
+This function is provided to allocate and initialize a BellFeedbackClassRec, 
+and should be called for extension devices that have a bell.
+It is passed a pointer to the device,
+and a pointer to the device control procedure.
+It returns FALSE if the allocation fails, and has the following parameters:
+<literallayout class="monospaced">
+Bool
+InitBellFeedbackClassDeviceStruct(dev, bellProc, controlProc)
+    DeviceIntPtr dev;
+    void (*bellProc)();
+    void (*controlProc)();
+</literallayout>
+</para>
+</sect4>
+<sect4 id="InitStringFeedbackClassDeviceStruct">
+<title>InitStringFeedbackClassDeviceStruct</title>
+<para>
+<!-- .LP -->
+This function is provided to allocate and initialize a StringFeedbackClassRec, 
+and should be called for extension devices that have a display upon which a 
+string can be displayed.
+It is passed a pointer to the device,
+and a pointer to the device control procedure.
+It returns FALSE if the allocation fails, and has the following parameters:
+<literallayout class="monospaced">
+Bool
+InitStringFeedbackClassDeviceStruct(dev, controlProc, max_symbols, 
+	num_symbols_supported, symbols)
+    DeviceIntPtr dev;
+    void (*controlProc)();
+    int max_symbols:
+    int num_symbols_supported;
+    KeySym *symbols;
+</literallayout>
+</para>
+</sect4>
+<sect4 id="InitIntegerFeedbackClassDeviceStruct">
+<title>InitIntegerFeedbackClassDeviceStruct</title>
+<para>
+<!-- .LP -->
+This function is provided to allocate and initialize an 
+IntegerFeedbackClassRec, 
+and should be called for extension devices that have a display upon which an
+integer can be displayed.
+It is passed a pointer to the device,
+and a pointer to the device control procedure.
+It returns FALSE if the allocation fails, and has the following parameters:
+<literallayout class="monospaced">
+Bool
+InitIntegerFeedbackClassDeviceStruct(dev, controlProc)
+    DeviceIntPtr dev;
+    void (*controlProc)();
+</literallayout>
+</para>
+</sect4>
+</sect3>
+</sect2>
+<sect2 id="Initializing_The_Device_Name_And_Type">
+<title>Initializing The Device Name And Type</title>
+<para>
+<!-- .LP -->
+The device name and type can be initialized by calling AssignTypeAndName
+with the following parameters:
+<literallayout class="monospaced">
+void
+AssignTypeAndName(dev, type, name)
+    DeviceIntPtr dev;
+    Atom type;
+    char *name;
+</literallayout>
+</para>
+<para>
+<!-- .LP -->
+This will allocate space for the device name and copy the name that was passed.
+The device type can be obtained by calling MakeAtom with one of the names
+defined for input devices.  MakeAtom has the following parameters:
+<literallayout class="monospaced">
+Atom
+MakeAtom(name, len, makeit)
+    char *name;
+    int len;
+    Bool makeit;
+</literallayout>
+</para>
+<para>
+<!-- .LP -->
+Since the atom was already made when the input extension was initialized, the
+value of makeit should be FALSE;
+</para>
+</sect2>
+</sect1>
+<sect1 id="Closing_Extension_Devices">
+<title>Closing Extension Devices</title>
+<para>
+<!-- .LP -->
+The DisableDevice entry point is provided by DIX to disable input devices.
+It calls the device control routine for the specified
+device with a mode value of DEVICE_OFF.  The device control routine should
+call RemoveEnabledDevice to stop the server from checking for input from
+that device.
+</para>
+<para>
+<!-- .LP -->
+DisableDevice is not called by any input extension routines.  It can be 
+called from the CloseInputDevice routine, which is called by
+ProcXCloseDevice when a client makes an XCloseDevice request.  If
+DisableDevice is called, it should only be called when the last client
+using the extension device has terminated or called XCloseDevice.
+</para>
+</sect1>
+<sect1 id="Implementation_Dependent_Routines">
+<title>Implementation-Dependent Routines</title>
+<para>
+<!-- .LP -->
+Several input extension protocol requests have 
+implementation-dependent  entry points.  Default routines
+are defined for these entry points and contained in the source
+file extensions/server/xinput/xstubs.c.  Some implementations may
+be able to use the default routines without change.
+The following sections describe each of these routines.
+</para>
+<sect2 id="AddOtherInputDevices">
+<title>AddOtherInputDevices</title>
+<para>
+<!-- .LP -->
+AddOtherInputDevice is called from ProcXListInputDevices as a result of 
+an XListInputDevices protocol request.  It may be needed by
+implementations that do not open extension input devices until requested
+to do so by some client.  These implementations may not initialize
+all devices when the X server starts up, because some of those devices
+may be in use.  Since the XListInputDevices
+function only lists those devices that have been initialized,
+AddOtherInputDevices is called to give DDX a chance to 
+initialize any previously unavailable input devices.
+</para>
+<para>
+<!-- .LP -->
+A sample AddOtherInputDevices routine might look like the following:
+<literallayout class="monospaced">
+void
+AddOtherInputDevices ()
+    {
+    DeviceIntPtr dev;
+    int i;
+
+    for (i=0; i&lt;MAX_DEVICES; i++) 
+        {
+        if (!local_dev[i].initialized &amp;&amp; available(local_dev[i]))
+            {
+            dev = (DeviceIntPtr) AddInputDevice (local_dev[i].deviceProc, TRUE);
+            dev-&gt;public.devicePrivate = local_dev[i];
+            RegisterOtherDevice (dev);
+            dev-&gt;inited = ((*dev-&gt;deviceProc)(dev, DEVICE_INIT) == Success);
+            }
+        }
+    }
+</literallayout>
+</para>
+<para>
+<!-- .LP -->
+The default AddOtherInputDevices routine in xstubs.c does nothing.
+If all input extension devices are initialized when the server 
+starts up, it can be left as a null routine.
+</para>
+</sect2>
+<sect2 id="OpenInputDevice">
+<title>OpenInputDevice</title>
+<para>
+<!-- .LP -->
+Some X server implementations open all input devices when the server
+is initialized and never close them.  Other implementations may open only
+the X pointer and keyboard devices during server initialization,
+and open other input devices only when some client makes an
+XOpenDevice request.  This entry point is for the latter type of 
+implementation.
+</para>
+<para>
+<!-- .LP -->
+If the physical device is not already open, it can be done in this routine.  
+In this case, the server must keep track of the fact that one or more clients 
+have the device open, and physically close it when the last client that has
+it open makes an XCloseDevice request.
+</para>
+<para>
+<!-- .LP -->
+The default implementation is to do nothing (assume all input devices
+are opened during X server initialization and kept open).
+</para>
+</sect2>
+<sect2 id="CloseInputDevice">
+<title>CloseInputDevice</title>
+<para>
+<!-- .LP -->
+Some implementations may close an input device when the last client
+using that device requests that it be closed, or terminates.
+CloseInputDevice is called from ProcXCloseDevice when a client
+makes an XCloseDevice protocol request.
+</para>
+<para>
+<!-- .LP -->
+The default implementation is to do nothing (assume all input devices
+are opened during X server initialization and kept open).
+</para>
+</sect2>
+<sect2 id="SetDeviceMode">
+<title>SetDeviceMode</title>
+<para>
+<!-- .LP -->
+Some implementations support input devices that can report 
+either absolute positional data or relative motion.  The XSetDeviceMode
+protocol request is provided to allow DDX to change the current mode of 
+such a device.
+</para>
+<para>
+<!-- .LP -->
+The default implementation is to always return a BadMatch error.  If the
+implementation does not support any input devices that are capable of 
+reporting both relative motion and absolute position information, the
+default implementation may be left unchanged.
+</para>
+</sect2>
+<sect2 id="SetDeviceValuators">
+<title>SetDeviceValuators</title>
+<para>
+<!-- .LP -->
+Some implementations support input devices that allow their valuators to be 
+set to an initial value.  The XSetDeviceValuators 
+protocol request is provided to allow DDX to set the valuators of
+such a device.
+</para>
+<para>
+<!-- .LP -->
+The default implementation is to always return a BadMatch error.  If the
+implementation does not support any input devices that are allow their
+valuators to be set, the default implementation may be left unchanged.
+</para>
+</sect2>
+<sect2 id="ChangePointerDevice">
+<title>ChangePointerDevice</title>
+<para>
+<!-- .LP -->
+The XChangePointerDevice protocol request is provided to change which device is
+used as the X pointer.  Some implementations may maintain information
+specific to the X pointer in the private data structure pointed to by
+the DeviceIntRec.  ChangePointerDevice is called to allow such 
+implementations to move that information to the new pointer device.
+The current location of the X cursor is an example of the type of 
+information that might be affected.
+</para>
+<para>
+<!-- .LP -->
+The DeviceIntRec structure that describes the X pointer device does not 
+contain a FocusRec.  If the device that has been made into the new X pointer 
+was previously a device that could be focused, ProcXChangePointerDevice will 
+free the FocusRec associated with that device.
+</para>
+<para>
+<!-- .LP -->
+If the server implementation desires to allow clients to focus the old pointer 
+device (which is now accessible through the input extension), it should call
+InitFocusClassDeviceStruct for the old pointer device.
+</para>
+<para>
+<!-- .LP -->
+The XChangePointerDevice protocol request also allows the client
+to choose which axes of the new pointer device are used to move 
+the X cursor in the X- and Y- directions.  If the axes are different
+than the default ones, the server implementation should record that fact.
+</para>
+<para>
+<!-- .LP -->
+If the server implementation supports input devices with valuators that 
+are not allowed to be used as the X pointer, they should be screened out
+by this routine and a  BadDevice error returned.
+</para>
+<para>
+<!-- .LP -->
+The default implementation is to do nothing. 
+</para>
+</sect2>
+<sect2 id="ChangeKeyboardDevice">
+<title>ChangeKeyboardDevice</title>
+<para>
+<!-- .LP -->
+The XChangeKeyboardDevice protocol request is provided to change which device is
+used as the X keyboard.  Some implementations may maintain information
+specific to the X keyboard in the private data structure pointed to by
+the DeviceIntRec.  ChangeKeyboardDevice is called to allow such 
+implementations to move that information to the new keyboard device.
+</para>
+<para>
+<!-- .LP -->
+The X keyboard device can be focused, and the DeviceIntRec that describes
+that device has a FocusRec.  If the device that has been made into the new X 
+keyboard did not previously have a FocusRec, 
+ProcXChangeKeyboardDevice will allocate one for it.
+</para>
+<para>
+<!-- .LP -->
+If the implementation does not want clients to be able to focus the old X 
+keyboard (which has now become available as an input extension device)
+it should call DeleteFocusClassDeviceStruct to free the FocusRec.
+</para>
+<para>
+<!-- .LP -->
+If the implementation supports input devices with keys that are not allowed
+to be used as the X keyboard, they should be checked for here, and a
+BadDevice error returned.
+</para>
+<para>
+<!-- .LP -->
+The default implementation is to do nothing. 
+</para>
+</sect2>
+</sect1>
+<sect1 id="Input_Extension_Events">
+<title>Input Extension Events</title>
+<para>
+<!-- .LP -->
+Events accessed through the input extension are analogous to the core input
+events, but have different event types.  They are of types 
+<function>DeviceKeyPress</function>, <function>DeviceKeyRelease</function>, <function>DeviceButtonPress</function>,
+<function>DeviceButtonRelease</function>, <function>DeviceDeviceMotionNotify</function>,
+<function>DeviceProximityIn</function>, <function>DeviceProximityOut</function>, and <function>DeviceValuator</function>.
+These event types are not constants.  Instead, they are external integers 
+defined by the input extension.  Their actual values will depend on which
+extensions are supported by a server, and the order in which they are
+initialized.
+</para>
+<para>
+<!-- .LP -->
+The data structures that define these
+events are defined in the file <function>extensions/include/XIproto.h</function>.  Other
+input extension constants needed by DDX are defined in the file
+<function>extensions/include/XI.h</function>.
+</para>
+<para>
+<!-- .LP -->
+Some events defined by the input extension contain more information than can
+be contained in the 32-byte xEvent data structure.  To send this information
+to clients, DDX must generate two or more 32-byte wire events.  The following
+sections describe the contents of these events. 
+</para>
+<sect2 id="Device_Key_Events">
+<title>Device Key Events</title>
+<para>
+<!-- .LP -->
+<function>DeviceKeyPresss</function> events contain all the information that is contained in
+a core <function>KeyPress</function> event, and also the following additional information:
+</para>
+<para>
+<!-- .LP -->
+<!-- .RS -->
+<!-- .in +5n -->
+</para>
+<itemizedlist>
+  <listitem>
+    <para>
+deviceid - the identifier of the device that generated the event.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+device_state - the state of any modifiers on the device that generated the event
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+num_valuators - the number of valuators reported in this event.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+first_valuator - the first valuator reported in this event.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+valuator0 through valuator5 - the values of the valuators.
+<!-- .in -5n -->
+<!-- .RE -->
+    </para>
+  </listitem>
+</itemizedlist>
+<para>
+<!-- .LP -->
+In order to pass this information to the input extension library, two 32-byte
+wire events must be generated by DDX.  The first has an event type of 
+<function>DeviceKeyPress</function>, and the second has an event type of \fPDeviceValuator\fP.
+</para>
+<para>
+<!-- .LP -->
+The following code fragment shows how the two wire events could be initialized:
+</para>
+<para>
+<!-- .LP -->
+<literallayout class="monospaced">
+    extern int DeviceKeyPress;
+    DeviceIntPtr dev;
+    xEvent xE[2];
+    CARD8 id, num_valuators;
+    INT16 x, y, pointerx, pointery;
+    Time timestamp;
+    deviceKeyButtonPointer *xev = (deviceKeyButtonPointer *) xE;
+    deviceValuator *xv;
+
+    xev-&gt;type = DeviceKeyPress;                /* defined by input extension */
+    xev-&gt;detail = keycode;              /* key pressed on this device */
+    xev-&gt;time = timestamp;              /* same as for core events    */
+    xev-&gt;rootX = pointerx;              /* x location of core pointer */
+    xev-&gt;rootY = pointery;              /* y location of core pointer */
+
+    /******************************************************************/
+    /*                                                                */
+    /* The following field does not exist for core input events.      */
+    /* It contains the device id for the device that generated the    */
+    /* event, and also indicates whether more than one 32-byte wire   */
+    /* event is being sent.                                           */
+    /*                                                                */
+    /******************************************************************/
+
+    xev-&gt;deviceid = dev-&gt;id | MORE_EVENTS;        /* sending more than 1*/
+
+    /******************************************************************/
+    /* Fields in the second 32-byte wire event:                       */
+    /******************************************************************/
+
+    xv = (deviceValuator *) ++xev;
+    xv-&gt;type = DeviceValuator;          /* event type of second event */
+    xv-&gt;deviceid = dev-&gt;id;             /* id of this device          */
+    xv-&gt;num_valuators = 0;              /* no valuators being sent    */
+    xv-&gt;device_state  = 0;              /* will be filled in by DIX   */
+</literallayout>
+</para>
+</sect2>
+<sect2 id="Device_Button_Events">
+<title>Device Button Events</title>
+<para>
+<!-- .LP -->
+<function>DeviceButton</function> events contain all the information that is contained in
+a core button event, and also the same additional information that a 
+<function>DeviceKey</function> event contains.
+</para>
+</sect2>
+<sect2 id="Device_Motion_Events">
+<title>Device Motion Events</title>
+<para>
+<!-- .LP -->
+<function>DeviceMotion</function> events contain all the information that is contained in
+a core motion event, and also additional valuator information.  At least
+two wire events are required to contain this information.
+The following code fragment shows how the two wire events could be initialized:
+</para>
+<para>
+<!-- .LP -->
+<literallayout class="monospaced">
+    extern int DeviceMotionNotify;
+    DeviceIntPtr dev;
+    xEvent xE[2];
+    CARD8 id, num_valuators;
+    INT16 x, y, pointerx, pointery;
+    Time timestamp;
+    deviceKeyButtonPointer *xev = (deviceKeyButtonPointer *) xE;
+    deviceValuator *xv;
+
+    xev-&gt;type = DeviceMotionNotify;     /* defined by input extension */
+    xev-&gt;detail = keycode;              /* key pressed on this device */
+    xev-&gt;time = timestamp;              /* same as for core events    */
+    xev-&gt;rootX = pointerx;              /* x location of core pointer */
+    xev-&gt;rootY = pointery;              /* y location of core pointer */
+
+    /******************************************************************/
+    /*                                                                */
+    /* The following field does not exist for core input events.      */
+    /* It contains the device id for the device that generated the    */
+    /* event, and also indicates whether more than one 32-byte wire   */
+    /* event is being sent.                                           */
+    /*                                                                */
+    /******************************************************************/
+
+    xev-&gt;deviceid = dev-&gt;id | MORE_EVENTS;        /* sending more than 1*/
+
+    /******************************************************************/
+    /* Fields in the second 32-byte wire event:                       */
+    /******************************************************************/
+
+    xv = (deviceValuator *) ++xev;
+    xv-&gt;type = DeviceValuator;          /* event type of second event */
+    xv-&gt;deviceid = dev-&gt;id;             /* id of this device          */
+    xv-&gt;num_valuators = 2;              /* 2 valuators being sent     */
+    xv-&gt;first_valuator = 0;             /* first valuator being sent  */
+    xv-&gt;device_state  = 0;              /* will be filled in by DIX   */
+    xv-&gt;valuator0 = x;                  /* first axis of this device  */
+    xv-&gt;valuator1 = y;                  /* second axis of this device */
+</literallayout>
+</para>
+<para>
+<!-- .LP -->
+Up to six axes can be reported in the deviceValuator event.  If the device
+is reporting more than 6 axes, additional pairs of DeviceMotionNotify and
+DeviceValuator events should be sent,  with the first_valuator field
+set correctly.
+</para>
+</sect2>
+<sect2 id="Device_Proximity_Events">
+<title>Device Proximity Events</title>
+<para>
+<!-- .LP -->
+Some input devices that report absolute positional information, such as 
+graphics tablets and touchscreens, may report proximity events.  
+<function>ProximityIn</function>
+events are generated when a pointing device like a stylus, or in the case
+of a touchscreen, the user's finger, comes into close proximity with the
+surface of the input device.  <function>ProximityOut</function> events are generated when
+the stylus or finger leaves the proximity of the input devices surface.
+</para>
+<para>
+<!-- .LP -->
+<function>Proximity</function> events contain almost the same information as button events.
+The event type is <function>ProximityIn</function> or <function>ProximityOut</function>, and there is no
+detail information.
+<!-- .bp -->
+<!-- .\" .TC -->
+
+</para>
+</sect2>
+</sect1>
+</chapter>
+</book>
diff --git a/xorg-server/doc/xml/Xserver-spec.xml b/xorg-server/doc/Xserver-spec.xml
index a48e88754..a48e88754 100644
--- a/xorg-server/doc/xml/Xserver-spec.xml
+++ b/xorg-server/doc/Xserver-spec.xml
diff --git a/xorg-server/doc/dtrace/Makefile.am b/xorg-server/doc/dtrace/Makefile.am
new file mode 100644
index 000000000..aaf5a1267
--- /dev/null
+++ b/xorg-server/doc/dtrace/Makefile.am
@@ -0,0 +1,17 @@
+
+if ENABLE_DOCS
+if HAVE_XMLTO
+if XSERVER_DTRACE
+
+# Main DocBook/XML files (DOCTYPE book)
+docbook = Xserver-DTrace.xml
+
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+
+endif XSERVER_DTRACE
+endif HAVE_XMLTO
+endif ENABLE_DOCS
diff --git a/xorg-server/doc/xml/dtrace/Xserver-DTrace.xml b/xorg-server/doc/dtrace/Xserver-DTrace.xml
index e0425c8ee..e0425c8ee 100644
--- a/xorg-server/doc/xml/dtrace/Xserver-DTrace.xml
+++ b/xorg-server/doc/dtrace/Xserver-DTrace.xml
diff --git a/xorg-server/doc/man/Makefile.am b/xorg-server/doc/man/Makefile.am
deleted file mode 100644
index 71d704917..000000000
--- a/xorg-server/doc/man/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-# Xserver.man covers options generic to all X servers built in this tree
-# (i.e. those handled in the os/utils.c options processing instead of in
-#  the DDX-level options processing)
-
-include $(top_srcdir)/manpages.am
-appman_PRE = Xserver.man
diff --git a/xorg-server/doc/man/Xserver.man b/xorg-server/doc/man/Xserver.man
deleted file mode 100644
index d3a16e2b7..000000000
--- a/xorg-server/doc/man/Xserver.man
+++ /dev/null
@@ -1,584 +0,0 @@
-.\" $Xorg: Xserver.man,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $

-.\" $XdotOrg: xserver/xorg/doc/Xserver.man.pre,v 1.4 2005/12/23 20:11:12 alanc Exp $

-.\" Copyright 1984 - 1991, 1993, 1994, 1998  The Open Group

-.\"

-.\" Permission to use, copy, modify, distribute, and sell this software and its

-.\" documentation for any purpose is hereby granted without fee, provided that

-.\" the above copyright notice appear in all copies and that both that

-.\" copyright notice and this permission notice appear in supporting

-.\" documentation.

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

-.\" OTHER 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.

-.\"

-.\" Except as contained in this notice, the name of The Open Group shall

-.\" not be used in advertising or otherwise to promote the sale, use or

-.\" other dealings in this Software without prior written authorization

-.\" from The Open Group.

-.\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.31 2004/01/10 22:27:46 dawes Exp $

-.\" shorthand for double quote that works everywhere.

-.ds q \N'34'

-.TH XSERVER 1 __xorgversion__

-.SH NAME

-Xserver \- X Window System display server

-.SH SYNOPSIS

-.B X

-[option ...]

-.SH DESCRIPTION

-.I X

-is the generic name for the X Window System display server.  It is

-frequently a link or a copy of the appropriate server binary for

-driving the most frequently used server on a given machine.

-.SH "STARTING THE SERVER"

-The X server is usually started from the X Display Manager program

-\fIxdm\fP(1) or a similar display manager program.

-This utility is run from the system boot files and takes care of keeping

-the server running, prompting for usernames and passwords, and starting up

-the user sessions.

-.PP

-Installations that run more than one window system may need to use the

-\fIxinit\fP(1) utility instead of a display manager.  However, \fIxinit\fP is

-to be considered a tool for building startup scripts and is not

-intended for use by end users.  Site administrators are \fBstrongly\fP

-urged to use a display manager, or build other interfaces for novice users.

-.PP

-The X server may also be started directly by the user, though this

-method is usually reserved for testing and is not recommended for

-normal operation.  On some platforms, the user must have special

-permission to start the X server, often because access to certain

-devices (e.g. \fI/dev/mouse\fP) is restricted.

-.PP

-When the X server starts up, it typically takes over the display.  If

-you are running on a workstation whose console is the display, you may

-not be able to log into the console while the server is running.

-.SH OPTIONS

-Many X servers have device-specific command line options.  See the manual

-pages for the individual servers for more details; a list of

-server-specific manual pages is provided in the SEE ALSO section below.

-.PP

-All of the X servers accept the command line options described below.

-Some X servers may have alternative ways of providing the parameters

-described here, but the values provided via the command line options

-should override values specified via other mechanisms.

-.TP 8

-.B :\fIdisplaynumber\fP

-The X server runs as the given \fIdisplaynumber\fP, which by default is 0.

-If multiple X servers are to run simultaneously on a host, each must have

-a unique display number.  See the DISPLAY

-NAMES section of the \fIX\fP(__miscmansuffix__) manual page to learn how to

-specify which display number clients should try to use.

-.TP 8

-.B \-a \fInumber\fP

-sets pointer acceleration (i.e. the ratio of how much is reported to how much

-the user actually moved the pointer).

-.TP 8

-.B \-ac

-disables host-based access control mechanisms.  Enables access by any host,

-and permits any host to modify the access control list.

-Use with extreme caution.

-This option exists primarily for running test suites remotely.

-.TP 8

-.B \-audit \fIlevel\fP

-sets the audit trail level.  The default level is 1, meaning only connection

-rejections are reported.  Level 2 additionally reports all successful

-connections and disconnects.  Level 4 enables messages from the

-SECURITY extension, if present, including generation and revocation of

-authorizations and violations of the security policy.

-Level 0 turns off the audit trail.

-Audit lines are sent as standard error output.

-.TP 8

-.B \-auth \fIauthorization-file\fP

-specifies a file which contains a collection of authorization records used

-to authenticate access.  See also the \fIxdm\fP(1) and

-\fIXsecurity\fP(__miscmansuffix__) manual pages.

-.TP 8

-.B \-br

-sets the default root window to solid black instead of the standard root weave

-pattern.   This is the default unless -retro or -wr is specified.

-.TP 8

-.B \-bs

-disables backing store support on all screens.

-.TP 8

-.B \-c

-turns off key-click.

-.TP 8

-.B c \fIvolume\fP

-sets key-click volume (allowable range: 0-100).

-.TP 8

-.B \-cc \fIclass\fP

-sets the visual class for the root window of color screens.

-The class numbers are as specified in the X protocol.

-Not obeyed by all servers.

-.TP 8

-.B \-core

-causes the server to generate a core dump on fatal errors.

-.TP 8

-.B \-deferglyphs \fIwhichfonts\fP

-specifies the types of fonts for which the server should attempt to use

-deferred glyph loading.  \fIwhichfonts\fP can be all (all fonts),

-none (no fonts), or 16 (16 bit fonts only).

-.TP 8

-.B \-dpi \fIresolution\fP

-sets the resolution for all screens, in dots per inch.

-To be used when the server cannot determine the screen size(s) from the

-hardware.

-.TP 8

-.B dpms

-enables DPMS (display power management services), where supported.  The

-default state is platform and configuration specific.

-.TP 8

-.B \-dpms

-disables DPMS (display power management services).  The default state

-is platform and configuration specific.

-.TP 8

-.BI \-extension extensionName

-disables named extension.   If an unknown extension name is specified,

-a list of accepted extension names is printed.

-.TP 8

-.BI \+extension extensionName

-enables named extension.   If an unknown extension name is specified,

-a list of accepted extension names is printed.

-.TP 8

-.B \-f \fIvolume\fP

-sets feep (bell) volume (allowable range: 0-100).

-.TP 8

-.B \-fc \fIcursorFont\fP

-sets default cursor font.

-.TP 8

-.B \-fn \fIfont\fP

-sets the default font.

-.TP 8

-.B \-fp \fIfontPath\fP

-sets the search path for fonts.  This path is a comma separated list

-of directories which the X server searches for font databases.

-See the FONTS section of this manual page for more information and the default

-list.

-.TP 8

-.B \-help

-prints a usage message.

-.TP 8

-.B \-I

-causes all remaining command line arguments to be ignored.

-.TP 8

-.B \-maxbigreqsize \fIsize\fP

-sets the maximum big request to

-.I size

-MB.

-.TP 8

-.B \-nocursor

-disable the display of the pointer cursor.

-.TP 8

-.B \-nolisten \fItrans-type\fP

-disables a transport type.  For example, TCP/IP connections can be disabled

-with

-.BR "\-nolisten tcp" .

-This option may be issued multiple times to disable listening to different

-transport types.

-.TP 8

-.B \-noreset

-prevents a server reset when the last client connection is closed.  This

-overrides a previous

-.B \-terminate

-command line option.

-.TP 8

-.B \-p \fIminutes\fP

-sets screen-saver pattern cycle time in minutes.

-.TP 8

-.B \-pn

-permits the server to continue running if it fails to establish all of

-its well-known sockets (connection points for clients), but

-establishes at least one.  This option is set by default.

-.TP 8

-.B \-nopn

-causes the server to exit if it fails to establish all of its well-known

-sockets (connection points for clients).

-.TP 8

-.B \-r

-turns off auto-repeat.

-.TP 8

-.B r

-turns on auto-repeat.

-.TP 8

-.B -retro

-starts the stipple with the classic stipple and cursor visible.  The default

-is to start with a black root window, and to suppress display of the cursor

-until the first time an application calls XDefineCursor().  For the Xorg

-server, this also sets the default for the DontZap option to FALSE.  For

-kdrive servers, this implies -zap.

-.TP 8

-.B \-s \fIminutes\fP

-sets screen-saver timeout time in minutes.

-.TP 8

-.B \-su

-disables save under support on all screens.

-.TP 8

-.B \-t \fInumber\fP

-sets pointer acceleration threshold in pixels (i.e. after how many pixels

-pointer acceleration should take effect).

-.TP 8

-.B \-terminate

-causes the server to terminate at server reset, instead of continuing to run.

-This overrides a previous

-.B \-noreset

-command line option.

-.TP 8

-.B \-to \fIseconds\fP

-sets default connection timeout in seconds.

-.TP 8

-.B \-tst

-disables all testing extensions (e.g., XTEST, XTrap, XTestExtension1, RECORD).

-.TP 8

-.B tty\fIxx\fP

-ignored, for servers started the ancient way (from init).

-.TP 8

-.B v

-sets video-off screen-saver preference.

-.TP 8

-.B \-v

-sets video-on screen-saver preference.

-.TP 8

-.B \-wm

-forces the default backing-store of all windows to be WhenMapped.  This

-is a backdoor way of getting backing-store to apply to all windows.

-Although all mapped windows will have backing store, the backing store

-attribute value reported by the server for a window will be the last

-value established by a client.  If it has never been set by a client,

-the server will report the default value, NotUseful.  This behavior is

-required by the X protocol, which allows the server to exceed the

-client's backing store expectations but does not provide a way to tell

-the client that it is doing so.

-.TP 8

-.B \-wr

-sets the default root window to solid white instead of the standard root weave

-pattern.

-.TP 8

-.B \-x \fIextension\fP

-loads the specified extension at init.

-This is a no-op for most implementations.

-.TP 8

-.B [+-]xinerama

-enables(+) or disables(-) the XINERAMA extension.  The default state is

-platform and configuration specific.

-.SH SERVER DEPENDENT OPTIONS

-Some X servers accept the following options:

-.TP 8

-.B \-ld \fIkilobytes\fP

-sets the data space limit of the server to the specified number of kilobytes.

-A value of zero makes the data size as large as possible.  The default value

-of \-1 leaves the data space limit unchanged.

-.TP 8

-.B \-lf \fIfiles\fP

-sets the number-of-open-files limit of the server to the specified number.

-A value of zero makes the limit as large as possible.  The default value

-of \-1 leaves the limit unchanged.

-.TP 8

-.B \-ls \fIkilobytes\fP

-sets the stack space limit of the server to the specified number of kilobytes.

-A value of zero makes the stack size as large as possible.  The default value

-of \-1 leaves the stack space limit unchanged.

-.TP 8

-.B \-render

-.BR default | mono | gray | color

-sets the color allocation policy that will be used by the render extension.

-.RS 8

-.TP 8

-.I default

-selects the default policy defined for the display depth of the X

-server.

-.TP 8

-.I mono

-don't use any color cell.

-.TP 8

-.I gray

-use a gray map of 13 color cells for the X render extension.

-.TP 8

-.I color

-use a color cube of at most 4*4*4 colors (that is 64 color cells).

-.RE

-.TP 8

-.B \-dumbSched

-disables smart scheduling on platforms that support the smart scheduler.

-.TP

-.B \-schedInterval \fIinterval\fP

-sets the smart scheduler's scheduling interval to

-.I interval

-milliseconds.

-.SH XDMCP OPTIONS

-X servers that support XDMCP have the following options.

-See the \fIX Display Manager Control Protocol\fP specification for more

-information.

-.TP 8

-.B \-query \fIhostname\fP

-enables XDMCP and sends Query packets to the specified

-.IR hostname .

-.TP 8

-.B \-broadcast

-enable XDMCP and broadcasts BroadcastQuery packets to the network.  The

-first responding display manager will be chosen for the session.

-.TP 8

-.B \-multicast [\fIaddress\fP [\fIhop count\fP]]

-Enable XDMCP and multicast BroadcastQuery packets to the  network.

-The first responding display manager is chosen for the session.  If an

-address is specified, the multicast is sent to that address.  If no

-address is specified, the multicast is sent to the default XDMCP IPv6

-multicast group.  If a hop count is specified, it is used as the maximum

-hop count for the multicast.  If no hop count is specified, the multicast

-is set to a maximum of 1 hop, to prevent the multicast from being routed

-beyond the local network.

-.TP 8

-.B \-indirect \fIhostname\fP

-enables XDMCP and send IndirectQuery packets to the specified

-.IR hostname .

-.TP 8

-.B \-port \fIport-number\fP

-uses the specified \fIport-number\fP for XDMCP packets, instead of the

-default.  This option must be specified before any \-query, \-broadcast,

-\-multicast, or \-indirect options.

-.TP 8

-.B \-from \fIlocal-address\fP

-specifies the local address to connect from (useful if the connecting host

-has multiple network interfaces).  The \fIlocal-address\fP may be expressed

-in any form acceptable to the host platform's \fIgethostbyname\fP(3)

-implementation.

-.TP 8

-.B \-once

-causes the server to terminate (rather than reset) when the XDMCP session

-ends.

-.TP 8

-.B \-class \fIdisplay-class\fP

-XDMCP has an additional display qualifier used in resource lookup for

-display-specific options.  This option sets that value, by default it

-is "MIT-Unspecified" (not a very useful value).

-.TP 8

-.B \-cookie \fIxdm-auth-bits\fP

-When testing XDM-AUTHENTICATION-1, a private key is shared between the

-server and the manager.  This option sets the value of that private

-data (not that it is very private, being on the command line!).

-.TP 8

-.B \-displayID \fIdisplay-id\fP

-Yet another XDMCP specific value, this one allows the display manager to

-identify each display so that it can locate the shared key.

-.SH XKEYBOARD OPTIONS

-X servers that support the XKEYBOARD (a.k.a. \*qXKB\*q) extension accept the

-following options.  All layout files specified on the command line must be

-located in the XKB base directory or a subdirectory, and specified as the

-relative path from the XKB base directory.  The default XKB base directory is

-.IR __projectroot__/lib/X11/xkb .

-.TP 8

-.BR [+-]accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]"

-enables(+) or disables(-) AccessX key sequences.

-.TP 8

-.B \-xkbdir \fIdirectory\fP

-base directory for keyboard layout files.  This option is not available

-for setuid X servers (i.e., when the X server's real and effective uids

-are different).

-.TP 8

-.B \-ardelay \fImilliseconds\fP

-sets the autorepeat delay (length of time in milliseconds that a key must

-be depressed before autorepeat starts).

-.TP 8

-.B \-arinterval \fImilliseconds\fP

-sets the autorepeat interval (length of time in milliseconds that should

-elapse between autorepeat-generated keystrokes).

-.TP 8

-.B \-xkbmap \fIfilename\fP

-loads keyboard description in \fIfilename\fP on server startup.

-.SH "NETWORK CONNECTIONS"

-The X server supports client connections via a platform-dependent subset of

-the following transport types: TCP\/IP, Unix Domain sockets, DECnet,

-and several varieties of SVR4 local connections.  See the DISPLAY

-NAMES section of the \fIX\fP(__miscmansuffix__) manual page to learn how to

-specify which transport type clients should try to use.

-.SH GRANTING ACCESS

-The X server implements a platform-dependent subset of the following

-authorization protocols: MIT-MAGIC-COOKIE-1, XDM-AUTHORIZATION-1,

-XDM-AUTHORIZATION-2, SUN-DES-1, and MIT-KERBEROS-5.  See the

-\fIXsecurity\fP(__miscmansuffix__) manual page for information on the

-operation of these protocols.

-.PP

-Authorization data required by the above protocols is passed to the

-server in a private file named with the \fB\-auth\fP command line

-option.  Each time the server is about to accept the first connection

-after a reset (or when the server is starting), it reads this file.

-If this file contains any authorization records, the local host is not

-automatically allowed access to the server, and only clients which

-send one of the authorization records contained in the file in the

-connection setup information will be allowed access.  See the

-\fIXau\fP manual page for a description of the binary format of this

-file.  See \fIxauth\fP(1) for maintenance of this file, and distribution

-of its contents to remote hosts.

-.PP

-The X server also uses a host-based access control list for deciding

-whether or not to accept connections from clients on a particular machine.

-If no other authorization mechanism is being used,

-this list initially consists of the host on which the server is running as

-well as any machines listed in the file \fI/etc/X\fBn\fI.hosts\fR, where

-\fBn\fP is the display number of the server.  Each line of the file should

-contain either an Internet hostname (e.g. expo.lcs.mit.edu) or a DECnet

-hostname in double colon format (e.g. hydra::) or a complete name in the format

-\fIfamily\fP:\fIname\fP as described in the \fIxhost\fP(1) manual page.

-There should be no leading or trailing spaces on any lines.  For example:

-.sp

-.in +8

-.nf

-joesworkstation

-corporate.company.com

-star::

-inet:bigcpu

-local:

-.fi

-.in -8

-.PP

-Users can add or remove hosts from this list and enable or disable access

-control using the \fIxhost\fP command from the same machine as the server.

-.PP

-If the X FireWall Proxy (\fIxfwp\fP) is being used without a sitepolicy,

-host-based authorization must be turned on for clients to be able to

-connect to the X server via the \fIxfwp\fP.  If \fIxfwp\fP is run without

-a configuration file and thus no sitepolicy is defined, if \fIxfwp\fP

-is using an X server where xhost + has been run to turn off host-based

-authorization checks, when a client tries to connect to this X server

-via \fIxfwp\fP, the X server will deny the connection.  See \fIxfwp\fP(1)

-for more information about this proxy.

-.PP

-The X protocol intrinsically does not have any notion of window operation

-permissions or place any restrictions on what a client can do; if a program can

-connect to a display, it has full run of the screen.

-X servers that support the SECURITY extension fare better because clients

-can be designated untrusted via the authorization they use to connect; see

-the \fIxauth\fP(1) manual page for details.  Restrictions are imposed

-on untrusted clients that curtail the mischief they can do.  See the SECURITY

-extension specification for a complete list of these restrictions.

-.PP

-Sites that have better

-authentication and authorization systems might wish to make

-use of the hooks in the libraries and the server to provide additional

-security models.

-.SH SIGNALS

-The X server attaches special meaning to the following signals:

-.TP 8

-.I SIGHUP

-This signal causes the server to close all existing connections, free all

-resources, and restore all defaults.  It is sent by the display manager

-whenever the main user's main application (usually an \fIxterm\fP or window

-manager) exits to force the server to clean up and prepare for the next

-user.

-.TP 8

-.I SIGTERM

-This signal causes the server to exit cleanly.

-.TP 8

-.I SIGUSR1

-This signal is used quite differently from either of the above.  When the

-server starts, it checks to see if it has inherited SIGUSR1 as SIG_IGN

-instead of the usual SIG_DFL.  In this case, the server sends a SIGUSR1 to

-its parent process after it has set up the various connection schemes.

-\fIXdm\fP uses this feature to recognize when connecting to the server

-is possible.

-.SH FONTS

-The X server can obtain fonts from directories and/or from font servers.

-The list of directories and font servers

-the X server uses when trying to open a font is controlled

-by the \fIfont path\fP.

-.LP

-The default font path is

-__default_font_path__ .

-.LP

-A special kind of directory can be specified using the \fBcatalogue\fP:

-prefix. Directories specified this way can contain symlinks pointing to the

-real font directories. See the FONTPATH.D section for details.

-.LP

-The font path can be set with the \fB\-fp\fP option or by \fIxset\fP(1)

-after the server has started.

-.SH "FONTPATH.D"

-You can specify a special kind of font path in the form \fBcatalogue:<dir>\fR.

-The directory specified after the catalogue: prefix will be scanned for symlinks

-and each symlink destination will be added as a local fontfile FPE.

-.PP

-The symlink can be suffixed by attributes such as '\fBunscaled\fR', which

-will be passed through to the underlying fontfile FPE. The only exception is

-the newly introduced '\fBpri\fR' attribute, which will be used for ordering

-the font paths specified by the symlinks.

-

-An example configuration:

-

-.nf

-    75dpi:unscaled:pri=20 \-> /usr/share/X11/fonts/75dpi

-    ghostscript:pri=60 \-> /usr/share/fonts/default/ghostscript

-    misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc

-    type1:pri=40 \-> /usr/share/X11/fonts/Type1

-    type1:pri=50 \-> /usr/share/fonts/default/Type1

-.fi

-

-This will add /usr/share/X11/fonts/misc as the first FPE with the attribute

-'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with

-the attribute unscaled etc. This is functionally equivalent to setting

-the following font path:

-

-.nf

-    /usr/share/X11/fonts/misc:unscaled,

-    /usr/share/X11/fonts/75dpi:unscaled,

-    /usr/share/X11/fonts/Type1,

-    /usr/share/fonts/default/Type1,

-    /usr/share/fonts/default/ghostscript

-.fi

-

-.SH FILES

-.TP 30

-.I /etc/X\fBn\fP.hosts

-Initial access control list for display number \fBn\fP

-.TP 30

-.IR __datadir__/fonts/X11/misc , __datadir__/fonts/X11/75dpi , __datadir__/fonts/X11/100dpi

-Bitmap font directories

-.TP 30

-.IR __datadir__/fonts/X11/TTF , __datadir__/fonts/X11/Type1

-Outline font directories

-.TP 30

-.I /tmp/.X11-unix/X\fBn\fP

-Unix domain socket for display number \fBn\fP

-.TP 30

-.I /usr/adm/X\fBn\fPmsgs

-Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffix__)

-.TP 30

-.I __projectroot__/lib/X11/xdm/xdm-errors

-Default error log file if the server is run from \fIxdm\fP(1)

-.SH "SEE ALSO"

-General information: \fIX\fP(__miscmansuffix__)

-.PP

-Protocols:

-.I "X Window System Protocol,"

-.I "The X Font Service Protocol,"

-.I "X Display Manager Control Protocol"

-.PP

-Fonts: \fIbdftopcf\fP(1), \fImkfontdir\fP(1), \fImkfontscale\fP(1),

-\fIxfs\fP(1), \fIxlsfonts\fP(1), \fIxfontsel\fP(1), \fIxfd\fP(1),

-.I "X Logical Font Description Conventions"

-.PP

-Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1),

-\fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),

-.I "Security Extension Specification"

-.PP

-Starting the server: \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)

-.PP

-Controlling the server once started: \fIxset\fP(1), \fIxsetroot\fP(1),

-\fIxhost\fP(1), \fIxinput\fP(1), \fIxrandr\fP(1)

-.PP

-Server-specific man pages:

-\fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXnest\fP(1),

-\fIXvfb\fP(1), \fIXquartz\fP(1), \fIXWin\fP(1).

-.PP

-Server internal documentation:

-.I "Definition of the Porting Layer for the X v11 Sample Server"

-.SH AUTHORS

-The sample server was originally written by Susan Angebranndt, Raymond

-Drewry, Philip Karlton, and Todd Newman, from Digital Equipment

-Corporation, with support from a large cast.  It has since been

-extensively rewritten by Keith Packard and Bob Scheifler, from MIT.

-Dave Wiggins took over post-R5 and made substantial improvements.

diff --git a/xorg-server/doc/xml/Makefile.am b/xorg-server/doc/xml/Makefile.am
deleted file mode 100644
index 9feb1f03d..000000000
--- a/xorg-server/doc/xml/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#

-# Copyright (c) 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"),

-# to deal in the Software without restriction, including without limitation

-# the rights to use, copy, modify, merge, publish, distribute, sublicense,

-# and/or sell copies of the Software, and to permit persons to whom the

-# Software is furnished to do so, subject to the following conditions:

-#

-# The above copyright notice and this permission notice (including the next

-# paragraph) shall be included in all copies or substantial portions of the

-# Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-# 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.

-#

-

-SUBDIRS = dtrace

-doc_sources =  Xserver-spec.xml

-

-# Developer's documentation is not installed

-if ENABLE_DEVEL_DOCS

-include $(top_srcdir)/doc/xml/xmlrules-noinst.in

-endif

diff --git a/xorg-server/doc/xml/dtrace/Makefile.am b/xorg-server/doc/xml/dtrace/Makefile.am
deleted file mode 100644
index 8bbe040d8..000000000
--- a/xorg-server/doc/xml/dtrace/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-#

-# Copyright (c) 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"),

-# to deal in the Software without restriction, including without limitation

-# the rights to use, copy, modify, merge, publish, distribute, sublicense,

-# and/or sell copies of the Software, and to permit persons to whom the

-# Software is furnished to do so, subject to the following conditions:

-#

-# The above copyright notice and this permission notice (including the next

-# paragraph) shall be included in all copies or substantial portions of the

-# Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-# 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.

-#

-

-doc_sources =  Xserver-DTrace.xml

-

-if ENABLE_DOCS

-

-# This user's documentation is installed only if tracing is available

-if XSERVER_DTRACE

-include $(top_srcdir)/doc/xml/xmlrules-inst.in

-else

-include $(top_srcdir)/doc/xml/xmlrules-noinst.in

-endif

-

-endif

-

diff --git a/xorg-server/doc/xml/xmlrules-inst.in b/xorg-server/doc/xml/xmlrules-inst.in
deleted file mode 100644
index d6965ff05..000000000
--- a/xorg-server/doc/xml/xmlrules-inst.in
+++ /dev/null
@@ -1,23 +0,0 @@
-

-# The doc_sources variable contains one or more DocBook/XML source file.

-# The generated documents will be installed in $(docdir),

-# The DocBook/XML files will always be included in the tarball

-

-dist_doc_DATA = $(doc_sources)

-

-if HAVE_XMLTO

-doc_DATA = $(doc_sources:.xml=.html)

-

-if HAVE_FOP

-doc_DATA += $(doc_sources:.xml=.pdf)

-endif

-

-if HAVE_XMLTO_TEXT

-doc_DATA += $(doc_sources:.xml=.txt)

-endif

-

-CLEANFILES = $(doc_DATA)

-include $(top_srcdir)/doc/xml/xmlrules.in

-

-endif HAVE_XMLTO

-

diff --git a/xorg-server/doc/xml/xmlrules-noinst.in b/xorg-server/doc/xml/xmlrules-noinst.in
deleted file mode 100644
index d582c2efd..000000000
--- a/xorg-server/doc/xml/xmlrules-noinst.in
+++ /dev/null
@@ -1,22 +0,0 @@
-

-# The doc_sources variable contains one or more DocBook/XML source file.

-# The generated documents will NOT be installed in $(docdir),

-# The DocBook/XML files will always be included in the tarball

-

-dist_noinst_DATA = $(doc_sources)

-

-if HAVE_XMLTO

-noinst_DATA = $(doc_sources:.xml=.html)

-

-if HAVE_FOP

-noinst_DATA += $(doc_sources:.xml=.pdf)

-endif

-

-if HAVE_XMLTO_TEXT

-noinst_DATA += $(doc_sources:.xml=.txt)

-endif

-

-CLEANFILES = $(noinst_DATA)

-include $(top_srcdir)/doc/xml/xmlrules.in

-

-endif HAVE_XMLTO

diff --git a/xorg-server/doc/xml/xmlrules.in b/xorg-server/doc/xml/xmlrules.in
deleted file mode 100644
index cc77ffc25..000000000
--- a/xorg-server/doc/xml/xmlrules.in
+++ /dev/null
@@ -1,47 +0,0 @@
-#

-# Copyright (c) 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"),

-# to deal in the Software without restriction, including without limitation

-# the rights to use, copy, modify, merge, publish, distribute, sublicense,

-# and/or sell copies of the Software, and to permit persons to whom the

-# Software is furnished to do so, subject to the following conditions:

-#

-# The above copyright notice and this permission notice (including the next

-# paragraph) shall be included in all copies or substantial portions of the

-# Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-# 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.

-#

-

-# This file provides pattern rules to generate html/pdf/txt from DocBook/XML

-# A stylesheet is used if xorg-sgml-doctools is installed

-# This file is included by xmlrules-inst.in for installable user's documentation

-# It is included by xmlrules-noinst for non installable developer's documentation

-# If the server version or release date changes, autogen && make

-

-XML_ENT_DIR = $(abs_top_builddir)/doc/xml

-SUFFIXES = .xml .txt .html .pdf

-

-XMLTO_FLAGS = --searchpath $(XML_ENT_DIR)

-

-if HAVE_STYLESHEETS

-XMLTO_FLAGS += -m $(XSL_STYLESHEET) \

-	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css

-endif

-

-%.txt: %.xml $(XML_ENT_DIR)/xserver.ent

-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<

-

-%.html: %.xml $(XML_ENT_DIR)/xserver.ent

-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<

-

-%.pdf: %.xml $(XML_ENT_DIR)/xserver.ent

-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<

diff --git a/xorg-server/doc/xml/xserver.ent.in b/xorg-server/doc/xml/xserver.ent.in
deleted file mode 100644
index aa02d7b93..000000000
--- a/xorg-server/doc/xml/xserver.ent.in
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- shared -*-xml-*- entity definitions for the X server documentation -->

-<!ENTITY xserver.version "@PACKAGE_VERSION@">

-<!ENTITY xserver.reldate "@RELEASE_DATE@">